diff --git a/.ci/Debian11/Dockerfile b/.ci/Debian11/Dockerfile new file mode 100644 index 000000000..b994863bf --- /dev/null +++ b/.ci/Debian11/Dockerfile @@ -0,0 +1,26 @@ +FROM debian:11 + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + build-essential \ + ccache \ + clang-format \ + cmake \ + file \ + g++ \ + git \ + liblzma-dev \ + libmariadb-dev-compat \ + libprotobuf-dev \ + libqt5multimedia5-plugins \ + libqt5sql5-mysql \ + libqt5svg5-dev \ + libqt5websockets5-dev \ + ninja-build \ + protobuf-compiler \ + qt5-image-formats-plugins \ + qtmultimedia5-dev \ + qttools5-dev \ + qttools5-dev-tools \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* diff --git a/.ci/Servatrice_Debian12/Dockerfile b/.ci/Servatrice_Debian11/Dockerfile similarity index 75% rename from .ci/Servatrice_Debian12/Dockerfile rename to .ci/Servatrice_Debian11/Dockerfile index 21f6a036e..fadc9e0e7 100644 --- a/.ci/Servatrice_Debian12/Dockerfile +++ b/.ci/Servatrice_Debian11/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:12 +FROM debian:11 RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ @@ -11,11 +11,11 @@ RUN apt-get update && \ git \ libmariadb-dev-compat \ libprotobuf-dev \ - libqt6sql6-mysql \ + libqt5sql5-mysql \ + libqt5websockets5-dev \ ninja-build \ protobuf-compiler \ - qt6-tools-dev \ - qt6-tools-dev-tools \ - qt6-websockets-dev \ + qttools5-dev \ + qttools5-dev-tools \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/.ci/Ubuntu22.04/Dockerfile b/.ci/Ubuntu22.04/Dockerfile new file mode 100644 index 000000000..93c8fdea9 --- /dev/null +++ b/.ci/Ubuntu22.04/Dockerfile @@ -0,0 +1,26 @@ +FROM ubuntu:22.04 + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + build-essential \ + ccache \ + clang-format \ + cmake \ + file \ + g++ \ + git \ + liblzma-dev \ + libmariadb-dev-compat \ + libprotobuf-dev \ + libqt5multimedia5-plugins \ + libqt5sql5-mysql \ + libqt5svg5-dev \ + libqt5websockets5-dev \ + ninja-build \ + protobuf-compiler \ + qt5-image-formats-plugins \ + qtmultimedia5-dev \ + qttools5-dev \ + qttools5-dev-tools \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* diff --git a/.ci/lint_cpp.sh b/.ci/lint_cpp.sh index 9786a83fc..cfb1e1f07 100755 --- a/.ci/lint_cpp.sh +++ b/.ci/lint_cpp.sh @@ -13,9 +13,17 @@ fi # Check formatting using format.sh echo "Checking your code using format.sh..." -./format.sh --color-diff --cmake --shell --print-version --branch origin/master +diff="$(./format.sh --diff --cmake --shell --print-version --branch origin/master)" err=$? +sep=" +---------- +" +used_version="${diff%%"$sep"*}" +diff="${diff#*"$sep"}" +changes_to_make="${diff%%"$sep"*}" +files_to_edit="${diff#*"$sep"}" + case $err in 1) cat < is the markdown comment escape sequence, emojis are way better generated_list="${generated_list//-->/→}" - # Escape & to preserve it from commit message into markdown output - generated_list="${generated_list//&/\\&}" body="${body//--REPLACE-WITH-GENERATED-LIST--/$generated_list}" body="${body//--REPLACE-WITH-COMMIT-COUNT--/$count}" body="${body//--REPLACE-WITH-PREVIOUS-RELEASE-TAG--/$previous}" diff --git a/.ci/release_template.md b/.ci/release_template.md index ac78a193a..e6dc2e4be 100644 --- a/.ci/release_template.md +++ b/.ci/release_template.md @@ -19,8 +19,10 @@ Available pre-compiled binaries for installation: Linux • Ubuntu 26.04 LTS Resolute Racoon • Ubuntu 24.04 LTS Noble Numbat + • Ubuntu 22.04 LTS Jammy Jellyfish • Debian 13 Trixie • Debian 12 Bookworm + • Debian 11 Bullseye • Fedora 44 • Fedora 43 diff --git a/.clang-format b/.clang-format index 1db97481a..1ef3ca6db 100644 --- a/.clang-format +++ b/.clang-format @@ -3,9 +3,7 @@ AccessModifierOffset: -4 ColumnLimit: 120 --- Language: Cpp -AllowAllParametersOfDeclarationOnNextLine: false -AllowShortFunctionsOnASingleLine: None -BinPackParameters: false +BreakBeforeBraces: Custom BraceWrapping: AfterClass: true AfterControlStatement: false @@ -20,14 +18,16 @@ BraceWrapping: SplitEmptyFunction: true SplitEmptyRecord: true SplitEmptyNamespace: true -BreakBeforeBraces: Custom -IncludeBlocks: Regroup +AllowShortFunctionsOnASingleLine: None +BinPackParameters: false +AllowAllParametersOfDeclarationOnNextLine: false IndentCaseLabels: true -InsertBraces: true PointerAlignment: Right -RemoveSemicolon: true SortIncludes: true +IncludeBlocks: Regroup StatementAttributeLikeMacros: [emit] +# requires clang-format 16 +# RemoveSemicolon: true --- Language: Proto AllowShortFunctionsOnASingleLine: None diff --git a/.codacy.yml b/.codacy.yml new file mode 100644 index 000000000..f9482da2f --- /dev/null +++ b/.codacy.yml @@ -0,0 +1,5 @@ +--- +exclude_paths: + - '**/translations/*.ts' + +# codacy config documentation: https://support.codacy.com/hc/en-us/articles/115002130625-Codacy-Configuration-File diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 56ad64283..b293b3937 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -209,16 +209,6 @@ nowadays and clean it up for you. Lines should be 120 characters or less. Please break up lines that are too long into smaller parts, for example at spaces or after opening a brace. -### Documentation Comments ### - -Use [Doxygen](https://www.doxygen.nl/) for code documentation: - -- **Doc blocks**: Use `/** @brief Description */` (Javadoc-style), not `///` -- **Member comments**: Use trailing `///<` for inline member documentation -- **TODOs**: Use `//! \todo Description` (Qt-style), Doxygen collects them into a Todo List - (uses [Qt-style comments](https://www.doxygen.nl/manual/docblocks.html) with - Doxygen's [\todo command](https://www.doxygen.nl/manual/commands.html#cmdtodo)) - ### Memory Management ### New code should be written using references over pointers and stack allocation diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 404cac62e..06fdf7ab9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,7 +10,7 @@ updates: # Look for `.gitmodules` in the `root` directory directory: "/" ignore: - # Ignore updates for vcpkg (Bump to latest tag not working (no SemVer used) + # Ignore updates for vcpkg (Bump to latest tag not working (no SemVer used) & macOS Intel triplet broken with newer releases) - dependency-name: "vcpkg" # Check for updates once a month schedule: diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index f1846ecf6..9eb81c007 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -1,10 +1,10 @@ name: Build Desktop permissions: - actions: write # needed to delete entries in GHA cache (update ccache) - attestations: write # needed to persist the attestation. contents: write - id-token: write # needed for signing certificate in attestation + id-token: write + attestations: write + actions: write # needed for ccache action to be able to delete gha caches on: push: @@ -19,7 +19,7 @@ on: - '.github/workflows/desktop-build.yml' - 'CMakeLists.txt' - 'vcpkg.json' - - 'vcpkg' # needed to match submodule bumps (gitlink) + - 'vcpkg' tags: - '*' pull_request: @@ -32,7 +32,7 @@ on: - '.github/workflows/desktop-build.yml' - 'CMakeLists.txt' - 'vcpkg.json' - - 'vcpkg' # needed to match submodule bumps (gitlink) + - 'vcpkg' # Cancel earlier, unfinished runs of this workflow on the same branch (unless on release) concurrency: @@ -44,217 +44,224 @@ jobs: name: Configure runs-on: ubuntu-slim outputs: - tag: ${{ steps.configure.outputs.tag }} - sha: ${{ steps.configure.outputs.sha }} + tag: ${{steps.configure.outputs.tag}} + sha: ${{steps.configure.outputs.sha}} - steps: - - name: "Configure" - env: - RESOLVED_SHA: ${{ case(github.event_name == 'pull_request', github.event.pull_request.head.sha, github.sha) }} + steps: + - name: Configure id: configure shell: bash run: | - if [[ "$GITHUB_REF_TYPE" == 'tag' ]]; then # release - echo "tag=$GITHUB_REF_NAME" >> "$GITHUB_OUTPUT" + tag_regex='^refs/tags/' + if [[ $GITHUB_EVENT_NAME == pull-request ]]; then # pull request + sha="${{github.event.pull_request.head.sha}}" + elif [[ $GITHUB_REF =~ $tag_regex ]]; then # release + sha="$GITHUB_SHA" + tag="${GITHUB_REF/refs\/tags\//}" + echo "tag=$tag" >>"$GITHUB_OUTPUT" + else # push to branch + sha="$GITHUB_SHA" fi - echo "sha=$RESOLVED_SHA" >> "$GITHUB_OUTPUT" + echo "sha=$sha" >>"$GITHUB_OUTPUT" - - name: "Checkout" + - name: Checkout if: steps.configure.outputs.tag != null - uses: actions/checkout@v7 + uses: actions/checkout@v6 with: - fetch-depth: 0 # fetch all history for all branches and tags + fetch-depth: 0 - - name: "Prepare release parameters" + - name: Prepare release parameters id: prepare if: steps.configure.outputs.tag != null shell: bash env: - TAG: ${{ steps.configure.outputs.tag }} + TAG: ${{steps.configure.outputs.tag}} run: .ci/prep_release.sh - - name: "Create release" + - name: Create release if: steps.configure.outputs.tag != null id: create_release shell: bash env: - GH_TOKEN: ${{ github.token }} - tag_name: ${{ steps.configure.outputs.tag }} - target: ${{ steps.configure.outputs.sha }} - release_name: ${{ steps.prepare.outputs.title }} - body_path: ${{ steps.prepare.outputs.body_path }} - prerelease: ${{ steps.prepare.outputs.is_beta }} + GH_TOKEN: ${{github.token}} + tag_name: ${{steps.configure.outputs.tag}} + target: ${{steps.configure.outputs.sha}} + release_name: ${{steps.prepare.outputs.title}} + body_path: ${{steps.prepare.outputs.body_path}} + prerelease: ${{steps.prepare.outputs.is_beta}} run: | - args=() - [[ $prerelease == yes ]] && args+=(--prerelease) - - gh release create "$tag_name" --verify-tag --draft "${args[@]}" \ - --target "$target" \ - --title "$release_name" \ - --notes-file "$body_path" + if [[ $prerelease == yes ]]; then + args="--prerelease" + fi + gh release create "$tag_name" --draft --verify-tag $args \ + --target "$target" --title "$release_name" \ + --notes-file "$body_path" build-linux: strategy: fail-fast: false matrix: - # The files in ".ci/$distro$version" correspond to the values given here + # These names correspond to the files in ".ci/$distro$version" include: - distro: Arch - - allow-failure: yes package: skip # We are packaged in Arch already + allow-failure: yes + + - distro: Debian + version: 11 + package: DEB - distro: Servatrice_Debian - version: 12 - + version: 11 package: DEB - server_only: yes test: skip + server_only: yes - distro: Debian version: 12 - package: DEB test: skip # Running tests on all distros is superfluous - distro: Debian version: 13 - package: DEB - distro: Fedora version: 43 - package: RPM test: skip # Running tests on all distros is superfluous - distro: Fedora version: 44 - package: RPM - distro: Ubuntu - version: 24.04 - + version: 22.04 package: DEB test: skip # Running tests on all distros is superfluous - distro: Ubuntu - version: 26.04 - + version: 24.04 package: DEB - name: ${{ matrix.distro }} ${{ matrix.version }} + - distro: Ubuntu + version: 26.04 + package: DEB + + name: ${{matrix.distro}} ${{matrix.version}} needs: configure runs-on: ubuntu-latest - continue-on-error: ${{ matrix.allow-failure == 'yes' }} + continue-on-error: ${{matrix.allow-failure == 'yes'}} timeout-minutes: 70 env: - CACHE: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.version }} # directory for caching docker image and ccache + NAME: ${{matrix.distro}}${{matrix.version}} + CACHE: ${{github.workspace}}/.cache/${{matrix.distro}}${{matrix.version}} # directory for caching docker image and ccache + # Cache size over the entire repo is 10Gi: + # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy + CCACHE_SIZE: 550M CCACHE_EVICTION_AGE: 7d - CCACHE_SIZE: 550M # 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 }} steps: - - name: "Checkout" - uses: actions/checkout@v7 + - name: Checkout + uses: actions/checkout@v6 - - name: "Restore compiler cache (ccache)" + - name: Restore compiler cache (ccache) id: ccache_restore - uses: actions/cache/restore@v6 + uses: actions/cache/restore@v5 env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} with: - key: ccache-${{ matrix.distro }}${{ matrix.version }}-${{ env.BRANCH_NAME }} - path: ${{ env.CACHE }} - restore-keys: ccache-${{ matrix.distro }}${{ matrix.version }}- + path: ${{env.CACHE}} + key: ccache-${{matrix.distro}}${{matrix.version}}-${{env.BRANCH_NAME}} + restore-keys: ccache-${{matrix.distro}}${{matrix.version}}- - - name: "Build ${{ matrix.distro }} ${{ matrix.version }} Docker image" + - name: Build ${{matrix.distro}} ${{matrix.version}} Docker image shell: bash run: source .ci/docker.sh --build - - name: "Build debug and test" + - name: Build debug and test if: matrix.test != 'skip' shell: bash run: | source .ci/docker.sh RUN --server --debug --test --ccache "$CCACHE_SIZE" \ - --cmake-generator "$CMAKE_GENERATOR" + --cmake-generator "$CMAKE_GENERATOR" - - name: "Build release package" + - name: Build release package id: build if: matrix.package != 'skip' shell: bash env: - SUFFIX: '-${{ matrix.distro }}${{ matrix.version }}' - package: '${{ matrix.package }}' - server_only: '${{ matrix.server_only }}' + SUFFIX: '-${{matrix.distro}}${{matrix.version}}' + package: '${{matrix.package}}' + server_only: '${{matrix.server_only}}' run: | source .ci/docker.sh args=() - [[ $server_only == yes ]] && args+=(--no-client) - [[ $GITHUB_REF == "refs/heads/master" ]] && args+=(--evict-ccache "$CCACHE_EVICTION_AGE") + if [[ $server_only == yes ]]; then + args+=(--no-client) + fi + if [[ $GITHUB_REF == "refs/heads/master" ]]; then + args+=(--evict-ccache "$CCACHE_EVICTION_AGE") + fi args+=(--ccache "$CCACHE_SIZE") args+=(--cmake-generator "$CMAKE_GENERATOR") args+=(--suffix "$SUFFIX") - RUN --server --release --package "$package" "${args[@]}" # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342 - - name: "Delete remote compiler cache (ccache)" + - name: Delete remote compiler cache (ccache) if: github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit continue-on-error: true env: - CACHE_PRIMARY_KEY: ${{ steps.ccache_restore.outputs.cache-primary-key }} GH_TOKEN: ${{ github.token }} run: | - if gh cache delete --repo "$GITHUB_REPOSITORY" "$CACHE_PRIMARY_KEY"; then + if gh cache delete --repo ${{ github.repository }} ${{ steps.ccache_restore.outputs.cache-primary-key }}; then echo "Cache deleted successfully" fi - - name: "Save updated compiler cache (ccache)" + - name: Save updated compiler cache (ccache) if: github.ref == 'refs/heads/master' - uses: actions/cache/save@v6 + uses: actions/cache/save@v5 with: + path: ${{env.CACHE}} key: ${{ steps.ccache_restore.outputs.cache-primary-key }} - path: ${{ env.CACHE }} - - name: "Upload artifact" + - name: Upload artifact id: upload_artifact if: matrix.package != 'skip' uses: actions/upload-artifact@v7 with: + path: ${{steps.build.outputs.path}} archive: false if-no-files-found: error - path: ${{ steps.build.outputs.path }} - - name: "Upload to release" + - name: Upload to release id: upload_release if: matrix.package != 'skip' && needs.configure.outputs.tag != null shell: bash env: - asset_name: ${{ steps.build.outputs.fullname }} - asset_path: ${{ steps.build.outputs.path }} - GH_TOKEN: ${{ github.token }} - tag_name: ${{ needs.configure.outputs.tag }} + GH_TOKEN: ${{github.token}} + tag_name: ${{needs.configure.outputs.tag}} + asset_name: ${{steps.build.outputs.fullname}} + asset_path: ${{steps.build.outputs.path}} run: gh release upload "$tag_name" "$asset_path#$asset_name" - - name: "Attest binary provenance" + - name: Attest binary provenance id: attestation if: steps.upload_release.outcome == 'success' uses: actions/attest@v4 with: + subject-path: ${{steps.build.outputs.path}} show-summary: false - subject-path: ${{ steps.build.outputs.path }} - - name: "Verify binary attestation" + - name: Verify binary attestation if: steps.attestation.outcome == 'success' shell: bash env: - BUILD_PATH: ${{ steps.build.outputs.path }} - GH_TOKEN: ${{ github.token }} - run: gh attestation verify "$BUILD_PATH" --repo Cockatrice/Cockatrice + GH_TOKEN: ${{github.token}} + run: gh attestation verify "${{steps.build.outputs.path}}" --repo Cockatrice/Cockatrice build-vcpkg: strategy: @@ -264,234 +271,234 @@ jobs: - os: macOS target: 13 runner: macos-15-intel - - ccache_eviction_age: 7d - cmake_generator: Ninja - make_package: 1 + soc: Intel + xcode: "16.4" + type: Release override_target: 13 + make_package: 1 package_suffix: "-macOS13_Intel" qt_version: 6.11.0 + qt_arch: clang_64 qt_modules: qtimageformats qtmultimedia qtwebsockets - soc: Intel - type: Release + cmake_generator: Ninja use_ccache: 1 - xcode: "16.4" + ccache_eviction_age: 7d - os: macOS target: 14 runner: macos-14 - - ccache_eviction_age: 7d - cmake_generator: Ninja + soc: Apple + xcode: "15.4" + type: Release make_package: 1 package_suffix: "-macOS14" qt_version: 6.11.0 + qt_arch: clang_64 qt_modules: qtimageformats qtmultimedia qtwebsockets - soc: Apple - type: Release + cmake_generator: Ninja use_ccache: 1 - xcode: "15.4" + ccache_eviction_age: 7d - os: macOS target: 15 runner: macos-15 - - ccache_eviction_age: 7d - cmake_generator: Ninja + soc: Apple + xcode: "16.4" + type: Release make_package: 1 package_suffix: "-macOS15" qt_version: 6.11.0 + qt_arch: clang_64 qt_modules: qtimageformats qtmultimedia qtwebsockets - soc: Apple - type: Release + cmake_generator: Ninja use_ccache: 1 - xcode: "16.4" + ccache_eviction_age: 7d - os: macOS target: 15 runner: macos-15 - - ccache_eviction_age: 7d - cmake_generator: Ninja - qt_version: 6.11.0 - qt_modules: qtimageformats qtmultimedia qtwebsockets soc: Apple - type: Debug - use_ccache: 1 xcode: "16.4" + type: Debug + qt_version: 6.11.0 + qt_arch: clang_64 + qt_modules: qtimageformats qtmultimedia qtwebsockets + cmake_generator: Ninja + use_ccache: 1 + ccache_eviction_age: 7d - os: Windows target: 10 runner: windows-2025 - - cmake_generator: "Visual Studio 18 2026" - cmake_generator_platform: x64 + type: Release make_package: 1 package_suffix: "-Win10" qt_version: 6.11.0 + qt_arch: win64_msvc2022_64 qt_modules: qtimageformats qtmultimedia qtwebsockets - type: Release + cmake_generator: "Visual Studio 17 2022" + cmake_generator_platform: x64 - name: ${{ matrix.os }} ${{ matrix.target }}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} + name: ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} needs: configure - runs-on: ${{ matrix.runner }} + runs-on: ${{matrix.runner}} timeout-minutes: 100 env: - CCACHE_DIR: ${{ github.workspace }}/.cache/ - CCACHE_SIZE: 550M # 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 + CCACHE_DIR: ${{github.workspace}}/.cache/ + # Cache size over the entire repo is 10Gi: + # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy + CCACHE_SIZE: 550M steps: - - name: "Checkout" - uses: actions/checkout@v7 + - name: Checkout + uses: actions/checkout@v6 with: submodules: recursive - - name: "[Windows] Add msbuild to PATH" + - name: Add msbuild to PATH if: matrix.os == 'Windows' id: add-msbuild uses: microsoft/setup-msbuild@v3 with: msbuild-architecture: x64 - - name: "[macOS] Setup ccache" - if: matrix.os == 'macOS' && matrix.use_ccache == 1 + - name: Setup ccache + if: matrix.use_ccache == 1 && matrix.os == 'macOS' run: brew install ccache - - name: "[macOS] Restore compiler cache (ccache)" - if: matrix.os == 'macOS' && matrix.use_ccache == 1 + - name: Restore compiler cache (ccache) + if: matrix.use_ccache == 1 id: ccache_restore - uses: actions/cache/restore@v6 + uses: actions/cache/restore@v5 env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} with: - key: ccache-${{ matrix.runner }}-${{ matrix.soc }}-${{ matrix.type }}-${{ env.BRANCH_NAME }} - path: ${{ env.CCACHE_DIR }} - restore-keys: ccache-${{ matrix.runner }}-${{ matrix.soc }}-${{ matrix.type }}- + path: ${{env.CCACHE_DIR}} + key: ccache-${{matrix.runner}}-${{matrix.soc}}-${{matrix.type}}-${{env.BRANCH_NAME}} + restore-keys: ccache-${{matrix.runner}}-${{matrix.soc}}-${{matrix.type}}- - - name: "Install aqtinstall" + - name: Install aqtinstall run: pipx install aqtinstall # Resolve given wildcard versions (e.g. Qt 6.6.*) to latest version via aqtinstall to avoid stale caches on new releases - - name: "Resolve latest Qt patch version" - env: - QT_VERSION: ${{ matrix.qt_version }} + - name: Resolve latest Qt patch version id: resolve_qt_version shell: bash - run: .ci/resolve_latest_aqt_qt_version.sh "$QT_VERSION" + run: .ci/resolve_latest_aqt_qt_version.sh "${{matrix.qt_version}}" - - name: "[macOS] Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }} libraries" + - name: Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }} libraries (${{ matrix.soc }} macOS) if: matrix.os == 'macOS' id: restore_qt - uses: actions/cache/restore@v6 + uses: actions/cache/restore@v5 with: - key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }} path: ${{ github.workspace }}/Qt + key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }} # Using jurplel/install-qt-action to install Qt without using brew - # Qt build using vcpkg either just fails or takes too long to build - - name: "[macOS] Install fat Qt ${{ steps.resolve_qt_version.outputs.version }}" + # qt build using vcpkg either just fails or takes too long to build + - name: Install fat Qt ${{ steps.resolve_qt_version.outputs.version }} (${{ matrix.soc }} macOS) if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true' uses: jurplel/install-qt-action@v4 with: - cache: false - dir: ${{ github.workspace }} - modules: ${{ matrix.qt_modules }} version: ${{ steps.resolve_qt_version.outputs.version }} + arch: ${{matrix.qt_arch}} + modules: ${{matrix.qt_modules}} + cache: false + dir: ${{github.workspace}} - - name: "[macOS] Create thin Qt libraries" + - name: Thin Qt libraries (${{ matrix.soc }} macOS) if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true' run: .ci/thin_macos_qtlib.sh - - name: "[macOS] Cache thin Qt libraries" + - name: Cache thin Qt libraries (${{ matrix.soc }} macOS) if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true' - uses: actions/cache/save@v6 + uses: actions/cache/save@v5 with: - key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }} path: ${{ github.workspace }}/Qt + key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }} - - name: "[Windows] Install Qt ${{ matrix.qt_version }}" + - name: Install Qt ${{matrix.qt_version}} (Windows) if: matrix.os == 'Windows' uses: jurplel/install-qt-action@v4 with: - # Qt 6.11.0 only works with aqtinstall directly from git until aqtinstall 3.4 is released + # qt 6.11.0 only works with aqtinstall directly from git until aqtinstall 3.4 is released aqtsource: git+https://github.com/miurahr/aqtinstall.git - cache: true - modules: ${{ matrix.qt_modules }} version: ${{ steps.resolve_qt_version.outputs.version }} + arch: ${{matrix.qt_arch}} + modules: ${{matrix.qt_modules}} + cache: true - - name: "[Windows] Install NSIS" + - name: Install NSIS if: matrix.os == 'Windows' shell: bash run: choco install nsis - - name: "Setup vcpkg cache" + - name: Setup vcpkg cache id: vcpkg-cache uses: TAServers/vcpkg-cache@v3 with: token: ${{ secrets.GITHUB_TOKEN }} - # Uses environment variables, see compile.sh for more details - - name: "Build Cockatrice" + # uses environment variables, see compile.sh for more details + - name: Build Cockatrice id: build shell: bash env: - BUILDTYPE: '${{ matrix.type }}' - CCACHE_EVICTION_AGE: ${{ matrix.ccache_eviction_age }} - CMAKE_GENERATOR: ${{ matrix.cmake_generator }} - CMAKE_GENERATOR_PLATFORM: ${{ matrix.cmake_generator_platform }} - DEVELOPER_DIR: '/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer' - MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }} - MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }} - MACOS_CERTIFICATE_PWD: ${{ secrets.PROD_MACOS_CERTIFICATE_PWD }} - MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }} - MAKE_PACKAGE: '${{ matrix.make_package }}' - PACKAGE_SUFFIX: '${{ matrix.package_suffix }}' - TARGET_MACOS_VERSION: ${{ matrix.override_target }} - USE_CCACHE: ${{ matrix.use_ccache }} - VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite' + BUILDTYPE: '${{matrix.type}}' + MAKE_PACKAGE: '${{matrix.make_package}}' + PACKAGE_SUFFIX: '${{matrix.package_suffix}}' + CMAKE_GENERATOR: ${{matrix.cmake_generator}} + CMAKE_GENERATOR_PLATFORM: ${{matrix.cmake_generator_platform}} + USE_CCACHE: ${{matrix.use_ccache}} VCPKG_DISABLE_METRICS: 1 + VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite' + # macOS-specific environment variables, will be ignored on Windows + MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }} + MACOS_CERTIFICATE_PWD: ${{ secrets.PROD_MACOS_CERTIFICATE_PWD }} + MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }} + MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }} + DEVELOPER_DIR: '/Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer' + TARGET_MACOS_VERSION: ${{ matrix.override_target }} + CCACHE_EVICTION_AGE: ${{ matrix.ccache_eviction_age }} run: .ci/compile.sh --server --test --vcpkg # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342 - - name: "[macOS] Delete remote compiler cache (ccache)" - if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit + - name: Delete remote compiler cache (ccache) + if: github.ref == 'refs/heads/master' && matrix.use_ccache == 1 && steps.ccache_restore.outputs.cache-hit continue-on-error: true env: - CACHE_PRIMARY_KEY: ${{ steps.ccache_restore.outputs.cache-primary-key }} GH_TOKEN: ${{ github.token }} run: | - if gh cache delete --repo "$GITHUB_REPOSITORY" "$CACHE_PRIMARY_KEY"; then + if gh cache delete --repo ${{ github.repository }} ${{ steps.ccache_restore.outputs.cache-primary-key }}; then echo "Cache deleted successfully" fi - - name: "[macOS] Save updated compiler cache (ccache)" - if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master' - uses: actions/cache/save@v6 + - name: Save updated compiler cache (ccache) + if: github.ref == 'refs/heads/master' && matrix.use_ccache == 1 + uses: actions/cache/save@v5 with: + path: ${{env.CCACHE_DIR}} key: ${{ steps.ccache_restore.outputs.cache-primary-key }} - path: ${{ env.CCACHE_DIR }} - - name: "[macOS] Sign app bundle" + - name: Sign app bundle if: matrix.os == 'macOS' && matrix.make_package && needs.configure.outputs.tag != null id: sign_macos env: - BUILD_PATH: ${{ steps.build.outputs.path }} MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }} MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }} run: | if [[ -n "$MACOS_CERTIFICATE_NAME" ]] then security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain - /usr/bin/codesign --sign="$MACOS_CERTIFICATE_NAME" --entitlements=".ci/macos.entitlements" --options=runtime --force --deep --timestamp --verbose "$BUILD_PATH" + /usr/bin/codesign --sign="$MACOS_CERTIFICATE_NAME" --entitlements=".ci/macos.entitlements" --options=runtime --force --deep --timestamp --verbose "${{steps.build.outputs.path}}" fi - - name: "[macOS] Notarize app bundle" - if: matrix.os == 'macOS' && steps.sign_macos.outcome == 'success' + - name: Notarize app bundle + if: steps.sign_macos.outcome == 'success' env: - BUILD_PATH: ${{ steps.build.outputs.path }} MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }} - MACOS_NOTARIZATION_PWD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }} MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }} + MACOS_NOTARIZATION_PWD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }} run: | if [[ -n "$MACOS_NOTARIZATION_APPLE_ID" ]] then @@ -503,7 +510,7 @@ jobs: # Therefore, we create a zip file containing our app bundle, so that we can send it to the # notarization service echo "Creating temp notarization archive" - ditto -c -k --keepParent "$BUILD_PATH" "notarization.zip" + ditto -c -k --keepParent "${{steps.build.outputs.path}}" "notarization.zip" # Here we send the notarization request to the Apple's Notarization service, waiting for the result. # This typically takes a few seconds inside a CI environment, but it might take more depending on the App @@ -515,52 +522,51 @@ jobs: # Finally, we need to "attach the staple" to our executable, which will allow our app to be # validated by macOS even when an internet connection is not available. echo "Attach staple" - xcrun stapler staple "$BUILD_PATH" + xcrun stapler staple "${{steps.build.outputs.path}}" fi - - name: "Upload artifact" + - name: Upload artifact if: matrix.make_package id: upload_artifact uses: actions/upload-artifact@v7 with: + path: ${{steps.build.outputs.path}} archive: false if-no-files-found: error - path: ${{ steps.build.outputs.path }} - - name: "[Windows] Upload PDBs (Program Databases)" + - name: Upload PDBs (Program Databases) if: matrix.os == 'Windows' && github.ref_type != 'tag' uses: actions/upload-artifact@v7 with: - if-no-files-found: error - name: ${{ steps.build.outputs.name }}-PDBs + name: ${{steps.build.outputs.name}}-PDBs path: | build/cockatrice/Release/*.pdb build/oracle/Release/*.pdb build/servatrice/Release/*.pdb + if-no-files-found: error - - name: "Upload to release" + - name: Upload to release if: needs.configure.outputs.tag != null && matrix.make_package == '1' id: upload_release shell: bash env: - asset_name: ${{ steps.build.outputs.fullname }} - asset_path: ${{ steps.build.outputs.path }} - GH_TOKEN: ${{ github.token }} - tag_name: ${{ needs.configure.outputs.tag }} + GH_TOKEN: ${{github.token}} + tag_name: ${{needs.configure.outputs.tag}} + asset_name: ${{steps.build.outputs.fullname}} + asset_path: ${{steps.build.outputs.path}} run: gh release upload "$tag_name" "$asset_path#$asset_name" - - name: "Attest binary provenance" + - name: Attest binary provenance if: steps.upload_release.outcome == 'success' id: attestation uses: actions/attest@v4 with: + subject-path: ${{steps.build.outputs.path}} show-summary: false - subject-path: ${{ steps.build.outputs.path }} - - name: "Verify binary attestation" + - name: Verify binary attestation if: steps.attestation.outcome == 'success' shell: bash env: - BUILD_PATH: ${{ steps.build.outputs.path }} - GH_TOKEN: ${{ github.token }} - run: gh attestation verify "$BUILD_PATH" --repo Cockatrice/Cockatrice + GH_TOKEN: ${{github.token}} + run: gh attestation verify "${{steps.build.outputs.path}}" --repo Cockatrice/Cockatrice diff --git a/.github/workflows/desktop-lint.yml b/.github/workflows/desktop-lint.yml index 5f31ea59c..df8b9f89e 100644 --- a/.github/workflows/desktop-lint.yml +++ b/.github/workflows/desktop-lint.yml @@ -1,7 +1,7 @@ name: Code Style (C++) on: - # Push trigger not needed for linting, we do not allow direct pushes to master + # push trigger not needed for linting, we do not allow direct pushes to master pull_request: paths: - '*/**' # matches all files not in root @@ -21,20 +21,17 @@ jobs: runs-on: ubuntu-slim steps: - - name: "Checkout" - uses: actions/checkout@v7 + - name: Checkout + uses: actions/checkout@v6 with: fetch-depth: 20 # should be enough to find merge base - - name: "Install dependencies" + - name: Install dependencies shell: bash run: | sudo apt-get update - sudo apt-get install -y --no-install-recommends \ - clang-format \ - cmake-format \ - shellcheck + sudo apt-get install -y --no-install-recommends clang-format cmake-format shellcheck - - name: "Check code formatting" + - name: Check code formatting shell: bash run: ./.ci/lint_cpp.sh diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml index 5384c9e64..b869d1fa9 100644 --- a/.github/workflows/docker-release.yml +++ b/.github/workflows/docker-release.yml @@ -1,10 +1,9 @@ name: Build Docker Image -permissions: - contents: read - packages: write - on: + release: + types: + - released # publishing of stable releases push: branches: - master @@ -14,9 +13,6 @@ on: paths: - '.github/workflows/docker-release.yml' - 'Dockerfile' - release: - types: - - released # publishing of stable releases # Cancel earlier, unfinished runs of this workflow on the same branch (unless on release) concurrency: @@ -28,51 +24,54 @@ jobs: name: amd64 & arm64 if: ${{ github.repository_owner == 'Cockatrice' }} runs-on: ubuntu-latest + + permissions: + contents: read + packages: write steps: - - name: "Checkout" - uses: actions/checkout@v7 + - name: Checkout + uses: actions/checkout@v6 - - name: "Docker metadata" + - name: Docker metadata id: metadata uses: docker/metadata-action@v6 env: DOCKER_METADATA_ANNOTATIONS_LEVELS: index # needed for GHCR with: - annotations: | - org.opencontainers.image.title=Servatrice - org.opencontainers.image.url=https://cockatrice.github.io/ - org.opencontainers.image.description=Server for Cockatrice, a cross-platform virtual tabletop for multiplayer card games images: | ghcr.io/cockatrice/servatrice labels: | org.opencontainers.image.title=Servatrice org.opencontainers.image.url=https://cockatrice.github.io/ org.opencontainers.image.description=Server for Cockatrice, a cross-platform virtual tabletop for multiplayer card games + annotations: | + org.opencontainers.image.title=Servatrice + org.opencontainers.image.url=https://cockatrice.github.io/ + org.opencontainers.image.description=Server for Cockatrice, a cross-platform virtual tabletop for multiplayer card games - - name: "Set up QEMU" + - name: Set up QEMU uses: docker/setup-qemu-action@v4 - - name: "Set up Docker buildx" + - name: Set up Docker buildx uses: docker/setup-buildx-action@v4 - - name: "Login to GitHub Container Registry (GHCR)" - if: github.event_name == 'release' && github.event.release.prerelease == false - id: login + - name: Login to GitHub Container Registry + if: contains(github.event.release.tag_name, 'Release') && github.event.release.target_commitish == 'master' uses: docker/login-action@v4 with: - password: ${{ github.token }} registry: ghcr.io username: ${{ github.actor }} + password: ${{ github.token }} - - name: "Build and push Docker image" + - name: Build and push Docker image uses: docker/build-push-action@v7 with: + context: . + platforms: linux/amd64,linux/arm64 + push: ${{ github.ref_type == 'tag' }} + tags: ${{ steps.metadata.outputs.tags }} + labels: ${{ steps.metadata.outputs.labels }} annotations: ${{ steps.metadata.outputs.annotations }} cache-from: type=gha,scope=servatrice cache-to: type=gha,mode=max,scope=servatrice - context: . - labels: ${{ steps.metadata.outputs.labels }} - platforms: linux/amd64,linux/arm64 - push: ${{ steps.login.outcome == 'success' }} - tags: ${{ steps.metadata.outputs.tags }} diff --git a/.github/workflows/documentation-build.yml b/.github/workflows/documentation-build.yml index 4b9ca79ab..7306c726a 100644 --- a/.github/workflows/documentation-build.yml +++ b/.github/workflows/documentation-build.yml @@ -1,18 +1,18 @@ name: Generate Docs on: + push: + tags: + - '*' # Only re-generate docs when a new tagged version is pushed pull_request: paths: - 'doc/doxygen/**' - '.github/workflows/documentation-build.yml' - 'Doxyfile' - release: - types: - - published # publishing of stable releases and pre-releases workflow_dispatch: env: - COCKATRICE_REF: ${{ github.ref_name }} # tag name if the commit is tagged, otherwise branch name + COCKATRICE_REF: ${{ github.ref_name }} # Tag name if the commit is tagged, otherwise branch name jobs: docs: @@ -20,22 +20,22 @@ jobs: runs-on: ubuntu-latest steps: - - name: "Checkout code" - uses: actions/checkout@v7 + - name: Checkout code + uses: actions/checkout@v6 with: submodules: recursive - - name: "Install Graphviz" + - name: Install Graphviz run: | sudo apt-get install -y graphviz dot -V - - name: "Install Doxygen" + - name: Install Doxygen uses: ssciwr/doxygen-install@v2 with: version: "1.16.1" - - name: "Update Doxygen Configuration" + - name: Update Doxygen Configuration run: | git diff Doxyfile doxygen -u Doxyfile @@ -48,16 +48,16 @@ jobs: exit 1 fi - - name: "Generate Documentation" + - name: Generate Documentation if: always() run: doxygen Doxyfile - - name: "Deploy to cockatrice.github.io" - if: github.event_name == 'release' || github.event_name == 'workflow_dispatch' + - name: Deploy to cockatrice.github.io + if: github.event_name != 'pull_request' uses: peaceiris/actions-gh-pages@v4 with: deploy_key: ${{ secrets.DOCS_DEPLOY_KEY }} - destination_dir: docs # docs will be available at https://cockatrice.github.io/docs/ external_repository: Cockatrice/cockatrice.github.io publish_branch: master publish_dir: ./docs/html + destination_dir: docs # Docs will live under https://cockatrice.github.io/docs/ diff --git a/.github/workflows/translations-pull.yml b/.github/workflows/translations-pull.yml index a3db5f86d..8f673fce9 100644 --- a/.github/workflows/translations-pull.yml +++ b/.github/workflows/translations-pull.yml @@ -1,14 +1,14 @@ name: Update Translations on: + workflow_dispatch: + schedule: + # runs in the middle of each month starting a quarter (UTC) = two weeks after new strings are built + - cron: '0 0 15 1,4,7,10 *' pull_request: paths: - '.tx/**' - '.github/workflows/translations-pull.yml' - schedule: - # Runs in the middle of each month starting a quarter (UTC) = two weeks after new strings are built - - cron: '0 0 15 1,4,7,10 *' - workflow_dispatch: jobs: translations: @@ -19,20 +19,18 @@ jobs: runs-on: ubuntu-slim steps: - - name: "Checkout repo" - uses: actions/checkout@v7 + - name: Checkout repo + uses: actions/checkout@v6 - - name: "Pull translated strings from Transifex" - # Do not run this step for PR's from forks, they don't have access to the secret - if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false + - name: Pull translated strings from Transifex uses: transifex/cli-action@v2 with: - # Used config file: https://github.com/Cockatrice/Cockatrice/blob/master/.tx/config - # Docs: https://github.com/transifex/cli#pulling-files-from-transifex - args: pull --force --all + # used config file: https://github.com/Cockatrice/Cockatrice/blob/master/.tx/config + # https://github.com/transifex/cli#pulling-files-from-transifex token: ${{ secrets.TX_TOKEN }} + args: pull --force --all - - name: "Create pull request" + - name: Create pull request if: github.event_name != 'pull_request' id: create_pr uses: peter-evans/create-pull-request@v8 @@ -40,32 +38,35 @@ jobs: add-paths: | cockatrice/translations/*.ts oracle/translations/*.ts - author: github-actions # owner of the commit + commit-message: Update translation files + # author is the owner of the commit + author: github-actions + branch: ci-update_translations + delete-branch: true + title: 'Update translations' body: | Pulled all translated strings from [Transifex][1]. - + --- *This PR is automatically generated and updated by the workflow at `.github/workflows/translations-pull.yml`. Review [action runs][2].*
*After merging, all new languages and translations are available in the next build.* - + [1]: https://explore.transifex.com/cockatrice/cockatrice/ [2]: https://github.com/Cockatrice/Cockatrice/actions/workflows/translations-pull.yml?query=branch%3Amaster - branch: ci-update_translations - commit-message: Update translation files - delete-branch: true - draft: false labels: | CI Translation - title: 'Update translations' + draft: false - - name: "PR Status" + - name: PR Status if: github.event_name != 'pull_request' shell: bash env: - PR_NUMBER: ${{ steps.create_pr.outputs.pull-request-number }} - PR_URL: ${{ steps.create_pr.outputs.pull-request-url }} - STATUS: ${{ case(steps.create_pr.outputs.pull-request-operation == 'none', 'unchanged', steps.create_pr.outputs.pull-request-operation) }} + STATUS: ${{ steps.create_pr.outputs.pull-request-operation }} run: | - echo "PR #$PR_NUMBER $STATUS!" >> "$GITHUB_STEP_SUMMARY" - echo "URL: $PR_URL" >> "$GITHUB_STEP_SUMMARY" + if [[ "$STATUS" == "none" ]]; then + echo "PR #${{ steps.create_pr.outputs.pull-request-number }} unchanged!" >> $GITHUB_STEP_SUMMARY + else + echo "PR #${{ steps.create_pr.outputs.pull-request-number }} $STATUS!" >> $GITHUB_STEP_SUMMARY + fi + echo "URL: ${{ steps.create_pr.outputs.pull-request-url }}" >> $GITHUB_STEP_SUMMARY diff --git a/.github/workflows/translations-push.yml b/.github/workflows/translations-push.yml index c4d3f61fb..e926a58ed 100644 --- a/.github/workflows/translations-push.yml +++ b/.github/workflows/translations-push.yml @@ -1,14 +1,14 @@ name: Update Translation Source on: + workflow_dispatch: + schedule: + # runs at the start of each quarter (UTC) + - cron: '0 0 1 1,4,7,10 *' pull_request: paths: - '.ci/update_translation_source_strings.sh' - '.github/workflows/translations-push.yml' - schedule: - # Runs at the start of each quarter (UTC) - - cron: '0 0 1 1,4,7,10 *' - workflow_dispatch: jobs: translations: @@ -19,33 +19,32 @@ jobs: runs-on: ubuntu-slim steps: - - name: "Checkout repo" - uses: actions/checkout@v7 + - name: Checkout repo + uses: actions/checkout@v6 - - name: "Install lupdate" + - name: Install lupdate shell: bash run: | sudo apt-get update sudo apt-get install -y --no-install-recommends qttools5-dev-tools - - name: "Update Cockatrice translation source" - env: - FILE: cockatrice/cockatrice_en@source.ts + - name: Update Cockatrice translation source id: cockatrice shell: bash - run: > - DIRS="cockatrice/src $(find . -maxdepth 1 -type d -name 'libcockatrice_*')" - .ci/update_translation_source_strings.sh + run: | + FILE="cockatrice/cockatrice_en@source.ts" + export DIRS="cockatrice/src $(find . -maxdepth 1 -type d -name 'libcockatrice_*')" + FILE="$FILE" DIRS="$DIRS" .ci/update_translation_source_strings.sh - - name: "Update Oracle translation source" + - name: Update Oracle translation source id: oracle shell: bash env: - DIRS: 'oracle/src' FILE: 'oracle/oracle_en@source.ts' + DIRS: 'oracle/src' run: .ci/update_translation_source_strings.sh - - name: "Render template" + - name: Render template id: template uses: chuhlomin/render-template/binary@v1 with: @@ -55,7 +54,7 @@ jobs: oracle_output: ${{ steps.oracle.outputs.output }} commit: ${{ github.sha }} - - name: "Create pull request" + - name: Create pull request if: github.event_name != 'pull_request' id: create_pr uses: peter-evans/create-pull-request@v8 @@ -63,24 +62,27 @@ jobs: add-paths: | cockatrice/cockatrice_en@source.ts oracle/oracle_en@source.ts - author: github-actions # owner of the commit - body: ${{ steps.template.outputs.result }} - branch: ci-update_translation_source commit-message: Update translation source strings + # author is the owner of the commit + author: github-actions + branch: ci-update_translation_source delete-branch: true - draft: false + title: 'Update source strings' + body: ${{ steps.template.outputs.result }} labels: | CI Translation - title: 'Update source strings' + draft: false - - name: "PR Status" + - name: PR Status if: github.event_name != 'pull_request' shell: bash env: - PR_NUMBER: ${{ steps.create_pr.outputs.pull-request-number }} - PR_URL: ${{ steps.create_pr.outputs.pull-request-url }} - STATUS: ${{ case(steps.create_pr.outputs.pull-request-operation == 'none', 'unchanged', steps.create_pr.outputs.pull-request-operation) }} + STATUS: ${{ steps.create_pr.outputs.pull-request-operation }} run: | - echo "PR #$PR_NUMBER $STATUS!" >> "$GITHUB_STEP_SUMMARY" - echo "URL: $PR_URL" >> "$GITHUB_STEP_SUMMARY" + if [[ "$STATUS" == "none" ]]; then + echo "PR #${{ steps.create_pr.outputs.pull-request-number }} unchanged!" >> $GITHUB_STEP_SUMMARY + else + echo "PR #${{ steps.create_pr.outputs.pull-request-number }} $STATUS!" >> $GITHUB_STEP_SUMMARY + fi + echo "URL: ${{ steps.create_pr.outputs.pull-request-url }}" >> $GITHUB_STEP_SUMMARY diff --git a/CMakeLists.txt b/CMakeLists.txt index c10e1db68..d2c10de72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ endif() # A project name is needed for CPack # Version can be overriden by git tags, see cmake/getversion.cmake -project("Cockatrice" VERSION 3.1.0) +project("Cockatrice" VERSION 3.0.0) # Set release name if not provided via env/cmake var if(NOT DEFINED GIT_TAG_RELEASENAME) diff --git a/Dockerfile b/Dockerfile index 7c5c773c9..d185b746a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # -------- Build Stage -------- -FROM ubuntu:26.04 AS build +FROM ubuntu:24.04 AS build ARG DEBIAN_FRONTEND=noninteractive @@ -26,7 +26,7 @@ RUN mkdir build && cd build && \ # -------- Runtime Stage (clean) -------- -FROM ubuntu:26.04 +FROM ubuntu:24.04 RUN apt-get update && apt-get install -y --no-install-recommends \ libprotobuf32t64 \ diff --git a/README.md b/README.md index 9a27601cd..472891b15 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Related | Community | Contribute | - Build | + Build | Run

diff --git a/cmake/NSIS.template.in b/cmake/NSIS.template.in index 5af116470..7b52b7bcc 100644 --- a/cmake/NSIS.template.in +++ b/cmake/NSIS.template.in @@ -117,22 +117,21 @@ ${If} $InstDir == "" ; we need to set a default based on the install mode StrCpy $InstDir $0 ${EndIf} +Call SetModeDestinationFromInstdir -; --- Detect portable install when using /R (must come BEFORE SetModeDestinationFromInstdir) --- +; --- Detect portable install when using /R --- ${If} $ReinstallMode = 1 IfFileExists "$InstDir\portable.dat" 0 not_portable StrCpy $PortableMode 1 Goto portable_done + not_portable: StrCpy $PortableMode 0 + portable_done: ${EndIf} -; Now that $PortableMode reflects reality, commit InstDir into the correct slot -Call SetModeDestinationFromInstdir - ${If} $ReinstallMode = 1 -${AndIf} $PortableMode = 0 Call AutoUninstallIfNeeded ${EndIf} diff --git a/cmake/gtest-CMakeLists.txt.in b/cmake/gtest-CMakeLists.txt.in index 2062d7f8c..2d71a55e5 100644 --- a/cmake/gtest-CMakeLists.txt.in +++ b/cmake/gtest-CMakeLists.txt.in @@ -1,16 +1,15 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.2) project(gtest-download LANGUAGES NONE) include(ExternalProject) -externalproject_add( - googletest - URL https://github.com/google/googletest/archive/refs/tags/v1.17.0.zip - URL_HASH SHA1=f638fa0e724760e2ba07ff8cfba32cd644e1ce28 +ExternalProject_Add(googletest + URL https://github.com/google/googletest/archive/release-1.11.0.zip + URL_HASH SHA1=9ffb7b5923f4a8fcdabf2f42c6540cce299f44c0 SOURCE_DIR "${CMAKE_BINARY_DIR}/gtest-src" BINARY_DIR "${CMAKE_BINARY_DIR}/gtest-build" CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" - TEST_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "" + TEST_COMMAND "" ) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 60ba06593..6fd009dd9 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -7,7 +7,6 @@ project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${ set(cockatrice_SOURCES ${VERSION_STRING_CPP} # sort by alphabetical order, so that there is no debate about where to add new sources to the list - src/client/network/connection_controller/remote_connection_controller.cpp src/client/network/update/client/update_downloader.cpp src/client/network/interfaces/deck_stats_interface.cpp src/client/network/interfaces/tapped_out_interface.cpp @@ -56,75 +55,68 @@ set(cockatrice_SOURCES src/filters/filter_tree_model.cpp src/filters/syntax_help.cpp src/game/abstract_game.cpp - src/game/arrow_registry.cpp - src/game_graphics/board/abstract_card_drag_item.cpp - src/game_graphics/board/abstract_card_item.cpp - src/game_graphics/board/abstract_counter.cpp - src/game/board/arrow_data.cpp - src/game_graphics/board/arrow_item.cpp - src/game_graphics/board/arrow_target.cpp - src/game_graphics/board/card_drag_item.cpp - src/game_graphics/board/card_item.cpp + src/game/board/abstract_card_drag_item.cpp + src/game/board/abstract_card_item.cpp + src/game/board/abstract_counter.cpp + src/game/board/arrow_item.cpp + src/game/board/arrow_target.cpp + src/game/board/card_drag_item.cpp + src/game/board/card_item.cpp src/game/board/card_list.cpp - src/game/board/card_state.cpp - src/game_graphics/board/counter_general.cpp - src/game/board/counter_state.cpp - src/game_graphics/board/translate_counter_name.cpp - src/game_graphics/deckview/deck_view.cpp - src/game_graphics/deckview/deck_view_container.cpp - src/game_graphics/deckview/tabbed_deck_view_container.cpp - src/game_graphics/dialogs/dlg_create_token.cpp - src/game_graphics/dialogs/dlg_move_top_cards_until.cpp - src/game_graphics/dialogs/dlg_roll_dice.cpp + src/game/board/counter_general.cpp + src/game/board/translate_counter_name.cpp + src/game/deckview/deck_view.cpp + src/game/deckview/deck_view_container.cpp + src/game/deckview/tabbed_deck_view_container.cpp + src/game/dialogs/dlg_create_token.cpp + src/game/dialogs/dlg_move_top_cards_until.cpp + src/game/dialogs/dlg_roll_dice.cpp src/game/game.cpp src/game/game_event_handler.cpp src/game/game_meta_info.cpp - src/game_graphics/game_scene.cpp + src/game/game_scene.cpp src/game/game_state.cpp - src/game_graphics/game_view.cpp - src/game_graphics/hand_counter.cpp - src/game_graphics/log/message_log_widget.cpp + src/game/game_view.cpp + src/game/hand_counter.cpp + src/game/log/message_log_widget.cpp src/game/phase.cpp - src/game_graphics/phases_toolbar.cpp - src/game_graphics/player/menu/card_menu.cpp - src/game_graphics/player/menu/custom_zone_menu.cpp - src/game_graphics/player/menu/grave_menu.cpp - src/game_graphics/player/menu/hand_menu.cpp - src/game_graphics/player/menu/library_menu.cpp - src/game_graphics/player/menu/move_menu.cpp - src/game_graphics/player/menu/player_menu.cpp - src/game_graphics/player/menu/pt_menu.cpp - src/game_graphics/player/menu/rfg_menu.cpp - src/game_graphics/player/menu/say_menu.cpp - src/game_graphics/player/menu/sideboard_menu.cpp - src/game_graphics/player/menu/utility_menu.cpp - src/game_graphics/tally/subtype_tally.cpp - src/game_graphics/tally/tally.cpp + src/game/phases_toolbar.cpp + src/game/player/menu/card_menu.cpp + src/game/player/menu/custom_zone_menu.cpp + src/game/player/menu/grave_menu.cpp + src/game/player/menu/hand_menu.cpp + src/game/player/menu/library_menu.cpp + src/game/player/menu/move_menu.cpp + src/game/player/menu/player_menu.cpp + src/game/player/menu/pt_menu.cpp + src/game/player/menu/rfg_menu.cpp + src/game/player/menu/say_menu.cpp + src/game/player/menu/sideboard_menu.cpp + src/game/player/menu/utility_menu.cpp + src/game/player/player.cpp src/game/player/player_actions.cpp - src/game_graphics/player/player_area.cpp - src/game_graphics/player/player_dialogs.cpp + src/game/player/player_area.cpp src/game/player/player_event_handler.cpp - src/game_graphics/player/player_graphics_item.cpp + src/game/player/player_graphics_item.cpp src/game/player/player_info.cpp - src/game_graphics/player/player_list_widget.cpp - src/game/player/player_logic.cpp + src/game/player/player_list_widget.cpp src/game/player/player_manager.cpp - src/game_graphics/player/player_target.cpp + src/game/player/player_target.cpp src/game/replay.cpp - src/game/zones/card_zone_logic.cpp - src/game/zones/hand_zone_logic.cpp - src/game/zones/pile_zone_logic.cpp - src/game/zones/stack_zone_logic.cpp - src/game/zones/table_zone_logic.cpp - src/game/zones/view_zone_logic.cpp - src/game_graphics/zones/card_zone.cpp - src/game_graphics/zones/hand_zone.cpp - src/game_graphics/zones/pile_zone.cpp - src/game_graphics/zones/select_zone.cpp - src/game_graphics/zones/stack_zone.cpp - src/game_graphics/zones/table_zone.cpp - src/game_graphics/zones/view_zone.cpp - src/game_graphics/zones/view_zone_widget.cpp + src/game/zones/card_zone.cpp + src/game/zones/hand_zone.cpp + src/game/zones/logic/card_zone_logic.cpp + src/game/zones/logic/hand_zone_logic.cpp + src/game/zones/logic/pile_zone_logic.cpp + src/game/zones/logic/stack_zone_logic.cpp + src/game/zones/logic/table_zone_logic.cpp + src/game/zones/logic/view_zone_logic.cpp + src/game/zones/pile_zone.cpp + src/game/zones/select_zone.cpp + src/game/zones/stack_zone.cpp + src/game/zones/table_zone.cpp + src/game/zones/view_zone.cpp + src/game/zones/view_zone_widget.cpp src/game_graphics/board/abstract_graphics_item.cpp src/interface/card_picture_loader/card_picture_loader.cpp src/interface/card_picture_loader/card_picture_loader_local.cpp @@ -137,13 +129,7 @@ set(cockatrice_SOURCES src/interface/layouts/overlap_layout.cpp src/interface/widgets/utility/line_edit_completer.cpp src/interface/pixel_map_generator.cpp - src/interface/theme_config.cpp src/interface/theme_manager.cpp - src/interface/palette_editor/color_button.cpp - src/interface/palette_editor/palette_generator.cpp - src/interface/palette_editor/quick_setup_panel.cpp - src/interface/palette_editor/palette_grid_widget.cpp - src/interface/palette_editor/palette_editor_dialog.cpp src/interface/widgets/cards/additional_info/color_identity_widget.cpp src/interface/widgets/cards/additional_info/mana_cost_widget.cpp src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp @@ -185,7 +171,6 @@ set(cockatrice_SOURCES src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.cpp - src/interface/widgets/deck_editor/card_database_view.cpp src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp @@ -231,30 +216,17 @@ set(cockatrice_SOURCES src/interface/widgets/replay/replay_manager.cpp src/interface/widgets/replay/replay_timeline_widget.cpp src/interface/widgets/server/chat_view/chat_view.cpp - src/interface/widgets/server/game_filter_configs.cpp src/interface/widgets/server/game_selector.cpp src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp src/interface/widgets/server/games_model.cpp src/interface/widgets/server/handle_public_servers.cpp src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp - src/interface/widgets/server/user/user_avatar_provider.cpp - src/interface/widgets/server/user/user_card_art_provider.cpp - src/interface/widgets/server/user/user_card_settings_dialog.cpp src/interface/widgets/server/user/user_context_menu.cpp src/interface/widgets/server/user/user_info_box.cpp src/interface/widgets/server/user/user_info_connection.cpp src/interface/widgets/server/user/user_list_manager.cpp - src/interface/widgets/server/user/user_list_painter.cpp src/interface/widgets/server/user/user_list_widget.cpp - src/interface/widgets/settings_page/appearance_settings_page.cpp - src/interface/widgets/settings_page/deck_editor_settings_page.cpp - src/interface/widgets/settings_page/general_settings_page.cpp - src/interface/widgets/settings_page/messages_settings_page.cpp - src/interface/widgets/settings_page/shortcut_settings_page.cpp - src/interface/widgets/settings_page/sound_settings_page.cpp - src/interface/widgets/settings_page/storage_settings_page.cpp - src/interface/widgets/settings_page/user_interface_settings_page.cpp src/interface/widgets/utility/custom_line_edit.cpp src/interface/widgets/utility/get_text_with_max.cpp src/interface/widgets/utility/sequence_edit.cpp @@ -333,7 +305,6 @@ set(cockatrice_SOURCES src/interface/widgets/tabs/tab.cpp src/interface/widgets/tabs/tab_account.cpp src/interface/widgets/tabs/tab_admin.cpp - src/interface/widgets/tabs/tab_card_art_rules.cpp src/interface/widgets/tabs/tab_deck_editor.cpp src/interface/widgets/tabs/tab_deck_storage.cpp src/interface/widgets/tabs/tab_game.cpp @@ -354,10 +325,6 @@ set(cockatrice_SOURCES src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h - src/interface/widgets/utility/compact_push_button.cpp - src/interface/widgets/utility/compact_push_button.h - src/interface/widgets/server/user/user_info_popup.cpp - src/interface/widgets/server/user/user_info_popup.h ) add_subdirectory(sounds) diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc index 9c34929b7..37fb145f0 100644 --- a/cockatrice/cockatrice.qrc +++ b/cockatrice/cockatrice.qrc @@ -55,7 +55,6 @@ resources/icons/view.svg resources/icons/mana/B.svg - resources/icons/mana/C.svg resources/icons/mana/G.svg resources/icons/mana/R.svg resources/icons/mana/U.svg @@ -70,7 +69,6 @@ resources/config/interface.svg resources/config/messages.svg resources/config/deckeditor.svg - resources/config/storage.svg resources/config/shorcuts.svg resources/config/sound.svg resources/config/debug.ini diff --git a/cockatrice/cockatrice_en@source.ts b/cockatrice/cockatrice_en@source.ts index e06972ddc..810b345df 100644 --- a/cockatrice/cockatrice_en@source.ts +++ b/cockatrice/cockatrice_en@source.ts @@ -4,7 +4,7 @@ AbstractCounter - + &Set counter... @@ -12,12 +12,12 @@ AbstractCounterDialog - + Set counter - + New value for counter '%1': @@ -38,60 +38,60 @@ AbstractTabDeckEditor - + Open in new tab - + Are you sure? - + The decklist has been modified. Do you want to save the changes? - - - - - - + + + + + + Error - + Could not open deck at %1 - + Could not save remote deck - - + + The deck could not be saved. Please check that the directory is writable and try again. - + Save deck - + The deck could not be saved. - + There are no cards in your deck to be exported @@ -107,12 +107,12 @@ Please check that the directory is writable and try again. AdminNotesDialog - + Update Notes - + Admin Notes for %1 @@ -129,227 +129,172 @@ Please check that the directory is writable and try again. Sideboard - - - Tokens - - AppearanceSettingsPage - + seconds - + Error - + Could not create themes directory at '%1'. - + Theme settings - + Current theme: - + Open themes folder - + Home tab background source: - + Home tab background shuffle frequency: - + Disabled - + + Display card name of background in bottom right: + + + + Menu settings - + Show keyboard shortcuts in right-click menus - + Show game filter toolbar above list in room tab - + Card rendering - + Display card names on cards having a picture - + Auto-Rotate cards with sideways layout - + Override all card art with personal set preference (Pre-ProviderID change behavior) - - Light - - - - - Dark - - - - - System - - - - - Active theme palette: - - - - - Edit theme palette - - - - - Home tab settings - - - - - Display card name of background in bottom right - - - - - Styling settings - - - - - Style user list - - - - - Card printings - - - - + Bump sets that the deck contains cards from to the top in the printing selector - + Scale cards on mouse over - + Use rounded card corners - - Card layout - - - - + Minimum overlap percentage of cards on the stack and in vertical hand - + Maximum initial height for card view window: - - + + rows - + Maximum expanded height for card view window: - + Card counters - + Counter %1 - + Hand layout - + Display hand horizontally (wastes space) - + Enable left justification - + Table grid layout - + Invert vertical coordinate - + Minimum player count for multi-column layout: - + Maximum font size for information displayed on cards: @@ -357,12 +302,12 @@ Please check that the directory is writable and try again. ArchidektApiResponseDeckDisplayWidget - + Back to results - + Open Deck in Deck Editor @@ -388,111 +333,111 @@ Please check that the directory is writable and try again. BanDialog - + ban &user name - + ban &IP address - + ban client I&D - + Ban type - + &permanent ban - + &temporary ban - + &Days: - + &Hours: - + &Minutes: - + Duration of the ban - + Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. - + Please enter the reason for the ban that will be visible to the banned person. - + Redact all messages from this user in all rooms - + &OK - + &Cancel - + Ban user from server - - - - + + + + Error - + You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. - + You must have a value in the name ban when selecting the name ban checkbox. - + You must have a value in the ip ban when selecting the ip ban checkbox. - + You must have a value in the clientid ban when selecting the clientid ban checkbox. @@ -500,123 +445,59 @@ This is only saved for moderators and cannot be seen by the banned person. BetaReleaseChannel - + Beta - + No reply received from the release update server. - + Invalid reply received from the release update server. - + No reply received from the file update server. - - CardArtPreviewWidget - - - No card selected - - - - - CardArtRulesModel - - - Card - - - - - ProviderId - - - - - Mode - - - - - Reason - - - CardDatabaseModel - + Name - + Sets - + Mana cost - + Card type - + P/T - + Color(s) - - CardDatabaseView - - - Add to Deck - - - - - Add to Sideboard - - - - - Select Printing - - - - - Show on EDHRec (Commander) - - - - - Show on EDHRec (Card) - - - - - Show Related cards - - - CardFilter @@ -745,22 +626,22 @@ This is only saved for moderators and cannot be seen by the banned person. CardInfoPictureWidget - + View related cards - + Add card to deck - + Mainboard - + Sideboard @@ -783,12 +664,12 @@ This is only saved for moderators and cannot be seen by the banned person. - + Related cards: - + Unknown card: @@ -796,146 +677,128 @@ This is only saved for moderators and cannot be seen by the banned person. CardMenu - + Re&veal to... - + &All players - + View related cards - + Token: - + All tokens - + &Select All - + S&elect Row - + S&elect Column - + &Play - + &Hide - + Play &Face Down - + &Tap / Untap Turn sideways or back again - + Skip &untapping - + T&urn Over Turn face up/face down - + &Peek at card face - + &Clone - + Attac&h to card... - + Unattac&h - + &Draw arrow... - + &Set annotation... - - Reduce life by power - - - - + Ca&rd counters - + &Add counter (%1) - + &Remove counter (%1) - + &Set counters (%1)... - - CardPictureLoaderCacheMethod - - - Network Cache - - - - - Filesystem - - - CardSizeWidget @@ -947,133 +810,133 @@ This is only saved for moderators and cannot be seen by the banned person. CardZoneLogic - + their hand nominative - + %1's hand nominative - + their library look at zone - + %1's library look at zone - + of their library top cards of zone, - + of %1's library top cards of zone - + their library reveal zone - + %1's library reveal zone - + their library shuffle - + %1's library shuffle - + their library nominative - + %1's library nominative - + their graveyard nominative - + %1's graveyard nominative - + their exile nominative - + %1's exile nominative - + their sideboard look at zone - + %1's sideboard look at zone - + their sideboard nominative - + %1's sideboard nominative - + their custom zone '%1' nominative - + %1's custom zone '%2' nominative @@ -1095,424 +958,16 @@ This is only saved for moderators and cannot be seen by the banned person. - - ColorButton - - - Click to pick a color - - - - - Pick colour - - - - - ConnectionController - - - - The server has reached its maximum user capacity, please check back later. - - - - - There are too many concurrent connections from your address. - - - - - Banned by moderator - - - - - Expected end time: %1 - - - - - This ban lasts indefinitely. - - - - - Scheduled server shutdown. - - - - - - Invalid username. - - - - - You have been logged out due to logging in at another location. - - - - - Connection closed - - - - - The server has terminated your connection. -Reason: %1 - - - - - The server is going to be restarted in %n minute(s). -All running games will be lost. -Reason for shutdown: %1 - - - - - - - - Scheduled server shutdown - - - - - Failed Login - - - - - Your client seems to be missing features this server requires for connection. - - - - - To update your client, go to 'Help -> Check for Client Updates'. - - - - - - - - - - - - - - - - - - - - - - Error - - - - - Incorrect username or password. Please check your authentication information and try again. - - - - - There is already an active session using this user name. -Please close that session first and re-login. - - - - - - You are banned until %1. - - - - - - You are banned indefinitely. - - - - - This server requires user registration. Do you want to register now? - - - - - This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. -Please close and reopen your client to try again. - - - - - An internal error has occurred, please close and reopen Cockatrice before trying again. -If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - - - - Account activation - - - - - Your account has not been activated yet. -You need to provide the activation token received in the activation email. - - - - - Server Full - - - - - Unknown login error: %1 - - - - - - -This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - - - - - - - - - Registration denied - - - - - Registration is currently disabled on this server - - - - - There is already an existing account with the same user name. - - - - - It's mandatory to specify a valid email address when registering. - - - - - It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. - - - - - Password too short. - - - - - Registration failed for a technical problem on the server. - - - - - The connection to the server has been lost. - - - - - Unknown registration error: %1 - - - - - Account activation failed - - - - - Socket error: %1 - - - - - Server timeout - - - - - You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. -Local version is %1, remote version is %2. - - - - - Your Cockatrice client is obsolete. Please update your Cockatrice version. -Local version is %1, remote version is %2. - - - - - - Success - - - - - Registration accepted. -Will now login. - - - - - Account activation accepted. -Will now login. - - - - - Information - - - - - This server supports additional features that your client doesn't have. -This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. - -To update your client, go to Help -> Check for Updates. - - - - - - - Reset Password - - - - - Your password has been reset successfully, you can now log in using the new credentials. - - - - - Failed to reset user account password, please contact the server operator to reset your password. - - - - - Activation request received, please check your email for an activation token. - - - - - Connecting to %1... - - - - - Registering to %1 as %2... - - - - - Disconnected - - - - - Connected, logging in at %1 - - - - - Requesting forgotten password to %1 as %2... - - - - - Your username must respect these rules: - - - - - is %1 - %2 characters long - - - - - can %1 contain lowercase characters - - - - - - - - NOT - - - - - can %1 contain uppercase characters - - - - - can %1 contain numeric characters - - - - - can contain the following punctuation: %1 - - - - - first character can %1 be a punctuation mark - - - - - no unacceptable language as specified by these server rules: - note that the following lines will not be translated - - - - - can not contain any of the following words: %1 - - - - - can not match any of the following expressions: %1 - - - - - You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - - CustomZoneMenu - + C&ustom Zones - - + + View custom zone '%1' @@ -1520,35 +975,30 @@ To update your client, go to Help -> Check for Updates. DeckAnalyticsWidget - + Add Panel - + Remove Panel - + Save Layout - + Load Layout - - - Include Sideboard - - DeckEditorCardDatabaseDockWidget - + Card Database @@ -1564,17 +1014,47 @@ To update your client, go to Help -> Check for Updates. DeckEditorDatabaseDisplayWidget - + Search by card name (or search expressions) - + + Add to Deck + + + + + Add to Sideboard + + + + + Select Printing + + + + + Show on EDHRec (Commander) + + + + + Show on EDHRec (Card) + + + + + Show Related cards + + + + Add card to &maindeck - + Add card to &sideboard @@ -1607,72 +1087,72 @@ To update your client, go to Help -> Check for Updates. - + Select Printing - + Deck - + Deck &name: - + Banner Card/Tags Visibility Settings - + Show banner card selection menu - + Show tags selection menu - + &Comments: - + Group by: - + Format: - + Hash: - + &Increment number - + &Decrement number - + &Remove row - + Swap card to/from sideboard @@ -1680,17 +1160,17 @@ To update your client, go to Help -> Check for Updates. DeckEditorFilterDockWidget - + Filters - + &Clear all filters - + Delete selected @@ -1821,113 +1301,169 @@ To update your client, go to Help -> Check for Updates. DeckEditorSettingsPage - - + + Update Spoilers - + + Success - + Download URLs have been reset. - + + Downloaded card pictures have been reset. + + + + + Error + + + + + One or more downloaded card pictures could not be cleared. + + + + Add URL - - + + URL: - - + + Edit URL - + + Network Cache Size: + + + + + Redirect Cache TTL: + + + + + How long cached redirects for urls are valid for. + + + + + Picture Cache Size: + + + + Add New URL - + Remove URL - + + Day(s) + + + + Updating... - + Choose path - + URL Download Priority - + Spoilers - + Download Spoilers Automatically - + Spoiler Location: - + Last Change - + Spoilers download automatically on launch - + Press the button to manually update without relaunching - + Do not close settings until manual update is complete - + Download card pictures on the fly - + How to add a custom URL - + + Delete Downloaded Images + + + + Reset Download URLs + + + On-disk cache for downloaded pictures + + + + + In-memory cache for pictures not currently on screen + + DeckListHistoryManagerWidget @@ -1993,12 +1529,12 @@ To update your client, go to Help -> Check for Updates. DeckLoader - + Common deck formats (%1) - + All files (*.*) @@ -2220,27 +1756,27 @@ To update your client, go to Help -> Check for Updates. - + Moved to %1 1 × "%2" (%3) - + Removed "%1" (all copies) - + %1 1 × "%2" (%3) - + Added - + Removed @@ -2262,74 +1798,74 @@ To update your client, go to Help -> Check for Updates. DeckViewContainer - + Load deck... - + Load remote deck... - + Load from clipboard... - + Load from website... - + Unload deck - + Ready to start - + Force start - + Sideboard unlocked - + Sideboard locked - - + + Error - + The selected file could not be loaded. - + Deck is greater than maximum file size. - + Are you sure you want to force start? This will kick all non-ready players from the game. - + Cockatrice @@ -2428,7 +1964,7 @@ This will kick all non-ready players from the game. - + Webpage @@ -2468,37 +2004,37 @@ This will kick all non-ready players from the game. - + Server URL - + Communication Port - + Unique Server Name - + Connection Warning - + You need to name your new connection profile. - + Connect Warning - + The player name can't be empty. @@ -2611,17 +2147,17 @@ This will kick all non-ready players from the game. - + Game information - + Error - + Server error. @@ -2629,97 +2165,97 @@ This will kick all non-ready players from the game. DlgCreateToken - + &Name: - + Token - + C&olor: - + white - + blue - + black - + red - + green - + multicolor - + colorless - + &P/T: - + &Annotation: - + &Destroy token when it leaves the table - + Create face-down (Only hides name) - + Token data - + Show &all tokens - + Show tokens from this &deck - + Choose token from list - + Create token @@ -2753,7 +2289,7 @@ This will kick all non-ready players from the game. - + ✖ @@ -2768,12 +2304,12 @@ This will kick all non-ready players from the game. - + Duplicate Tag - + This tag already exists. @@ -2959,12 +2495,12 @@ To remove your current avatar, confirm without choosing a new image. - + Error - + The chosen name conflicts with an existing card or token. Make sure to enable the 'Token' set in the "Manage sets" dialog to display them correctly. @@ -2988,12 +2524,12 @@ Make sure to enable the 'Token' set in the "Manage sets" dia - + Real name: - + Edit user profile @@ -3031,113 +2567,113 @@ Make sure to enable the 'Token' set in the "Manage sets" dia - + Hide 'buddies only' games - + Hide full games - + Hide games that have started - + Hide password protected games - + Hide 'ignored user' games - + Hide games not created by buddies Hide games not created by buddy - + Hide games with forced open decklists - + &Newer than: - + Game &description: - + &Creator name: - + General - + &Game types - + at &least: - + at &most: - + Maximum player count - + Restrictions - + Show games only if &spectators can watch - + Show spectator password p&rotected games - + Show only if spectators can ch&at - + Show only if spectators can see &hands - + Spectators - + Filter games @@ -3440,37 +2976,37 @@ https://tappedout.net/mtg-decks/your-deck-name/ DlgMoveTopCardsUntil - + Card name (or search expressions): - + Number of hits: - + Auto play hits - + Put top cards on stack until... - + No cards matching the search expression exists in the card database. Proceed anyways? - + Cockatrice - + Invalid filter @@ -3529,40 +3065,40 @@ Your email will be used to verify your account. - + Real name: - + Register to server - - - - + + + + Registration Warning - + Your password is too short. - + Your passwords do not match, please try again. - + Your email addresses do not match, please try again. - + The player name can't be empty. @@ -3570,17 +3106,17 @@ Your email will be used to verify your account. DlgRollDice - + Number of sides: - + Number of dice: - + Roll Dice @@ -3631,12 +3167,12 @@ Your email will be used to verify your account. DlgSettings - + Unknown Error loading card database - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -3647,7 +3183,7 @@ Would you like to change your database location setting? - + Your card database version is too old. This can cause problems loading card information or images @@ -3658,7 +3194,7 @@ Would you like to change your database location setting? - + Your card database did not finish loading Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached @@ -3667,21 +3203,21 @@ Would you like to change your database location setting? - + File Error loading your card database. Would you like to change your database location setting? - + Your card database was loaded but contains no cards. Would you like to change your database location setting? - + Unknown card database load status Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues @@ -3690,64 +3226,59 @@ Would you like to change your database location setting? - - - + + + Error - + The path to your deck directory is invalid. Would you like to go back and set the correct path? - + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? - + Settings - + General - + Appearance - + User Interface - - Storage - - - - + Card Sources - + Chat - + Sound - + Shortcuts @@ -3839,9 +3370,9 @@ You can always change this behavior in the 'General' settings tab. - - - + + + Error @@ -3893,31 +3424,31 @@ Please visit the download page to update manually. - + Update Available - + A new version of Cockatrice is available! - + New version - + Released - + Changelog @@ -3927,50 +3458,50 @@ Please visit the download page to update manually. - + Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. - + Please check the <a href="%1">releases page</a> on our Github and download the build for your system. - - - + + + Update Error - + An error occurred while checking for updates: - + An error occurred while downloading an update: - + Installing... - + Cockatrice is unable to open the installer. - + Try to update manually by closing Cockatrice and running the installer. - + Download location @@ -4060,67 +3591,67 @@ You may have to manually download the new version. DrawProbabilityWidget - + Draw Probability - + Probability of drawing - + Card Name - + Type - + Subtype - + Mana Value - + At least - + Exactly - + card(s) having drawn at least - + cards - + Category - + Qty - + Odds (%) @@ -4234,7 +3765,7 @@ You may have to manually download the new version. FilterBuilder - + Type your filter here @@ -4265,22 +3796,22 @@ You may have to manually download the new version. GameEventHandler - + kicked by game host or moderator - + player left the game - + player disconnected from server - + reason unknown @@ -4288,140 +3819,140 @@ You may have to manually download the new version. GameSelector - - - - - - - - - + + + + + + + + + Error - + Please join the appropriate room first. - + Wrong password. - + Spectators are not allowed in this game. - + The game is already full. - + The game does not exist any more. - + This game is only open to registered users. - + This game is only open to its creator's buddies. - + You are being ignored by the creator of this game. - + Join Game - + Spectate Game - + Game Information - + Join Game as Judge - + Spectate Game as Judge - + Join game - + Password: - + Please join the respective room first. - + &Filter games - + C&lear filter - + C&reate - + &Join - + Join as judge - + J&oin as spectator - + Join as judge spectator - + Games shown: %1 / %2 - + Games @@ -4429,32 +3960,32 @@ You may have to manually download the new version. GameSelectorQuickFilterToolBar - + All types - + Filter by game name... - + Filter by game type/format - + Hide games not created by buddies - + Hide full games - + Hide started games @@ -4462,12 +3993,12 @@ You may have to manually download the new version. GamesModel - + >1 day - + %1%2 hr short age in hours @@ -4476,12 +4007,12 @@ You may have to manually download the new version. - + new - + %1%2 min short age in minutes @@ -4490,83 +4021,83 @@ You may have to manually download the new version. - + password - + buddies only - + reg. users only - + open decklists + - can chat - + see hands - + can see hands - + not allowed - + Room - + Age - + Description - + Creator - + Type - + Restrictions - + Players - + Spectators @@ -4574,158 +4105,143 @@ You may have to manually download the new version. GeneralSettingsPage - + Reset all paths - + All paths have been reset - - - - - - - + + + + + + + Choose path - - Language settings + + Personal settings - + Language: - - Version settings - - - - - Card database - - - - - Startup settings - - - - + Paths (editing disabled in portable mode) - + Paths - + How to help with translations - + Decks directory: - + Filters directory: - + Replays directory: - + Pictures directory: - + Card database: - + Custom database directory: - + Token database: - + Update channel - + Check for client updates on startup - + Check for card database updates on startup - + Don't check - + Prompt for update - + Always update in the background - + Check for card database updates every - + days - + Notify if a feature supported by the server is missing in my client - + Automatically run Oracle when running a new version of Cockatrice - + Show tips on startup - + Last update check on %1 (%2 days ago) @@ -4733,47 +4249,47 @@ You may have to manually download the new version. GraveyardMenu - + &Graveyard - + &View graveyard - + &Move graveyard to... - + &Top of library - + &Bottom of library - + &All players - + &Hand - + &Exile - + Reveal random card to... @@ -4781,88 +4297,88 @@ You may have to manually download the new version. HandMenu - + &Hand - + &View hand - + Sort hand by... - + Name - + Type - + Mana Value - + Take &mulligan (Choose hand size) - + Take mulligan (Same hand size) - + Take mulligan (Hand size - 1) - + &Move hand to... - + &Top of library - + &Bottom of library - + &Graveyard - + &Exile - + &Reveal hand to... - - + + All players - + Reveal r&andom card to... @@ -4870,52 +4386,52 @@ You may have to manually download the new version. HomeWidget - + Create New Deck - + Browse Decks - + Browse Card Database - + Browse EDHRec - + Browse Archidekt - + View Replays - + Quit - + Connecting... - + Connect - + Play @@ -4923,213 +4439,213 @@ You may have to manually download the new version. LibraryMenu - + &Library - + &View library - + View &top cards of library... - + View bottom cards of library... - + Reveal &library to... - + Lend library to... - + Reveal &top cards to... - + &Top of library... - + &Bottom of library... - + &Always reveal top card - + &Always look at top card - + &Open deck in deck editor - + &Draw card - + D&raw cards... - + &Undo last draw - + Shuffle - + &Play top card - + Play top card &face down - + Put top card on &bottom - + Move top card to grave&yard - + Move top card to e&xile - + Move top cards to &graveyard... - + Move top cards to graveyard face down... - + Move top cards to &exile... - + Move top cards to exile face down... - + Put top cards on stack &until... - + Shuffle top cards... - + &Draw bottom card - + D&raw bottom cards... - + &Play bottom card - + Play bottom card &face down - + Move bottom card to grave&yard - + Move bottom card to e&xile - + Move bottom cards to &graveyard... - + Move bottom cards to graveyard face down... - + Move bottom cards to &exile... - + Move bottom cards to exile face down... - + Put bottom card on &top - + Shuffle bottom cards... - - + + &All players - + Reveal top cards of library - + Number of cards: (max. %1) @@ -5137,300 +4653,655 @@ You may have to manually download the new version. MainWindow - - + + + The server has reached its maximum user capacity, please check back later. + + + + + There are too many concurrent connections from your address. + + + + + Banned by moderator + + + + + Expected end time: %1 + + + + + This ban lasts indefinitely. + + + + + Scheduled server shutdown. + + + + + + Invalid username. + + + + + You have been logged out due to logging in at another location. + + + + + Connection closed + + + + + The server has terminated your connection. +Reason: %1 + + + + + The server is going to be restarted in %n minute(s). +All running games will be lost. +Reason for shutdown: %1 + + + + + + + + Scheduled server shutdown + + + + + + Success + + + + + Registration accepted. +Will now login. + + + + + Account activation accepted. +Will now login. + + + + + Player %1 - + Load replay - + About Cockatrice - + Version - + Cockatrice Webpage - + Project Manager: - + Past Project Managers: - + Developers: - + Our Developers - + Help Develop! - + Translators: - + Our Translators - + Help Translate! - + Support: - + Report an Issue - + Troubleshooting - + F.A.Q. - - + + + + + + + + + + + + + + + + + + + + Error - - &Connect... + + Server timeout - - &Disconnect + + Failed Login - - Start &local game... + + Your client seems to be missing features this server requires for connection. - - &Watch replay... + + To update your client, go to 'Help -> Check for Client Updates'. - - &Full screen + + Incorrect username or password. Please check your authentication information and try again. - - &Register to server... + + There is already an active session using this user name. +Please close that session first and re-login. - - &Restore password... + + + You are banned until %1. - - &Settings... + + + You are banned indefinitely. - - &Exit + + This server requires user registration. Do you want to register now? - - A&ctions + + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. - - &Cockatrice + + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - C&ard Database + + Account activation - - &Manage sets... + + Your account has not been activated yet. +You need to provide the activation token received in the activation email. - - Edit custom &tokens... + + Server Full - - Open custom image folder + + Unknown login error: %1 - - Open custom sets folder + + + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - Add custom sets/cards + + Your username must respect these rules: - - Reload card database + + is %1 - %2 characters long - - Tabs + + can %1 contain lowercase characters - - &Help + + + + + NOT - - &About Cockatrice + + can %1 contain uppercase characters - - &Tip of the Day + + can %1 contain numeric characters - - Check for Client Updates + + can contain the following punctuation: %1 - - Check for Card Updates... + + first character can %1 be a punctuation mark - - Check for Card Updates (Automatic) + + no unacceptable language as specified by these server rules: + note that the following lines will not be translated - - Show Status Bar + + can not contain any of the following words: %1 - - View &Debug Log + + can not match any of the following expressions: %1 - - Open Settings Folder + + You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - Show/Hide + + + + + + + Registration denied - - New Version + + Registration is currently disabled on this server + + + + + There is already an existing account with the same user name. + + + + + It's mandatory to specify a valid email address when registering. + + + + + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + + + + + Password too short. + + + + + Registration failed for a technical problem on the server. + + + + + The connection to the server has been lost. + + + + + Unknown registration error: %1 + + + + + Account activation failed + + + + + Socket error: %1 + + + + + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + + + + + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + + + + + Connecting to %1... + + + + + Registering to %1 as %2... + + + + + Disconnected + Connected, logging in at %1 + + + + + + + Requesting forgotten password to %1 as %2... + + + + + &Connect... + + + + + &Disconnect + + + + + Start &local game... + + + + + &Watch replay... + + + + + &Full screen + + + + + &Register to server... + + + + + &Restore password... + + + + + &Settings... + + + + + &Exit + + + + + A&ctions + + + + + &Cockatrice + + + + + C&ard Database + + + + + &Manage sets... + + + + + Edit custom &tokens... + + + + + Open custom image folder + + + + + Open custom sets folder + + + + + Add custom sets/cards + + + + + Reload card database + + + + + Tabs + + + + + &Help + + + + + &About Cockatrice + + + + + &Tip of the Day + + + + + Check for Client Updates + + + + + Check for Card Updates... + + + + + Check for Card Updates (Automatic) + + + + + Show Status Bar + + + + + View &Debug Log + + + + + Open Settings Folder + + + + + Show/Hide + + + + + New Version + + + + Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. - + Cockatrice installed - + Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. - + Card database - + Cockatrice is unable to load the card database. Do you want to update your card database now? If unsure or first time user, choose "Yes" - - + + Yes - - + + No - + Open settings - + New sets found - + %n new set(s) found in the card database Set code(s): %1 Do you want to enable it/them? @@ -5440,153 +5311,179 @@ Do you want to enable it/them? - - Yes, always enable - - - - + View sets - + Welcome - + Hi! It seems like you're running this version of Cockatrice for the first time. All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. - + + Information - + A card database update is already running. - + Unable to run the card database updater: - + Card database update running. - + Failed to start. The file might be missing, or permissions might be incorrect. - + The process crashed some time after starting successfully. - + Timed out. The process took too long to respond. The last waitFor...() function timed out. - + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. - + An error occurred when attempting to read from the process. For example, the process may not be running. - + Unknown error occurred. - + The card database updater exited with an error: %1 - - - - - + + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + + + + + + + + Load sets/cards - + Selected file cannot be found. - + You can only import XML databases at this time. - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. - + Sets/cards failed to import. + + + + + Reset Password + + + + + Your password has been reset successfully, you can now log in using the new credentials. + + + + + Failed to reset user account password, please contact the server operator to reset your password. + + + + + Activation request received, please check your email for an activation token. + + ManaBaseConfigDialog - + Mana Base Configuration - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): - + OK - + Cancel @@ -5658,27 +5555,27 @@ Cockatrice will now reload the card database. ManaDevotionConfigDialog - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): @@ -5748,297 +5645,297 @@ Cockatrice will now reload the card database. MessageLogWidget - + from play - + from their graveyard - + from exile - + from their hand - + the top card of %1's library - + the top card of their library - + from the top of %1's library - + from the top of their library - + the bottom card of %1's library - + the bottom card of their library - + from the bottom of %1's library - + from the bottom of their library - + from %1's library - + from their library - + from sideboard - + from the stack - + from custom zone '%1' - + %1 is now keeping the top card %2 revealed. - + %1 is not revealing the top card %2 any longer. - + %1 can now look at top card %2 at any time. - + %1 no longer can look at top card %2 at any time. - + %1 attaches %2 to %3's %4. - + %1 has conceded the game. - + %1 has unconceded the game. - + %1 has restored connection to the game. - + %1 has lost connection to the game. - + %1 points from their %2 to themselves. - + %1 points from their %2 to %3. - + %1 points from %2's %3 to themselves. - + %1 points from %2's %3 to %4. - + %1 points from their %2 to their %3. - + %1 points from their %2 to %3's %4. - + %1 points from %2's %3 to their own %4. - + %1 points from %2's %3 to %4's %5. - + %1 creates a face down token. - + %1 creates token: %2%3. - + %1 has loaded a deck (%2). - + %1 has loaded a deck with %2 sideboard cards (%3). - + %1 destroys %2. - + a card - + %1 gives %2 control over %3. - + %1 puts %2 into play%3 face down. - + %1 puts %2 into play%3. - + %1 puts %2%3 into their graveyard face down. - + %1 puts %2%3 into their graveyard. - + %1 exiles %2%3 face down. - + %1 exiles %2%3. - + %1 moves %2%3 to their hand. - + %1 puts %2%3 into their library. - + %1 puts %2%3 onto the bottom of their library. - + %1 puts %2%3 on top of their library. - + %1 puts %2%3 into their library %4 cards from the top. - + %1 moves %2%3 to sideboard. - + %1 plays %2%3 face down. - + %1 plays %2%3. - + %1 moves %2%3 to custom zone '%4' face down. - + %1 moves %2%3 to custom zone '%4'. - + %1 tries to draw from an empty library - + %1 draws %2 card(s). @@ -6046,12 +5943,12 @@ Cockatrice will now reload the card database. - + %1 is looking at %2. - + %1 is looking at the %4 %3 card(s) %2. top card for singular, top %3 cards for plural @@ -6060,72 +5957,72 @@ Cockatrice will now reload the card database. - + bottom - + top - + %1 turns %2 face-down. - + %1 turns %2 face-up. - + The game has been closed. - + The game has started. - + You are flooding the game. Please wait a couple of seconds. - + %1 has joined the game. - + %1 is now watching the game. - + You have been kicked out of the game. - + %1 has left the game (%2). - + %1 is not watching the game any more (%2). - + %1 is not ready to start the game any more. - + %1 shuffles their deck and draws a new hand of %2 card(s). @@ -6133,28 +6030,28 @@ Cockatrice will now reload the card database. - + %1 shuffles their deck and draws a new hand. - + You are watching a replay of game #%1. - + %1 is ready to start the game. - + cards an unknown amount of cards - + %1 card(s) a card for singular, %1 cards for plural @@ -6163,218 +6060,213 @@ Cockatrice will now reload the card database. - + %1 lends %2 to %3. - + %1 reveals %2 to %3. - + %1 reveals %2. - + %1 randomly reveals %2%3 to %4. - + %1 randomly reveals %2%3. - + %1 peeks at face down card #%2. - + %1 peeks at face down card #%2: %3. - + %1 reveals %2%3 to %4. - + %1 reveals %2%3. - + %1 reversed turn order, now it's %2. - + reversed - + normal - + Heads - + Tails - + %1 flipped a coin. It landed as %2. - + %1 rolls a %2 with a %3-sided die. - + %1 flips %2 coins. There are %3 heads and %4 tails. - + %1 rolls a %2-sided dice %3 times: %4. - + %1's turn. - + %1 sets annotation of %2 to %3. - - %1 places %2 %3%4 counter(s) on %5 (now %6). + + %1 places %2 "%3" counter(s) on %4 (now %5). - - %1 removes %2 %3%4 counter(s) from %5 (now %6). + + %1 removes %2 "%3" counter(s) from %4 (now %5). - - %1 failed to undo their last draw. - - - - + %1 sets counter %2 to %3 (%4%5). - + %1 sets %2 to not untap normally. - + %1 sets %2 to untap normally. - + %1 removes the PT of %2. - + %1 changes the PT of %2 from nothing to %4. - + %1 changes the PT of %2 from %3 to %4. - + %1 has locked their sideboard. - + %1 has unlocked their sideboard. - + %1 taps their permanents. - + %1 untaps their permanents. - + %1 taps %2. - + %1 untaps %2. - + %1 shuffles %2. - + %1 shuffles the bottom %3 cards of %2. - + %1 shuffles the top %3 cards of %2. - + %1 shuffles cards %3 - %4 of %2. - + %1 unattaches %2. - + %1 undoes their last draw. - + %1 undoes their last draw (%2). @@ -6382,115 +6274,110 @@ Cockatrice will now reload the card database. MessagesSettingsPage - + Word1 Word2 Word3 - + Add New Message - + Edit Message - + Remove Message - + Add message - - + + Message: - + Edit message - + Chat settings - + Custom alert words - + Enable chat mentions - + Enable mention completer - + In-game message macros - + How to use in-game message macros - + Ignore chat room messages sent by unregistered users - + Ignore private messages sent by unregistered users - - Ignore private messages sent by non-buddy users - - - - - + + Invert text color - + Enable desktop notifications for private messages - + Enable desktop notification for mentions - + Enable room message history on join - - + + (Color is hexadecimal) - + Separate words with a space, alphanumeric characters only @@ -6498,42 +6385,42 @@ Cockatrice will now reload the card database. MoveMenu - + Move to - + &Top of library in random order - + X cards from the top of library... - + &Bottom of library in random order - + T&able - + &Hand - + &Graveyard - + &Exile @@ -6546,47 +6433,47 @@ Cockatrice will now reload the card database. - + Mana Value - + Color(s) - + Loyalty - + Main Card Type - + Mana Cost - + P/T - + Side - + Layout - + Color Identity @@ -6609,152 +6496,6 @@ Cockatrice will now reload the card database. - - PaletteEditorDialog - - - - Reset - - - - - - Apply - - - - - - Save && Apply - - - - - ▼ Edit Palette - - - - - - ▶ Edit Palette - - - - - Palette Editor — %1 - - - - - <b>Palette Editor</b> &nbsp;·&nbsp; %1 - - - - - This theme ships no default palette files - - - - - Replace current colours with the theme author's defaults - - - - - Switch between the light and dark palette files - - - - - Editing: - - - - - Show or hide the per-role colour grid for manual tweaks - - - - - ↺ Revert to theme default - - - - - Discard unsaved edits and restore the last saved palette - - - - - Preview this palette without saving to disk - - - - - Write palette-%1.toml and reload the theme - - - - - Cannot save: this theme has no directory on disk - - - - - Save failed - - - - - Could not write %1 to: -%2 - - - - - No default found - - - - - No default palette file found for the "%1" scheme. - - - - - PaletteGridWidget - - - Active - - - - - Disabled - - - - - Inactive - - - - - Normal interactive state - - - - - Widget is disabled / not interactive - - - - - Window is in background / unfocused - - - Phase @@ -6821,57 +6562,57 @@ Cockatrice will now reload the card database. PhasesToolbar - + Untap step - + Upkeep step - + Draw step - + First main phase - + Beginning of combat step - + Declare attackers step - + Declare blockers step - + Combat damage step - + End of combat step - + Second main phase - + End of turn step @@ -6879,7 +6620,7 @@ Cockatrice will now reload the card database. PictureLoader - + en code for scryfall's language property, not available for all languages @@ -6888,142 +6629,151 @@ Cockatrice will now reload the card database. PlayerActions - - - - - grave - - - - - - - - exile - - - - - PlayerDialogs - - + View top cards of library - - - - - - - - - + + + + + + + + + Number of cards: (max. %1) - + View bottom cards of library - + Shuffle top cards of library - + Shuffle bottom cards of library - + Draw hand - + 0 and lower are in comparison to current hand size - + Draw cards - + + + + + grave + + + + + + + + exile + + + + Move top cards to %1 - + Move bottom cards to %1 - + Draw bottom cards - + + + C&reate another %1 token + + + + Create tokens - + + Number: - + Place card X cards from top of library - + Which position should this card be placed: - + (max. %1) - + Change power/toughness - + Change stats to: - + Set annotation - + Please enter the new annotation: + + + Set counters + + PlayerMenu - + Player "%1" - + &Counters @@ -7053,7 +6803,7 @@ This setting means you'll only see the default printing for each card, inst - + Printing Selector @@ -7061,22 +6811,22 @@ This setting means you'll only see the default printing for each card, inst PrintingSelectorCardOverlayWidget - + Preference - + Pin Printing - + Unpin Printing - + Show Related cards @@ -7147,57 +6897,57 @@ This setting means you'll only see the default printing for each card, inst PtMenu - + Power / toughness - + &Increase power - + &Decrease power - + I&ncrease toughness - + D&ecrease toughness - + In&crease power and toughness - + Dec&rease power and toughness - + Increase power and decrease toughness - + Decrease power and increase toughness - + Set &power and toughness... - + Reset p&ower and toughness @@ -7205,37 +6955,37 @@ This setting means you'll only see the default printing for each card, inst QMenuBar - + Services - + Hide %1 - + Hide Others - + Show All - + Preferences... - + Quit %1 - + About %1 @@ -7243,17 +6993,17 @@ This setting means you'll only see the default printing for each card, inst QObject - + Cockatrice card database (*.xml) - + All files (*.*) - + Cockatrice replays (*.cor) @@ -7313,177 +7063,110 @@ Are you sure you would like to disable this feature? QPlatformTheme - + OK - + Save - + Save All - + Open - + &Yes - + Yes to &All - + &No - + N&o to All - + Abort - + Retry - + Ignore - + Close - + Cancel - + Discard - + Help - + Apply - + Reset - + Restore Defaults - - QuickSetupPanel - - - %1% - - - - - <b>Quick Setup</b> - - - - - Generate all palette roles automatically from a single accent colour - - - - - Accent: - - - - - Primary hue. Used directly for highlights and links. -At high intensity it also tints buttons and backgrounds. - - - - - Intensity: - - - - - Subtle - - - - - Full colour - - - - - 0–30 Subtle tint — only highlights and links change hue -30–70 Accented — buttons, tooltips, and borders join in -70–100 Full colour — backgrounds, everything - - - - - 70% - - - - - Generate ↓ - - - - - Derive all palette roles from the accent colour above. -Fine-tune individual colours in the grid afterwards. - - - RemoteDeckList_TreeModel - + Name - + ID - + Upload time @@ -7491,32 +7174,32 @@ Fine-tune individual colours in the grid afterwards. RemoteReplayList_TreeModel - + ID - + Name - + Players - + Keep - + Time started - + Duration (sec) @@ -7524,37 +7207,37 @@ Fine-tune individual colours in the grid afterwards. RfgMenu - + &Exile - + &View exile - + &Move exile to... - + &Top of library - + &Bottom of library - + &Hand - + &Graveyard @@ -7600,7 +7283,7 @@ Fine-tune individual colours in the grid afterwards. SayMenu - + S&ay @@ -7641,27 +7324,27 @@ Fine-tune individual colours in the grid afterwards. SetsModel - + Enabled - + Set type - + Set code - + Long name - + Release date @@ -7669,53 +7352,53 @@ Fine-tune individual colours in the grid afterwards. ShortcutSettingsPage - - + + Restore all default shortcuts - + Do you really want to restore all default shortcuts? - + Clear all default shortcuts - + Do you really want to clear all shortcuts? - + Section: - + Action: - + Shortcut: - + How to set custom shortcuts - + Clear all shortcuts - + Search by shortcut name @@ -7769,12 +7452,12 @@ Please check your shortcut settings! SideboardMenu - + &Sideboard - + &View sideboard @@ -7782,27 +7465,27 @@ Please check your shortcut settings! SoundSettingsPage - + Enable &sounds - + Current sounds theme: - + Test system sound engine - + Sound settings - + Master volume @@ -7874,146 +7557,16 @@ Please check your shortcut settings! - + No reply received from the tag update server. - + Invalid reply received from the tag update server. - - StorageSettingsPage - - - - - Success - - - - - Cached card pictures have been reset. - - - - - Downloaded card pictures have been reset. - - - - - Error - - - - - One or more downloaded card pictures could not be cleared. - - - - - In-memory (currently loaded) card pictures have been reset. - - - - - Card Picture Loader Caching Method: - - - - - The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size. - - - - - Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while. - - - - - This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk. - - - - - Delete Cached Images - - - - - Delete Saved Images - - - - - Clear In-Memory Images - - - - - Card Picture Loader Cache Method - - - - - Network Cache - - - - - Filesystem - - - - - In-Memory Picture Cache - - - - - Network Cache Size: - - - - - On-disk cache for downloaded pictures - - - - - Redirect Cache TTL: - - - - - How long cached redirects for urls are valid for. - - - - - Picture Cache Size: - - - - - In-memory cache for pictures not currently on screen - - - - - Naming scheme: - - - - - Day(s) - - - TabAccount @@ -8149,117 +7702,117 @@ Please check your shortcut settings! TabArchidekt - - + + Desc. - - + + AND - - + + Require ALL selected colors - - + + Deck name... - - + + Owner... - - + + Packages - - + + Advanced Filters - + Bracket: - - + + Any - - + + Contains card... - - + + Commander... - - + + Tag... - - + + Deck Size - + Cards: - - + + Asc. - + Sort by: - + Filter by: - + Display Settings - - + + Search - - + + Formats @@ -8269,54 +7822,6 @@ Please check your shortcut settings! - - TabCardArtRules - - - Card: - - - - - ProviderId: - - - - - Mode: - - - - - Reason: - - - - - Type a card name... - - - - - Add rule - - - - - Remove rule - - - - - Refresh - - - - - Card Art Rules - - - TabDeckEditor @@ -8365,7 +7870,7 @@ Please check your shortcut settings! - + Deck: %1 @@ -8373,49 +7878,55 @@ Please check your shortcut settings! TabDeckEditorVisual - + Visual Deck: %1 - + &Visual Deck Editor - - + + Card Info - - + + Deck - + + + Filters + + + + &View - + Printing - + Visible - + Floating - + Reset layout @@ -8423,22 +7934,22 @@ Please check your shortcut settings! TabDeckEditorVisualTabWidget - + Visual Deck View - + Visual Database Display - + Deck Analytics - + Sample Hand @@ -8446,133 +7957,133 @@ Please check your shortcut settings! TabDeckStorage - + Local file system - + Server deck storage - - + + Open in deck editor - + Rename deck or folder - + Upload deck - + Download deck + - - - + + New folder + - Delete - + Open decks folder - + Rename local folder - + Rename local file - + New name: - - - - + + + + Error - + Rename failed - - + + Invalid deck file - + Enter deck name - + This decklist does not have a name. Please enter a name: - + Unnamed deck - + Failed to upload deck to server - + Delete local file - + Are you sure you want to delete the selected files? - + Delete remote decks - + Are you sure you want to delete the selected decks? - - + + Name of new folder: @@ -8644,191 +8155,191 @@ Please enter a name: TabGame - - - + + + Replay - - + + Game - - + + Player List - - + + Card Info - - + + Messages - - + + Replay Timeline - + &Phases - + &Game - + Next &phase - + Next phase with &action - + Next &turn - + Reverse turn order - + &Remove all local arrows - + Rotate View Cl&ockwise - + Rotate View Co&unterclockwise - + Game &information - + Un&concede - - - + + + &Concede - + &Leave game - + C&lose replay - + &Focus Chat - + &Say: - + Selected cards - + &View - + Visible - + Floating - + Reset layout - + Concede - + Are you sure you want to concede this game? - + Unconcede - + You have already conceded. Do you want to return to this game? - + Leave game - + Are you sure you want to leave this game? - + A player has joined game #%1 - + %1 has joined the game - + You have been kicked out of the game. @@ -8887,114 +8398,114 @@ Please enter a name: - + Username: - + IP Address: - + Game Name: - + GameID: - + Message: - + Main Room - + Game Room - + Private Chat - + Past X Days: - + Today - + Last Hour - + Maximum Results: - + At least one filter is required. The more information you put in, the more specific your results will be. - + Get User Logs - + Clear Filters - + Filters - + Log Locations - + Date Range - + Maximum Results - - + + Message History - + Failed to collect message history information. - + There are no messages for the selected filters. @@ -9012,27 +8523,27 @@ The more information you put in, the more specific your results will be. - + %1 - Private chat - + This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. - + Private message from - + %1 has left the server. - + %1 has joined the server. @@ -9040,180 +8551,180 @@ The more information you put in, the more specific your results will be. TabReplays - + Local file system - + Server replay storage - - + + Watch replay - + Rename - - + + New folder - - + + Delete - + Open replays folder - + Download replay - + Toggle expiration lock - + Get replay share code - - + + Look up replay by share code - + Rename local folder - + Rename local file - + New name: - + Error - + Rename failed - + Name of new folder: - + Delete local file - + Are you sure you want to delete the selected files? - + Are you sure you want to delete the selected replays? - + Failed to get code - - + + Either this server does not support replay sharing, or does not permit replay sharing for you. - - - + + + Failed - + Could not get replay code - + Replay Share Code - + Others can use this code to add the replay to their list of remote replays: %1 - + Copy to clipboard - + Replay share code - + Replay code found - + Replay was added, or you already had access to it. - + Replay code not found - + Failed to submit code - + Unexpected error - + Delete remote replay @@ -9226,62 +8737,47 @@ The more information you put in, the more specific your results will be. TabRoom - - Friends - - - - - Online - - - - - Ignored - - - - + &Say: - + Chat - + &Room - + &Leave room - + &Clear chat - + Chat Settings... - + mentioned you. - + Click to view - + You are flooding the chat. Please wait a couple of seconds. @@ -9294,30 +8790,30 @@ The more information you put in, the more specific your results will be. - - - - + + + + Error - + Failed to join the server room: it doesn't exist on the server. - + The server thinks you are in the server room but your client is unable to display it. Try restarting your client. - + You do not have the required permission to join this server room. - + Failed to join the server room due to an unknown error: %1. @@ -9325,97 +8821,97 @@ The more information you put in, the more specific your results will be. TabSupervisor - + Deck Editor - + Visual Deck Editor - + EDHRec - + Archidekt - + Home - + &Visual Deck Storage - + Visual Database Display - + Server - + Account - + Deck Storage - + Game Replays - + Administration - + Logs - + Are you sure? - + There are still open games. Are you sure you want to quit? - + Click to view - + Your buddy %1 has signed on! - + Unknown Event - + The server has sent you a message that your client does not understand. This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. @@ -9423,38 +8919,38 @@ To update your client, go to Help -> Check for Updates. - + Idle Timeout - + You are about to be logged out due to inactivity. - + Promotion - + You have been promoted. Please log out and back in for changes to take effect. - + Warned - + You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. - + You have received the following message from the server. (custom messages like these could be untranslated) @@ -9463,12 +8959,12 @@ Please refrain from engaging in this activity or further actions may be taken ag TabVisualDatabaseDisplay - + Database Display - + Visual Database Display @@ -9505,42 +9001,42 @@ Please refrain from engaging in this activity or further actions may be taken ag TranslateCounterName - + Life - + White - + Blue - + Black - + Red - + Green - + Colorless - + Other @@ -9548,69 +9044,11 @@ Please refrain from engaging in this activity or further actions may be taken ag UpdateDownloader - + Could not open the file for reading. - - UserCardArtSettingsDialog - - - Card Art Settings - - - - - Type a card name... - - - - - Card name: - - - - - Card ProviderId: - - - - - Left margin (%): - - - - - Right margin (%): - - - - - Vertical offset: - - - - - Zoom: - - - - - Parameters - - - - - Preview - - - - - Remove Banner Card - - - UserContextMenu @@ -9728,7 +9166,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Ban History @@ -9743,87 +9181,77 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Failed to collect ban information. - - - + + + Warning History - + Warning Time;Moderator;User Name;Reason - + User has never been warned. - + Failed to collect warning information. - + Failed to get admin notes. - - + + Success - + Successfully promoted user. - + Successfully demoted user. - - Kick Player - - - - - Are you sure you want to kick this player from the game? - - - - - - + + + Failed - + Failed to promote user. - + Failed to demote user. - + Copy hash to clipboard - + Remove this user's messages @@ -9831,116 +9259,109 @@ Please refrain from engaging in this activity or further actions may be taken ag UserInfoBox - + Location: - + Account Age: - + Edit - + Change password - + Change avatar - + Administrator - + Moderator - + Registered user - - + + Unregistered user - + Judge - + Unknown - + The entered password does not match your account. - - - - + + + Information - + User information updated. - - - - - - - - - - - + + + + + + + + + + Error - + User Information - + Real Name: - + User Level: - - - Edit Banner Card - - - + %n Year(s), amount of years (only shown if more than 0) @@ -9949,7 +9370,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + %10%n Day(s) %20 amount of years (if more than 0), amount of days, date in local short format @@ -9958,433 +9379,212 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Enter Password - + Password verification is required in order to change your email address - - - + + + An error occurred while trying to update your user information. - - The selected card is blacklisted on this server or another error occurred. - - - - - Banner card removed. - - - - - Banner card updated. - - - - + This server does not permit you to update your user informations. - + Password changed. - + This server does not permit you to change your password. - + The new password is too short. - + The old password is incorrect. - + Avatar updated. - + This server does not permit you to update your avatar. - - - An error occured while trying to update your avatar. - - - This server does not permit you to update your user informations. - An error occured while trying to updater your avatar. - - - - - UserInfoPopup - - - - Games - - - - - Chat - - - - - Open private chat - - - - - Profile - - - - - View user profile - - - - - Show this user's games - - - - - − Buddy - - - - - Remove from buddy list - - - - - + Buddy - - - - - Add to buddy list - - - - - − Ignore - - - - - Remove from ignore list - - - - - + Ignore - - - - - Add to ignore list - - - - - Ban - - - - - Ban from server - - - - - Warn - - - - - Warn user - - - - - Ban log - - - - - View ban history - - - - - Warn log - - - - - View warning history - - - - - Notes - - - - - View admin notes - - - - - − Mod - - - - - Demote from moderator - - - - - + Mod - - - - - Promote to moderator - - - - - − Judge - - - - - Demote from judge - - - - - + Judge - - - - - Promote to judge - - - - - Join game - - - - - Spectate - - - - - - Loading games… - - - - - Could not load games. - - - - - No active games. + An error occured while trying to updater your avatar. UserInterfaceSettingsPage - + General interface settings - + &Double-click cards to play them (instead of single-click) - + &Clicking plays all selected cards (instead of just the clicked card) - + &Play all nonlands onto the stack (not the battlefield) by default - + Do not delete &arrows inside of subphases - + Close card view window when last card is removed - + Auto focus search bar when card view window is opened - + Annotate card text on tokens - - Show selection count during drag selection + + Show selection counter during drag selection - - Show total selection count + + Show total selection counter - - Show subtype breakdown in selection tally - - - - + Use tear-off menus, allowing right click menus to persist on screen - - Keep game chat focused when clicking in game (Note: disables card view search bar) - - - - + Notifications settings - + Enable notifications in taskbar - + Notify in the taskbar for game events while you are spectating - + Notify in the taskbar when users in your buddy list connect - + Animation settings - + &Tap/untap animation - + Deck editor/storage settings - + Open deck in new tab by default - + Use visual deck storage in game lobby - + Use selection animation for Visual Deck Storage - + When adding a tag in the visual deck storage to a .txt deck: - + do nothing - + ask to convert to .cod - + always convert to .cod - + Default deck editor type - + Classic Deck Editor - + Visual Deck Editor - + Replay settings - + Buffer time for backwards skip via shortcut: @@ -10392,22 +9592,22 @@ Please refrain from engaging in this activity or further actions may be taken ag UserListWidget - + Users connected to server: %1 - + Users in this room: %1 - + Buddies online: %1 / %2 - + Ignored users online: %1 / %2 @@ -10415,45 +9615,35 @@ Please refrain from engaging in this activity or further actions may be taken ag UtilityMenu - + Increment all card counters - + &Untap all permanents - + R&oll die... - - Flip coin - - - - + &Create token... - + C&reate another token - + Cr&eate predefined token - - - C&reate another %1 token - - VisualDatabaseDisplayColorFilterWidget @@ -10505,72 +9695,72 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFilterToolbarWidget - + Sort by - + Filter by - + Save and load filters - + Filter by exact card name - + Filter by card main-type - + Filter by card sub-type - + Filter by set - + Filter by format legality - + Save/Load - + Name - + Main Type - + Sub Type - + Sets - + Formats @@ -10578,22 +9768,22 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFormatLegalityFilterWidget - + Show formats with at least: - + cards - + Do not display formats with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) @@ -10611,32 +9801,32 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayMainTypeFilterWidget - + Show main types with at least: - + cards - + Do not display card main-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10644,27 +9834,27 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayNameFilterWidget - + Filter by name... (Exact match) - + Load from Deck - + Apply all card names in currently loaded deck as exact match name filters - + Load from Clipboard - + Apply all card names in clipboard as exact match name filters @@ -10672,7 +9862,7 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayRecentSetFilterSettingsWidget - + Filter to most recent sets @@ -10680,19 +9870,19 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySetFilterWidget - + Search sets... - - + + Mode: Exact Match - - + + Mode: Includes @@ -10700,37 +9890,37 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySubTypeFilterWidget - + Search subtypes... - + Show sub types with at least: - + cards - + Do not display card sub-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10738,23 +9928,23 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayWidget - + Search by card name (or search expressions) - + Visual - + Loading database ... - + Clear all filters @@ -10793,17 +9983,17 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Toggle Layout: Overlap - + Change how cards are displayed within zones (i.e. overlapped or fully visible.) - + Toggle Layout: Flat @@ -10832,17 +10022,17 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDeckEditorWidget - + Type a card name here for suggestions from the database... - + Quick search and add card - + Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter @@ -10960,43 +10150,43 @@ Please refrain from engaging in this activity or further actions may be taken ag WarningDialog - + Which warning would you like to send? - + Redact all messages from this user in all rooms - + &OK - + &Cancel - + Warn user for misconduct - - + + Error - + User name to send a warning to can not be blank, please specify a user to warn. - + Warning to use can not be blank, please select a valid warning to send. @@ -11004,133 +10194,133 @@ Please refrain from engaging in this activity or further actions may be taken ag WndSets - + Move selected set to the top - + Move selected set up - + Move selected set down - + Move selected set to the bottom - + Search by set name, code, or type - + Default order - + Restore original art priority order - + Enable all sets - + Disable all sets - + Enable selected set(s) - + Disable selected set(s) - + Deck Editor - + Use CTRL+A to select all sets in the view. - + Only cards in enabled sets will appear in the card list of the deck editor. - + Image priority is decided in the following order: - + first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) %1 is a link to the wiki - + Include cards rebalanced for Alchemy [requires restart] - + Card Art - + How to use custom card art - + Hints - + Note - + Sorting by column allows you to find a set while not changing set priority. - + To enable ordering again, click the column header until this message disappears. - + Use the current sorting as the set priority instead - + Sorts the set priority using the same column - + Manage sets @@ -11138,72 +10328,72 @@ Please refrain from engaging in this activity or further actions may be taken ag ZoneViewWidget - + Search by card name (or search expressions) - + Ungrouped - + Group by Type - + Group by Mana Value - + Group by Color - + Unsorted - + Sort by Name - + Sort by Type - + Sort by Mana Cost - + Sort by Colors - + Sort by P/T - + Sort by Set - + shuffle when closing - + pile view @@ -11211,7 +10401,7 @@ Please refrain from engaging in this activity or further actions may be taken ag i18n - + English @@ -11219,12 +10409,12 @@ Please refrain from engaging in this activity or further actions may be taken ag main - + Connect on startup - + Debug to file @@ -11238,7 +10428,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Deck Editor @@ -11319,7 +10509,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Replays @@ -11434,129 +10624,129 @@ Please refrain from engaging in this activity or further actions may be taken ag - - + + Load Deck from Clipboard... - + Edit Deck in Clipboard, Annotated - + Edit Deck in Clipboard - + New Deck - + Open Custom Pictures Folder - + Print Deck... - + Delete Card - - + + Reset Layout - + Save Deck - + Save Deck as... - + Save Deck to Clipboard, Annotated - + Save Deck to Clipboard, Annotated (No Set Info) - + Save Deck to Clipboard - + Save Deck to Clipboard (No Set Info) - + Load Local Deck... - + Load Remote Deck... - + Set Ready to Start - + Toggle Sideboard Lock - + Add Green Counter - + Remove Green Counter - + Set Green Counters... - + Add Red Counter - + Remove Red Counter - + Set Red Counters... - + Add Life Counter @@ -11566,744 +10756,724 @@ Please refrain from engaging in this activity or further actions may be taken ag - - Load deck from online service... - - - - - Load from website... - - - - + Unload Deck - + Force Start - + Add Card Counter (F) - + Remove Card Counter (F) - + Set Card Counters (F)... - + Add Card Counter (E) - + Remove Card Counter (E) - + Set Card Counters (E)... - + Add Card Counter(D) - + Remove Card Counter (D) - + Set Card Counters (D)... - + Add Card Counter (C) - + Remove Card Counter (C) - + Set Card Counters (C)... - + Add Card Counter (B) - + Remove Card Counter (B) - + Set Card Counters (B)... - + Add Card Counter (A) - + Remove Card Counter (A) - + Set Card Counters (A)... - + Remove Life Counter - + Set Life Counters... - + Add White Counter - + Remove White Counter - + Set White Counters... - + Add Blue Counter - + Remove Blue Counter - + Set Blue Counters... - + Add Black Counter - + Remove Black Counter - + Set Black Counters... - + Add Colorless Counter - + Remove Colorless Counter - + Set Colorless Counters... - + Add Other Counter - + Remove Other Counter - + Set Other Counters... - + Increment all card counters - + Add Power (+1/+0) - + Remove Power (-1/-0) - + Move Toughness to Power (+1/-1) - + Add Toughness (+0/+1) - + Remove Toughness (-0/-1) - + Move Power to Toughness (-1/+1) - + Add Power and Toughness (+1/+1) - + Remove Power and Toughness (-1/-1) - + Set Power and Toughness... - + Reset Power and Toughness - + Untap - + Upkeep - + Draw - + First Main Phase - + Start Combat - + Attack - + Block - + Damage - + End Combat - + Second Main Phase - + End - + Next Phase - + Next Phase Action - + Next Turn - + Hide Card in Reveal Window - + Tap / Untap Card - + Untap All - + Toggle Skip Untapping Toggle Untap - + Turn Card Over - + Peek Card - + Play Card - + Play Card, Face Down - + Attach Card... - + Unattach Card - + Clone Card - + Create Token... - + Create All Related Tokens - + Create Another Token - + Set Annotation... - - Reduce Life by Power - - - - + Select All Cards in Zone - + Select All Cards in Row - + Select All Cards in Column - + Reveal Selected Cards to All Players - - + + Bottom of Library - - - - + + + + Exile - - - - + + + + Graveyard - - + + Hand - - + + Top of Library - - + + Battlefield, Face Down - + Battlefield - + Library - + Sideboard - + Top Cards of Library - + Bottom Cards of Library - + Close Recent View - - + + Stack - - + + Graveyard (Multiple) - - + + Graveyard (Multiple), Face Down - - + + Exile (Multiple) - - + + Exile (Multiple), Face Down - + Stack Until Found - + Draw Bottom Card - + Draw Multiple Cards from Bottom... - + Draw Arrow... - + Remove Local Arrows - + Leave Game - + Concede - + Roll Dice... - - Flip Coin - - - - + Shuffle Library - + Shuffle Top Cards of Library - + Shuffle Bottom Cards of Library - + Mulligan - + Mulligan (Same hand size) - + Mulligan (Hand size - 1) - + Draw a Card - + Draw Multiple Cards... - + Undo Draw - + Always Reveal Top Card - + Always Look At Top Card - + Sort Hand by Name - + Sort Hand by Type - + Sort Hand by Mana Value - + Reveal Hand to All Players - + Reveal Random Card to All Players - + Rotate View Clockwise - + Rotate View Counterclockwise - + Unfocus Text Box - + Focus Chat - + Clear Chat - + Refresh - + Skip Forward - + Skip Backward - + Skip Forward by a lot - + Skip Backward by a lot - + Play/Pause - + Toggle Fast Forward - + Home - + Visual Deck Storage - + Deck Storage - + Server - + Account - + Administration - + Logs diff --git a/cockatrice/resources/config/qtlogging.ini b/cockatrice/resources/config/qtlogging.ini index 7ac0d9ca4..20aa206ce 100644 --- a/cockatrice/resources/config/qtlogging.ini +++ b/cockatrice/resources/config/qtlogging.ini @@ -28,8 +28,6 @@ #dlg_tip_of_the_day = true #dlg_update = true -#general_settings_page = true - #settings_cache = true #servers_settings = true #shortcuts_settings = true diff --git a/cockatrice/resources/config/storage.svg b/cockatrice/resources/config/storage.svg deleted file mode 100644 index de85228dc..000000000 --- a/cockatrice/resources/config/storage.svg +++ /dev/null @@ -1,799 +0,0 @@ - - - -image/svg+xml diff --git a/cockatrice/resources/icons/mana/C.svg b/cockatrice/resources/icons/mana/C.svg deleted file mode 100644 index eb09fb872..000000000 --- a/cockatrice/resources/icons/mana/C.svg +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - diff --git a/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp b/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp deleted file mode 100644 index 75cedcafc..000000000 --- a/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp +++ /dev/null @@ -1,587 +0,0 @@ -#include "remote_connection_controller.h" - -#include "../../settings/cache_settings.h" -#include "../interface/widgets/dialogs/dlg_connect.h" -#include "../interface/widgets/dialogs/dlg_forgot_password_challenge.h" -#include "../interface/widgets/dialogs/dlg_forgot_password_request.h" -#include "../interface/widgets/dialogs/dlg_forgot_password_reset.h" -#include "../interface/widgets/dialogs/dlg_register.h" -#include "../interface/widgets/utility/get_text_with_max.h" - -#include -#include -#include -#include -#include -#include - -ConnectionController::ConnectionController(QWidget *dialogParent, QObject *parent) - : QObject(parent), dialogParent(dialogParent) -{ - remoteClient = new RemoteClient(nullptr, &SettingsCache::instance()); - - clientThread = new QThread(this); - remoteClient->moveToThread(clientThread); - clientThread->start(); - - wireClientSignals(); -} - -ConnectionController::~ConnectionController() -{ - remoteClient->deleteLater(); - clientThread->wait(); -} - -void ConnectionController::wireClientSignals() -{ - connect(remoteClient, &RemoteClient::connectionClosedEventReceived, this, - &ConnectionController::onConnectionClosedEvent); - - connect(remoteClient, &RemoteClient::serverShutdownEventReceived, this, - &ConnectionController::onServerShutdownEvent); - - connect(remoteClient, &RemoteClient::statusChanged, this, &ConnectionController::onStatusChanged); - - connect(remoteClient, &RemoteClient::userInfoChanged, this, &ConnectionController::onUserInfoReceived, - Qt::BlockingQueuedConnection); - - connect(remoteClient, &RemoteClient::loginError, this, - [this](Response::ResponseCode r, QString rs, quint32 et, QList mf) { - onLoginError(static_cast(r), rs, et, mf); - }); - - connect(remoteClient, &RemoteClient::registerError, this, - [this](Response::ResponseCode r, QString rs, quint32 et) { onRegisterError(static_cast(r), rs, et); }); - - connect(remoteClient, &RemoteClient::activateError, this, &ConnectionController::onActivateError); - connect(remoteClient, &RemoteClient::socketError, this, &ConnectionController::onSocketError); - connect(remoteClient, &RemoteClient::serverTimeout, this, &ConnectionController::onServerTimeout); - - connect(remoteClient, &RemoteClient::protocolVersionMismatch, this, - &ConnectionController::onProtocolVersionMismatch); - - connect(remoteClient, &RemoteClient::registerAccepted, this, &ConnectionController::onRegisterAccepted); - - connect(remoteClient, &RemoteClient::registerAcceptedNeedsActivate, this, - &ConnectionController::onRegisterAcceptedNeedsActivate); - - connect(remoteClient, &RemoteClient::activateAccepted, this, &ConnectionController::onActivateAccepted); - - connect(remoteClient, &RemoteClient::notifyUserAboutUpdate, this, &ConnectionController::onNotifyUserAboutUpdate); - - connect(remoteClient, &RemoteClient::sigForgotPasswordSuccess, this, - &ConnectionController::onForgotPasswordSuccess); - - connect(remoteClient, &RemoteClient::sigForgotPasswordError, this, &ConnectionController::onForgotPasswordError); - - connect(remoteClient, &RemoteClient::sigPromptForForgotPasswordReset, this, - &ConnectionController::onPromptForgotPasswordReset); - - connect(remoteClient, &RemoteClient::sigPromptForForgotPasswordChallenge, this, - &ConnectionController::onPromptForgotPasswordChallenge); -} - -void ConnectionController::connectToServer() -{ - dlgConnect = new DlgConnect(dialogParent); - connect(dlgConnect, &DlgConnect::sigStartForgotPasswordRequest, this, &ConnectionController::forgotPasswordRequest); - - if (dlgConnect->exec()) { - remoteClient->connectToServer(dlgConnect->getHost(), static_cast(dlgConnect->getPort()), - dlgConnect->getPlayerName(), dlgConnect->getPassword()); - } -} - -void ConnectionController::connectToServerDirect(const QString &host, - unsigned int port, - const QString &playerName, - const QString &password) -{ - remoteClient->connectToServer(host, port, playerName, password); -} - -void ConnectionController::disconnectFromServer() -{ - remoteClient->disconnectFromServer(); -} - -void ConnectionController::registerToServer() -{ - DlgRegister dlg(dialogParent); - if (dlg.exec()) { - remoteClient->registerToServer(dlg.getHost(), static_cast(dlg.getPort()), dlg.getPlayerName(), - dlg.getPassword(), dlg.getEmail(), dlg.getCountry(), dlg.getRealName()); - } -} - -void ConnectionController::forgotPasswordRequest() -{ - DlgForgotPasswordRequest dlg(dialogParent); - if (dlg.exec()) { - remoteClient->requestForgotPasswordToServer(dlg.getHost(), static_cast(dlg.getPort()), - dlg.getPlayerName()); - } -} - -void ConnectionController::onConnectionClosedEvent(const Event_ConnectionClosed &event) -{ - remoteClient->disconnectFromServer(); - - QString reasonStr; - switch (event.reason()) { - case Event_ConnectionClosed::USER_LIMIT_REACHED: { - reasonStr = tr("The server has reached its maximum user capacity, please check back later."); - break; - } - case Event_ConnectionClosed::TOO_MANY_CONNECTIONS: { - reasonStr = tr("There are too many concurrent connections from your address."); - break; - } - case Event_ConnectionClosed::BANNED: { - reasonStr = tr("Banned by moderator"); - if (event.has_end_time()) { - reasonStr.append( - "\n" + tr("Expected end time: %1").arg(QDateTime::fromSecsSinceEpoch(event.end_time()).toString())); - } else { - reasonStr.append("\n" + tr("This ban lasts indefinitely.")); - } - if (event.has_reason_str()) { - reasonStr.append("\n\n" + QString::fromStdString(event.reason_str())); - } - break; - } - case Event_ConnectionClosed::SERVER_SHUTDOWN: { - reasonStr = tr("Scheduled server shutdown."); - break; - } - case Event_ConnectionClosed::USERNAMEINVALID: { - reasonStr = tr("Invalid username."); - break; - } - case Event_ConnectionClosed::LOGGEDINELSEWERE: { - reasonStr = tr("You have been logged out due to logging in at another location."); - break; - } - default: - reasonStr = QString::fromStdString(event.reason_str()); - } - - QMessageBox::critical(dialogParent, tr("Connection closed"), - tr("The server has terminated your connection.\nReason: %1").arg(reasonStr)); -} - -void ConnectionController::onServerShutdownEvent(const Event_ServerShutdown &event) -{ - serverShutdownMessageBox.setInformativeText(tr("The server is going to be restarted in %n minute(s).\nAll running " - "games will be lost.\nReason for shutdown: %1", - "", event.minutes()) - .arg(QString::fromStdString(event.reason()))); - serverShutdownMessageBox.setIconPixmap(QPixmap("theme:cockatrice").scaled(64, 64)); - serverShutdownMessageBox.setText(tr("Scheduled server shutdown")); - serverShutdownMessageBox.setWindowModality(Qt::ApplicationModal); - serverShutdownMessageBox.setVisible(true); -} - -void ConnectionController::onStatusChanged(ClientStatus status) -{ - // Update the window title first, then let MainWindow handle its own UI - // state via the forwarded signal - updateWindowTitle(); - emit statusChanged(status); - - // TabSupervisor::stop() needs calling on disconnect; start() is driven by - // onUserInfoReceived → tabSupervisorStartRequested. - if (status == StatusDisconnected) { - emit tabSupervisorStopRequested(); - } -} - -void ConnectionController::onUserInfoReceived(const ServerInfo_User &info) -{ - emit tabSupervisorStartRequested(info); -} - -void ConnectionController::onLoginError(int r, - QString reasonStr, - quint32 endTime, - const QList &missingFeatures) -{ - switch (static_cast(r)) { - case Response::RespClientUpdateRequired: { - QString formatted = "Missing Features: "; - for (int i = 0; i < missingFeatures.size(); ++i) { - formatted.append(QString("\n %1").arg(QChar(0x2022)) + " " + missingFeatures.value(i)); - } - - QMessageBox msgBox(dialogParent); - msgBox.setIcon(QMessageBox::Critical); - msgBox.setWindowTitle(tr("Failed Login")); - msgBox.setText(tr("Your client seems to be missing features this server requires for connection.") + - "\n\n" + tr("To update your client, go to 'Help -> Check for Client Updates'.")); - msgBox.setDetailedText(formatted); - msgBox.exec(); - break; - } - - case Response::RespWrongPassword: { - QMessageBox::critical(dialogParent, tr("Error"), - tr("Incorrect username or password. " - "Please check your authentication information and try again.")); - break; - } - - case Response::RespWouldOverwriteOldSession: { - QMessageBox::critical(dialogParent, tr("Error"), - tr("There is already an active session using this user name.\n" - "Please close that session first and re-login.")); - break; - } - - case Response::RespUserIsBanned: { - QString bannedStr = - endTime ? tr("You are banned until %1.").arg(QDateTime::fromSecsSinceEpoch(endTime).toString()) - : tr("You are banned indefinitely."); - if (!reasonStr.isEmpty()) { - bannedStr.append("\n\n" + reasonStr); - } - QMessageBox::critical(dialogParent, tr("Error"), bannedStr); - break; - } - - case Response::RespUsernameInvalid: { - QMessageBox::critical(dialogParent, tr("Error"), extractInvalidUsernameMessage(reasonStr)); - break; - } - - case Response::RespRegistrationRequired: { - if (QMessageBox::question(dialogParent, tr("Error"), - tr("This server requires user registration. Do you want to register now?"), - QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) { - registerToServer(); - } - return; // don't re-prompt connect - } - - case Response::RespClientIdRequired: { - QMessageBox::critical(dialogParent, tr("Error"), - tr("This server requires client IDs. Your client is either failing to generate an " - "ID or you are running a modified client.\n" - "Please close and reopen your client to try again.")); - break; - } - - case Response::RespContextError: { - QMessageBox::critical(dialogParent, tr("Error"), - tr("An internal error has occurred, please close and reopen Cockatrice before " - "trying again.\nIf the error persists, ensure you are running the latest " - "version of the software and if needed contact the software developers.")); - break; - } - - case Response::RespAccountNotActivated: { - bool ok = false; - QString token = - getTextWithMax(dialogParent, tr("Account activation"), - tr("Your account has not been activated yet.\n" - "You need to provide the activation token received in the activation email."), - QLineEdit::Normal, QString(), &ok); - - if (ok && !token.isEmpty()) { - remoteClient->activateToServer(token); - return; - } - remoteClient->disconnectFromServer(); - return; - } - - case Response::RespServerFull: { - QMessageBox::critical(dialogParent, tr("Server Full"), - tr("The server has reached its maximum user capacity, please check back later.")); - break; - } - - default: { - QMessageBox::critical(dialogParent, tr("Error"), - tr("Unknown login error: %1").arg(r) + - tr("\nThis usually means that your client version is out of date, and the server " - "sent a reply your client doesn't understand.")); - break; - } - } - - // Re-open the connect dialog after any handled error - connectToServer(); -} - -void ConnectionController::onRegisterError(int r, QString reasonStr, quint32 endTime) -{ - switch (static_cast(r)) { - case Response::RespRegistrationDisabled: { - QMessageBox::critical(dialogParent, tr("Registration denied"), - tr("Registration is currently disabled on this server")); - break; - } - case Response::RespUserAlreadyExists: { - QMessageBox::critical(dialogParent, tr("Registration denied"), - tr("There is already an existing account with the same user name.")); - break; - } - case Response::RespEmailRequiredToRegister: { - QMessageBox::critical(dialogParent, tr("Registration denied"), - tr("It's mandatory to specify a valid email address when registering.")); - break; - } - case Response::RespEmailBlackListed: { - if (reasonStr.isEmpty()) { - reasonStr = - "The email address provider used during registration has been blocked from use on this server."; - } - QMessageBox::critical(dialogParent, tr("Registration denied"), reasonStr); - break; - } - case Response::RespTooManyRequests: { - QMessageBox::critical(dialogParent, tr("Registration denied"), - tr("It appears you are attempting to register a new account on this server yet you " - "already have an account registered with the email provided. This server " - "restricts the number of accounts a user can register per address. Please " - "contact the server operator for further assistance or to obtain your " - "credential information.")); - break; - } - case Response::RespPasswordTooShort: { - QMessageBox::critical(dialogParent, tr("Registration denied"), tr("Password too short.")); - break; - } - case Response::RespUserIsBanned: { - QString bannedStr = - endTime ? tr("You are banned until %1.").arg(QDateTime::fromSecsSinceEpoch(endTime).toString()) - : tr("You are banned indefinitely."); - if (!reasonStr.isEmpty()) { - bannedStr.append("\n\n" + reasonStr); - } - QMessageBox::critical(dialogParent, tr("Error"), bannedStr); - break; - } - case Response::RespUsernameInvalid: { - QMessageBox::critical(dialogParent, tr("Error"), extractInvalidUsernameMessage(reasonStr)); - break; - } - case Response::RespRegistrationFailed: { - QMessageBox::critical(dialogParent, tr("Error"), - tr("Registration failed for a technical problem on the server.")); - break; - } - case Response::RespNotConnected: { - QMessageBox::critical(dialogParent, tr("Error"), tr("The connection to the server has been lost.")); - break; - } - default: { - QMessageBox::critical(dialogParent, tr("Error"), - tr("Unknown registration error: %1").arg(r) + - tr("\nThis usually means that your client version is out of date, and the server " - "sent a reply your client doesn't understand.")); - break; - } - } - - registerToServer(); -} - -void ConnectionController::onActivateError() -{ - QMessageBox::critical(dialogParent, tr("Error"), tr("Account activation failed")); - remoteClient->disconnectFromServer(); - connectToServer(); -} - -void ConnectionController::onSocketError(const QString &errorStr) -{ - QMessageBox::critical(dialogParent, tr("Error"), tr("Socket error: %1").arg(errorStr)); - connectToServer(); -} - -void ConnectionController::onServerTimeout() -{ - QMessageBox::critical(dialogParent, tr("Error"), tr("Server timeout")); - connectToServer(); -} - -void ConnectionController::onProtocolVersionMismatch(int localVersion, int remoteVersion) -{ - if (localVersion > remoteVersion) { - QMessageBox::critical(dialogParent, tr("Error"), - tr("You are trying to connect to an obsolete server. Please downgrade your Cockatrice " - "version or connect to a suitable server.\n" - "Local version is %1, remote version is %2.") - .arg(localVersion) - .arg(remoteVersion)); - } else { - QMessageBox::critical(dialogParent, tr("Error"), - tr("Your Cockatrice client is obsolete. Please update your Cockatrice version.\n" - "Local version is %1, remote version is %2.") - .arg(localVersion) - .arg(remoteVersion)); - } -} - -void ConnectionController::onRegisterAccepted() -{ - QMessageBox::information(dialogParent, tr("Success"), tr("Registration accepted.\nWill now login.")); -} - -void ConnectionController::onRegisterAcceptedNeedsActivate() -{ - // Server will send activation email; nothing to display here. -} - -void ConnectionController::onActivateAccepted() -{ - QMessageBox::information(dialogParent, tr("Success"), tr("Account activation accepted.\nWill now login.")); -} - -void ConnectionController::onNotifyUserAboutUpdate() -{ - QMessageBox::information( - dialogParent, tr("Information"), - tr("This server supports additional features that your client doesn't have.\n" - "This is most likely not a problem, but this message might mean there is a new version of " - "Cockatrice available or this server is running a custom or pre-release version.\n\n" - "To update your client, go to Help -> Check for Updates.")); -} - -void ConnectionController::onForgotPasswordSuccess() -{ - QMessageBox::information( - dialogParent, tr("Reset Password"), - tr("Your password has been reset successfully, you can now log in using the new credentials.")); - SettingsCache::instance().servers().setFPHostName(""); - SettingsCache::instance().servers().setFPPort(""); - SettingsCache::instance().servers().setFPPlayerName(""); -} - -void ConnectionController::onForgotPasswordError() -{ - QMessageBox::warning( - dialogParent, tr("Reset Password"), - tr("Failed to reset user account password, please contact the server operator to reset your password.")); - SettingsCache::instance().servers().setFPHostName(""); - SettingsCache::instance().servers().setFPPort(""); - SettingsCache::instance().servers().setFPPlayerName(""); -} - -void ConnectionController::onPromptForgotPasswordReset() -{ - QMessageBox::information(dialogParent, tr("Reset Password"), - tr("Activation request received, please check your email for an activation token.")); - DlgForgotPasswordReset dlg(dialogParent); - if (dlg.exec()) { - remoteClient->submitForgotPasswordResetToServer(dlg.getHost(), static_cast(dlg.getPort()), - dlg.getPlayerName(), dlg.getToken(), dlg.getPassword()); - } -} - -void ConnectionController::onPromptForgotPasswordChallenge() -{ - DlgForgotPasswordChallenge dlg(dialogParent); - if (dlg.exec()) { - remoteClient->submitForgotPasswordChallengeToServer(dlg.getHost(), static_cast(dlg.getPort()), - dlg.getPlayerName(), dlg.getEmail()); - } -} - -void ConnectionController::updateWindowTitle() -{ - const QString appName = QStringLiteral("Cockatrice"); - QString title; - - switch (remoteClient->getStatus()) { - case StatusConnecting: { - title = appName + " - " + tr("Connecting to %1...").arg(remoteClient->peerName()); - break; - } - case StatusRegistering: { - title = appName + " - " + - tr("Registering to %1 as %2...").arg(remoteClient->peerName()).arg(remoteClient->getUserName()); - break; - } - case StatusDisconnected: { - title = appName + " - " + tr("Disconnected"); - break; - } - case StatusLoggingIn: { - title = appName + " - " + tr("Connected, logging in at %1").arg(remoteClient->peerName()); - break; - } - case StatusLoggedIn: { - title = remoteClient->getUserName() + "@" + remoteClient->peerName(); - break; - } - case StatusRequestingForgotPassword: - case StatusSubmitForgotPasswordChallenge: - case StatusSubmitForgotPasswordReset: - title = appName + " - " + - tr("Requesting forgotten password to %1 as %2...") - .arg(remoteClient->peerName()) - .arg(remoteClient->getUserName()); - break; - default: - title = appName; - } - - emit windowTitleChanged(title); -} - -// static -QString ConnectionController::extractInvalidUsernameMessage(QString &in) -{ - QString out = tr("Invalid username.") + "
"; - QStringList rules = in.split(QChar('|')); - - if (rules.size() == 7 || rules.size() == 9) { - out += tr("Your username must respect these rules:") + "
    "; - - out += "
  • " + tr("is %1 - %2 characters long").arg(rules.at(0)).arg(rules.at(1)) + "
    • "; - out += "
  • " + tr("can %1 contain lowercase characters").arg((rules.at(2).toInt() > 0) ? "" : tr("NOT")) + - "
    • "; - out += "
  • " + tr("can %1 contain uppercase characters").arg((rules.at(3).toInt() > 0) ? "" : tr("NOT")) + - "
    • "; - out += - "
  • " + tr("can %1 contain numeric characters").arg((rules.at(4).toInt() > 0) ? "" : tr("NOT")) + "
    • "; - - if (rules.at(6).size() > 0) { - out += "
  • " + tr("can contain the following punctuation: %1").arg(rules.at(6).toHtmlEscaped()) + "
    • "; - } - - out += "
  • " + - tr("first character can %1 be a punctuation mark").arg((rules.at(5).toInt() > 0) ? "" : tr("NOT")) + - "
    • "; - - if (rules.size() == 9) { - if (rules.at(7).size() > 0) { - QString words = rules.at(7).toHtmlEscaped(); - if (words.startsWith("\n")) { - out += tr("no unacceptable language as specified by these server rules:", - "note that the following lines will not be translated"); - for (QString &line : words.split("\n", Qt::SkipEmptyParts)) { - out += "
  • " + line + "
    • "; - } - } else { - out += "
  • " + tr("can not contain any of the following words: %1").arg(words) + "
    • "; - } - } - - if (rules.at(8).size() > 0) { - out += "
  • " + - tr("can not match any of the following expressions: %1").arg(rules.at(8).toHtmlEscaped()) + - "
    • "; - } - } - - out += "
"; - } else { - out += tr("You may only use A-Z, a-z, 0-9, _, ., and - in your username."); - } - - return out; -} \ No newline at end of file diff --git a/cockatrice/src/client/network/connection_controller/remote_connection_controller.h b/cockatrice/src/client/network/connection_controller/remote_connection_controller.h deleted file mode 100644 index 7486bc81a..000000000 --- a/cockatrice/src/client/network/connection_controller/remote_connection_controller.h +++ /dev/null @@ -1,98 +0,0 @@ -#ifndef COCKATRICE_REMOTE_CONNECTION_CONTROLLER_H -#define COCKATRICE_REMOTE_CONNECTION_CONTROLLER_H - -#include "abstract_client.h" - -#include -#include -#include -#include -#include -#include - -class RemoteClient; -class ServerInfo_User; -class DlgConnect; - -/** - * Owns the RemoteClient and its worker thread. - * Encapsulates all connection, authentication, and registration logic so that - * MainWindow only needs to react to high-level signals. - */ -class ConnectionController : public QObject -{ - Q_OBJECT - -public: - explicit ConnectionController(QWidget *dialogParent, QObject *parent = nullptr); - ~ConnectionController() override; - - RemoteClient *client() const - { - return remoteClient; - } - - void registerToServer(); - void forgotPasswordRequest(); - void connectToServer(); - void - connectToServerDirect(const QString &host, unsigned int port, const QString &playerName, const QString &password); - void disconnectFromServer(); - - void refreshWindowTitle() - { - updateWindowTitle(); - } - -signals: - void windowTitleChanged(const QString &title); - - void tabSupervisorStartRequested(const ServerInfo_User &info); - void tabSupervisorStopRequested(); - - // Passes the raw ClientStatus through so MainWindow can drive its own - // action enable/disable logic - void statusChanged(ClientStatus status); - -private slots: - // Slots wired directly to RemoteClient signals - void onStatusChanged(ClientStatus status); - void onUserInfoReceived(const ServerInfo_User &info); - void onLoginError(int r, QString reasonStr, quint32 endTime, const QList &missingFeatures); - void onRegisterAccepted(); - void onRegisterAcceptedNeedsActivate(); - void onRegisterError(int r, QString reasonStr, quint32 endTime); - void onActivateAccepted(); - void onActivateError(); - void onProtocolVersionMismatch(int localVersion, int remoteVersion); - void onNotifyUserAboutUpdate(); - void onConnectionClosedEvent(const Event_ConnectionClosed &event); - void onServerShutdownEvent(const Event_ServerShutdown &event); - void onSocketError(const QString &errorStr); - void onServerTimeout(); - - // Forgot-password flow - void onForgotPasswordSuccess(); - void onForgotPasswordError(); - void onPromptForgotPasswordReset(); - void onPromptForgotPasswordChallenge(); - -private: - void wireClientSignals(); - void updateWindowTitle(); - - /** Parse the server's pipe-delimited username-rule string into HTML. */ - static QString extractInvalidUsernameMessage(QString &in); - - RemoteClient *remoteClient{nullptr}; - QThread *clientThread{nullptr}; - QWidget *dialogParent{nullptr}; // used as parent for QMessageBox / dialog calls - - // Persistent so it can be updated in-place by onServerShutdownEvent - QMessageBox serverShutdownMessageBox; - - // Kept as a member so the forgot-password signal can be wired to it - DlgConnect *dlgConnect{nullptr}; -}; - -#endif // COCKATRICE_REMOTE_CONNECTION_CONTROLLER_H diff --git a/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp b/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp index 8689a19e9..0298daa6b 100644 --- a/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp +++ b/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp @@ -6,12 +6,12 @@ #include #include #include -#include #include #include #include -DeckStatsInterface::DeckStatsInterface(QObject *parent) : QObject(parent) +DeckStatsInterface::DeckStatsInterface(CardDatabase &_cardDatabase, QObject *parent) + : QObject(parent), cardDatabase(_cardDatabase) { manager = new QNetworkAccessManager(this); connect(manager, &QNetworkAccessManager::finished, this, &DeckStatsInterface::queryFinished); @@ -70,8 +70,8 @@ void DeckStatsInterface::analyzeDeck(const DeckList &deck) void DeckStatsInterface::copyDeckWithoutTokens(const DeckList &source, DeckList &destination) { - auto copyIfNotAToken = [&destination](const auto node, const auto card) { - CardInfoPtr dbCard = CardDatabaseManager::query()->getCardInfo(card->getName()); + auto copyIfNotAToken = [this, &destination](const auto node, const auto card) { + CardInfoPtr dbCard = cardDatabase.query()->getCardInfo(card->getName()); if (dbCard && !dbCard->getIsToken()) { DecklistCardNode *addedCard = destination.addCard(card->getName(), node->getName(), -1); addedCard->setNumber(card->getNumber()); diff --git a/cockatrice/src/client/network/interfaces/deck_stats_interface.h b/cockatrice/src/client/network/interfaces/deck_stats_interface.h index 09bf998de..7dc841027 100644 --- a/cockatrice/src/client/network/interfaces/deck_stats_interface.h +++ b/cockatrice/src/client/network/interfaces/deck_stats_interface.h @@ -1,12 +1,13 @@ /** * @file deck_stats_interface.h * @ingroup ApiInterfaces + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DECKSTATS_INTERFACE_H #define DECKSTATS_INTERFACE_H +#include #include class QByteArray; @@ -20,6 +21,8 @@ class DeckStatsInterface : public QObject private: QNetworkAccessManager *manager; + CardDatabase &cardDatabase; + /** * Deckstats doesn't recognize token cards, and instead tries to find the * closest non-token card instead. So we construct a new deck which has no @@ -32,7 +35,7 @@ private slots: void getAnalyzeRequestData(const DeckList &deck, QByteArray &data); public: - explicit DeckStatsInterface(QObject *parent = nullptr); + explicit DeckStatsInterface(CardDatabase &_cardDatabase, QObject *parent = nullptr); void analyzeDeck(const DeckList &deck); }; diff --git a/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp b/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp index 5dc77fa2c..af377d176 100644 --- a/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp +++ b/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp @@ -6,12 +6,12 @@ #include #include #include -#include #include #include #include -TappedOutInterface::TappedOutInterface(QObject *parent) : QObject(parent) +TappedOutInterface::TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent) + : QObject(parent), cardDatabase(_cardDatabase) { manager = new QNetworkAccessManager(this); connect(manager, &QNetworkAccessManager::finished, this, &TappedOutInterface::queryFinished); @@ -97,18 +97,16 @@ void TappedOutInterface::analyzeDeck(const DeckList &deck) void TappedOutInterface::copyDeckSplitMainAndSide(const DeckList &source, DeckList &mainboard, DeckList &sideboard) { - auto copyMainOrSide = [&mainboard, &sideboard](const auto node, const auto card) { - CardInfoPtr dbCard = CardDatabaseManager::query()->getCardInfo(card->getName()); - if (!dbCard || dbCard->getIsToken()) { + auto copyMainOrSide = [this, &mainboard, &sideboard](const auto node, const auto card) { + CardInfoPtr dbCard = cardDatabase.query()->getCardInfo(card->getName()); + if (!dbCard || dbCard->getIsToken()) return; - } DecklistCardNode *addedCard; - if (node->getName() == DECK_ZONE_SIDE) { + if (node->getName() == DECK_ZONE_SIDE) addedCard = sideboard.addCard(card->getName(), node->getName(), -1); - } else { + else addedCard = mainboard.addCard(card->getName(), node->getName(), -1); - } addedCard->setNumber(card->getNumber()); }; diff --git a/cockatrice/src/client/network/interfaces/tapped_out_interface.h b/cockatrice/src/client/network/interfaces/tapped_out_interface.h index 32f9369d5..0ea9c8358 100644 --- a/cockatrice/src/client/network/interfaces/tapped_out_interface.h +++ b/cockatrice/src/client/network/interfaces/tapped_out_interface.h @@ -1,14 +1,14 @@ /** * @file tapped_out_interface.h * @ingroup ApiInterfaces + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TAPPEDOUT_INTERFACE_H #define TAPPEDOUT_INTERFACE_H -#include -#include +#include +#include inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface"); @@ -29,13 +29,14 @@ class TappedOutInterface : public QObject private: QNetworkAccessManager *manager; + CardDatabase &cardDatabase; void copyDeckSplitMainAndSide(const DeckList &source, DeckList &mainboard, DeckList &sideboard); private slots: void queryFinished(QNetworkReply *reply); void getAnalyzeRequestData(const DeckList &deck, QByteArray &data); public: - explicit TappedOutInterface(QObject *parent = nullptr); + explicit TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent = nullptr); void analyzeDeck(const DeckList &deck); }; 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 bbdd70c97..1e2372fd1 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 @@ -1,8 +1,8 @@ /** * @file deck_link_to_api_transformer.h * @ingroup ApiInterfaces + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DECK_LINK_TO_API_TRANSFORMER_H #define DECK_LINK_TO_API_TRANSFORMER_H 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 87fde4d54..1818aa35c 100644 --- a/cockatrice/src/client/network/parsers/interface_json_deck_parser.h +++ b/cockatrice/src/client/network/parsers/interface_json_deck_parser.h @@ -1,8 +1,8 @@ /** * @file interface_json_deck_parser.h * @ingroup ApiInterfaces + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef INTERFACE_JSON_DECK_PARSER_H #define INTERFACE_JSON_DECK_PARSER_H 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 03d4897a2..a2feb5ccf 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 @@ -1,8 +1,8 @@ /** * @file spoiler_background_updater.h * @ingroup Client + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_SPOILER_DOWNLOADER_H #define COCKATRICE_SPOILER_DOWNLOADER_H diff --git a/cockatrice/src/client/network/update/client/client_update_checker.h b/cockatrice/src/client/network/update/client/client_update_checker.h index 1a89de533..4e6f279c3 100644 --- a/cockatrice/src/client/network/update/client/client_update_checker.h +++ b/cockatrice/src/client/network/update/client/client_update_checker.h @@ -1,8 +1,8 @@ /** * @file client_update_checker.h * @ingroup ClientUpdate + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CLIENT_UPDATE_CHECKER_H #define CLIENT_UPDATE_CHECKER_H diff --git a/cockatrice/src/client/network/update/client/release_channel.cpp b/cockatrice/src/client/network/update/client/release_channel.cpp index 260167bc8..9edfe7caf 100644 --- a/cockatrice/src/client/network/update/client/release_channel.cpp +++ b/cockatrice/src/client/network/update/client/release_channel.cpp @@ -129,9 +129,8 @@ void StableReleaseChannel::releaseListFinished() return; } - if (!lastRelease) { + if (!lastRelease) lastRelease = new Release; - } lastRelease->setName(resultMap["name"].toString()); lastRelease->setDescriptionUrl(resultMap["html_url"].toString()); @@ -247,9 +246,8 @@ void BetaReleaseChannel::releaseListFinished() return; } - if (lastRelease == nullptr) { + if (lastRelease == nullptr) lastRelease = new Release; - } lastRelease->setCommitHash(resultMap["target_commitish"].toString()); lastRelease->setPublishDate(resultMap["published_at"].toDate()); diff --git a/cockatrice/src/client/network/update/client/release_channel.h b/cockatrice/src/client/network/update/client/release_channel.h index c56d0cfce..93e6b985d 100644 --- a/cockatrice/src/client/network/update/client/release_channel.h +++ b/cockatrice/src/client/network/update/client/release_channel.h @@ -1,8 +1,8 @@ /** * @file release_channel.h * @ingroup ClientUpdate + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef RELEASECHANNEL_H #define RELEASECHANNEL_H diff --git a/cockatrice/src/client/network/update/client/update_downloader.cpp b/cockatrice/src/client/network/update/client/update_downloader.cpp index a71bcf8f8..c0f3e945c 100644 --- a/cockatrice/src/client/network/update/client/update_downloader.cpp +++ b/cockatrice/src/client/network/update/client/update_downloader.cpp @@ -10,9 +10,8 @@ UpdateDownloader::UpdateDownloader(QObject *parent) : QObject(parent), response( void UpdateDownloader::beginDownload(QUrl downloadUrl) { // Save the original URL because we need it for the filename - if (originalUrl.isEmpty()) { + if (originalUrl.isEmpty()) originalUrl = downloadUrl; - } response = netMan->get(QNetworkRequest(downloadUrl)); connect(response, &QNetworkReply::finished, this, &UpdateDownloader::fileFinished); @@ -22,9 +21,8 @@ void UpdateDownloader::beginDownload(QUrl downloadUrl) void UpdateDownloader::downloadError(QNetworkReply::NetworkError) { - if (response == nullptr) { + if (response == nullptr) return; - } emit error(response->errorString().toUtf8()); } diff --git a/cockatrice/src/client/network/update/client/update_downloader.h b/cockatrice/src/client/network/update/client/update_downloader.h index 9a0caccbc..d70759038 100644 --- a/cockatrice/src/client/network/update/client/update_downloader.h +++ b/cockatrice/src/client/network/update/client/update_downloader.h @@ -1,8 +1,8 @@ /** * @file update_downloader.h * @ingroup ClientUpdate + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_UPDATEDOWNLOADER_H #define COCKATRICE_UPDATEDOWNLOADER_H diff --git a/cockatrice/src/client/settings/cache_settings.cpp b/cockatrice/src/client/settings/cache_settings.cpp index b6bc8a47d..9a46c6426 100644 --- a/cockatrice/src/client/settings/cache_settings.cpp +++ b/cockatrice/src/client/settings/cache_settings.cpp @@ -1,7 +1,5 @@ #include "cache_settings.h" -#include "../../interface/card_picture_loader/card_picture_loader_cache_method.h" -#include "../../interface/card_picture_loader/card_picture_loader_local_schemes.h" #include "../network/update/client/release_channel.h" #include "card_counter_settings.h" #include "version_string.h" @@ -26,11 +24,10 @@ SettingsCache &SettingsCache::instance() QString SettingsCache::getDataPath() { - if (isPortableBuild) { + if (isPortableBuild) return qApp->applicationDirPath() + "/data"; - } else { + else return QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation); - } } QString SettingsCache::getSettingsPath() @@ -40,11 +37,10 @@ QString SettingsCache::getSettingsPath() QString SettingsCache::getCachePath() const { - if (isPortableBuild) { + if (isPortableBuild) return qApp->applicationDirPath() + "/cache"; - } else { + else return QStandardPaths::writableLocation(QStandardPaths::CacheLocation); - } } QString SettingsCache::getNetworkCachePath() const @@ -54,17 +50,14 @@ QString SettingsCache::getNetworkCachePath() const void SettingsCache::translateLegacySettings() { - if (isPortableBuild) { + if (isPortableBuild) return; - } // Layouts QFile layoutFile(getSettingsPath() + "layouts/deckLayout.ini"); - if (layoutFile.exists()) { - if (layoutFile.copy(getSettingsPath() + "layouts.ini")) { + if (layoutFile.exists()) + if (layoutFile.copy(getSettingsPath() + "layouts.ini")) layoutFile.remove(); - } - } QStringList usedKeys; QSettings legacySetting; @@ -123,11 +116,10 @@ void SettingsCache::translateLegacySettings() gameFilters().setHideIgnoredUserGames(legacySetting.value("hide_ignored_user_games").toBool()); gameFilters().setMinPlayers(legacySetting.value("min_players").toInt()); - if (legacySetting.value("max_players").toInt() > 1) { + if (legacySetting.value("max_players").toInt() > 1) gameFilters().setMaxPlayers(legacySetting.value("max_players").toInt()); - } else { + else gameFilters().setMaxPlayers(99); // This prevents a bug where no games will show if max was not set before - } QStringList allFilters = legacySetting.allKeys(); for (int i = 0; i < allFilters.size(); ++i) { @@ -143,9 +135,8 @@ void SettingsCache::translateLegacySettings() QStringList allLegacyKeys = legacySetting.allKeys(); for (int i = 0; i < allLegacyKeys.size(); ++i) { - if (usedKeys.contains(allLegacyKeys.at(i))) { + if (usedKeys.contains(allLegacyKeys.at(i))) continue; - } settings->setValue(allLegacyKeys.at(i), legacySetting.value(allLegacyKeys.at(i))); } } @@ -156,9 +147,8 @@ QString SettingsCache::getSafeConfigPath(QString configEntry, QString defaultPat // if the config settings is empty or refers to a not-existing folder, // ensure that the defaut path exists and return it if (tmp.isEmpty() || !QDir(tmp).exists()) { - if (!QDir().mkpath(defaultPath)) { + if (!QDir().mkpath(defaultPath)) qCInfo(SettingsCacheLog) << "[SettingsCache] Could not create folder:" << defaultPath; - } tmp = defaultPath; } return tmp; @@ -169,9 +159,8 @@ QString SettingsCache::getSafeConfigFilePath(QString configEntry, QString defaul QString tmp = settings->value(configEntry).toString(); // if the config settings is empty or refers to a not-existing file, // return the default Path - if (!QFile::exists(tmp) || tmp.isEmpty()) { + if (!QFile::exists(tmp) || tmp.isEmpty()) tmp = std::move(defaultPath); - } return tmp; } @@ -179,9 +168,8 @@ SettingsCache::SettingsCache() { // first, figure out if we are running in portable mode isPortableBuild = QFile::exists(qApp->applicationDirPath() + "/portable.dat"); - if (isPortableBuild) { + if (isPortableBuild) qCInfo(SettingsCacheLog) << "Portable mode enabled"; - } // define a dummy context that will be used where needed QString dummy = QT_TRANSLATE_NOOP("i18n", "English"); @@ -201,9 +189,8 @@ SettingsCache::SettingsCache() cardCounterSettings = new CardCounterSettings(settingsPath, this); - if (!QFile(settingsPath + "global.ini").exists()) { + if (!QFile(settingsPath + "global.ini").exists()) translateLegacySettings(); - } // updates - don't reorder them or their index in the settings won't match // append channels one by one, or msvc will add them in the wrong order. @@ -270,26 +257,14 @@ SettingsCache::SettingsCache() settings->setValue("personal/pixmapCacheSize", pixmapCacheSize); settings->setValue("personal/picturedownloadhq", false); settings->setValue("revert/pixmapCacheSize", true); - } else { + } else pixmapCacheSize = settings->value("personal/pixmapCacheSize", PIXMAPCACHE_SIZE_DEFAULT).toInt(); - } // sanity check - if (pixmapCacheSize < PIXMAPCACHE_SIZE_MIN || pixmapCacheSize > PIXMAPCACHE_SIZE_MAX) { + if (pixmapCacheSize < PIXMAPCACHE_SIZE_MIN || pixmapCacheSize > PIXMAPCACHE_SIZE_MAX) pixmapCacheSize = PIXMAPCACHE_SIZE_DEFAULT; - } networkCacheSize = settings->value("personal/networkCacheSize", NETWORK_CACHE_SIZE_DEFAULT).toInt(); redirectCacheTtl = settings->value("personal/redirectCacheTtl", NETWORK_REDIRECT_CACHE_TTL_DEFAULT).toInt(); - cardPictureLoaderCacheMethod = - settings - ->value("personal/cardPictureLoaderCacheMethod", - static_cast(CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE)) - .toInt(); - localCardImageStorageNamingScheme = - settings - ->value("personal/localCardImageStorageNamingScheme", - static_cast(CardPictureLoaderLocalSchemes::NamingScheme::Set_Folder_Name_Set_Collector)) - .toInt(); picDownload = settings->value("personal/picturedownload", true).toBool(); showStatusBar = settings->value("personal/showStatusBar", false).toBool(); @@ -309,11 +284,9 @@ SettingsCache::SettingsCache() cardViewExpandedRowsMax = settings->value("interface/cardViewExpandedRowsMax", 20).toInt(); closeEmptyCardView = settings->value("interface/closeEmptyCardView", true).toBool(); focusCardViewSearchBar = settings->value("interface/focusCardViewSearchBar", true).toBool(); - keepGameChatFocus = settings->value("interface/keepGameChatFocus", false).toBool(); showDragSelectionCount = settings->value("interface/showlassoselectioncount", true).toBool(); showTotalSelectionCount = settings->value("interface/showpersistentselectioncount", true).toBool(); - showSubtypeSelectionTally = settings->value("interface/showsubtypeselectiontally", true).toBool(); showShortcuts = settings->value("menu/showshortcuts", true).toBool(); showGameSelectorFilterToolbar = settings->value("menu/showgameselectorfiltertoolbar", true).toBool(); @@ -372,7 +345,6 @@ SettingsCache::SettingsCache() openDeckInNewTab = settings->value("editor/openDeckInNewTab", false).toBool(); rewindBufferingMs = settings->value("replay/rewindBufferingMs", 200).toInt(); - styleUserList = settings->value("appearance/styleUserList", true).toBool(); chatMention = settings->value("chat/mention", true).toBool(); chatMentionCompleter = settings->value("chat/mentioncompleter", true).toBool(); chatMentionForeground = settings->value("chat/mentionforeground", true).toBool(); @@ -391,7 +363,6 @@ SettingsCache::SettingsCache() ignoreUnregisteredUsers = settings->value("chat/ignore_unregistered", false).toBool(); ignoreUnregisteredUserMessages = settings->value("chat/ignore_unregistered_messages", false).toBool(); - ignoreNonBuddyUserMessages = settings->value("chat/ignore_nonbuddy_messages", false).toBool(); scaleCards = settings->value("cards/scaleCards", true).toBool(); verticalCardOverlapPercent = settings->value("cards/verticalCardOverlapPercent", 33).toInt(); @@ -460,13 +431,6 @@ void SettingsCache::setFocusCardViewSearchBar(QT_STATE_CHANGED_T value) settings->setValue("interface/focusCardViewSearchBar", focusCardViewSearchBar); } -void SettingsCache::setKeepGameChatFocus(QT_STATE_CHANGED_T value) -{ - keepGameChatFocus = value; - settings->setValue("interface/keepGameChatFocus", keepGameChatFocus); - emit keepGameChatFocusChanged(keepGameChatFocus); -} - void SettingsCache::setKnownMissingFeatures(const QString &_knownMissingFeatures) { knownMissingFeatures = _knownMissingFeatures; @@ -806,9 +770,8 @@ void SettingsCache::setPrintingSelectorCardSize(int _printingSelectorCardSize) void SettingsCache::setIncludeRebalancedCards(bool _includeRebalancedCards) { - if (includeRebalancedCards == _includeRebalancedCards) { + if (includeRebalancedCards == _includeRebalancedCards) return; - } includeRebalancedCards = _includeRebalancedCards; settings->setValue("cards/includerebalancedcards", includeRebalancedCards); @@ -1047,13 +1010,6 @@ void SettingsCache::setRewindBufferingMs(int _rewindBufferingMs) settings->setValue("replay/rewindBufferingMs", rewindBufferingMs); } -void SettingsCache::setStyleUserList(QT_STATE_CHANGED_T _styleUserList) -{ - styleUserList = static_cast(_styleUserList); - settings->setValue("appearance/styleUserList", styleUserList); - emit styleUserListChanged(); -} - void SettingsCache::setChatMention(QT_STATE_CHANGED_T _chatMention) { chatMention = static_cast(_chatMention); @@ -1135,12 +1091,6 @@ void SettingsCache::setIgnoreUnregisteredUserMessages(QT_STATE_CHANGED_T _ignore settings->setValue("chat/ignore_unregistered_messages", ignoreUnregisteredUserMessages); } -void SettingsCache::setIgnoreNonBuddyUserMessages(QT_STATE_CHANGED_T _ignoreNonBuddyUserMessages) -{ - ignoreNonBuddyUserMessages = static_cast(_ignoreNonBuddyUserMessages); - settings->setValue("chat/ignore_nonbuddy_messages", ignoreNonBuddyUserMessages); -} - void SettingsCache::setPixmapCacheSize(const int _pixmapCacheSize) { pixmapCacheSize = _pixmapCacheSize; @@ -1148,13 +1098,6 @@ void SettingsCache::setPixmapCacheSize(const int _pixmapCacheSize) emit pixmapCacheSizeChanged(pixmapCacheSize); } -void SettingsCache::setCardImageCacheMethod(const CardPictureLoaderCacheMethod::CacheMethod _cardImageCachingMethod) -{ - cardPictureLoaderCacheMethod = static_cast(_cardImageCachingMethod); - settings->setValue("personal/cardPictureLoaderCacheMethod", cardPictureLoaderCacheMethod); - emit cardPictureLoaderCacheMethodChanged(cardPictureLoaderCacheMethod); -} - void SettingsCache::setNetworkCacheSizeInMB(const int _networkCacheSize) { networkCacheSize = _networkCacheSize; @@ -1169,14 +1112,6 @@ void SettingsCache::setNetworkRedirectCacheTtl(const int _redirectCacheTtl) emit redirectCacheTtlChanged(redirectCacheTtl); } -void SettingsCache::setLocalCardImageStorageNamingScheme( - const CardPictureLoaderLocalSchemes::NamingScheme _localCardImageStorageNamingScheme) -{ - localCardImageStorageNamingScheme = static_cast(_localCardImageStorageNamingScheme); - settings->setValue("personal/localCardImageStorageNamingScheme", localCardImageStorageNamingScheme); - emit localCardImageStorageNamingSchemeChanged(localCardImageStorageNamingScheme); -} - void SettingsCache::setClientID(const QString &_clientID) { clientID = _clientID; @@ -1375,9 +1310,8 @@ void SettingsCache::setMaxFontSize(int _max) void SettingsCache::setRoundCardCorners(bool _roundCardCorners) { - if (_roundCardCorners == roundCardCorners) { + if (_roundCardCorners == roundCardCorners) return; - } roundCardCorners = _roundCardCorners; settings->setValue("cards/roundcardcorners", _roundCardCorners); @@ -1396,12 +1330,6 @@ void SettingsCache::setShowTotalSelectionCount(QT_STATE_CHANGED_T _showTotalSele settings->setValue("interface/showpersistentselectioncount", showTotalSelectionCount); } -void SettingsCache::setShowSubtypeSelectionTally(QT_STATE_CHANGED_T _showSubtypeSelectionTally) -{ - showSubtypeSelectionTally = static_cast(_showSubtypeSelectionTally); - settings->setValue("interface/showsubtypeselectiontally", showSubtypeSelectionTally); -} - void SettingsCache::loadPaths() { QString dataPath = getDataPath(); diff --git a/cockatrice/src/client/settings/cache_settings.h b/cockatrice/src/client/settings/cache_settings.h index 29af89587..0cd5ceb68 100644 --- a/cockatrice/src/client/settings/cache_settings.h +++ b/cockatrice/src/client/settings/cache_settings.h @@ -1,14 +1,12 @@ /** * @file cache_settings.h * @ingroup Settings + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef SETTINGSCACHE_H #define SETTINGSCACHE_H -#include "../../interface/card_picture_loader/card_picture_loader_cache_method.h" -#include "../../interface/card_picture_loader/card_picture_loader_local_schemes.h" #include "shortcuts_settings.h" #include @@ -183,20 +181,15 @@ signals: void soundThemeChanged(); void ignoreUnregisteredUsersChanged(); void ignoreUnregisteredUserMessagesChanged(); - void ignoreNonBuddyUserMessagesChanged(); void pixmapCacheSizeChanged(int newSizeInMBs); void networkCacheSizeChanged(int newSizeInMBs); void redirectCacheTtlChanged(int newTtl); - void cardPictureLoaderCacheMethodChanged(int cardPictureLoaderCacheMethod); - void localCardImageStorageNamingSchemeChanged(int localCardImageStorageNamingScheme); void masterVolumeChanged(int value); - void styleUserListChanged(); void chatMentionCompleterChanged(); void downloadSpoilerTimeIndexChanged(); void downloadSpoilerStatusChanged(); void useTearOffMenusChanged(bool state); void roundCardCornersChanged(bool roundCardCorners); - void keepGameChatFocusChanged(bool value); private: QSettings *settings; @@ -285,7 +278,6 @@ private: bool autoRotateSidewaysLayoutCards; bool openDeckInNewTab; int rewindBufferingMs; - bool styleUserList; bool chatMention; bool chatMentionCompleter; QString chatMentionColor; @@ -298,7 +290,6 @@ private: QString soundThemeName; bool ignoreUnregisteredUsers; bool ignoreUnregisteredUserMessages; - bool ignoreNonBuddyUserMessages; QString picUrl; QString picUrlFallback; QString clientID; @@ -309,12 +300,9 @@ private: int cardViewExpandedRowsMax; bool closeEmptyCardView; bool focusCardViewSearchBar; - bool keepGameChatFocus; int pixmapCacheSize; int networkCacheSize; int redirectCacheTtl; - int cardPictureLoaderCacheMethod; - int localCardImageStorageNamingScheme; bool scaleCards; int verticalCardOverlapPercent; bool showMessagePopups; @@ -355,7 +343,6 @@ private: bool showStatusBar; bool showDragSelectionCount; bool showTotalSelectionCount; - bool showSubtypeSelectionTally; public: SettingsCache(); @@ -479,10 +466,6 @@ public: { return showTotalSelectionCount; } - [[nodiscard]] bool getShowSubtypeSelectionTally() const - { - return showSubtypeSelectionTally; - } [[nodiscard]] bool getNotificationsEnabled() const { return notificationsEnabled; @@ -745,10 +728,6 @@ public: { return rewindBufferingMs; } - [[nodiscard]] bool getStyleUserList() const - { - return styleUserList; - } [[nodiscard]] bool getChatMention() const { return chatMention; @@ -803,18 +782,10 @@ public: { return ignoreUnregisteredUserMessages; } - [[nodiscard]] bool getIgnoreNonBuddyUserMessages() const - { - return ignoreNonBuddyUserMessages; - } [[nodiscard]] int getPixmapCacheSize() const { return pixmapCacheSize; } - [[nodiscard]] CardPictureLoaderCacheMethod::CacheMethod getCardPictureLoaderCacheMethod() const - { - return static_cast(cardPictureLoaderCacheMethod); - } [[nodiscard]] int getNetworkCacheSizeInMB() const { return networkCacheSize; @@ -823,10 +794,6 @@ public: { return redirectCacheTtl; } - [[nodiscard]] CardPictureLoaderLocalSchemes::NamingScheme getLocalCardImageStorageNamingScheme() const - { - return static_cast(localCardImageStorageNamingScheme); - } [[nodiscard]] bool getScaleCards() const { return scaleCards; @@ -948,7 +915,6 @@ public: void setCardViewExpandedRowsMax(int value); void setCloseEmptyCardView(QT_STATE_CHANGED_T value); void setFocusCardViewSearchBar(QT_STATE_CHANGED_T value); - void setKeepGameChatFocus(QT_STATE_CHANGED_T value); QString getClientID() override { return clientID; @@ -981,10 +947,6 @@ public: { return focusCardViewSearchBar; } - [[nodiscard]] bool getKeepGameChatFocus() const - { - return keepGameChatFocus; - } [[nodiscard]] ShortcutsSettings &shortcuts() const { return *shortcutsSettings; @@ -1124,7 +1086,6 @@ public slots: void setAutoRotateSidewaysLayoutCards(QT_STATE_CHANGED_T _autoRotateSidewaysLayoutCards); void setOpenDeckInNewTab(QT_STATE_CHANGED_T _openDeckInNewTab); void setRewindBufferingMs(int _rewindBufferingMs); - void setStyleUserList(QT_STATE_CHANGED_T _styleUserList); void setChatMention(QT_STATE_CHANGED_T _chatMention); void setChatMentionCompleter(QT_STATE_CHANGED_T _chatMentionCompleter); void setChatMentionForeground(QT_STATE_CHANGED_T _chatMentionForeground); @@ -1136,13 +1097,9 @@ public slots: void setSoundThemeName(const QString &_soundThemeName); void setIgnoreUnregisteredUsers(QT_STATE_CHANGED_T _ignoreUnregisteredUsers); void setIgnoreUnregisteredUserMessages(QT_STATE_CHANGED_T _ignoreUnregisteredUserMessages); - void setIgnoreNonBuddyUserMessages(QT_STATE_CHANGED_T _ignoreNonBuddyUserMessages); void setPixmapCacheSize(const int _pixmapCacheSize); - void setCardImageCacheMethod(CardPictureLoaderCacheMethod::CacheMethod _cardImageCachingMethod); void setNetworkCacheSizeInMB(const int _networkCacheSize); void setNetworkRedirectCacheTtl(const int _redirectCacheTtl); - void setLocalCardImageStorageNamingScheme( - const CardPictureLoaderLocalSchemes::NamingScheme _localCardImageStorageNamingScheme); void setCardScaling(const QT_STATE_CHANGED_T _scaleCards); void setStackCardOverlapPercent(const int _verticalCardOverlapPercent); void setShowMessagePopups(const QT_STATE_CHANGED_T _showMessagePopups); @@ -1181,6 +1138,5 @@ public slots: void setRoundCardCorners(bool _roundCardCorners); void setShowDragSelectionCount(QT_STATE_CHANGED_T _showDragSelectionCount); void setShowTotalSelectionCount(QT_STATE_CHANGED_T _showTotalSelectionCount); - void setShowSubtypeSelectionTally(QT_STATE_CHANGED_T _showSubtypeSelectionTally); }; #endif diff --git a/cockatrice/src/client/settings/card_counter_settings.cpp b/cockatrice/src/client/settings/card_counter_settings.cpp index 662ae0c7d..399365c99 100644 --- a/cockatrice/src/client/settings/card_counter_settings.cpp +++ b/cockatrice/src/client/settings/card_counter_settings.cpp @@ -15,9 +15,8 @@ void CardCounterSettings::setColor(int counterId, const QColor &color) QString key = QString("cards/counters/%1/color").arg(counterId); - if (settings.value(key).value() == color) { + if (settings.value(key).value() == color) return; - } settings.setValue(key, color); emit colorChanged(counterId, color); diff --git a/cockatrice/src/client/settings/card_counter_settings.h b/cockatrice/src/client/settings/card_counter_settings.h index 2ac658177..b1d467d67 100644 --- a/cockatrice/src/client/settings/card_counter_settings.h +++ b/cockatrice/src/client/settings/card_counter_settings.h @@ -1,8 +1,8 @@ /** * @file card_counter_settings.h * @ingroup GameSettings + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARD_COUNTER_SETTINGS_H #define CARD_COUNTER_SETTINGS_H diff --git a/cockatrice/src/client/settings/shortcut_treeview.h b/cockatrice/src/client/settings/shortcut_treeview.h index afaf7e7ed..8d74a6f1e 100644 --- a/cockatrice/src/client/settings/shortcut_treeview.h +++ b/cockatrice/src/client/settings/shortcut_treeview.h @@ -1,8 +1,8 @@ /** * @file shortcut_treeview.h * @ingroup CoreSettings + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef SHORTCUT_TREEVIEW_H #define SHORTCUT_TREEVIEW_H diff --git a/cockatrice/src/client/settings/shortcuts_settings.cpp b/cockatrice/src/client/settings/shortcuts_settings.cpp index 2ff65ab6f..53c6f6a23 100644 --- a/cockatrice/src/client/settings/shortcuts_settings.cpp +++ b/cockatrice/src/client/settings/shortcuts_settings.cpp @@ -64,13 +64,8 @@ ShortcutsSettings::ShortcutsSettings(const QString &settingsPath, QObject *paren } } -/** - * @brief Migrates legacy shortcut key names to current naming scheme. - * - * PR 5079 changed Textbox/unfocusTextBox to Player/unfocusTextBox and - * tab_game/aFocusChat to Player/aFocusChat. This migration allows players - * to keep their already configured shortcuts. - */ +/// PR 5079 changes Textbox/unfocusTextBox to Player/unfocusTextBox and tab_game/aFocusChat to Player/aFocusChat. +/// A migration is necessary to let players keep their already configured shortcuts. void ShortcutsSettings::migrateShortcuts() { if (QFile(settingsFilePath).exists()) { @@ -241,7 +236,9 @@ bool ShortcutsSettings::isValid(const QString &name, const QString &sequences) c return findOverlaps(name, sequences).isEmpty(); } -/** @brief Checks if the shortcut is a shortcut that is active in all windows. */ +/** + * Checks if the shortcut is a shortcut that is active in all windows + */ static bool isAlwaysActiveShortcut(const QString &shortcutName) { return shortcutName.startsWith("MainWindow") || shortcutName.startsWith("Tabs"); diff --git a/cockatrice/src/client/settings/shortcuts_settings.h b/cockatrice/src/client/settings/shortcuts_settings.h index 95155b8d1..d9ea494dc 100644 --- a/cockatrice/src/client/settings/shortcuts_settings.h +++ b/cockatrice/src/client/settings/shortcuts_settings.h @@ -1,8 +1,8 @@ /** * @file shortcuts_settings.h * @ingroup CoreSettings + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef SHORTCUTSSETTINGS_H #define SHORTCUTSSETTINGS_H @@ -223,10 +223,6 @@ private: {"TabDeckEditor/aLoadDeck", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Load Deck..."), parseSequenceString("Ctrl+O"), ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aLoadDeckFromWebsite", - ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Load deck from online service..."), - parseSequenceString("Ctrl+Shift+O"), - ShortcutGroup::Deck_Editor)}, {"TabDeckEditor/aLoadDeckFromClipboard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Load Deck from Clipboard..."), parseSequenceString("Ctrl+Shift+V"), @@ -287,10 +283,6 @@ private: ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Load Deck from Clipboard..."), parseSequenceString("Ctrl+Shift+V"), ShortcutGroup::Game_Lobby)}, - {"DeckViewContainer/loadFromWebsiteButton", - ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Load from website..."), - parseSequenceString("Ctrl+Shift+O"), - ShortcutGroup::Game_Lobby)}, {"DeckViewContainer/unloadDeckButton", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Unload Deck"), parseSequenceString("Ctrl+Alt+U"), ShortcutGroup::Game_Lobby)}, @@ -545,9 +537,6 @@ private: {"Player/aSetAnnotation", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Set Annotation..."), parseSequenceString("Alt+N"), ShortcutGroup::Playing_Area)}, - {"Player/aReduceLifeByPower", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Reduce Life by Power"), - parseSequenceString("Ctrl+Shift+L"), - ShortcutGroup::Playing_Area)}, {"Player/aSelectAll", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Select All Cards in Zone"), parseSequenceString("Ctrl+A"), ShortcutGroup::Playing_Area)}, diff --git a/cockatrice/src/client/sound_engine.cpp b/cockatrice/src/client/sound_engine.cpp index e592b5ea0..31cb2a35e 100644 --- a/cockatrice/src/client/sound_engine.cpp +++ b/cockatrice/src/client/sound_engine.cpp @@ -105,9 +105,8 @@ QStringMap &SoundEngine::getAvailableThemes() dir.setPath(SettingsCache::instance().getDataPath() + "/sounds"); for (const QString &themeName : dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name)) { - if (!availableThemes.contains(themeName)) { + if (!availableThemes.contains(themeName)) availableThemes.insert(themeName, dir.absoluteFilePath(themeName)); - } } // load themes from cockatrice system dir @@ -122,9 +121,8 @@ QStringMap &SoundEngine::getAvailableThemes() ); for (const QString &themeName : dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name)) { - if (!availableThemes.contains(themeName)) { + if (!availableThemes.contains(themeName)) availableThemes.insert(themeName, dir.absoluteFilePath(themeName)); - } } return availableThemes; diff --git a/cockatrice/src/client/sound_engine.h b/cockatrice/src/client/sound_engine.h index 0c201523a..f45cccf7d 100644 --- a/cockatrice/src/client/sound_engine.h +++ b/cockatrice/src/client/sound_engine.h @@ -1,8 +1,8 @@ /** * @file sound_engine.h * @ingroup Core + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef SOUNDENGINE_H #define SOUNDENGINE_H diff --git a/cockatrice/src/filters/deck_filter_string.cpp b/cockatrice/src/filters/deck_filter_string.cpp index dd873cfa5..6b671831d 100644 --- a/cockatrice/src/filters/deck_filter_string.cpp +++ b/cockatrice/src/filters/deck_filter_string.cpp @@ -88,27 +88,20 @@ static void setupParserRules() const auto arg = std::any_cast(sv[1]); const auto op = std::any_cast(sv[0]); - if (op == ">") { + if (op == ">") return [=](const int s) { return s > arg; }; - } - if (op == ">=") { + if (op == ">=") return [=](const int s) { return s >= arg; }; - } - if (op == "<") { + if (op == "<") return [=](const int s) { return s < arg; }; - } - if (op == "<=") { + if (op == "<=") return [=](const int s) { return s <= arg; }; - } - if (op == "=") { + if (op == "=") return [=](const int s) { return s == arg; }; - } - if (op == ":") { + if (op == ":") return [=](const int s) { return s == arg; }; - } - if (op == "!=") { + if (op == "!=") return [=](const int s) { return s != arg; }; - } return [](int) { return false; }; }; diff --git a/cockatrice/src/filters/deck_filter_string.h b/cockatrice/src/filters/deck_filter_string.h index 916b629ee..1b43d770d 100644 --- a/cockatrice/src/filters/deck_filter_string.h +++ b/cockatrice/src/filters/deck_filter_string.h @@ -1,8 +1,8 @@ /** * @file deck_filter_string.h * @ingroup DeckStorageWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DECK_FILTER_STRING_H #define DECK_FILTER_STRING_H diff --git a/cockatrice/src/filters/filter_builder.cpp b/cockatrice/src/filters/filter_builder.cpp index 785f753e7..7178ce95a 100644 --- a/cockatrice/src/filters/filter_builder.cpp +++ b/cockatrice/src/filters/filter_builder.cpp @@ -11,15 +11,13 @@ FilterBuilder::FilterBuilder(QWidget *parent) : QWidget(parent) { filterCombo = new QComboBox; filterCombo->setObjectName("filterCombo"); - for (int i = 0; i < CardFilter::AttrEnd; i++) { + for (int i = 0; i < CardFilter::AttrEnd; i++) filterCombo->addItem(CardFilter::attrName(static_cast(i)), QVariant(i)); - } typeCombo = new QComboBox; typeCombo->setObjectName("typeCombo"); - for (int i = 0; i < CardFilter::TypeEnd; i++) { + for (int i = 0; i < CardFilter::TypeEnd; i++) typeCombo->addItem(CardFilter::typeName(static_cast(i)), QVariant(i)); - } QPushButton *ok = new QPushButton(QPixmap("theme:icons/increment"), QString()); ok->setObjectName("ok"); @@ -55,9 +53,8 @@ FilterBuilder::~FilterBuilder() void FilterBuilder::destroyFilter() { - if (fltr) { + if (fltr) delete fltr; - } } static int comboCurrentIntData(const QComboBox *combo) @@ -70,9 +67,8 @@ void FilterBuilder::emit_add() QString txt; txt = edit->text(); - if (txt.length() < 1) { + if (txt.length() < 1) return; - } destroyFilter(); fltr = new CardFilter(txt, static_cast(comboCurrentIntData(typeCombo)), diff --git a/cockatrice/src/filters/filter_builder.h b/cockatrice/src/filters/filter_builder.h index 98fe3fd02..74872e3cd 100644 --- a/cockatrice/src/filters/filter_builder.h +++ b/cockatrice/src/filters/filter_builder.h @@ -1,8 +1,8 @@ /** * @file filter_builder.h * @ingroup CardDatabaseModelFilters + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef FILTERBUILDER_H #define FILTERBUILDER_H diff --git a/cockatrice/src/filters/filter_tree_model.cpp b/cockatrice/src/filters/filter_tree_model.cpp index 33b54530e..f0a02ec79 100644 --- a/cockatrice/src/filters/filter_tree_model.cpp +++ b/cockatrice/src/filters/filter_tree_model.cpp @@ -23,9 +23,8 @@ void FilterTreeModel::proxyBeginInsertRow(const FilterTreeNode *node, int i) int idx; idx = node->index(); - if (idx >= 0) { + if (idx >= 0) beginInsertRows(createIndex(idx, 0, (void *)node), i, i); - } } void FilterTreeModel::proxyEndInsertRow(const FilterTreeNode *node, int) @@ -33,9 +32,8 @@ void FilterTreeModel::proxyEndInsertRow(const FilterTreeNode *node, int) int idx; idx = node->index(); - if (idx >= 0) { + if (idx >= 0) endInsertRows(); - } } void FilterTreeModel::proxyBeginRemoveRow(const FilterTreeNode *node, int i) @@ -43,9 +41,8 @@ void FilterTreeModel::proxyBeginRemoveRow(const FilterTreeNode *node, int i) int idx; idx = node->index(); - if (idx >= 0) { + if (idx >= 0) beginRemoveRows(createIndex(idx, 0, (void *)node), i, i); - } } void FilterTreeModel::proxyEndRemoveRow(const FilterTreeNode *node, int) @@ -53,9 +50,8 @@ void FilterTreeModel::proxyEndRemoveRow(const FilterTreeNode *node, int) int idx; idx = node->index(); - if (idx >= 0) { + if (idx >= 0) endRemoveRows(); - } } FilterTreeNode *FilterTreeModel::indexToNode(const QModelIndex &idx) const @@ -63,14 +59,12 @@ FilterTreeNode *FilterTreeModel::indexToNode(const QModelIndex &idx) const void *ip; FilterTreeNode *node; - if (!idx.isValid()) { + if (!idx.isValid()) return fTree; - } ip = idx.internalPointer(); - if (ip == NULL) { + if (ip == NULL) return fTree; - } node = static_cast(ip); return node; @@ -151,16 +145,14 @@ int FilterTreeModel::rowCount(const QModelIndex &parent) const const FilterTreeNode *node; int result; - if (parent.column() > 0) { + if (parent.column() > 0) return 0; - } node = indexToNode(parent); - if (node) { + if (node) result = node->childCount(); - } else { + else result = 0; - } return result; } @@ -174,17 +166,14 @@ QVariant FilterTreeModel::data(const QModelIndex &index, int role) const { const FilterTreeNode *node; - if (!index.isValid()) { + if (!index.isValid()) return QVariant(); - } - if (index.column() >= columnCount()) { + if (index.column() >= columnCount()) return QVariant(); - } node = indexToNode(index); - if (node == NULL) { + if (node == NULL) return QVariant(); - } switch (role) { case Qt::FontRole: @@ -201,11 +190,10 @@ QVariant FilterTreeModel::data(const QModelIndex &index, int role) const case Qt::WhatsThisRole: return node->text(); case Qt::CheckStateRole: - if (node->isEnabled()) { + if (node->isEnabled()) return Qt::Checked; - } else { + else return Qt::Unchecked; - } default: return QVariant(); } @@ -217,27 +205,22 @@ bool FilterTreeModel::setData(const QModelIndex &index, const QVariant &value, i { FilterTreeNode *node; - if (!index.isValid()) { + if (!index.isValid()) return false; - } - if (index.column() >= columnCount()) { + if (index.column() >= columnCount()) return false; - } - if (role != Qt::CheckStateRole) { + if (role != Qt::CheckStateRole) return false; - } node = indexToNode(index); - if (node == NULL || node == fTree) { + if (node == NULL || node == fTree) return false; - } Qt::CheckState state = static_cast(value.toInt()); - if (state == Qt::Checked) { + if (state == Qt::Checked) node->enable(); - } else { + else node->disable(); - } emit dataChanged(index, index); return true; @@ -248,19 +231,16 @@ Qt::ItemFlags FilterTreeModel::flags(const QModelIndex &index) const const FilterTreeNode *node; Qt::ItemFlags result; - if (!index.isValid()) { + if (!index.isValid()) return Qt::NoItemFlags; - } node = indexToNode(index); - if (node == NULL) { + if (node == NULL) return Qt::NoItemFlags; - } result = Qt::ItemIsEnabled; - if (node == fTree) { + if (node == fTree) return result; - } result |= Qt::ItemIsSelectable; result |= Qt::ItemIsUserCheckable; @@ -272,9 +252,8 @@ QModelIndex FilterTreeModel::nodeIndex(const FilterTreeNode *node, int row, int { FilterTreeNode *child; - if (column > 0 || row >= node->childCount()) { + if (column > 0 || row >= node->childCount()) return QModelIndex(); - } child = node->nodeAt(row); return createIndex(row, column, child); @@ -284,14 +263,12 @@ QModelIndex FilterTreeModel::index(int row, int column, const QModelIndex &paren { const FilterTreeNode *node; - if (!hasIndex(row, column, parent)) { + if (!hasIndex(row, column, parent)) return QModelIndex(); - } node = indexToNode(parent); - if (node == NULL) { + if (node == NULL) return QModelIndex(); - } return nodeIndex(node, row, column); } @@ -302,21 +279,18 @@ QModelIndex FilterTreeModel::parent(const QModelIndex &ind) const FilterTreeNode *parent; QModelIndex idx; - if (!ind.isValid()) { + if (!ind.isValid()) return QModelIndex(); - } node = indexToNode(ind); - if (node == NULL || node == fTree) { + if (node == NULL || node == fTree) return QModelIndex(); - } parent = node->parent(); if (parent) { int row = parent->index(); - if (row < 0) { + if (row < 0) return QModelIndex(); - } idx = createIndex(row, 0, parent); return idx; } @@ -330,22 +304,18 @@ bool FilterTreeModel::removeRows(int row, int count, const QModelIndex &parent) int i, last; last = row + count - 1; - if (!parent.isValid() || count < 1 || row < 0) { + if (!parent.isValid() || count < 1 || row < 0) return false; - } node = indexToNode(parent); - if (node == NULL || last >= node->childCount()) { + if (node == NULL || last >= node->childCount()) return false; - } - for (i = 0; i < count; i++) { + for (i = 0; i < count; i++) node->deleteAt(row); - } - if (node != fTree && node->childCount() < 1) { + if (node != fTree && node->childCount() < 1) return removeRow(parent.row(), parent.parent()); - } return true; } diff --git a/cockatrice/src/filters/filter_tree_model.h b/cockatrice/src/filters/filter_tree_model.h index 7452f7a61..c6666a838 100644 --- a/cockatrice/src/filters/filter_tree_model.h +++ b/cockatrice/src/filters/filter_tree_model.h @@ -1,8 +1,8 @@ /** * @file filter_tree_model.h * @ingroup CardDatabaseModelFilters + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef FILTERTREEMODEL_H #define FILTERTREEMODEL_H diff --git a/cockatrice/src/filters/syntax_help.h b/cockatrice/src/filters/syntax_help.h index d06fe03e5..7e5ef3e0e 100644 --- a/cockatrice/src/filters/syntax_help.h +++ b/cockatrice/src/filters/syntax_help.h @@ -2,8 +2,8 @@ * @file syntax_help.h * @ingroup CardDatabaseModelFilters * @ingroup DeckStorageWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef SEARCH_SYNTAX_HELP_H #define SEARCH_SYNTAX_HELP_H diff --git a/cockatrice/src/game/abstract_game.cpp b/cockatrice/src/game/abstract_game.cpp index c20003ece..9216f9174 100644 --- a/cockatrice/src/game/abstract_game.cpp +++ b/cockatrice/src/game/abstract_game.cpp @@ -1,9 +1,9 @@ #include "abstract_game.h" #include "../interface/widgets/tabs/tab_game.h" -#include "player/player_logic.h" +#include "player/player.h" -AbstractGame::AbstractGame(QObject *_parent) : QObject(_parent) +AbstractGame::AbstractGame(TabGame *_tab) : QObject(_tab), tab(_tab) { gameMetaInfo = new GameMetaInfo(this); gameEventHandler = new GameEventHandler(this); @@ -24,11 +24,10 @@ AbstractClient *AbstractGame::getClientForPlayer(int playerId) const } return gameState->getClients().at(playerId); - } else if (gameState->getClients().isEmpty()) { + } else if (gameState->getClients().isEmpty()) return nullptr; - } else { + else return gameState->getClients().first(); - } } void AbstractGame::loadReplay(GameReplay *replay) @@ -44,15 +43,13 @@ void AbstractGame::setActiveCard(CardItem *card) CardItem *AbstractGame::getCard(int playerId, const QString &zoneName, int cardId) const { - PlayerLogic *player = playerManager->getPlayer(playerId); - if (!player) { + Player *player = playerManager->getPlayer(playerId); + if (!player) return nullptr; - } CardZoneLogic *zone = player->getZones().value(zoneName, 0); - if (!zone) { + if (!zone) return nullptr; - } return zone->getCard(cardId); } \ No newline at end of file diff --git a/cockatrice/src/game/abstract_game.h b/cockatrice/src/game/abstract_game.h index 5115ed5ca..cb4dbac2a 100644 --- a/cockatrice/src/game/abstract_game.h +++ b/cockatrice/src/game/abstract_game.h @@ -1,8 +1,8 @@ /** * @file abstract_game.h * @ingroup GameLogic + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_ABSTRACT_GAME_H #define COCKATRICE_ABSTRACT_GAME_H @@ -16,19 +16,26 @@ #include class CardItem; +class TabGame; class AbstractGame : public QObject { Q_OBJECT public: - explicit AbstractGame(QObject *parent); + explicit AbstractGame(TabGame *tab); + TabGame *tab; GameMetaInfo *gameMetaInfo; GameState *gameState; GameEventHandler *gameEventHandler; PlayerManager *playerManager; CardItem *activeCard; + TabGame *getTab() const + { + return tab; + } + GameMetaInfo *getGameMetaInfo() { return gameMetaInfo; diff --git a/cockatrice/src/game/arrow_registry.cpp b/cockatrice/src/game/arrow_registry.cpp deleted file mode 100644 index 286764b3b..000000000 --- a/cockatrice/src/game/arrow_registry.cpp +++ /dev/null @@ -1,48 +0,0 @@ -#include "arrow_registry.h" - -#include "../game_graphics/board/arrow_item.h" - -void ArrowRegistry::insert(QSharedPointer data, ArrowItem *arrow) -{ - const ArrowKey key{data->creatorId, data->id}; - - if (auto *existing = take(data->creatorId, data->id)) { - existing->delArrow(); - } - - dataStore.insert(key, data); - items.insert(key, arrow); - byPlayer[data->creatorId].insert(data->id); -} - -ArrowItem *ArrowRegistry::take(int creatorId, int arrowId) -{ - const ArrowKey key{creatorId, arrowId}; - dataStore.remove(key); - auto &playerSet = byPlayer[creatorId]; - playerSet.remove(arrowId); - if (playerSet.isEmpty()) { - byPlayer.remove(creatorId); - } - return items.take(key); -} - -ArrowItem *ArrowRegistry::get(int creatorId, int arrowId) const -{ - return items.value(ArrowKey{creatorId, arrowId}, nullptr); -} - -bool ArrowRegistry::contains(int creatorId, int arrowId) const -{ - return items.contains(ArrowKey{creatorId, arrowId}); -} - -QSet ArrowRegistry::idsForPlayer(int playerId) const -{ - return byPlayer.value(playerId); -} - -QList ArrowRegistry::all() const -{ - return items.values(); -} \ No newline at end of file diff --git a/cockatrice/src/game/arrow_registry.h b/cockatrice/src/game/arrow_registry.h deleted file mode 100644 index ef98229a2..000000000 --- a/cockatrice/src/game/arrow_registry.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef COCKATRICE_ARROW_REGISTRY_H -#define COCKATRICE_ARROW_REGISTRY_H - -#include "board/arrow_data.h" - -#include -#include -#include - -class ArrowItem; - -struct ArrowKey -{ - int creatorId; - int arrowId; - - bool operator<(const ArrowKey &other) const - { - if (creatorId != other.creatorId) { - return creatorId < other.creatorId; - } - return arrowId < other.arrowId; - } -}; - -class ArrowRegistry -{ -public: - void insert(QSharedPointer data, ArrowItem *arrow); - ArrowItem *take(int creatorId, int arrowId); - - [[nodiscard]] ArrowItem *get(int creatorId, int arrowId) const; - [[nodiscard]] bool contains(int creatorId, int arrowId) const; - [[nodiscard]] QSet idsForPlayer(int playerId) const; - [[nodiscard]] QList all() const; - -private: - QMap> dataStore; - QMap items; - QMap> byPlayer; -}; - -#endif \ No newline at end of file diff --git a/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp b/cockatrice/src/game/board/abstract_card_drag_item.cpp similarity index 98% rename from cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp rename to cockatrice/src/game/board/abstract_card_drag_item.cpp index 026efd60d..8e3def4ca 100644 --- a/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp +++ b/cockatrice/src/game/board/abstract_card_drag_item.cpp @@ -25,12 +25,11 @@ AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item, setCursor(Qt::ClosedHandCursor); setZValue(ZValues::DRAG_ITEM); } - if (item->getTapped()) { + if (item->getTapped()) setTransform(QTransform() .translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F) .rotate(90) .translate(-CardDimensions::WIDTH_HALF_F, -CardDimensions::HEIGHT_HALF_F)); - } setCacheMode(DeviceCoordinateCache); diff --git a/cockatrice/src/game_graphics/board/abstract_card_drag_item.h b/cockatrice/src/game/board/abstract_card_drag_item.h similarity index 97% rename from cockatrice/src/game_graphics/board/abstract_card_drag_item.h rename to cockatrice/src/game/board/abstract_card_drag_item.h index 1cbeb4fe7..fe3b87983 100644 --- a/cockatrice/src/game_graphics/board/abstract_card_drag_item.h +++ b/cockatrice/src/game/board/abstract_card_drag_item.h @@ -1,8 +1,8 @@ /** * @file abstract_card_drag_item.h * @ingroup GameGraphicsCards + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef ABSTRACTCARDDRAGITEM_H #define ABSTRACTCARDDRAGITEM_H diff --git a/cockatrice/src/game_graphics/board/abstract_card_item.cpp b/cockatrice/src/game/board/abstract_card_item.cpp similarity index 90% rename from cockatrice/src/game_graphics/board/abstract_card_item.cpp rename to cockatrice/src/game/board/abstract_card_item.cpp index 86b3e27c8..9ec6ada9a 100644 --- a/cockatrice/src/game_graphics/board/abstract_card_item.cpp +++ b/cockatrice/src/game/board/abstract_card_item.cpp @@ -13,7 +13,7 @@ #include #include -AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef, PlayerLogic *_owner, int _id) +AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef, Player *_owner, int _id) : ArrowTarget(_owner, parent), id(_id), cardRef(cardRef), tapped(false), facedown(false), tapAngle(0), bgColor(Qt::transparent), isHovered(false), realZValue(0) { @@ -85,12 +85,7 @@ const CardInfo &AbstractCardItem::getCardInfo() const void AbstractCardItem::setRealZValue(qreal _zValue) { realZValue = _zValue; - // During hover, zValue is overridden to HOVERED_CARD. Layout operations - // like reorganizeCards() call setRealZValue() on all cards including the - // hovered one — skip setZValue() here to avoid clobbering the override. - if (!isHovered) { - setZValue(_zValue); - } + setZValue(_zValue); } QSizeF AbstractCardItem::getTranslatedSize(QPainter *painter) const @@ -131,9 +126,8 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS // don't even spend time trying to load the picture if our size is too small if (translatedSize.width() > 10) { CardPictureLoader::getPixmap(translatedPixmap, exactCard, translatedSize.toSize()); - if (translatedPixmap.isNull()) { + if (translatedPixmap.isNull()) paintImage = false; - } } else { paintImage = false; } @@ -158,9 +152,9 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS painter->setBackground(Qt::black); painter->setBackgroundMode(Qt::OpaqueMode); QString nameStr; - if (facedown) { + if (facedown) nameStr = "# " + QString::number(id); - } else { + else { QString prefix = ""; if (SettingsCache::instance().debug().getShowCardId()) { prefix = "#" + QString::number(id) + " "; @@ -187,12 +181,10 @@ void AbstractCardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * if (isSelected() || isHovered) { QPen pen; - if (isHovered) { + if (isHovered) pen.setColor(Qt::yellow); - } - if (isSelected()) { + if (isSelected()) pen.setColor(Qt::red); - } pen.setWidth(0); // Cosmetic pen painter->setPen(pen); painter->drawPath(shape()); @@ -218,20 +210,11 @@ void AbstractCardItem::setCardRef(const CardRef &_cardRef) void AbstractCardItem::setHovered(bool _hovered) { - if (isHovered == _hovered) { + if (isHovered == _hovered) return; - } - if (_hovered) { + if (_hovered) processHoverEvent(); - } else { - // Mark the hovered card's current scene footprint dirty so overlapped - // sibling zones (e.g. StackZone) repaint after the card moves away. - if (scene()) { - scene()->update(sceneBoundingRect()); - } - } - isHovered = _hovered; setZValue(_hovered ? ZValues::HOVERED_CARD : realZValue); setScale(_hovered && SettingsCache::instance().getScaleCards() ? 1.1 : 1); @@ -282,14 +265,13 @@ void AbstractCardItem::cacheBgColor() void AbstractCardItem::setTapped(bool _tapped, bool canAnimate) { - if (tapped == _tapped) { + if (tapped == _tapped) return; - } tapped = _tapped; - if (SettingsCache::instance().getTapAnimation() && canAnimate) { + if (SettingsCache::instance().getTapAnimation() && canAnimate) static_cast(scene())->registerAnimationItem(this); - } else { + else { tapAngle = tapped ? 90 : 0; setTransform(QTransform() .translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F) @@ -315,19 +297,17 @@ void AbstractCardItem::mousePressEvent(QGraphicsSceneMouseEvent *event) scene()->clearSelection(); setSelected(true); } - if (event->button() == Qt::LeftButton) { + if (event->button() == Qt::LeftButton) setCursor(Qt::ClosedHandCursor); - } else if (event->button() == Qt::MiddleButton) { + else if (event->button() == Qt::MiddleButton) emit showCardInfoPopup(event->screenPos(), cardRef); - } event->accept(); } void AbstractCardItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { - if (event->button() == Qt::MiddleButton) { + if (event->button() == Qt::MiddleButton) emit deleteCardInfoPopup(cardRef.name); - } // This function ensures the parent function doesn't mess around with our selection. event->accept(); @@ -343,7 +323,6 @@ QVariant AbstractCardItem::itemChange(QGraphicsItem::GraphicsItemChange change, if (change == ItemSelectedHasChanged) { update(); return value; - } else { + } else return ArrowTarget::itemChange(change, value); - } } diff --git a/cockatrice/src/game_graphics/board/abstract_card_item.h b/cockatrice/src/game/board/abstract_card_item.h similarity index 83% rename from cockatrice/src/game_graphics/board/abstract_card_item.h rename to cockatrice/src/game/board/abstract_card_item.h index bdb5f7cf1..7d2c29cae 100644 --- a/cockatrice/src/game_graphics/board/abstract_card_item.h +++ b/cockatrice/src/game/board/abstract_card_item.h @@ -1,20 +1,20 @@ /** * @file abstract_card_item.h * @ingroup GameGraphicsCards - * @brief Base class for graphical card items, providing shared rendering, identity, and interaction logic. + * @brief TODO: Document this. */ #ifndef ABSTRACTCARDITEM_H #define ABSTRACTCARDITEM_H +#include "../../game_graphics/board/graphics_item_type.h" #include "../card_dimensions.h" #include "arrow_target.h" -#include "graphics_item_type.h" #include #include -class PlayerLogic; +class Player; class AbstractCardItem : public ArrowTarget { @@ -44,11 +44,6 @@ signals: void deleteCardInfoPopup(QString cardName); void sigPixmapUpdated(); void cardShiftClicked(QString cardName); - void rightClicked(AbstractCardItem *card, QPoint screenPos); - void playSelected(AbstractCardItem *card); - void playSelectedFaceDown(AbstractCardItem *card); - void hideSelected(AbstractCardItem *card); - void selectionChanged(AbstractCardItem *card, bool selected); public: enum @@ -61,7 +56,7 @@ public: } explicit AbstractCardItem(QGraphicsItem *parent = nullptr, const CardRef &cardRef = {}, - PlayerLogic *_owner = nullptr, + Player *_owner = nullptr, int _id = -1); ~AbstractCardItem() override; QRectF boundingRect() const override; @@ -101,10 +96,6 @@ public: } void setRealZValue(qreal _zValue); void setHovered(bool _hovered); - bool getIsHovered() const - { - return isHovered; - } QString getColor() const { return color; diff --git a/cockatrice/src/game_graphics/board/abstract_counter.cpp b/cockatrice/src/game/board/abstract_counter.cpp similarity index 55% rename from cockatrice/src/game_graphics/board/abstract_counter.cpp rename to cockatrice/src/game/board/abstract_counter.cpp index 219dd456e..08d19ec8a 100644 --- a/cockatrice/src/game_graphics/board/abstract_counter.cpp +++ b/cockatrice/src/game/board/abstract_counter.cpp @@ -1,15 +1,14 @@ #include "abstract_counter.h" #include "../../client/settings/cache_settings.h" -#include "../../game/player/player_actions.h" -#include "../../game/player/player_logic.h" -#include "../../game_graphics/board/translate_counter_name.h" #include "../../interface/widgets/tabs/tab_game.h" +#include "../player/player.h" +#include "../player/player_actions.h" +#include "translate_counter_name.h" #include #include #include -#include #include #include #include @@ -17,24 +16,24 @@ #include #include -AbstractCounter::AbstractCounter(CounterState *state, - PlayerLogic *_player, +AbstractCounter::AbstractCounter(Player *_player, + int _id, + const QString &_name, bool _shownInCounterArea, + int _value, bool _useNameForShortcut, QGraphicsItem *parent) - : QGraphicsItem(parent), player(_player), id(state->getId()), name(state->getName()), value(state->getValue()), - color(state->getColor()), radius(state->getRadius()), useNameForShortcut(_useNameForShortcut), - shownInCounterArea(_shownInCounterArea) + : QGraphicsItem(parent), player(_player), id(_id), name(_name), value(_value), + useNameForShortcut(_useNameForShortcut), hovered(false), aDec(nullptr), aInc(nullptr), dialogSemaphore(false), + deleteAfterDialog(false), shownInCounterArea(_shownInCounterArea) { setAcceptHoverEvents(true); - connect(state, &CounterState::valueChanged, this, [this](int, int newValue) { - value = newValue; - update(); - }); + shortcutActive = false; if (player->getPlayerInfo()->getLocalOrJudge()) { - menu = new TearOffMenu(TranslateCounterName::getDisplayName(state->getName())); + QString displayName = TranslateCounterName::getDisplayName(_name); + menu = new TearOffMenu(displayName); aSet = new QAction(this); connect(aSet, &QAction::triggered, this, &AbstractCounter::setCounter); menu->addAction(aSet); @@ -42,18 +41,16 @@ AbstractCounter::AbstractCounter(CounterState *state, for (int i = 10; i >= -10; --i) { if (i == 0) { menu->addSeparator(); - continue; + } else { + QAction *aIncrement = new QAction(QString(i < 0 ? "%1" : "+%1").arg(i), this); + if (i == -1) + aDec = aIncrement; + else if (i == 1) + aInc = aIncrement; + aIncrement->setData(i); + connect(aIncrement, &QAction::triggered, this, &AbstractCounter::incrementCounter); + menu->addAction(aIncrement); } - auto *a = new QAction(QString(i < 0 ? "%1" : "+%1").arg(i), this); - if (i == -1) { - aDec = a; - } - if (i == 1) { - aInc = a; - } - a->setData(i); - connect(a, &QAction::triggered, this, &AbstractCounter::incrementCounter); - menu->addAction(a); } } else { menu = nullptr; @@ -72,35 +69,39 @@ AbstractCounter::~AbstractCounter() void AbstractCounter::delCounter() { - if (dialogSemaphore) { + if (dialogSemaphore) deleteAfterDialog = true; - } else { + else deleteLater(); - } } void AbstractCounter::retranslateUi() { - if (aSet) { + if (menu) { aSet->setText(tr("&Set counter...")); } } void AbstractCounter::setShortcutsActive() { - if (!menu || !player->getPlayerInfo()->getLocal()) { + if (!menu) { return; } - ShortcutsSettings &sc = SettingsCache::instance().shortcuts(); - shortcutActive = true; + if (!player->getPlayerInfo()->getLocal()) { + return; + } + + ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts(); if (name == "life") { - aSet->setShortcuts(sc.getShortcut("Player/aSet")); - aDec->setShortcuts(sc.getShortcut("Player/aDec")); - aInc->setShortcuts(sc.getShortcut("Player/aInc")); + shortcutActive = true; + aSet->setShortcuts(shortcuts.getShortcut("Player/aSet")); + aDec->setShortcuts(shortcuts.getShortcut("Player/aDec")); + aInc->setShortcuts(shortcuts.getShortcut("Player/aInc")); } else if (useNameForShortcut) { - aSet->setShortcuts(sc.getShortcut("Player/aSetCounter_" + name)); - aDec->setShortcuts(sc.getShortcut("Player/aDecCounter_" + name)); - aInc->setShortcuts(sc.getShortcut("Player/aIncCounter_" + name)); + shortcutActive = true; + aSet->setShortcuts(shortcuts.getShortcut("Player/aSetCounter_" + name)); + aDec->setShortcuts(shortcuts.getShortcut("Player/aDecCounter_" + name)); + aInc->setShortcuts(shortcuts.getShortcut("Player/aIncCounter_" + name)); } } @@ -125,32 +126,43 @@ void AbstractCounter::refreshShortcuts() } } -void AbstractCounter::mousePressEvent(QGraphicsSceneMouseEvent *event) +void AbstractCounter::setValue(int _value) { - if (!isUnderMouse() || !player->getPlayerInfo()->getLocalOrJudge()) { - event->ignore(); - return; - } - - if (event->button() == Qt::MiddleButton || QApplication::keyboardModifiers() & Qt::ShiftModifier) { - if (menu) { - menu->exec(event->screenPos()); - } - } else { - Command_IncCounter cmd; - cmd.set_counter_id(id); - cmd.set_delta(event->button() == Qt::LeftButton ? 1 : -1); - player->getPlayerActions()->sendGameCommand(cmd); - } - event->accept(); + value = _value; + update(); } -void AbstractCounter::hoverEnterEvent(QGraphicsSceneHoverEvent *) +void AbstractCounter::mousePressEvent(QGraphicsSceneMouseEvent *event) +{ + if (isUnderMouse() && player->getPlayerInfo()->getLocalOrJudge()) { + if (event->button() == Qt::MiddleButton || (QApplication::keyboardModifiers() & Qt::ShiftModifier)) { + if (menu) + menu->exec(event->screenPos()); + event->accept(); + } else if (event->button() == Qt::LeftButton) { + Command_IncCounter cmd; + cmd.set_counter_id(id); + cmd.set_delta(1); + player->getPlayerActions()->sendGameCommand(cmd); + event->accept(); + } else if (event->button() == Qt::RightButton) { + Command_IncCounter cmd; + cmd.set_counter_id(id); + cmd.set_delta(-1); + player->getPlayerActions()->sendGameCommand(cmd); + event->accept(); + } + } else + event->ignore(); +} + +void AbstractCounter::hoverEnterEvent(QGraphicsSceneHoverEvent * /*event*/) { hovered = true; update(); } -void AbstractCounter::hoverLeaveEvent(QGraphicsSceneHoverEvent *) + +void AbstractCounter::hoverLeaveEvent(QGraphicsSceneHoverEvent * /*event*/) { hovered = false; update(); @@ -158,36 +170,34 @@ void AbstractCounter::hoverLeaveEvent(QGraphicsSceneHoverEvent *) void AbstractCounter::incrementCounter() { + const int delta = static_cast(sender())->data().toInt(); Command_IncCounter cmd; cmd.set_counter_id(id); - cmd.set_delta(static_cast(sender())->data().toInt()); + cmd.set_delta(delta); player->getPlayerActions()->sendGameCommand(cmd); } void AbstractCounter::setCounter() { - QWidget *parent = nullptr; - if (auto *view = scene() ? scene()->views().value(0) : nullptr) { - parent = view->window(); - } - dialogSemaphore = true; - AbstractCounterDialog dlg(name, QString::number(value), parent); - const int ok = dlg.exec(); - dialogSemaphore = false; + AbstractCounterDialog dialog(name, QString::number(value), player->getGame()->getTab()); + const int ok = dialog.exec(); if (deleteAfterDialog) { deleteLater(); return; } - if (!ok) { + dialogSemaphore = false; + + if (!ok) return; - } Expression exp(value); + int newValue = static_cast(exp.parse(dialog.textValue())); + Command_SetCounter cmd; cmd.set_counter_id(id); - cmd.set_value(static_cast(exp.parse(dlg.textValue()))); + cmd.set_value(newValue); player->getPlayerActions()->sendGameCommand(cmd); } @@ -221,9 +231,8 @@ void AbstractCounterDialog::changeValue(int diff) { bool ok; int curValue = textValue().toInt(&ok); - if (!ok) { + if (!ok) return; - } curValue += diff; setTextValue(QString::number(curValue)); } diff --git a/cockatrice/src/game_graphics/board/abstract_counter.h b/cockatrice/src/game/board/abstract_counter.h similarity index 70% rename from cockatrice/src/game_graphics/board/abstract_counter.h rename to cockatrice/src/game/board/abstract_counter.h index b319a722d..074650d54 100644 --- a/cockatrice/src/game_graphics/board/abstract_counter.h +++ b/cockatrice/src/game/board/abstract_counter.h @@ -1,20 +1,19 @@ /** * @file abstract_counter.h * @ingroup GameGraphicsPlayers + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COUNTER_H #define COUNTER_H -#include "../../game/board/counter_state.h" #include "../../interface/widgets/menus/tearoff_menu.h" #include "../player/menu/abstract_player_component.h" #include #include -class PlayerLogic; +class Player; class QAction; class QKeyEvent; class QMenu; @@ -26,26 +25,22 @@ class AbstractCounter : public QObject, public QGraphicsItem, public AbstractPla Q_INTERFACES(QGraphicsItem) protected: - PlayerLogic *player; + Player *player; int id; QString name; int value; - QColor color; - int radius; - bool hovered = false; - bool useNameForShortcut; + bool useNameForShortcut, hovered; void mousePressEvent(QGraphicsSceneMouseEvent *event) override; void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; private: - QAction *aSet = nullptr, *aDec = nullptr, *aInc = nullptr; - TearOffMenu *menu = nullptr; - bool dialogSemaphore = false; - bool deleteAfterDialog = false; + QAction *aSet, *aDec, *aInc; + TearOffMenu *menu; + bool dialogSemaphore, deleteAfterDialog; bool shownInCounterArea; - bool shortcutActive = false; + bool shortcutActive; private slots: void refreshShortcuts(); @@ -53,14 +48,17 @@ private slots: void setCounter(); public: - AbstractCounter(CounterState *state, - PlayerLogic *player, - bool shownInCounterArea, - bool useNameForShortcut = false, + AbstractCounter(Player *_player, + int _id, + const QString &_name, + bool _shownInCounterArea, + int _value, + bool _useNameForShortcut = false, QGraphicsItem *parent = nullptr); ~AbstractCounter() override; void retranslateUi() override; + void setValue(int _value); void setShortcutsActive() override; void setShortcutsInactive() override; void delCounter(); @@ -69,6 +67,7 @@ public: { return menu; } + int getId() const { return id; @@ -77,22 +76,14 @@ public: { return name; } - QColor getColor() const + bool getShownInCounterArea() const { - return color; - } - int getRadius() const - { - return radius; + return shownInCounterArea; } int getValue() const { return value; } - bool getShownInCounterArea() const - { - return shownInCounterArea; - } }; class AbstractCounterDialog : public QInputDialog diff --git a/cockatrice/src/game/board/arrow_data.cpp b/cockatrice/src/game/board/arrow_data.cpp deleted file mode 100644 index 9e89deed0..000000000 --- a/cockatrice/src/game/board/arrow_data.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "arrow_data.h" - -ArrowData ArrowData::fromProto(const ServerInfo_Arrow &arrow, int creatorId, bool isLocalCreator) -{ - ArrowData data; - data.creatorId = creatorId; - data.isLocalCreator = isLocalCreator; - data.id = arrow.id(); - data.startPlayerId = arrow.start_player_id(); - data.startZone = QString::fromStdString(arrow.start_zone()); - data.startCardId = arrow.start_card_id(); - data.targetPlayerId = arrow.target_player_id(); - data.color = convertColorToQColor(arrow.arrow_color()); - - if (arrow.has_target_zone()) { - data.targetZone = QString::fromStdString(arrow.target_zone()); - data.targetCardId = arrow.target_card_id(); - } - - return data; -} \ No newline at end of file diff --git a/cockatrice/src/game/board/arrow_data.h b/cockatrice/src/game/board/arrow_data.h deleted file mode 100644 index 2752f97e3..000000000 --- a/cockatrice/src/game/board/arrow_data.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef COCKATRICE_ARROW_DATA_H -#define COCKATRICE_ARROW_DATA_H - -#include -#include -#include -#include - -struct ArrowData -{ - int creatorId = -1; - bool isLocalCreator = false; - int id = -1; - int startPlayerId = -1; - QString startZone = ""; - int startCardId = -1; - int targetPlayerId = -1; - QString targetZone = ""; - int targetCardId = -1; - QColor color = ""; - - static ArrowData fromProto(const ServerInfo_Arrow &arrow, int creatorId, bool isLocalCreator); - - bool isPlayerTargeted() const - { - return targetZone.isEmpty(); - } -}; - -#endif // COCKATRICE_ARROW_DATA_H diff --git a/cockatrice/src/game_graphics/board/arrow_item.cpp b/cockatrice/src/game/board/arrow_item.cpp similarity index 57% rename from cockatrice/src/game_graphics/board/arrow_item.cpp rename to cockatrice/src/game/board/arrow_item.cpp index af6a6bf36..60585a774 100644 --- a/cockatrice/src/game_graphics/board/arrow_item.cpp +++ b/cockatrice/src/game/board/arrow_item.cpp @@ -2,8 +2,8 @@ #include "arrow_item.h" #include "../../client/settings/cache_settings.h" -#include "../../game/player/player_actions.h" -#include "../../game/player/player_logic.h" +#include "../player/player.h" +#include "../player/player_actions.h" #include "../player/player_target.h" #include "../z_values.h" #include "../zones/card_zone.h" @@ -21,49 +21,46 @@ #include #include -ArrowItem::ArrowItem(QSharedPointer _data, ArrowTarget *_startItem, ArrowTarget *_targetItem) - : data(std::move(_data)), startItem(_startItem), targetItem(_targetItem) +ArrowItem::ArrowItem(Player *_player, int _id, ArrowTarget *_startItem, ArrowTarget *_targetItem, const QColor &_color) + : QGraphicsItem(), player(_player), id(_id), startItem(_startItem), targetItem(_targetItem), targetLocked(false), + color(_color), fullColor(true) { setZValue(ZValues::ARROWS); - auto doUpdate = [this]() { - if (startItem && targetItem) { - updatePath(); - } - }; + if (startItem) + startItem->addArrowFrom(this); + if (targetItem) + targetItem->addArrowTo(this); - if (startItem) { - connect(startItem, &ArrowTarget::scenePositionChanged, this, doUpdate); - connect(startItem, &QObject::destroyed, this, &ArrowItem::onTargetDestroyed); - } - if (targetItem) { - connect(targetItem, &ArrowTarget::scenePositionChanged, this, doUpdate); - connect(targetItem, &QObject::destroyed, this, &ArrowItem::onTargetDestroyed); - } - - if (startItem && targetItem) { + if (startItem && targetItem) updatePath(); - } } -void ArrowItem::onTargetDestroyed() +ArrowItem::~ArrowItem() { - emit requestDeletion(data->creatorId, data->id); } void ArrowItem::delArrow() { + if (startItem) { + startItem->removeArrowFrom(this); + startItem = 0; + } + if (targetItem) { targetItem->setBeingPointedAt(false); + targetItem->removeArrowTo(this); + targetItem = 0; } + + player->removeArrow(this); deleteLater(); } void ArrowItem::updatePath() { - if (!targetItem) { + if (!targetItem) return; - } QPointF endPoint = targetItem->mapToScene( QPointF(targetItem->boundingRect().width() / 2, targetItem->boundingRect().height() / 2)); @@ -78,9 +75,8 @@ void ArrowItem::updatePath(const QPointF &endPoint) headWidth / qPow(2, 0.5); // aka headWidth / sqrt (2) but this produces a compile error with MSVC++ const double phi = 15; - if (!startItem) { + if (!startItem) return; - } QPointF startPoint = startItem->mapToScene(QPointF(startItem->boundingRect().width() / 2, startItem->boundingRect().height() / 2)); @@ -88,9 +84,9 @@ void ArrowItem::updatePath(const QPointF &endPoint) qreal lineLength = line.length(); prepareGeometryChange(); - if (lineLength < 30) { + if (lineLength < 30) path = QPainterPath(); - } else { + else { QPointF c(lineLength / 2, qTan(phi * M_PI / 180) * lineLength); QPainterPath centerLine; @@ -126,24 +122,24 @@ void ArrowItem::updatePath(const QPointF &endPoint) void ArrowItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/) { - QColor paintColor(data->color); - if (fullColor) { + QColor paintColor(color); + if (fullColor) paintColor.setAlpha(200); - } else { + else paintColor.setAlpha(150); - } painter->setBrush(paintColor); painter->drawPath(path); } void ArrowItem::mousePressEvent(QGraphicsSceneMouseEvent *event) { - if (!data->isLocalCreator) { + if (!player->getPlayerInfo()->getLocal()) { event->ignore(); return; } - for (auto *item : scene()->items(event->scenePos())) { + QList colliding = scene()->items(event->scenePos()); + for (QGraphicsItem *item : colliding) { if (qgraphicsitem_cast(item)) { event->ignore(); return; @@ -152,109 +148,95 @@ void ArrowItem::mousePressEvent(QGraphicsSceneMouseEvent *event) event->accept(); if (event->button() == Qt::RightButton) { - emit requestDeletion(data->creatorId, data->id); + Command_DeleteArrow cmd; + cmd.set_arrow_id(id); + player->getPlayerActions()->sendGameCommand(cmd); } } -// ArrowDragItem - -ArrowDragItem::ArrowDragItem(PlayerLogic *_owner, ArrowTarget *_startItem, const QColor &_color, int _deleteInPhase) - : ArrowItem(QSharedPointer::create(ArrowData{.creatorId = _owner->getPlayerInfo()->getId(), - .isLocalCreator = true, - .id = -1, - .color = _color}), - _startItem, - nullptr), - player(_owner), deleteInPhase(_deleteInPhase) +ArrowDragItem::ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color, int _deleteInPhase) + : ArrowItem(_owner, -1, _startItem, 0, _color), deleteInPhase(_deleteInPhase) { } -void ArrowDragItem::addChildArrow(ArrowDragItem *child) +void ArrowDragItem::addChildArrow(ArrowDragItem *childArrow) { - childArrows.append(child); + childArrows.append(childArrow); } void ArrowDragItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { - if (targetLocked || !startItem) { + // This ensures that if a mouse move event happens after a call to delArrow(), + // the event will be discarded as it would create some stray pointers. + if (targetLocked || !startItem) return; - } - const QPointF endPos = event->scenePos(); + QPointF endPos = event->scenePos(); - ArrowTarget *cursorItem = nullptr; + QList colliding = scene()->items(endPos); + ArrowTarget *cursorItem = 0; qreal cursorItemZ = -1; - for (auto *item : scene()->items(endPos)) { - ArrowTarget *candidate = nullptr; - if (auto *card = qgraphicsitem_cast(item)) { - candidate = card; - } else if (auto *pt = qgraphicsitem_cast(item)) { - candidate = pt; - } - - if (candidate && candidate->zValue() > cursorItemZ) { - cursorItem = candidate; - cursorItemZ = candidate->zValue(); + for (int i = colliding.size() - 1; i >= 0; i--) { + if (qgraphicsitem_cast(colliding.at(i)) || qgraphicsitem_cast(colliding.at(i))) { + if (colliding.at(i)->zValue() > cursorItemZ) { + cursorItem = static_cast(colliding.at(i)); + cursorItemZ = cursorItem->zValue(); + } } } - if (cursorItem != targetItem) { - if (targetItem) { - disconnect(positionConnection); - targetItem->setBeingPointedAt(false); - } - - targetItem = cursorItem; - fullColor = (cursorItem != nullptr); - - if (cursorItem && cursorItem != startItem) { - cursorItem->setBeingPointedAt(true); - positionConnection = - connect(cursorItem, &ArrowTarget::scenePositionChanged, this, [this]() { updatePath(); }); - } + if ((cursorItem != targetItem) && targetItem) { + targetItem->setBeingPointedAt(false); + targetItem->removeArrowTo(this); + } + if (!cursorItem) { + fullColor = false; + targetItem = 0; + updatePath(endPos); + } else { + if (cursorItem != targetItem) { + fullColor = true; + if (cursorItem != startItem) { + cursorItem->setBeingPointedAt(true); + cursorItem->addArrowTo(this); + } + targetItem = cursorItem; + } + updatePath(); } - - targetItem ? updatePath() : updatePath(endPos); update(); - for (auto *child : childArrows) { + for (ArrowDragItem *child : childArrows) { child->mouseMoveEvent(event); } } void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { - if (!startItem) { + if (!startItem) return; - } - if (targetItem && targetItem != startItem) { - CardItem *startCard = qgraphicsitem_cast(startItem); + if (targetItem && (targetItem != startItem)) { + CardZoneLogic *startZone = static_cast(startItem)->getZone(); // For now, we can safely assume that the start item is always a card. // The target item can be a player as well. - if (!startCard) { - delArrow(); - return; - } - - CardZoneLogic *startZone = startCard->getZone(); + CardItem *startCard = qgraphicsitem_cast(startItem); + CardItem *targetCard = qgraphicsitem_cast(targetItem); Command_CreateArrow cmd; - cmd.mutable_arrow_color()->CopyFrom(convertQColorToColor(data->color)); + cmd.mutable_arrow_color()->CopyFrom(convertQColorToColor(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)) { + if (targetCard) { CardZoneLogic *targetZone = targetCard->getZone(); 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)) { + } else { // failed to cast target to card, this means it's a player + PlayerTarget *targetPlayer = qgraphicsitem_cast(targetItem); cmd.set_target_player_id(targetPlayer->getOwner()->getPlayerInfo()->getId()); - } else { - delArrow(); - return; } // if the card is in hand then we will move the card to stack or table as part of drawing the arrow @@ -264,11 +246,10 @@ void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) bool playToStack = SettingsCache::instance().getPlayToStack(); if (ci && ((!playToStack && ci->getUiAttributes().tableRow == 3) || (playToStack && ci->getUiAttributes().tableRow != 0 && - startCard->getZone()->getName() != ZoneNames::STACK))) { + startCard->getZone()->getName() != ZoneNames::STACK))) cmd.set_start_zone(ZoneNames::STACK); - } else { + else cmd.set_start_zone(playToStack ? ZoneNames::STACK : ZoneNames::TABLE); - } } if (deleteInPhase != 0) { @@ -277,116 +258,111 @@ void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) player->getPlayerActions()->sendGameCommand(cmd); } - delArrow(); - for (auto *child : childArrows) { + + for (ArrowDragItem *child : childArrows) { child->mouseReleaseEvent(event); } } -// ArrowAttachItem ArrowAttachItem::ArrowAttachItem(ArrowTarget *_startItem) - : ArrowItem( - QSharedPointer::create(ArrowData{.creatorId = _startItem->getOwner()->getPlayerInfo()->getId(), - .isLocalCreator = true, - .id = -1, - .color = Qt::green}), - _startItem, - nullptr), - player(_startItem->getOwner()) + : ArrowItem(_startItem->getOwner(), -1, _startItem, 0, Qt::green) { } -void ArrowAttachItem::addChildArrow(ArrowAttachItem *child) +void ArrowAttachItem::addChildArrow(ArrowAttachItem *childArrow) { - childArrows.append(child); + childArrows.append(childArrow); } void ArrowAttachItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { - if (targetLocked || !startItem) { + if (targetLocked || !startItem) return; - } - const QPointF endPos = event->scenePos(); + QPointF endPos = event->scenePos(); - ArrowTarget *cursorItem = nullptr; + QList colliding = scene()->items(endPos); + ArrowTarget *cursorItem = 0; qreal cursorItemZ = -1; - for (auto *item : scene()->items(endPos)) { - if (auto *card = qgraphicsitem_cast(item)) { - if (card->zValue() > cursorItemZ) { - cursorItem = card; - cursorItemZ = card->zValue(); + for (int i = colliding.size() - 1; i >= 0; i--) { + if (qgraphicsitem_cast(colliding.at(i))) { + if (colliding.at(i)->zValue() > cursorItemZ) { + cursorItem = static_cast(colliding.at(i)); + cursorItemZ = cursorItem->zValue(); } } } - if (cursorItem != targetItem) { - if (targetItem) { - disconnect(positionConnection); - targetItem->setBeingPointedAt(false); - } - - targetItem = cursorItem; - fullColor = (cursorItem != nullptr); - - if (cursorItem && cursorItem != startItem) { - cursorItem->setBeingPointedAt(true); - positionConnection = - connect(cursorItem, &ArrowTarget::scenePositionChanged, this, [this]() { updatePath(); }); - } + if ((cursorItem != targetItem) && targetItem) { + targetItem->setBeingPointedAt(false); + } + if (!cursorItem) { + fullColor = false; + targetItem = 0; + updatePath(endPos); + } else { + fullColor = true; + if (cursorItem != startItem) { + cursorItem->setBeingPointedAt(true); + } + targetItem = cursorItem; + updatePath(); } - - targetItem ? updatePath() : updatePath(endPos); update(); - for (auto *child : childArrows) { + for (ArrowAttachItem *child : childArrows) { child->mouseMoveEvent(event); } } -void ArrowAttachItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) -{ - if (!startItem) { - return; - } - - // Attaching could move startItem under the current cursor position, causing all children to retarget to it right - // before they are processed. Prevent that. - for (auto *child : childArrows) { - child->setTargetLocked(true); - } - - if (targetItem && targetItem != startItem) { - auto *startCard = qgraphicsitem_cast(startItem); - auto *targetCard = qgraphicsitem_cast(targetItem); - if (startCard && targetCard) { - attachCards(startCard, targetCard); - } - } - - delArrow(); - for (auto *child : childArrows) { - child->mouseReleaseEvent(event); - } -} - void ArrowAttachItem::attachCards(CardItem *startCard, const CardItem *targetCard) { + // do nothing if target is already attached to another card or is not in play if (targetCard->getAttachedTo() || targetCard->getZone()->getName() != ZoneNames::TABLE) { return; } + CardZoneLogic *startZone = startCard->getZone(); + CardZoneLogic *targetZone = targetCard->getZone(); + // move card onto table first if attaching from some other zone - if (startCard->getZone()->getName() != ZoneNames::TABLE) { + if (startZone->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_player_id(targetZone->getPlayer()->getPlayerInfo()->getId()); + cmd.set_target_zone(targetZone->getName().toStdString()); cmd.set_target_card_id(targetCard->getId()); + player->getPlayerActions()->sendGameCommand(cmd); -} \ No newline at end of file +} + +void ArrowAttachItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +{ + if (!startItem) + return; + + // Attaching could move startItem under the current cursor position, causing all children to retarget to it right + // before they are processed. Prevent that. + for (ArrowAttachItem *child : childArrows) { + child->setTargetLocked(true); + } + + if (targetItem && (targetItem != startItem)) { + auto startCard = qgraphicsitem_cast(startItem); + auto targetCard = qgraphicsitem_cast(targetItem); + if (startCard && targetCard) { + attachCards(startCard, targetCard); + } + } + + delArrow(); + + for (ArrowAttachItem *child : childArrows) { + child->mouseReleaseEvent(event); + } +} diff --git a/cockatrice/src/game_graphics/board/arrow_item.h b/cockatrice/src/game/board/arrow_item.h similarity index 64% rename from cockatrice/src/game_graphics/board/arrow_item.h rename to cockatrice/src/game/board/arrow_item.h index 1c306e065..cb78ee066 100644 --- a/cockatrice/src/game_graphics/board/arrow_item.h +++ b/cockatrice/src/game/board/arrow_item.h @@ -1,44 +1,40 @@ +/** + * @file arrow_item.h + * @ingroup GameGraphics + * @brief TODO: Document this. + */ + #ifndef ARROWITEM_H #define ARROWITEM_H -#include "../../game/board/arrow_data.h" -#include "arrow_target.h" - #include -#include -#include class CardItem; class QGraphicsSceneMouseEvent; -class PlayerLogic; +class QMenu; +class Player; +class ArrowTarget; class ArrowItem : public QObject, public QGraphicsItem { Q_OBJECT Q_INTERFACES(QGraphicsItem) -signals: - void requestDeletion(int creatorId, int id); - private: QPainterPath path; + QMenu *menu; protected: - QSharedPointer data; - QPointer startItem; - QPointer targetItem; - bool targetLocked = false; - bool fullColor = true; - + Player *player; + int id; + ArrowTarget *startItem, *targetItem; + bool targetLocked; + QColor color; + bool fullColor; void mousePressEvent(QGraphicsSceneMouseEvent *event) override; public: - ArrowItem(QSharedPointer _data, ArrowTarget *_startItem, ArrowTarget *_targetItem); - - void onTargetDestroyed(); - void delArrow(); - void updatePath(); - void updatePath(const QPointF &endPoint); - + ArrowItem(Player *_player, int _id, ArrowTarget *_startItem, ArrowTarget *_targetItem, const QColor &color); + ~ArrowItem() override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; [[nodiscard]] QRectF boundingRect() const override { @@ -48,13 +44,24 @@ public: { return path; } + void updatePath(); + void updatePath(const QPointF &endPoint); + [[nodiscard]] int getId() const { - return data->id; + return id; } - [[nodiscard]] int getCreatorId() const + [[nodiscard]] Player *getPlayer() const { - return data->creatorId; + return player; + } + void setStartItem(ArrowTarget *_item) + { + startItem = _item; + } + void setTargetItem(ArrowTarget *_item) + { + targetItem = _item; } [[nodiscard]] ArrowTarget *getStartItem() const { @@ -68,20 +75,19 @@ public: { targetLocked = _targetLocked; } + void delArrow(); }; class ArrowDragItem : public ArrowItem { Q_OBJECT private: - PlayerLogic *player; int deleteInPhase; QList childArrows; - QMetaObject::Connection positionConnection; public: - ArrowDragItem(PlayerLogic *_owner, ArrowTarget *_startItem, const QColor &_color, int _deleteInPhase); - void addChildArrow(ArrowDragItem *child); + ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color, int _deleteInPhase); + void addChildArrow(ArrowDragItem *childArrow); protected: void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; @@ -92,18 +98,17 @@ class ArrowAttachItem : public ArrowItem { Q_OBJECT private: - PlayerLogic *player; QList childArrows; - QMetaObject::Connection positionConnection; + void attachCards(CardItem *startCard, const CardItem *targetCard); public: explicit ArrowAttachItem(ArrowTarget *_startItem); - void addChildArrow(ArrowAttachItem *child); + void addChildArrow(ArrowAttachItem *childArrow); protected: void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; }; -#endif \ No newline at end of file +#endif // ARROWITEM_H diff --git a/cockatrice/src/game/board/arrow_target.cpp b/cockatrice/src/game/board/arrow_target.cpp new file mode 100644 index 000000000..2dbd913fa --- /dev/null +++ b/cockatrice/src/game/board/arrow_target.cpp @@ -0,0 +1,41 @@ +#include "arrow_target.h" + +#include "../player/player.h" +#include "arrow_item.h" + +ArrowTarget::ArrowTarget(Player *_owner, QGraphicsItem *parent) + : AbstractGraphicsItem(parent), owner(_owner), beingPointedAt(false) +{ + setFlag(ItemSendsScenePositionChanges); +} + +ArrowTarget::~ArrowTarget() +{ + for (int i = 0; i < arrowsFrom.size(); ++i) { + arrowsFrom[i]->setStartItem(0); + arrowsFrom[i]->delArrow(); + } + for (int i = 0; i < arrowsTo.size(); ++i) { + arrowsTo[i]->setTargetItem(0); + arrowsTo[i]->delArrow(); + } +} + +void ArrowTarget::setBeingPointedAt(bool _beingPointedAt) +{ + beingPointedAt = _beingPointedAt; + update(); +} + +QVariant ArrowTarget::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) +{ + if (change == ItemScenePositionHasChanged && scene()) { + for (auto *arrow : arrowsFrom) + arrow->updatePath(); + + for (auto *arrow : arrowsTo) + arrow->updatePath(); + } + + return QGraphicsItem::itemChange(change, value); +} diff --git a/cockatrice/src/game/board/arrow_target.h b/cockatrice/src/game/board/arrow_target.h new file mode 100644 index 000000000..55f4ef678 --- /dev/null +++ b/cockatrice/src/game/board/arrow_target.h @@ -0,0 +1,70 @@ +/** + * @file arrow_target.h + * @ingroup GameGraphics + * @brief TODO: Document this. + */ + +#ifndef ARROWTARGET_H +#define ARROWTARGET_H + +#include "../../game_graphics/board/abstract_graphics_item.h" + +#include + +class Player; +class ArrowItem; + +class ArrowTarget : public AbstractGraphicsItem +{ + Q_OBJECT +protected: + Player *owner; + +private: + bool beingPointedAt; + QList arrowsFrom, arrowsTo; + +public: + explicit ArrowTarget(Player *_owner, QGraphicsItem *parent = nullptr); + ~ArrowTarget() override; + + [[nodiscard]] Player *getOwner() const + { + return owner; + } + + void setBeingPointedAt(bool _beingPointedAt); + [[nodiscard]] bool getBeingPointedAt() const + { + return beingPointedAt; + } + + [[nodiscard]] const QList &getArrowsFrom() const + { + return arrowsFrom; + } + void addArrowFrom(ArrowItem *arrow) + { + arrowsFrom.append(arrow); + } + void removeArrowFrom(ArrowItem *arrow) + { + arrowsFrom.removeOne(arrow); + } + [[nodiscard]] const QList &getArrowsTo() const + { + return arrowsTo; + } + void addArrowTo(ArrowItem *arrow) + { + arrowsTo.append(arrow); + } + void removeArrowTo(ArrowItem *arrow) + { + arrowsTo.removeOne(arrow); + } + +protected: + QVariant itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) override; +}; +#endif diff --git a/cockatrice/src/game_graphics/board/card_drag_item.cpp b/cockatrice/src/game/board/card_drag_item.cpp similarity index 90% rename from cockatrice/src/game_graphics/board/card_drag_item.cpp rename to cockatrice/src/game/board/card_drag_item.cpp index 49467c5c9..5ae56ccba 100644 --- a/cockatrice/src/game_graphics/board/card_drag_item.cpp +++ b/cockatrice/src/game/board/card_drag_item.cpp @@ -24,9 +24,8 @@ void CardDragItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti { AbstractCardDragItem::paint(painter, option, widget); - if (occupied) { + if (occupied) painter->fillPath(shape(), QColor(200, 0, 0, 100)); - } } void CardDragItem::updatePosition(const QPointF &cursorScenePos) @@ -39,19 +38,16 @@ void CardDragItem::updatePosition(const QPointF &cursorScenePos) ZoneViewZone *zoneViewZone = 0; for (int i = colliding.size() - 1; i >= 0; i--) { CardZone *temp = qgraphicsitem_cast(colliding.at(i)); - if (!cardZone) { + if (!cardZone) cardZone = temp; - } - if (!zoneViewZone) { + if (!zoneViewZone) zoneViewZone = qobject_cast(temp); - } } CardZone *cursorZone = 0; - if (zoneViewZone) { + if (zoneViewZone) cursorZone = zoneViewZone; - } else if (cardZone) { + else if (cardZone) cursorZone = cardZone; - } // Always update the current zone, even if its null, to cancel the drag // instead of dropping cards into an non-intuitive location. @@ -63,9 +59,8 @@ void CardDragItem::updatePosition(const QPointF &cursorScenePos) QPointF newPos = cursorScenePos - hotSpot; if (newPos != pos()) { - for (int i = 0; i < childDrags.size(); i++) { + for (int i = 0; i < childDrags.size(); i++) childDrags[i]->setPos(newPos + childDrags[i]->getHotSpot()); - } setPos(newPos); } @@ -83,27 +78,23 @@ void CardDragItem::updatePosition(const QPointF &cursorScenePos) // position. TableZone *tableZone = qobject_cast(cursorZone); QPointF closestGridPoint; - if (tableZone) { + if (tableZone) closestGridPoint = tableZone->closestGridPoint(cursorPosInZone); - } else { + else closestGridPoint = cursorPosInZone - hotSpot; - } QPointF newPos = zonePos + closestGridPoint; if (newPos != pos()) { - for (int i = 0; i < childDrags.size(); i++) { + for (int i = 0; i < childDrags.size(); i++) childDrags[i]->setPos(newPos + childDrags[i]->getHotSpot()); - } setPos(newPos); bool newOccupied = false; TableZone *table = qobject_cast(cursorZone); - if (table) { - if (table->getCardFromCoords(closestGridPoint)) { + if (table) + if (table->getCardFromCoords(closestGridPoint)) newOccupied = true; - } - } if (newOccupied != occupied) { occupied = newOccupied; update(); diff --git a/cockatrice/src/game_graphics/board/card_drag_item.h b/cockatrice/src/game/board/card_drag_item.h similarity index 96% rename from cockatrice/src/game_graphics/board/card_drag_item.h rename to cockatrice/src/game/board/card_drag_item.h index 74d25ad04..930c6be6f 100644 --- a/cockatrice/src/game_graphics/board/card_drag_item.h +++ b/cockatrice/src/game/board/card_drag_item.h @@ -1,8 +1,8 @@ /** * @file card_drag_item.h * @ingroup GameGraphicsCards + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARDDRAGITEM_H #define CARDDRAGITEM_H diff --git a/cockatrice/src/game_graphics/board/card_item.cpp b/cockatrice/src/game/board/card_item.cpp similarity index 68% rename from cockatrice/src/game_graphics/board/card_item.cpp rename to cockatrice/src/game/board/card_item.cpp index cabe988c2..62de4a02e 100644 --- a/cockatrice/src/game_graphics/board/card_item.cpp +++ b/cockatrice/src/game/board/card_item.cpp @@ -1,12 +1,12 @@ #include "card_item.h" #include "../../client/settings/cache_settings.h" -#include "../../game/phase.h" -#include "../../game/player/player_actions.h" -#include "../../game/player/player_logic.h" -#include "../../game/zones/view_zone_logic.h" #include "../../interface/widgets/tabs/tab_game.h" #include "../game_scene.h" +#include "../phase.h" +#include "../player/player.h" +#include "../player/player_actions.h" +#include "../zones/logic/view_zone_logic.h" #include "../zones/table_zone.h" #include "../zones/view_zone.h" #include "arrow_item.h" @@ -20,19 +20,15 @@ #include #include -CardItem::CardItem(PlayerLogic *_owner, - QGraphicsItem *parent, - const CardRef &cardRef, - int _cardid, - CardZoneLogic *_zone) - : AbstractCardItem(parent, cardRef, _owner, _cardid), state(new CardState(this, _zone)), dragItem(nullptr) +CardItem::CardItem(Player *_owner, QGraphicsItem *parent, const CardRef &cardRef, int _cardid, CardZoneLogic *_zone) + : AbstractCardItem(parent, cardRef, _owner, _cardid), zone(_zone), attacking(false), destroyOnZoneChange(false), + doesntUntap(false), dragItem(nullptr), attachedTo(nullptr) { owner->addCard(this); connect(&SettingsCache::instance().cardCounters(), &CardCounterSettings::colorChanged, this, [this](int counterId) { - if (state->getCounters().contains(counterId)) { + if (counters.contains(counterId)) update(); - } }); } @@ -40,7 +36,7 @@ void CardItem::prepareDelete() { if (owner != nullptr) { if (owner->getGame()->getActiveCard() == this) { - emit owner->requestCardMenuUpdate(nullptr); + owner->getPlayerMenu()->updateCardMenu(nullptr); owner->getGame()->setActiveCard(nullptr); } owner = nullptr; @@ -51,24 +47,23 @@ void CardItem::prepareDelete() attachedCards.first()->setAttachedTo(nullptr); } - if (state->getAttachedTo() != nullptr) { - state->getAttachedTo()->removeAttachedCard(this); - state->setAttachedTo(nullptr); + if (attachedTo != nullptr) { + attachedTo->removeAttachedCard(this); + attachedTo = nullptr; } } void CardItem::deleteLater() { prepareDelete(); - if (scene()) { + if (scene()) static_cast(scene())->unregisterAnimationItem(this); - } AbstractCardItem::deleteLater(); } void CardItem::setZone(CardZoneLogic *_zone) { - state->setZone(_zone); + zone = _zone; } void CardItem::retranslateUi() @@ -83,23 +78,23 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, AbstractCardItem::paint(painter, option, widget); int i = 0; - QMapIterator counterIterator(state->getCounters()); + QMapIterator counterIterator(counters); while (counterIterator.hasNext()) { counterIterator.next(); QColor _color = cardCounterSettings.color(counterIterator.key()); - paintNumberEllipse(counterIterator.value(), 14, _color, i, state->getCounters().size(), painter); + paintNumberEllipse(counterIterator.value(), 14, _color, i, counters.size(), painter); ++i; } QSizeF translatedSize = getTranslatedSize(painter); qreal scaleFactor = translatedSize.width() / boundingRect().width(); - if (!state->getPT().isEmpty()) { + if (!pt.isEmpty()) { painter->save(); transformPainter(painter, translatedSize, tapAngle); - if (!getFaceDown() && state->getPT() == exactCard.getInfo().getPowTough()) { + if (!getFaceDown() && pt == exactCard.getInfo().getPowTough()) { painter->setPen(Qt::white); } else { painter->setPen(QColor(255, 150, 0)); // dark orange @@ -110,11 +105,11 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, painter->drawText(QRectF(4 * scaleFactor, 4 * scaleFactor, translatedSize.width() - 10 * scaleFactor, translatedSize.height() - 8 * scaleFactor), - Qt::AlignRight | Qt::AlignBottom, state->getPT()); + Qt::AlignRight | Qt::AlignBottom, pt); painter->restore(); } - if (!state->getAnnotation().isEmpty()) { + if (!annotation.isEmpty()) { painter->save(); transformPainter(painter, translatedSize, tapAngle); @@ -124,7 +119,7 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, painter->drawText(QRectF(4 * scaleFactor, 4 * scaleFactor, translatedSize.width() - 8 * scaleFactor, translatedSize.height() - 8 * scaleFactor), - Qt::AlignCenter | Qt::TextWrapAnywhere, state->getAnnotation()); + Qt::AlignCenter | Qt::TextWrapAnywhere, annotation); painter->restore(); } @@ -132,7 +127,7 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, painter->fillPath(shape(), QBrush(QColor(255, 0, 0, 100))); } - if (state->getDoesntUntap()) { + if (doesntUntap) { painter->save(); painter->setRenderHint(QPainter::Antialiasing, false); @@ -151,66 +146,69 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, void CardItem::setAttacking(bool _attacking) { - state->setAttacking(_attacking); + attacking = _attacking; update(); } void CardItem::setCounter(int _id, int _value) { - state->setCounter(_id, _value); + if (_value) + counters.insert(_id, _value); + else + counters.remove(_id); update(); } void CardItem::setAnnotation(const QString &_annotation) { - state->setAnnotation(_annotation); + annotation = _annotation; update(); } void CardItem::setDoesntUntap(bool _doesntUntap) { - state->setDoesntUntap(_doesntUntap); + doesntUntap = _doesntUntap; update(); } void CardItem::setPT(const QString &_pt) { - state->setPT(_pt); + pt = _pt; update(); } void CardItem::setAttachedTo(CardItem *_attachedTo) { - if (state->getAttachedTo() != nullptr) { - state->getAttachedTo()->removeAttachedCard(this); + if (attachedTo != nullptr) { + attachedTo->removeAttachedCard(this); } gridPoint.setX(-1); - state->setAttachedTo(_attachedTo); - if (state->getAttachedTo() != nullptr) { + attachedTo = _attachedTo; + 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 - if (state->getAttachedTo()->getZone() == nullptr) { + if (attachedTo->zone == nullptr) { deleteLater(); } else { - emit state->getAttachedTo()->getZone()->cardAdded(this); - state->getAttachedTo()->addAttachedCard(this); - if (state->getZone() != state->getAttachedTo()->getZone()) { - state->getAttachedTo()->getZone()->reorganizeCards(); + emit attachedTo->zone->cardAdded(this); + attachedTo->addAttachedCard(this); + if (zone != attachedTo->getZone()) { + attachedTo->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) { + if (zone == nullptr) { deleteLater(); } else { - emit state->getZone()->cardAdded(this); + emit zone->cardAdded(this); } } - if (state->getZone() != nullptr) { - state->getZone()->reorganizeCards(); + if (zone != nullptr) { + zone->reorganizeCards(); } } @@ -219,23 +217,28 @@ void CardItem::setAttachedTo(CardItem *_attachedTo) */ void CardItem::resetState(bool keepAnnotations) { - state->resetState(keepAnnotations); + attacking = false; + counters.clear(); + pt.clear(); + if (!keepAnnotations) { + annotation.clear(); + } + attachedTo = 0; attachedCards.clear(); setTapped(false, false); setDoesntUntap(false); - if (scene()) { + if (scene()) static_cast(scene())->unregisterAnimationItem(this); - } update(); } void CardItem::processCardInfo(const ServerInfo_Card &_info) { - state->clearCounters(); + counters.clear(); const int counterListSize = _info.counter_list_size(); for (int i = 0; i < counterListSize; ++i) { const ServerInfo_CardCounter &counterInfo = _info.counter_list(i); - state->insertCounter(counterInfo.id(), counterInfo.value()); + counters.insert(counterInfo.id(), counterInfo.value()); } setId(_info.id()); @@ -272,12 +275,11 @@ void CardItem::deleteDragItem() void CardItem::drawArrow(const QColor &arrowColor) { - if (owner->getGame()->getPlayerManager()->isSpectator()) { + if (owner->getGame()->getPlayerManager()->isSpectator()) return; - } auto *game = owner->getGame(); - PlayerLogic *arrowOwner = game->getPlayerManager()->getActiveLocalPlayer(game->getGameState()->getActivePlayer()); + Player *arrowOwner = game->getPlayerManager()->getActiveLocalPlayer(game->getGameState()->getActivePlayer()); int phase = 0; // 0 means to not set the phase if (SettingsCache::instance().getDoNotDeleteArrowsInSubPhases()) { int currentPhase = game->getGameState()->getCurrentPhase(); @@ -289,12 +291,10 @@ void CardItem::drawArrow(const QColor &arrowColor) for (const auto &item : scene()->selectedItems()) { CardItem *card = qgraphicsitem_cast(item); - if (card == nullptr || card == this) { + if (card == nullptr || card == this) continue; - } - if (card->getZone() != state->getZone()) { + if (card->getZone() != zone) continue; - } ArrowDragItem *childArrow = new ArrowDragItem(arrowOwner, card, arrowColor, phase); scene()->addItem(childArrow); @@ -304,9 +304,8 @@ void CardItem::drawArrow(const QColor &arrowColor) void CardItem::drawAttachArrow() { - if (owner->getGame()->getPlayerManager()->isSpectator()) { + if (owner->getGame()->getPlayerManager()->isSpectator()) return; - } auto *arrow = new ArrowAttachItem(this); scene()->addItem(arrow); @@ -314,12 +313,10 @@ void CardItem::drawAttachArrow() for (const auto &item : scene()->selectedItems()) { CardItem *card = qgraphicsitem_cast(item); - if (card == nullptr) { + if (card == nullptr) continue; - } - if (card->getZone() != state->getZone()) { + if (card->getZone() != zone) continue; - } ArrowAttachItem *childArrow = new ArrowAttachItem(card); scene()->addItem(childArrow); @@ -331,32 +328,27 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { if (event->buttons().testFlag(Qt::RightButton)) { if ((event->screenPos() - event->buttonDownScreenPos(Qt::RightButton)).manhattanLength() < - 2 * QApplication::startDragDistance()) { + 2 * QApplication::startDragDistance()) return; - } QColor arrowColor = Qt::red; - if (event->modifiers().testFlag(Qt::ControlModifier)) { + if (event->modifiers().testFlag(Qt::ControlModifier)) arrowColor = Qt::yellow; - } else if (event->modifiers().testFlag(Qt::AltModifier)) { + else if (event->modifiers().testFlag(Qt::AltModifier)) arrowColor = Qt::blue; - } else if (event->modifiers().testFlag(Qt::ShiftModifier)) { + else if (event->modifiers().testFlag(Qt::ShiftModifier)) arrowColor = Qt::green; - } drawArrow(arrowColor); } else if (event->buttons().testFlag(Qt::LeftButton)) { if ((event->screenPos() - event->buttonDownScreenPos(Qt::LeftButton)).manhattanLength() < - 2 * QApplication::startDragDistance()) { + 2 * QApplication::startDragDistance()) return; - } - if (const ZoneViewZoneLogic *view = qobject_cast(state->getZone())) { - if (view->getRevealZone() && !view->getWriteableRevealZone()) { + if (const ZoneViewZoneLogic *view = qobject_cast(zone)) { + if (view->getRevealZone() && !view->getWriteableRevealZone()) return; - } - } else if (!owner->getPlayerInfo()->getLocalOrJudge()) { + } else if (!owner->getPlayerInfo()->getLocalOrJudge()) return; - } bool forceFaceDown = event->modifiers().testFlag(Qt::ShiftModifier); @@ -368,16 +360,14 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) int childIndex = 0; for (const auto &item : scene()->selectedItems()) { CardItem *card = static_cast(item); - if ((card == this) || (card->getZone() != state->getZone())) { + if ((card == this) || (card->getZone() != zone)) continue; - } ++childIndex; QPointF childPos; - if (state->getZone()->getHasCardAttr()) { + if (zone->getHasCardAttr()) childPos = card->pos() - pos(); - } else { + else childPos = QPointF(childIndex * CardDimensions::WIDTH_HALF_F, 0); - } CardDragItem *drag = new CardDragItem(card, card->getId(), childPos, card->getFaceDown() || forceFaceDown, dragItem); drag->setPos(dragItem->pos() + childPos); @@ -390,57 +380,22 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) void CardItem::playCard(bool faceDown) { // Do nothing if the card belongs to another player - if (!owner->getPlayerInfo()->getLocalOrJudge()) { + if (!owner->getPlayerInfo()->getLocalOrJudge()) return; - } - TableZoneLogic *tz = qobject_cast(state->getZone()); - if (tz) { + TableZoneLogic *tz = qobject_cast(zone); + if (tz) emit tz->toggleTapped(); - } else { + else { if (SettingsCache::instance().getClickPlaysAllSelected()) { - if (faceDown) { - emit playSelectedFaceDown(this); - } else { - emit playSelected(this); - } + faceDown ? zone->getPlayer()->getPlayerActions()->actPlayFacedown() + : zone->getPlayer()->getPlayerActions()->actPlay(); } else { - state->getZone()->getPlayer()->getPlayerActions()->playCard(this, faceDown); + zone->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. @@ -461,11 +416,11 @@ static bool isUnwritableRevealZone(CardZoneLogic *zone) */ void CardItem::handleClickedToPlay(bool shiftHeld) { - if (isUnwritableRevealZone(state->getZone())) { + if (isUnwritableRevealZone(zone)) { if (SettingsCache::instance().getClickPlaysAllSelected()) { - emit hideSelected(this); + zone->getPlayer()->getPlayerActions()->actHide(); } else { - state->getZone()->removeCard(this); + zone->removeCard(this); } } else { playCard(shiftHeld); @@ -474,15 +429,21 @@ void CardItem::handleClickedToPlay(bool shiftHeld) void CardItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { - if (event->button() == Qt::RightButton && owner != nullptr) { - emit rightClicked(this, event->screenPos()); - return; - } - if ((event->modifiers() != Qt::AltModifier) && (event->button() == Qt::LeftButton) && - (!SettingsCache::instance().getDoubleClickToPlay())) { + if (event->button() == Qt::RightButton) { + + if (owner != nullptr) { + owner->getGame()->setActiveCard(this); + if (QMenu *cardMenu = owner->getPlayerMenu()->updateCardMenu(this)) { + cardMenu->popup(event->screenPos()); + return; + } + } + } else if ((event->modifiers() != Qt::AltModifier) && (event->button() == Qt::LeftButton) && + (!SettingsCache::instance().getDoubleClickToPlay())) { handleClickedToPlay(event->modifiers().testFlag(Qt::ShiftModifier)); } - if (owner != nullptr) { + + if (owner != nullptr) { // cards without owner will be deleted setCursor(Qt::OpenHandCursor); } AbstractCardItem::mouseReleaseEvent(event); @@ -501,9 +462,8 @@ bool CardItem::animationEvent() { int rotation = ROTATION_DEGREES_PER_FRAME; bool animationIncomplete = true; - if (!tapped) { + if (!tapped) rotation *= -1; - } tapAngle += rotation; if (tapped && (tapAngle > 90)) { @@ -528,14 +488,14 @@ bool CardItem::animationEvent() QVariant CardItem::itemChange(GraphicsItemChange change, const QVariant &value) { if ((change == ItemSelectedHasChanged) && owner != nullptr) { - bool selected = value.toBool(); - - if (selected) { + if (value == true) { owner->getGame()->setActiveCard(this); + owner->getPlayerMenu()->updateCardMenu(this); + } else if (owner->getGameScene()->selectedItems().isEmpty()) { + + owner->getGame()->setActiveCard(nullptr); + owner->getPlayerMenu()->updateCardMenu(nullptr); } - - emit selectionChanged(this, selected); } - return AbstractCardItem::itemChange(change, value); -} \ No newline at end of file +} diff --git a/cockatrice/src/game_graphics/board/card_item.h b/cockatrice/src/game/board/card_item.h similarity index 65% rename from cockatrice/src/game_graphics/board/card_item.h rename to cockatrice/src/game/board/card_item.h index 37f3bab50..da2097a2c 100644 --- a/cockatrice/src/game_graphics/board/card_item.h +++ b/cockatrice/src/game/board/card_item.h @@ -1,14 +1,13 @@ /** * @file card_item.h * @ingroup GameGraphicsCards + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARDITEM_H #define CARDITEM_H -#include "../../game/board/card_state.h" -#include "../../game/zones/card_zone_logic.h" +#include "../zones/logic/card_zone_logic.h" #include "abstract_card_item.h" #include @@ -17,20 +16,27 @@ class CardDatabase; class CardDragItem; class CardZone; class ServerInfo_Card; -class PlayerLogic; +class Player; class QAction; class QColor; +const int MAX_COUNTERS_ON_CARD = 999; const int ROTATION_DEGREES_PER_FRAME = 10; class CardItem : public AbstractCardItem { Q_OBJECT private: - CardState *state; - + CardZoneLogic *zone; + bool attacking; + QMap counters; + QString annotation; + QString pt; + bool destroyOnZoneChange; + bool doesntUntap; QPoint gridPoint; CardDragItem *dragItem; + CardItem *attachedTo; QList attachedCards; void prepareDelete(); @@ -47,20 +53,16 @@ public: { return Type; } - explicit CardItem(PlayerLogic *_owner, + explicit CardItem(Player *_owner, QGraphicsItem *parent = nullptr, const CardRef &cardRef = {}, int _cardid = -1, CardZoneLogic *_zone = nullptr); void retranslateUi(); - [[nodiscard]] CardState *getState() const - { - return state; - } [[nodiscard]] CardZoneLogic *getZone() const { - return state->getZone(); + return zone; } void setZone(CardZoneLogic *_zone); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; @@ -76,50 +78,50 @@ public: { return gridPoint; } - [[nodiscard]] PlayerLogic *getOwner() const + [[nodiscard]] Player *getOwner() const { return owner; } - void setOwner(PlayerLogic *_owner) + void setOwner(Player *_owner) { owner = _owner; } [[nodiscard]] bool getAttacking() const { - return state->getAttacking(); + return attacking; } void setAttacking(bool _attacking); [[nodiscard]] const QMap &getCounters() const { - return state->getCounters(); + return counters; } void setCounter(int _id, int _value); [[nodiscard]] QString getAnnotation() const { - return state->getAnnotation(); + return annotation; } void setAnnotation(const QString &_annotation); [[nodiscard]] bool getDoesntUntap() const { - return state->getDoesntUntap(); + return doesntUntap; } void setDoesntUntap(bool _doesntUntap); [[nodiscard]] QString getPT() const { - return state->getPT(); + return pt; } void setPT(const QString &_pt); [[nodiscard]] bool getDestroyOnZoneChange() const { - return state->getDestroyOnZoneChange(); + return destroyOnZoneChange; } void setDestroyOnZoneChange(bool _destroy) { - state->setDestroyOnZoneChange(_destroy); + destroyOnZoneChange = _destroy; } [[nodiscard]] CardItem *getAttachedTo() const { - return state->getAttachedTo(); + return attachedTo; } void setAttachedTo(CardItem *_attachedTo); void addAttachedCard(CardItem *card) @@ -144,26 +146,6 @@ 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/board/card_list.cpp b/cockatrice/src/game/board/card_list.cpp index 0080b5ae6..c324ca10a 100644 --- a/cockatrice/src/game/board/card_list.cpp +++ b/cockatrice/src/game/board/card_list.cpp @@ -1,6 +1,6 @@ #include "card_list.h" -#include "../../game_graphics/board/card_item.h" +#include "card_item.h" #include #include diff --git a/cockatrice/src/game/board/card_list.h b/cockatrice/src/game/board/card_list.h index 85a6848b7..07be33b32 100644 --- a/cockatrice/src/game/board/card_list.h +++ b/cockatrice/src/game/board/card_list.h @@ -1,8 +1,8 @@ /** * @file card_list.h * @ingroup GameLogicCards + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARDLIST_H #define CARDLIST_H diff --git a/cockatrice/src/game/board/card_state.cpp b/cockatrice/src/game/board/card_state.cpp deleted file mode 100644 index 4319400d7..000000000 --- a/cockatrice/src/game/board/card_state.cpp +++ /dev/null @@ -1,111 +0,0 @@ -#include "card_state.h" - -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 deleted file mode 100644 index 0498b1aa2..000000000 --- a/cockatrice/src/game/board/card_state.h +++ /dev/null @@ -1,103 +0,0 @@ -#ifndef COCKATRICE_CARD_STATE_H -#define COCKATRICE_CARD_STATE_H - -#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/cockatrice/src/game_graphics/board/counter_general.cpp b/cockatrice/src/game/board/counter_general.cpp similarity index 65% rename from cockatrice/src/game_graphics/board/counter_general.cpp rename to cockatrice/src/game/board/counter_general.cpp index 379c6f837..d68486a1b 100644 --- a/cockatrice/src/game_graphics/board/counter_general.cpp +++ b/cockatrice/src/game/board/counter_general.cpp @@ -1,12 +1,19 @@ #include "counter_general.h" +#include "../../game_graphics/board/abstract_graphics_item.h" #include "../../interface/pixel_map_generator.h" -#include "abstract_graphics_item.h" #include -GeneralCounter::GeneralCounter(CounterState *state, PlayerLogic *player, bool useNameForShortcut, QGraphicsItem *parent) - : AbstractCounter(state, player, true, useNameForShortcut, parent) +GeneralCounter::GeneralCounter(Player *_player, + int _id, + const QString &_name, + const QColor &_color, + int _radius, + int _value, + bool useNameForShortcut, + QGraphicsItem *parent) + : AbstractCounter(_player, _id, _name, true, _value, useNameForShortcut, parent), color(_color), radius(_radius) { setCacheMode(DeviceCoordinateCache); } diff --git a/cockatrice/src/game_graphics/board/counter_general.h b/cockatrice/src/game/board/counter_general.h similarity index 62% rename from cockatrice/src/game_graphics/board/counter_general.h rename to cockatrice/src/game/board/counter_general.h index 0a2e882ce..3db1d7bb4 100644 --- a/cockatrice/src/game_graphics/board/counter_general.h +++ b/cockatrice/src/game/board/counter_general.h @@ -1,8 +1,8 @@ /** * @file counter_general.h * @ingroup GameGraphicsPlayers + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COUNTER_GENERAL_H #define COUNTER_GENERAL_H @@ -12,10 +12,17 @@ class GeneralCounter : public AbstractCounter { Q_OBJECT +private: + QColor color; + int radius; public: - GeneralCounter(CounterState *state, - PlayerLogic *player, + GeneralCounter(Player *_player, + int _id, + const QString &_name, + const QColor &_color, + int _radius, + int _value, bool useNameForShortcut = false, QGraphicsItem *parent = nullptr); QRectF boundingRect() const override; diff --git a/cockatrice/src/game/board/counter_state.cpp b/cockatrice/src/game/board/counter_state.cpp deleted file mode 100644 index 6da18b662..000000000 --- a/cockatrice/src/game/board/counter_state.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include "counter_state.h" - -#include - -CounterState::CounterState(int id, const QString &name, const QColor &color, int radius, int value, QObject *parent) - : QObject(parent), id(id), name(name), color(color), radius(radius), value(value) -{ -} - -CounterState *CounterState::fromProto(const ServerInfo_Counter &counter, QObject *parent) -{ - return new CounterState(counter.id(), QString::fromStdString(counter.name()), - convertColorToQColor(counter.counter_color()), counter.radius(), counter.count(), parent); -} - -void CounterState::setValue(int newValue) -{ - if (newValue == value) { - return; - } - int old = value; - value = newValue; - emit valueChanged(old, newValue); -} \ No newline at end of file diff --git a/cockatrice/src/game/board/counter_state.h b/cockatrice/src/game/board/counter_state.h deleted file mode 100644 index 0f2f16b55..000000000 --- a/cockatrice/src/game/board/counter_state.h +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef COCKATRICE_COUNTER_STATE_H -#define COCKATRICE_COUNTER_STATE_H - -#include -#include -#include -#include - -class CounterState : public QObject -{ - Q_OBJECT -public: - CounterState(int id, const QString &name, const QColor &color, int radius, int value, QObject *parent = nullptr); - - static CounterState *fromProto(const ServerInfo_Counter &counter, QObject *parent = nullptr); - - int getId() const - { - return id; - } - QString getName() const - { - return name; - } - QColor getColor() const - { - return color; - } - int getRadius() const - { - return radius; - } - int getValue() const - { - return value; - } - - void setValue(int newValue); - -signals: - void valueChanged(int oldValue, int newValue); - -private: - int id; - QString name; - QColor color; - int radius; - int value; -}; - -#endif // COCKATRICE_COUNTER_STATE_H diff --git a/cockatrice/src/game_graphics/board/translate_counter_name.cpp b/cockatrice/src/game/board/translate_counter_name.cpp similarity index 100% rename from cockatrice/src/game_graphics/board/translate_counter_name.cpp rename to cockatrice/src/game/board/translate_counter_name.cpp diff --git a/cockatrice/src/game_graphics/board/translate_counter_name.h b/cockatrice/src/game/board/translate_counter_name.h similarity index 94% rename from cockatrice/src/game_graphics/board/translate_counter_name.h rename to cockatrice/src/game/board/translate_counter_name.h index ba3a94fa5..fdb277c11 100644 --- a/cockatrice/src/game_graphics/board/translate_counter_name.h +++ b/cockatrice/src/game/board/translate_counter_name.h @@ -1,8 +1,8 @@ /** * @file translate_counter_name.h * @ingroup GameGraphicsPlayers + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TRANSLATECOUNTERNAME_H #define TRANSLATECOUNTERNAME_H diff --git a/cockatrice/src/game_graphics/card_dimensions.h b/cockatrice/src/game/card_dimensions.h similarity index 76% rename from cockatrice/src/game_graphics/card_dimensions.h rename to cockatrice/src/game/card_dimensions.h index c59a01b48..255d0bc04 100644 --- a/cockatrice/src/game_graphics/card_dimensions.h +++ b/cockatrice/src/game/card_dimensions.h @@ -12,16 +12,16 @@ */ namespace CardDimensions { -/** @brief Card width in pixels. */ +/// Card width in pixels constexpr int WIDTH = 72; -/** @brief Card height in pixels. */ +/// Card height in pixels constexpr int HEIGHT = 102; -/** @brief Pre-converted for floating-point contexts (Z-value calculations). */ +/// Pre-converted for floating-point contexts (Z-value calculations) constexpr qreal WIDTH_F = static_cast(WIDTH); constexpr qreal HEIGHT_F = static_cast(HEIGHT); -/** @brief Half-dimensions for centering and rotation transforms. */ +/// Half-dimensions for centering and rotation transforms constexpr qreal WIDTH_HALF_F = WIDTH_F / 2; constexpr qreal HEIGHT_HALF_F = HEIGHT_F / 2; } // namespace CardDimensions diff --git a/cockatrice/src/game_graphics/deckview/deck_view.cpp b/cockatrice/src/game/deckview/deck_view.cpp similarity index 90% rename from cockatrice/src/game_graphics/deckview/deck_view.cpp rename to cockatrice/src/game/deckview/deck_view.cpp index a5d0fa3bc..620dfaa5f 100644 --- a/cockatrice/src/game_graphics/deckview/deck_view.cpp +++ b/cockatrice/src/game/deckview/deck_view.cpp @@ -24,21 +24,17 @@ void DeckViewCardDragItem::updatePosition(const QPointF &cursorScenePos) QList colliding = scene()->items(cursorScenePos); DeckViewCardContainer *cursorZone = 0; - for (int i = colliding.size() - 1; i >= 0; i--) { - if ((cursorZone = qgraphicsitem_cast(colliding.at(i)))) { + for (int i = colliding.size() - 1; i >= 0; i--) + if ((cursorZone = qgraphicsitem_cast(colliding.at(i)))) break; - } - } - if (!cursorZone) { + if (!cursorZone) return; - } currentZone = cursorZone; QPointF newPos = cursorScenePos; if (newPos != pos()) { - for (int i = 0; i < childDrags.size(); i++) { + for (int i = 0; i < childDrags.size(); i++) childDrags[i]->setPos(newPos + childDrags[i]->getHotSpot()); - } setPos(newPos); } } @@ -108,13 +104,11 @@ void DeckViewCard::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti void DeckViewCard::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { if ((event->screenPos() - event->buttonDownScreenPos(Qt::LeftButton)).manhattanLength() < - 2 * QApplication::startDragDistance()) { + 2 * QApplication::startDragDistance()) return; - } - if (static_cast(scene())->getLocked()) { + if (static_cast(scene())->getLocked()) return; - } delete dragItem; dragItem = new DeckViewCardDragItem(this, event->pos()); @@ -126,9 +120,8 @@ void DeckViewCard::mouseMoveEvent(QGraphicsSceneMouseEvent *event) int j = 0; for (int i = 0; i < sel.size(); i++) { auto *c = static_cast(sel.at(i)); - if (c == this) { + if (c == this) continue; - } ++j; auto childPos = QPointF(j * CardDimensions::WIDTH_HALF_F, 0); auto *drag = new DeckViewCardDragItem(c, childPos, dragItem); @@ -140,9 +133,8 @@ void DeckViewCard::mouseMoveEvent(QGraphicsSceneMouseEvent *event) void DeckView::mouseDoubleClickEvent(QMouseEvent *event) { - if (static_cast(scene())->getLocked()) { + if (static_cast(scene())->getLocked()) return; - } if (event->button() == Qt::LeftButton) { QList result; @@ -155,13 +147,12 @@ void DeckView::mouseDoubleClickEvent(QMouseEvent *event) m.set_card_name(c->getName().toStdString()); m.set_start_zone(zone->getName().toStdString()); - if (zone->getName() == DECK_ZONE_MAIN) { + if (zone->getName() == DECK_ZONE_MAIN) m.set_target_zone(DECK_ZONE_SIDE); - } else if (zone->getName() == DECK_ZONE_SIDE) { + else if (zone->getName() == DECK_ZONE_SIDE) m.set_target_zone(DECK_ZONE_MAIN); - } else { // Trying to move from another zone + else // Trying to move from another zone m.set_target_zone(zone->getName().toStdString()); - } result.append(m); } @@ -241,9 +232,8 @@ QList> DeckViewCardContainer::getRowsAndCols() const { QList> result; QList cardTypeList = cardsByType.uniqueKeys(); - for (int i = 0; i < cardTypeList.size(); ++i) { + for (int i = 0; i < cardTypeList.size(); ++i) result.append(QPair(1, cardsByType.count(cardTypeList[i]))); - } return result; } @@ -272,9 +262,8 @@ QSizeF DeckViewCardContainer::calculateBoundingRect(const QList> // Calculate space needed for cards for (int i = 0; i < rowsAndCols.size(); ++i) { totalHeight += CardDimensions::HEIGHT_F * rowsAndCols[i].first + paddingY; - if (CardDimensions::WIDTH_F * rowsAndCols[i].second > totalWidth) { + if (CardDimensions::WIDTH_F * rowsAndCols[i].second > totalWidth) totalWidth = CardDimensions::WIDTH_F * rowsAndCols[i].second; - } } return QSizeF(getCardTypeTextWidth() + totalWidth, totalHeight + separatorY + paddingY); @@ -282,9 +271,8 @@ QSizeF DeckViewCardContainer::calculateBoundingRect(const QList> bool DeckViewCardContainer::sortCardsByName(DeckViewCard *c1, DeckViewCard *c2) { - if (c1 && c2) { + if (c1 && c2) return c1->getName() < c2->getName(); - } return false; } @@ -334,17 +322,15 @@ DeckViewScene::~DeckViewScene() void DeckViewScene::clearContents() { QMapIterator i(cardContainers); - while (i.hasNext()) { + while (i.hasNext()) delete i.next().value(); - } cardContainers.clear(); } void DeckViewScene::setDeck(const DeckList &_deck) { - if (deck) { + if (deck) delete deck; - } deck = new DeckList(_deck.writeToString_Native()); rebuildTree(); @@ -356,19 +342,8 @@ void DeckViewScene::rebuildTree() { clearContents(); - if (!deck) { + if (!deck) return; - } - - QStringList requiredZones = {DECK_ZONE_MAIN, DECK_ZONE_SIDE}; - - for (const QString &zoneName : requiredZones) { - if (!cardContainers.contains(zoneName)) { - auto *container = new DeckViewCardContainer(zoneName); - cardContainers.insert(zoneName, container); - addItem(container); - } - } for (auto *currentZone : deck->getZoneNodes()) { DeckViewCardContainer *container = cardContainers.value(currentZone->getName(), 0); @@ -380,9 +355,8 @@ void DeckViewScene::rebuildTree() for (int j = 0; j < currentZone->size(); j++) { auto *currentCard = dynamic_cast(currentZone->at(j)); - if (!currentCard) { + if (!currentCard) continue; - } for (int k = 0; k < currentCard->getNumber(); ++k) { auto *newCard = new DeckViewCard(container, currentCard->toCardRef(), currentZone->getName()); @@ -399,21 +373,18 @@ void DeckViewScene::applySideboardPlan(const QList &plan) const MoveCard_ToZone &m = plan[i]; DeckViewCardContainer *start = cardContainers.value(QString::fromStdString(m.start_zone())); DeckViewCardContainer *target = cardContainers.value(QString::fromStdString(m.target_zone())); - if (!start || !target) { + if (!start || !target) continue; - } DeckViewCard *card = 0; const QList &cardList = start->getCards(); - for (int j = 0; j < cardList.size(); ++j) { + for (int j = 0; j < cardList.size(); ++j) if (cardList[j]->getName() == QString::fromStdString(m.card_name())) { card = cardList[j]; break; } - } - if (!card) { + if (!card) continue; - } start->removeCard(card); target->addCard(card); @@ -434,9 +405,8 @@ void DeckViewScene::rearrangeItems() rowsAndColsList.append(rowsAndCols); cardCountList.append(QList()); - for (int j = 0; j < rowsAndCols.size(); ++j) { + for (int j = 0; j < rowsAndCols.size(); ++j) cardCountList[i].append(rowsAndCols[j].second); - } } qreal totalHeight, totalWidth; @@ -447,27 +417,23 @@ void DeckViewScene::rearrangeItems() for (int i = 0; i < contList.size(); ++i) { QSizeF contSize = contList[i]->calculateBoundingRect(rowsAndColsList[i]); totalHeight += contSize.height() + spacing; - if (contSize.width() > totalWidth) { + if (contSize.width() > totalWidth) totalWidth = contSize.width(); - } } // We're done when the aspect ratio shifts from too high to too low. - if (totalWidth / totalHeight <= optimalAspectRatio) { + if (totalWidth / totalHeight <= optimalAspectRatio) break; - } // Find category with highest column count int maxIndex1 = -1, maxIndex2 = -1, maxCols = 0; - for (int i = 0; i < rowsAndColsList.size(); ++i) { - for (int j = 0; j < rowsAndColsList[i].size(); ++j) { + for (int i = 0; i < rowsAndColsList.size(); ++i) + for (int j = 0; j < rowsAndColsList[i].size(); ++j) if (rowsAndColsList[i][j].second > maxCols) { maxIndex1 = i; maxIndex2 = j; maxCols = rowsAndColsList[i][j].second; } - } - } // Add row to category const int maxRows = rowsAndColsList[maxIndex1][maxIndex2].first; @@ -485,9 +451,8 @@ void DeckViewScene::rearrangeItems() } totalWidth = totalHeight * optimalAspectRatio; - for (int i = 0; i < contList.size(); ++i) { + for (int i = 0; i < contList.size(); ++i) contList[i]->setWidth(totalWidth); - } setSceneRect(QRectF(0, 0, totalWidth, totalHeight)); } @@ -505,7 +470,7 @@ QList DeckViewScene::getSideboardPlan() const while (containerIterator.hasNext()) { DeckViewCardContainer *cont = containerIterator.next().value(); const QList cardList = cont->getCards(); - for (int i = 0; i < cardList.size(); ++i) { + for (int i = 0; i < cardList.size(); ++i) if (cardList[i]->getOriginZone() != cont->getName()) { MoveCard_ToZone m; m.set_card_name(cardList[i]->getName().toStdString()); @@ -513,7 +478,6 @@ QList DeckViewScene::getSideboardPlan() const m.set_target_zone(cont->getName().toStdString()); result.append(m); } - } } return result; } diff --git a/cockatrice/src/game_graphics/deckview/deck_view.h b/cockatrice/src/game/deckview/deck_view.h similarity index 99% rename from cockatrice/src/game_graphics/deckview/deck_view.h rename to cockatrice/src/game/deckview/deck_view.h index f996fd4da..5abc558bd 100644 --- a/cockatrice/src/game_graphics/deckview/deck_view.h +++ b/cockatrice/src/game/deckview/deck_view.h @@ -1,8 +1,8 @@ /** * @file deck_view.h * @ingroup Lobby + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DECKVIEW_H #define DECKVIEW_H diff --git a/cockatrice/src/game_graphics/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp similarity index 98% rename from cockatrice/src/game_graphics/deckview/deck_view_container.cpp rename to cockatrice/src/game/deckview/deck_view_container.cpp index d476a5012..44b2be6d1 100644 --- a/cockatrice/src/game_graphics/deckview/deck_view_container.cpp +++ b/cockatrice/src/game/deckview/deck_view_container.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include ToggleButton::ToggleButton(QWidget *parent) : QPushButton(parent), state(false) { @@ -209,7 +209,6 @@ void DeckViewContainer::refreshShortcuts() loadLocalButton->setShortcut(shortcuts.getSingleShortcut("DeckViewContainer/loadLocalButton")); loadRemoteButton->setShortcut(shortcuts.getSingleShortcut("DeckViewContainer/loadRemoteButton")); loadFromClipboardButton->setShortcut(shortcuts.getSingleShortcut("DeckViewContainer/loadFromClipboardButton")); - loadFromWebsiteButton->setShortcut(shortcuts.getSingleShortcut("DeckViewContainer/loadFromWebsiteButton")); unloadDeckButton->setShortcut(shortcuts.getSingleShortcut("DeckViewContainer/unloadDeckButton")); readyStartButton->setShortcut(shortcuts.getSingleShortcut("DeckViewContainer/readyStartButton")); sideboardLockButton->setShortcut(shortcuts.getSingleShortcut("DeckViewContainer/sideboardLockButton")); @@ -252,9 +251,8 @@ void DeckViewContainer::unloadDeck() void DeckViewContainer::loadLocalDeck() { DlgLoadDeck dialog(this); - if (!dialog.exec()) { + if (!dialog.exec()) return; - } loadDeckFromFile(dialog.selectedFiles().at(0)); } @@ -366,9 +364,8 @@ void DeckViewContainer::sideboardPlanChanged() { Command_SetSideboardPlan cmd; const QList &newPlan = deckView->getSideboardPlan(); - for (const auto &i : newPlan) { + for (const auto &i : newPlan) cmd.add_move_list()->CopyFrom(i); - } parentGame->getGame()->getGameEventHandler()->sendGameCommand(cmd, playerId); } @@ -407,9 +404,8 @@ void DeckViewContainer::setSideboardLocked(bool locked) { sideboardLockButton->setState(!locked); deckView->setLocked(readyStartButton->getState() || !sideboardLockButton->getState()); - if (locked) { + if (locked) deckView->resetSideboardPlan(); - } } void DeckViewContainer::setDeck(const DeckList &deck) diff --git a/cockatrice/src/game_graphics/deckview/deck_view_container.h b/cockatrice/src/game/deckview/deck_view_container.h similarity index 98% rename from cockatrice/src/game_graphics/deckview/deck_view_container.h rename to cockatrice/src/game/deckview/deck_view_container.h index ec024bace..6d685cd79 100644 --- a/cockatrice/src/game_graphics/deckview/deck_view_container.h +++ b/cockatrice/src/game/deckview/deck_view_container.h @@ -1,8 +1,8 @@ /** * @file deck_view_container.h * @ingroup Lobby + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DECK_VIEW_CONTAINER_H #define DECK_VIEW_CONTAINER_H diff --git a/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp b/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp similarity index 100% rename from cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp rename to cockatrice/src/game/deckview/tabbed_deck_view_container.cpp diff --git a/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.h b/cockatrice/src/game/deckview/tabbed_deck_view_container.h similarity index 95% rename from cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.h rename to cockatrice/src/game/deckview/tabbed_deck_view_container.h index 7cfa8c9aa..c34eef1ef 100644 --- a/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.h +++ b/cockatrice/src/game/deckview/tabbed_deck_view_container.h @@ -1,8 +1,8 @@ /** * @file tabbed_deck_view_container.h * @ingroup Lobby + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TABBED_DECK_VIEW_CONTAINER_H #define TABBED_DECK_VIEW_CONTAINER_H diff --git a/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp b/cockatrice/src/game/dialogs/dlg_create_token.cpp similarity index 98% rename from cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp rename to cockatrice/src/game/dialogs/dlg_create_token.cpp index 1a9dc59b2..df264f065 100644 --- a/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp +++ b/cockatrice/src/game/dialogs/dlg_create_token.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *parent) : QDialog(parent), predefinedTokens(_predefinedTokens) @@ -101,9 +101,8 @@ DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *pa chooseTokenView->resizeColumnToContents(0); chooseTokenView->setWordWrap(true); - if (!deckHeaderState.isNull()) { + if (!deckHeaderState.isNull()) chooseTokenView->header()->restoreState(deckHeaderState); - } chooseTokenView->header()->setStretchLastSection(false); chooseTokenView->header()->hideSection(1); // Sets @@ -186,9 +185,8 @@ void DlgCreateToken::tokenSelectionChanged(const QModelIndex ¤t, const QMo const QChar cardColor = cardInfo->getColorChar(); colorEdit->setCurrentIndex(colorEdit->findData(cardColor, Qt::UserRole, Qt::MatchFixedString)); ptEdit->setText(cardInfo->getPowTough()); - if (SettingsCache::instance().getAnnotateTokens()) { + if (SettingsCache::instance().getAnnotateTokens()) annotationEdit->setText(cardInfo->getText()); - } } else { nameEdit->setText(""); colorEdit->setCurrentIndex(colorEdit->findData(QString(), Qt::UserRole, Qt::MatchFixedString)); diff --git a/cockatrice/src/game_graphics/dialogs/dlg_create_token.h b/cockatrice/src/game/dialogs/dlg_create_token.h similarity index 98% rename from cockatrice/src/game_graphics/dialogs/dlg_create_token.h rename to cockatrice/src/game/dialogs/dlg_create_token.h index 281e161fc..9a18f1a57 100644 --- a/cockatrice/src/game_graphics/dialogs/dlg_create_token.h +++ b/cockatrice/src/game/dialogs/dlg_create_token.h @@ -1,8 +1,8 @@ /** * @file dlg_create_token.h * @ingroup GameDialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_CREATETOKEN_H #define DLG_CREATETOKEN_H diff --git a/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.cpp b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp similarity index 100% rename from cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.cpp rename to cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp diff --git a/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.h similarity index 97% rename from cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h rename to cockatrice/src/game/dialogs/dlg_move_top_cards_until.h index ac9d41a94..20ba11c5c 100644 --- a/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h +++ b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.h @@ -1,8 +1,8 @@ /** * @file dlg_move_top_cards_until.h * @ingroup GameDialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_MOVE_TOP_CARDS_UNTIL_H #define DLG_MOVE_TOP_CARDS_UNTIL_H diff --git a/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.cpp b/cockatrice/src/game/dialogs/dlg_roll_dice.cpp similarity index 97% rename from cockatrice/src/game_graphics/dialogs/dlg_roll_dice.cpp rename to cockatrice/src/game/dialogs/dlg_roll_dice.cpp index 4f5d5b861..dfb3d0bc5 100644 --- a/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.cpp +++ b/cockatrice/src/game/dialogs/dlg_roll_dice.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include DlgRollDice::DlgRollDice(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.h b/cockatrice/src/game/dialogs/dlg_roll_dice.h similarity index 95% rename from cockatrice/src/game_graphics/dialogs/dlg_roll_dice.h rename to cockatrice/src/game/dialogs/dlg_roll_dice.h index 15f7dc1ba..69edd0757 100644 --- a/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.h +++ b/cockatrice/src/game/dialogs/dlg_roll_dice.h @@ -1,8 +1,8 @@ /** * @file dlg_roll_dice.h * @ingroup GameDialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_ROLL_DICE_H #define DLG_ROLL_DICE_H diff --git a/cockatrice/src/game/game.cpp b/cockatrice/src/game/game.cpp index 4c8b109c2..38477f7f7 100644 --- a/cockatrice/src/game/game.cpp +++ b/cockatrice/src/game/game.cpp @@ -4,16 +4,16 @@ #include -Game::Game(QObject *_parent, - bool isLocalGame, +Game::Game(TabGame *_tab, QList &_clients, const Event_GameJoined &event, const QMap &_roomGameTypes) - : AbstractGame(_parent) + : AbstractGame(_tab) { gameMetaInfo->setFromProto(event.game_info()); gameMetaInfo->setRoomGameTypes(_roomGameTypes); - gameState = new GameState(this, 0, event.host_id(), isLocalGame, _clients, false, event.resuming(), -1, false); + gameState = new GameState(this, 0, event.host_id(), tab->getTabSupervisor()->getIsLocalGame(), _clients, false, + event.resuming(), -1, false); connect(gameMetaInfo, &GameMetaInfo::startedChanged, gameState, &GameState::onStartedChanged); playerManager = new PlayerManager(this, event.player_id(), event.judge(), event.spectator()); gameMetaInfo->setStarted(false); diff --git a/cockatrice/src/game/game.h b/cockatrice/src/game/game.h index 4f912664c..96ebbae4d 100644 --- a/cockatrice/src/game/game.h +++ b/cockatrice/src/game/game.h @@ -1,8 +1,8 @@ /** * @file game.h * @ingroup GameLogic + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_GAME_H #define COCKATRICE_GAME_H @@ -16,8 +16,7 @@ class Game : public AbstractGame Q_OBJECT public: - Game(QObject *parent, - bool isLocalGame, + Game(TabGame *tab, QList &_clients, const Event_GameJoined &event, const QMap &_roomGameTypes); diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp index 4a96eebdb..42dd49458 100644 --- a/cockatrice/src/game/game_event_handler.cpp +++ b/cockatrice/src/game/game_event_handler.cpp @@ -1,8 +1,8 @@ #include "game_event_handler.h" -#include "../game_graphics/log/message_log_widget.h" #include "../interface/widgets/tabs/tab_game.h" #include "abstract_game.h" +#include "log/message_log_widget.h" #include #include @@ -36,9 +36,8 @@ GameEventHandler::GameEventHandler(AbstractGame *_game) : QObject(_game), game(_ void GameEventHandler::sendGameCommand(PendingCommand *pend, int playerId) { AbstractClient *client = game->getClientForPlayer(playerId); - if (!client) { + if (!client) return; - } connect(pend, &PendingCommand::finished, this, &GameEventHandler::commandFinished); client->sendCommand(pend); @@ -47,9 +46,8 @@ void GameEventHandler::sendGameCommand(PendingCommand *pend, int playerId) void GameEventHandler::sendGameCommand(const google::protobuf::Message &command, int playerId) { AbstractClient *client = game->getClientForPlayer(playerId); - if (!client) { + if (!client) return; - } PendingCommand *pend = prepareGameCommand(command); connect(pend, &PendingCommand::finished, this, &GameEventHandler::commandFinished); @@ -58,9 +56,8 @@ void GameEventHandler::sendGameCommand(const google::protobuf::Message &command, void GameEventHandler::commandFinished(const Response &response) { - if (response.response_code() == Response::RespChatFlood) { + if (response.response_code() == Response::RespChatFlood) emit gameFlooded(); - } } PendingCommand *GameEventHandler::prepareGameCommand(const ::google::protobuf::Message &cmd) @@ -99,7 +96,7 @@ void GameEventHandler::processGameEventContainer(const GameEventContainer &cont, if (cont.has_forced_by_judge()) { auto id = cont.forced_by_judge(); - PlayerLogic *judgep = game->getPlayerManager()->getPlayers().value(id, nullptr); + Player *judgep = game->getPlayerManager()->getPlayers().value(id, nullptr); if (judgep) { emit setContextJudgeName(judgep->getPlayerInfo()->getName()); } else if (game->getPlayerManager()->getSpectators().contains(id)) { @@ -120,11 +117,9 @@ void GameEventHandler::processGameEventContainer(const GameEventContainer &cont, break; } } else { - if ((game->getGameState()->getClients().size() > 1) && (playerId != -1)) { - if (game->getGameState()->getClients().at(playerId) != client) { + if ((game->getGameState()->getClients().size() > 1) && (playerId != -1)) + if (game->getGameState()->getClients().at(playerId) != client) continue; - } - } switch (eventType) { case GameEvent::GAME_STATE_CHANGED: @@ -160,7 +155,7 @@ void GameEventHandler::processGameEventContainer(const GameEventContainer &cont, break; default: { - PlayerLogic *player = game->getPlayerManager()->getPlayers().value(playerId, 0); + Player *player = game->getPlayerManager()->getPlayers().value(playerId, 0); if (!player) { qCWarning(GameEventHandlerLog) << "unhandled game event: invalid player id"; break; @@ -213,25 +208,11 @@ void GameEventHandler::handleChatMessageSent(const QString &chatMessage) sendGameCommand(cmd); } -void GameEventHandler::handleArrowDeletion(int creatorId, int arrowId) +void GameEventHandler::handleArrowDeletion(int arrowId) { Command_DeleteArrow cmd; cmd.set_arrow_id(arrowId); - - auto preparedCommand = prepareGameCommand(cmd); - - connect(preparedCommand, &PendingCommand::finished, this, [creatorId, arrowId, this](const Response &response) { - handleArrowDeletionFinished(response, creatorId, arrowId); - }); - - sendGameCommand(preparedCommand); -} - -void GameEventHandler::handleArrowDeletionFinished(const Response &response, int creatorId, int arrowId) -{ - if (response.response_code() == Response::RespNameNotFound) { - emit arrowDeleted(creatorId, arrowId); - } + sendGameCommand(cmd); } void GameEventHandler::eventSpectatorSay(const Event_GameSay &event, @@ -275,7 +256,7 @@ void GameEventHandler::eventGameStateChanged(const Event_GameStateChanged &event emit spectatorJoined(prop); } } else { - PlayerLogic *player = game->getPlayerManager()->getPlayers().value(playerId, 0); + Player *player = game->getPlayerManager()->getPlayers().value(playerId, 0); if (!player) { player = game->getPlayerManager()->addPlayer(playerId, prop.user_info()); emit playerJoined(prop); @@ -303,9 +284,8 @@ void GameEventHandler::eventGameStateChanged(const Event_GameStateChanged &event if (event.game_started() && !game->getGameMetaInfo()->started()) { game->getGameState()->setResuming(!game->getGameState()->isGameStateKnown()); game->getGameMetaInfo()->setStarted(event.game_started()); - if (game->getGameState()->isGameStateKnown()) { + if (game->getGameState()->isGameStateKnown()) emit logGameStart(); - } game->getGameState()->setActivePlayer(event.active_player_id()); game->getGameState()->setCurrentPhase(event.active_phase()); } else if (!event.game_started() && game->getGameMetaInfo()->started()) { @@ -324,10 +304,9 @@ void GameEventHandler::processCardAttachmentsForPlayers(const Event_GameStateCha const ServerInfo_Player &playerInfo = event.player_list(i); const ServerInfo_PlayerProperties &prop = playerInfo.properties(); if (!prop.spectator()) { - PlayerLogic *player = game->getPlayerManager()->getPlayers().value(prop.player_id(), 0); - if (!player) { + Player *player = game->getPlayerManager()->getPlayers().value(prop.player_id(), 0); + if (!player) continue; - } player->processCardAttachment(playerInfo); } } @@ -337,10 +316,9 @@ void GameEventHandler::eventPlayerPropertiesChanged(const Event_PlayerProperties int eventPlayerId, const GameEventContext &context) { - PlayerLogic *player = game->getPlayerManager()->getPlayers().value(eventPlayerId, 0); - if (!player) { + Player *player = game->getPlayerManager()->getPlayers().value(eventPlayerId, 0); + if (!player) return; - } const ServerInfo_PlayerProperties &prop = event.player_properties(); emit playerPropertiesChanged(prop, eventPlayerId); @@ -348,9 +326,8 @@ void GameEventHandler::eventPlayerPropertiesChanged(const Event_PlayerProperties switch (contextType) { case GameEventContext::READY_START: { bool ready = prop.ready_start(); - if (player->getPlayerInfo()->getLocal()) { + if (player->getPlayerInfo()->getLocal()) emit localPlayerReadyStateChanged(player->getPlayerInfo()->getId(), ready); - } if (ready) { emit logReadyStart(player); } else { @@ -361,10 +338,9 @@ void GameEventHandler::eventPlayerPropertiesChanged(const Event_PlayerProperties case GameEventContext::CONCEDE: { player->setConceded(true); - QMapIterator playerIterator(game->getPlayerManager()->getPlayers()); - while (playerIterator.hasNext()) { + QMapIterator playerIterator(game->getPlayerManager()->getPlayers()); + while (playerIterator.hasNext()) playerIterator.next().value()->updateZones(); - } emit logConcede(eventPlayerId); @@ -373,10 +349,9 @@ void GameEventHandler::eventPlayerPropertiesChanged(const Event_PlayerProperties case GameEventContext::UNCONCEDE: { player->setConceded(false); - QMapIterator playerIterator(game->getPlayerManager()->getPlayers()); - while (playerIterator.hasNext()) { + QMapIterator playerIterator(game->getPlayerManager()->getPlayers()); + while (playerIterator.hasNext()) playerIterator.next().value()->updateZones(); - } emit logUnconcede(eventPlayerId); @@ -414,16 +389,15 @@ void GameEventHandler::eventJoin(const Event_Join &event, int /*eventPlayerId*/, QString playerName = QString::fromStdString(playerInfo.user_info().name()); emit addPlayerToAutoCompleteList(playerName); - if (game->getPlayerManager()->getPlayers().contains(playerId)) { + if (game->getPlayerManager()->getPlayers().contains(playerId)) return; - } if (playerInfo.spectator()) { game->getPlayerManager()->addSpectator(playerId, playerInfo); emit logJoinSpectator(playerName); emit spectatorJoined(playerInfo); } else { - PlayerLogic *newPlayer = game->getPlayerManager()->addPlayer(playerId, playerInfo.user_info()); + Player *newPlayer = game->getPlayerManager()->addPlayer(playerId, playerInfo.user_info()); emit logJoinPlayer(newPlayer); emit playerJoined(playerInfo); } @@ -451,10 +425,9 @@ QString GameEventHandler::getLeaveReason(Event_Leave::LeaveReason reason) } void GameEventHandler::eventLeave(const Event_Leave &event, int eventPlayerId, const GameEventContext & /*context*/) { - PlayerLogic *player = game->getPlayerManager()->getPlayers().value(eventPlayerId, 0); - if (!player) { + Player *player = game->getPlayerManager()->getPlayers().value(eventPlayerId, 0); + if (!player) return; - } player->clear(); emit playerLeft(eventPlayerId); @@ -466,10 +439,9 @@ void GameEventHandler::eventLeave(const Event_Leave &event, int eventPlayerId, c player->deleteLater(); // Rearrange all remaining zones so that attachment relationship updates take place - QMapIterator playerIterator(game->getPlayerManager()->getPlayers()); - while (playerIterator.hasNext()) { + QMapIterator playerIterator(game->getPlayerManager()->getPlayers()); + while (playerIterator.hasNext()) playerIterator.next().value()->updateZones(); - } emitUserEvent(); } @@ -488,10 +460,9 @@ void GameEventHandler::eventReverseTurn(const Event_ReverseTurn &event, int eventPlayerId, const GameEventContext & /*context*/) { - PlayerLogic *player = game->getPlayerManager()->getPlayers().value(eventPlayerId, 0); - if (!player) { + Player *player = game->getPlayerManager()->getPlayers().value(eventPlayerId, 0); + if (!player) return; - } emit logTurnReversed(player, event.reversed()); } @@ -519,10 +490,9 @@ void GameEventHandler::eventSetActivePlayer(const Event_SetActivePlayer &event, const GameEventContext & /*context*/) { game->getGameState()->setActivePlayer(event.active_player_id()); - PlayerLogic *player = game->getPlayerManager()->getPlayer(event.active_player_id()); - if (!player) { + Player *player = game->getPlayerManager()->getPlayer(event.active_player_id()); + if (!player) return; - } emit logActivePlayer(player); emitUserEvent(); } diff --git a/cockatrice/src/game/game_event_handler.h b/cockatrice/src/game/game_event_handler.h index f47116949..302e7a6ff 100644 --- a/cockatrice/src/game/game_event_handler.h +++ b/cockatrice/src/game/game_event_handler.h @@ -1,8 +1,8 @@ /** * @file game_event_handler.h * @ingroup GameLogic + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_GAME_EVENT_HANDLER_H #define COCKATRICE_GAME_EVENT_HANDLER_H @@ -38,7 +38,7 @@ class Event_Kicked; class Event_ReverseTurn; class AbstractGame; class PendingCommand; -class PlayerLogic; +class Player; inline Q_LOGGING_CATEGORY(GameEventHandlerLog, "game_event_handler"); @@ -60,8 +60,7 @@ public: void handleActivePhaseChanged(int phase); void handleGameLeft(); void handleChatMessageSent(const QString &chatMessage); - void handleArrowDeletion(int creatorId, int arrowId); - void handleArrowDeletionFinished(const Response &response, int creatorId, int arrowId); + void handleArrowDeletion(int arrowId); void eventSpectatorSay(const Event_GameSay &event, int eventPlayerId, const GameEventContext &context); void eventSpectatorLeave(const Event_Leave &event, int eventPlayerId, const GameEventContext &context); @@ -96,7 +95,7 @@ public slots: signals: void emitUserEvent(); void addPlayerToAutoCompleteList(QString playerName); - void localPlayerDeckSelected(PlayerLogic *localPlayer, int playerId, ServerInfo_Player playerInfo); + void localPlayerDeckSelected(Player *localPlayer, int playerId, ServerInfo_Player playerInfo); void remotePlayerDeckSelected(QString deckList, int playerId, QString playerName); void remotePlayersDecksSelected(QVector>> opponentDecks); void localPlayerSideboardLocked(int playerId, bool sideboardLocked); @@ -113,22 +112,21 @@ signals: void containerProcessingStarted(GameEventContext context); void setContextJudgeName(QString judgeName); void containerProcessingDone(); - void arrowDeleted(int creatorId, int arrowId); void logSpectatorSay(ServerInfo_User userInfo, QString message); void logSpectatorLeave(QString name, QString reason); void logGameStart(); - void logReadyStart(PlayerLogic *player); - void logNotReadyStart(PlayerLogic *player); - void logDeckSelect(PlayerLogic *player, QString deckHash, int sideboardSize); - void logSideboardLockSet(PlayerLogic *player, bool sideboardLocked); - void logConnectionStateChanged(PlayerLogic *player, bool connected); + void logReadyStart(Player *player); + void logNotReadyStart(Player *player); + void logDeckSelect(Player *player, QString deckHash, int sideboardSize); + void logSideboardLockSet(Player *player, bool sideboardLocked); + void logConnectionStateChanged(Player *player, bool connected); void logJoinSpectator(QString spectatorName); - void logJoinPlayer(PlayerLogic *player); - void logLeave(PlayerLogic *player, QString reason); + void logJoinPlayer(Player *player); + void logLeave(Player *player, QString reason); void logKicked(); - void logTurnReversed(PlayerLogic *player, bool reversed); + void logTurnReversed(Player *player, bool reversed); void logGameClosed(); - void logActivePlayer(PlayerLogic *activePlayer); + void logActivePlayer(Player *activePlayer); void logActivePhaseChanged(int activePhase); void logConcede(int playerId); void logUnconcede(int playerId); diff --git a/cockatrice/src/game/game_meta_info.h b/cockatrice/src/game/game_meta_info.h index cdba1605f..b5f5bfe4f 100644 --- a/cockatrice/src/game/game_meta_info.h +++ b/cockatrice/src/game/game_meta_info.h @@ -1,8 +1,8 @@ /** * @file game_meta_info.h * @ingroup GameLogic + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef GAME_META_INFO_H #define GAME_META_INFO_H @@ -87,17 +87,15 @@ public: public slots: void setStarted(bool s) { - if (gameInfo_.started() == s) { + if (gameInfo_.started() == s) return; - } gameInfo_.set_started(s); emit startedChanged(s); } void setSpectatorsOmniscient(bool v) { - if (gameInfo_.spectators_omniscient() == v) { + if (gameInfo_.spectators_omniscient() == v) return; - } gameInfo_.set_spectators_omniscient(v); emit spectatorsOmniscienceChanged(v); } diff --git a/cockatrice/src/game_graphics/game_scene.cpp b/cockatrice/src/game/game_scene.cpp similarity index 63% rename from cockatrice/src/game_graphics/game_scene.cpp rename to cockatrice/src/game/game_scene.cpp index b9816a602..034ff6947 100644 --- a/cockatrice/src/game_graphics/game_scene.cpp +++ b/cockatrice/src/game/game_scene.cpp @@ -1,15 +1,10 @@ #include "game_scene.h" #include "../client/settings/cache_settings.h" -#include "../game/abstract_game.h" -#include "../game/player/player_actions.h" -#include "../game/player/player_logic.h" -#include "../game_graphics/player/player_graphics_item.h" #include "board/card_item.h" #include "phases_toolbar.h" -#include "player/menu/player_menu.h" +#include "player/player.h" #include "player/player_graphics_item.h" -#include "zones/select_zone.h" #include "zones/view_zone.h" #include "zones/view_zone_widget.h" @@ -59,95 +54,8 @@ GameScene::~GameScene() */ void GameScene::retranslateUi() { - for (ZoneViewWidget *view : zoneViews) { + for (ZoneViewWidget *view : zoneViews) view->retranslateUi(); - } -} - -QList GameScene::selectedCards() const -{ - QList selectedCards; - for (auto item : selectedItems()) { - if (auto card = qgraphicsitem_cast(item)) { - selectedCards.append(card); - } - } - - return selectedCards; -} - -void GameScene::onCardSelectionChanged(AbstractCardItem *abstractCard, bool selected) -{ - CardItem *card = qobject_cast(abstractCard); - if (!card || !card->getOwner()) { - return; - } - - auto *owner = card->getOwner(); - - if (selected) { - owner->requestCardMenuUpdate(card); - return; - } - - if (selectedItems().isEmpty()) { - owner->getGame()->setActiveCard(nullptr); - owner->requestCardMenuUpdate(nullptr); - } -} - -void GameScene::onCardRightClicked(AbstractCardItem *abstractCard, QPoint screenPos) -{ - auto *card = qobject_cast(abstractCard); - if (!card) { - return; - } - if (!card->getOwner()) { - return; - } - auto *view = playerViews.value(card->getOwner()->getPlayerInfo()->getId()); - if (!view) { - return; - } - - card->getOwner()->getGame()->setActiveCard(card); - - if (auto *menu = view->getPlayerMenu()->updateCardMenu(card)) { - menu->popup(screenPos); - } -} - -void GameScene::playSelected(AbstractCardItem *card) -{ - if (!card) { - return; - } - if (!card->getOwner()) { - return; - } - card->getOwner()->getPlayerActions()->actPlay(selectedCards()); -} - -void GameScene::playSelectedFaceDown(AbstractCardItem *card) -{ - if (!card) { - return; - } - if (!card->getOwner()) { - return; - } - card->getOwner()->getPlayerActions()->actPlayFacedown(selectedCards()); -} - -void GameScene::hideSelected(AbstractCardItem *card) -{ - if (!card) { - return; - } - if (!card->getOwner()) { - return; - } - card->getOwner()->getPlayerActions()->actHide(selectedCards()); } /** @@ -156,34 +64,13 @@ void GameScene::hideSelected(AbstractCardItem *card) * * Connects to the player's sizeChanged signal to recompute layout on resize. */ -void GameScene::addPlayer(PlayerLogic *player) +void GameScene::addPlayer(Player *player) { qCInfo(GameScenePlayerAdditionRemovalLog) << "GameScene::addPlayer name=" << player->getPlayerInfo()->getName(); - auto *view = new PlayerGraphicsItem(player); - - playerViews.insert(player->getPlayerInfo()->getId(), view); - addItem(view); - connect(view, &PlayerGraphicsItem::sizeChanged, this, &GameScene::rearrange); - - connect(player, &PlayerLogic::concededChanged, this, [this](int id, bool conceded) { - if (conceded) { - clearArrowsForPlayer(id); - } - rearrange(); - }); - - connect(player, &PlayerLogic::requestZoneViewToggle, this, &GameScene::toggleZoneView); - connect(player, &PlayerLogic::requestRevealedZoneView, this, &GameScene::addRevealedZoneView); - connect(player, &PlayerLogic::arrowDeleted, this, &GameScene::deleteArrow); - connect(player, &PlayerLogic::arrowCreateRequested, this, &GameScene::addArrow); - connect(player, &PlayerLogic::arrowDeleteRequested, this, &GameScene::requestArrowDeletion); - connect(player, &PlayerLogic::arrowsClearedLocally, this, - [this, id = player->getPlayerInfo()->getId()]() { clearArrowsForPlayerLocally(id); }); - - connect(player->getPlayerEventHandler(), &PlayerEventHandler::cardZoneChanged, this, &GameScene::onCardZoneChanged); - - rearrange(); + players << player->getGraphicsItem(); + addItem(player->getGraphicsItem()); + connect(player->getGraphicsItem(), &PlayerGraphicsItem::sizeChanged, this, &GameScene::rearrange); } /** @@ -192,20 +79,17 @@ void GameScene::addPlayer(PlayerLogic *player) * * Closes any zone views associated with the player and recomputes layout. */ -void GameScene::removePlayer(PlayerLogic *player) +void GameScene::removePlayer(Player *player) { qCInfo(GameScenePlayerAdditionRemovalLog) << "GameScene::removePlayer name=" << player->getPlayerInfo()->getName(); - clearArrowsForPlayer(player->getPlayerInfo()->getId()); - for (ZoneViewWidget *zone : zoneViews) { if (zone->getPlayer() == player) { zone->close(); } } - auto *view = playerViews.take(player->getPlayerInfo()->getId()); - removeItem(view); - view->deleteLater(); + players.removeOne(player->getGraphicsItem()); + removeItem(player->getGraphicsItem()); rearrange(); } @@ -280,14 +164,14 @@ void GameScene::processViewSizeChange(const QSize &newSize) * * Used to determine rotation and layout order. */ -QList GameScene::collectActivePlayers(int &firstPlayerIndex) const +QList GameScene::collectActivePlayers(int &firstPlayerIndex) const { - QList activePlayers; + QList activePlayers; firstPlayerIndex = 0; bool firstPlayerFound = false; - for (auto *pgItem : playerViews.values()) { - PlayerLogic *p = pgItem->getLogic(); + for (auto *pgItem : players) { + Player *p = pgItem->getPlayer(); if (p && !p->getConceded()) { activePlayers.append(p); if (!firstPlayerFound && p->getPlayerInfo()->getLocal()) { @@ -307,17 +191,15 @@ QList GameScene::collectActivePlayers(int &firstPlayerIndex) cons * * Applies rotation offset and ensures the list wraps correctly. */ -QList GameScene::rotatePlayers(const QList &activePlayers, int firstPlayerIndex) const +QList GameScene::rotatePlayers(const QList &activePlayers, int firstPlayerIndex) const { - QList rotated = activePlayers; + QList rotated = activePlayers; if (!rotated.isEmpty()) { int totalRotation = firstPlayerIndex + playerRotation; - while (totalRotation < 0) { + while (totalRotation < 0) totalRotation += rotated.size(); - } - for (int i = 0; i < totalRotation; ++i) { + for (int i = 0; i < totalRotation; ++i) rotated.append(rotated.takeFirst()); - } } return rotated; } @@ -340,7 +222,7 @@ int GameScene::determineColumnCount(int playerCount) * - Position players in columns with spacing. * - Mirror graphics for visual balance. */ -QSizeF GameScene::computeSceneSizeAndPlayerLayout(const QList &playersPlaying, int columns) +QSizeF GameScene::computeSceneSizeAndPlayerLayout(const QList &playersPlaying, int columns) { playersByColumn.clear(); @@ -348,7 +230,7 @@ QSizeF GameScene::computeSceneSizeAndPlayerLayout(const QList &pl qreal sceneHeight = 0, sceneWidth = -playerAreaSpacing; QList columnWidth; - QListIterator playersIter(playersPlaying); + QListIterator playersIter(playersPlaying); for (int col = 0; col < columns; ++col) { playersByColumn.append(QList()); columnWidth.append(0); @@ -356,14 +238,13 @@ QSizeF GameScene::computeSceneSizeAndPlayerLayout(const QList &pl int rowsInColumn = rows - (playersPlaying.size() % columns) * col; // Adjust rows for uneven columns for (int j = 0; j < rowsInColumn; ++j) { - PlayerLogic *player = playersIter.next(); - if (col == 0) { - playersByColumn[col].prepend(playerViews.value(player->getPlayerInfo()->getId())); - } else { - playersByColumn[col].append(playerViews.value(player->getPlayerInfo()->getId())); - } + Player *player = playersIter.next(); + if (col == 0) + playersByColumn[col].prepend(player->getGraphicsItem()); + else + playersByColumn[col].append(player->getGraphicsItem()); - auto *pgItem = playerViews.value(player->getPlayerInfo()->getId()); + auto *pgItem = player->getGraphicsItem(); thisColumnHeight += pgItem->boundingRect().height() + playerAreaSpacing; columnWidth[col] = std::max(columnWidth[col], (int)pgItem->boundingRect().width()); } @@ -400,9 +281,8 @@ QList GameScene::calculateMinWidthByColumn() const QList minWidthByColumn; for (const auto &col : playersByColumn) { qreal maxWidth = 0; - for (PlayerGraphicsItem *player : col) { + for (PlayerGraphicsItem *player : col) maxWidth = std::max(maxWidth, player->getMinimumWidth()); - } minWidthByColumn.append(maxWidth); } return minWidthByColumn; @@ -450,89 +330,6 @@ void GameScene::resizeColumnsAndPlayers(const QList &minWidthByColumn, qr } } -void GameScene::addArrow(QSharedPointer data) -{ - auto *startView = playerViews.value(data->startPlayerId); - auto *targetView = playerViews.value(data->targetPlayerId); - if (!startView || !targetView) { - return; - } - - PlayerLogic *startLogic = startView->getLogic(); - auto *startZone = startLogic->getZones().value(data->startZone); - if (!startZone) { - return; - } - - CardItem *startCard = startZone->getCard(data->startCardId); - if (!startCard) { - return; - } - - ArrowTarget *targetItem = nullptr; - if (data->isPlayerTargeted()) { - targetItem = targetView->getPlayerTarget(); - } else { - auto *zone = targetView->getLogic()->getZones().value(data->targetZone); - if (zone) { - targetItem = zone->getCard(data->targetCardId); - } - } - if (!targetItem) { - return; - } - - auto *arrow = new ArrowItem(data, startCard, targetItem); - addItem(arrow); - arrowRegistry.insert(data, arrow); - connect(arrow, &ArrowItem::requestDeletion, this, &GameScene::requestArrowDeletion); -} - -void GameScene::deleteArrow(int playerId, int arrowId) -{ - if (auto *arrow = arrowRegistry.take(playerId, arrowId)) { - arrow->delArrow(); - } -} - -void GameScene::requestArrowDeletion(int playerId, int arrowId) -{ - if (arrowRegistry.contains(playerId, arrowId)) { - emit arrowDeletionRequested(playerId, arrowId); - } -} - -void GameScene::onCardZoneChanged(CardItem *card, bool sameZone) -{ - QList toDelete; - for (auto *arrow : arrowRegistry.all()) { - if (arrow->getStartItem() == card || arrow->getTargetItem() == card) { - if (sameZone) { - arrow->updatePath(); - } else { - toDelete.append(arrow); - } - } - } - for (auto *arrow : toDelete) { - deleteArrow(arrow->getCreatorId(), arrow->getId()); - } -} - -void GameScene::clearArrowsForPlayer(int playerId) -{ - for (int arrowId : arrowRegistry.idsForPlayer(playerId)) { - emit requestArrowDeletion(playerId, arrowId); - } -} - -void GameScene::clearArrowsForPlayerLocally(int playerId) -{ - for (int arrowId : arrowRegistry.idsForPlayer(playerId)) { - arrowRegistry.take(playerId, arrowId)->delArrow(); - } -} - // ---------- Hover Handling ---------- void GameScene::updateHover(const QPointF &scenePos) @@ -546,38 +343,18 @@ void GameScene::updateHover(const QPointF &scenePos) void GameScene::updateHoveredCard(CardItem *newCard) { - if (hoveredCard && (newCard != hoveredCard)) { - endCardHover(hoveredCard); - } - if (newCard && (newCard != hoveredCard)) { - beginCardHover(newCard); - } + if (hoveredCard && (newCard != hoveredCard)) + hoveredCard->setHovered(false); + if (newCard && (newCard != hoveredCard)) + newCard->setHovered(true); hoveredCard = newCard; } -void GameScene::beginCardHover(CardItem *card) -{ - card->setHovered(true); - if (auto *zone = SelectZone::findOwningSelectZone(card)) { - zone->escapeClipForHover(card); - } -} - -void GameScene::endCardHover(CardItem *card) -{ - if (auto *zone = SelectZone::findOwningSelectZone(card)) { - zone->restoreClipAfterHover(card); - } - card->setHovered(false); -} - CardZone *GameScene::findTopmostZone(const QList &items) { - for (QGraphicsItem *item : items) { - if (auto *zone = qgraphicsitem_cast(item)) { + for (QGraphicsItem *item : items) + if (auto *zone = qgraphicsitem_cast(item)) return zone; - } - } return nullptr; } @@ -588,17 +365,14 @@ CardItem *GameScene::findTopmostCardInZone(const QList &items, for (QGraphicsItem *item : items) { CardItem *card = qgraphicsitem_cast(item); - if (!card) { + if (!card) continue; - } if (card->getAttachedTo()) { - if (card->getAttachedTo()->getZone() != zone->getLogic()) { + if (card->getAttachedTo()->getZone() != zone->getLogic()) continue; - } - } else if (card->getZone() != zone->getLogic()) { + } else if (card->getZone() != zone->getLogic()) continue; - } if (card->getRealZValue() > maxZ) { maxZ = card->getRealZValue(); @@ -620,7 +394,7 @@ CardItem *GameScene::findTopmostCardInZone(const QList &items, * If an identical view exists, it is closed. Otherwise, a new ZoneViewWidget is created * and positioned based on zone type. */ -void GameScene::toggleZoneView(PlayerLogic *player, const QString &zoneName, int numberCards, bool isReversed) +void GameScene::toggleZoneView(Player *player, const QString &zoneName, int numberCards, bool isReversed) { for (auto &view : zoneViews) { ZoneViewZone *temp = view->getZone(); @@ -637,13 +411,12 @@ void GameScene::toggleZoneView(PlayerLogic *player, const QString &zoneName, int connect(item, &ZoneViewWidget::closePressed, this, &GameScene::removeZoneView); addItem(item); - if (zoneName == ZoneNames::GRAVE) { + if (zoneName == ZoneNames::GRAVE) item->setPos(360, 100); - } else if (zoneName == ZoneNames::EXILE) { + else if (zoneName == ZoneNames::EXILE) item->setPos(380, 120); - } else { + else item->setPos(340, 80); - } } /** @@ -653,7 +426,7 @@ void GameScene::toggleZoneView(PlayerLogic *player, const QString &zoneName, int * @param cardList List of cards to show. * @param withWritePermission Whether edits are allowed. */ -void GameScene::addRevealedZoneView(PlayerLogic *player, +void GameScene::addRevealedZoneView(Player *player, CardZoneLogic *zone, const QList &cardList, bool withWritePermission) @@ -680,9 +453,8 @@ void GameScene::removeZoneView(ZoneViewWidget *item) */ void GameScene::clearViews() { - while (!zoneViews.isEmpty()) { + while (!zoneViews.isEmpty()) zoneViews.first()->close(); - } } /** @@ -690,9 +462,8 @@ void GameScene::clearViews() */ void GameScene::closeMostRecentZoneView() { - if (!zoneViews.isEmpty()) { + if (!zoneViews.isEmpty()) zoneViews.last()->close(); - } } // ---------- View Transforms ---------- @@ -711,11 +482,8 @@ QTransform GameScene::getViewportTransform() const bool GameScene::event(QEvent *event) { - if (event->type() == QEvent::GraphicsSceneMouseMove) { + if (event->type() == QEvent::GraphicsSceneMouseMove) updateHover(static_cast(event)->scenePos()); - } else if (event->type() == QEvent::Leave) { - updateHoveredCard(nullptr); - } return QGraphicsScene::event(event); } @@ -725,29 +493,25 @@ void GameScene::timerEvent(QTimerEvent * /*event*/) QMutableSetIterator i(cardsToAnimate); while (i.hasNext()) { i.next(); - if (!i.value()->animationEvent()) { + if (!i.value()->animationEvent()) i.remove(); - } } - if (cardsToAnimate.isEmpty()) { + if (cardsToAnimate.isEmpty()) animationTimer->stop(); - } } void GameScene::registerAnimationItem(AbstractCardItem *card) { cardsToAnimate.insert(static_cast(card)); - if (!animationTimer->isActive()) { + if (!animationTimer->isActive()) animationTimer->start(10, this); - } } void GameScene::unregisterAnimationItem(AbstractCardItem *card) { cardsToAnimate.remove(static_cast(card)); - if (cardsToAnimate.isEmpty()) { + if (cardsToAnimate.isEmpty()) animationTimer->stop(); - } } // ---------- Rubber Band ---------- diff --git a/cockatrice/src/game_graphics/game_scene.h b/cockatrice/src/game/game_scene.h similarity index 64% rename from cockatrice/src/game_graphics/game_scene.h rename to cockatrice/src/game/game_scene.h index 74e979556..f08e83aa4 100644 --- a/cockatrice/src/game_graphics/game_scene.h +++ b/cockatrice/src/game/game_scene.h @@ -1,10 +1,7 @@ #ifndef GAMESCENE_H #define GAMESCENE_H -#include "../game/arrow_registry.h" -#include "../game/board/arrow_data.h" -#include "../game/zones/card_zone_logic.h" -#include "board/arrow_item.h" +#include "zones/logic/card_zone_logic.h" #include #include @@ -15,7 +12,7 @@ inline Q_LOGGING_CATEGORY(GameSceneLog, "game_scene"); inline Q_LOGGING_CATEGORY(GameScenePlayerAdditionRemovalLog, "game_scene.player_addition_removal"); -class PlayerLogic; +class Player; class PlayerGraphicsItem; class ZoneViewWidget; class CardZone; @@ -44,9 +41,8 @@ private: static const int playerAreaSpacing = 5; ///< Space between player areas PhasesToolbar *phasesToolbar; ///< Toolbar showing game phases - QMap playerViews; ///< ID lookup for player graphics items + QList players; ///< All player graphics items QList> playersByColumn; ///< Players organized by column - ArrowRegistry arrowRegistry; ///< ID registry for arrow graphics items QList zoneViews; ///< Active zone view widgets QSize viewSize; ///< Current view size QPointer hoveredCard; ///< Currently hovered card @@ -60,14 +56,6 @@ private: */ void updateHover(const QPointF &scenePos); - /** - * @brief Activates hover state and escapes the card from its clip container - * so hover scaling is visible beyond zone bounds. - */ - void beginCardHover(CardItem *card); - /** @brief Deactivates hover state and restores the card to its clip container. */ - void endCardHover(CardItem *card); - public: /** * @brief Constructs the GameScene. @@ -76,36 +64,23 @@ public: */ explicit GameScene(PhasesToolbar *_phasesToolbar, QObject *parent = nullptr); - /** @brief Destructor, cleans up timer and zone views. */ + /** Destructor, cleans up timer and zone views. */ ~GameScene() override; - /** @brief Updates UI text for all zone views. */ + /** Updates UI text for all zone views. */ void retranslateUi(); - /** @brief Gets all selected CardItems. */ - QList selectedCards() const; - /** * @brief Adds a player to the scene and stores their graphics item. * @param player Player to add. */ - void addPlayer(PlayerLogic *player); + void addPlayer(Player *player); /** * @brief Removes a player from the scene. * @param player Player to remove. */ - void removePlayer(PlayerLogic *player); - - QMap getPlayers() const - { - return playerViews; - } - - PlayerGraphicsItem *viewForPlayer(int playerId) - { - return playerViews.value(playerId); - } + void removePlayer(Player *player); /** * @brief Adjusts the global rotation offset for player layout. @@ -113,7 +88,7 @@ public: */ void adjustPlayerRotation(int rotationAdjustment); - /** @brief Recomputes the layout of players and the scene size. */ + /** Recomputes the layout of players and the scene size. */ void rearrange(); /** @@ -127,7 +102,7 @@ public: * @param firstPlayerIndex Output index of first local player. * @return List of active players. */ - QList collectActivePlayers(int &firstPlayerIndex) const; + QList collectActivePlayers(int &firstPlayerIndex) const; /** * @brief Rotates the list of players for layout. @@ -135,7 +110,7 @@ public: * @param firstPlayerIndex Index of first local player. * @return Rotated list. */ - QList rotatePlayers(const QList &players, int firstPlayerIndex) const; + QList rotatePlayers(const QList &players, int firstPlayerIndex) const; /** * @brief Determines the number of columns to display players in. @@ -150,7 +125,7 @@ public: * @param columns Number of columns to split into. * @return Calculated scene size. */ - QSizeF computeSceneSizeAndPlayerLayout(const QList &playersPlaying, int columns); + QSizeF computeSceneSizeAndPlayerLayout(const QList &playersPlaying, int columns); /** * @brief Computes the minimum width for each column based on player minimum widths. @@ -173,73 +148,56 @@ public: */ void resizeColumnsAndPlayers(const QList &minWidthByColumn, qreal newWidth); - /** @brief Finds the topmost card zone under the cursor. */ + /** Finds the topmost card zone under the cursor. */ static CardZone *findTopmostZone(const QList &items); - /** @brief Finds the topmost card in a given zone, considering attachments and Z-order. */ + /** Finds the topmost card in a given zone, considering attachments and Z-order. */ static CardItem *findTopmostCardInZone(const QList &items, CardZone *zone); - /** @brief Updates hovered card highlighting. */ + /** Updates hovered card highlighting. */ void updateHoveredCard(CardItem *newCard); - /** @brief Registers a card for animation updates. */ + /** Registers a card for animation updates. */ void registerAnimationItem(AbstractCardItem *card); - /** @brief Unregisters a card from animation updates. */ + /** Unregisters a card from animation updates. */ void unregisterAnimationItem(AbstractCardItem *card); void startRubberBand(const QPointF &selectionOrigin); void resizeRubberBand(const QPointF &cursorPoint, int selectedCount); void stopRubberBand(); public slots: - void onCardSelectionChanged(AbstractCardItem *card, bool selected); - void onCardRightClicked(AbstractCardItem *card, QPoint screenPos); - void playSelected(AbstractCardItem *card); - void playSelectedFaceDown(AbstractCardItem *card); - void hideSelected(AbstractCardItem *card); - /** @brief Toggles a zone view for a player. */ - void toggleZoneView(PlayerLogic *player, const QString &zoneName, int numberCards, bool isReversed = false); + /** Toggles a zone view for a player. */ + void toggleZoneView(Player *player, const QString &zoneName, int numberCards, bool isReversed = false); - /** @brief Adds a revealed zone view (for shown cards). */ - void addRevealedZoneView(PlayerLogic *player, + /** Adds a revealed zone view (for shown cards). */ + void addRevealedZoneView(Player *player, CardZoneLogic *zone, const QList &cardList, bool withWritePermission); - /** @brief Removes a zone view widget from the scene. */ + /** Removes a zone view widget from the scene. */ void removeZoneView(ZoneViewWidget *item); - /** @brief Closes all zone views. */ + /** Closes all zone views. */ void clearViews(); - /** @brief Closes the most recently added zone view. */ + /** Closes the most recently added zone view. */ void closeMostRecentZoneView(); QTransform getViewTransform() const; QTransform getViewportTransform() const; - /// Directly modifies the scene - void addArrow(QSharedPointer data); - void deleteArrow(int playerId, int arrowId); - void clearArrowsForPlayer(int playerId); - void clearArrowsForPlayerLocally(int playerId); - - /// Queues up arrow deletion but doesn't directly modify the scene - void requestArrowDeletion(int playerId, int arrowId); - - void onCardZoneChanged(CardItem *card, bool sameZone); - protected: - /** @brief Handles hover updates. */ + /** Handles hover updates. */ bool event(QEvent *event) override; - /** @brief Handles animation timer updates. */ + /** Handles animation timer updates. */ void timerEvent(QTimerEvent *event) override; signals: void sigStartRubberBand(const QPointF &selectionOrigin); void sigResizeRubberBand(const QPointF &cursorPoint, int selectedCount); void sigStopRubberBand(); - void arrowDeletionRequested(int creatorId, int arrowId); }; #endif diff --git a/cockatrice/src/game/game_state.h b/cockatrice/src/game/game_state.h index 5a57d4321..54f6d9276 100644 --- a/cockatrice/src/game/game_state.h +++ b/cockatrice/src/game/game_state.h @@ -1,8 +1,8 @@ /** * @file game_state.h * @ingroup GameLogic + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_GAME_STATE_H #define COCKATRICE_GAME_STATE_H diff --git a/cockatrice/src/game_graphics/game_view.cpp b/cockatrice/src/game/game_view.cpp similarity index 50% rename from cockatrice/src/game_graphics/game_view.cpp rename to cockatrice/src/game/game_view.cpp index db17aaead..ce53828a7 100644 --- a/cockatrice/src/game_graphics/game_view.cpp +++ b/cockatrice/src/game/game_view.cpp @@ -4,12 +4,9 @@ #include "game_scene.h" #include -#include #include -#include #include #include -#include // QRubberBand calls raise() in showEvent() and changeEvent() to stay on top of siblings. // This subclass disables that behavior so dragCountLabel can appear above it. @@ -37,6 +34,7 @@ GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, par { setBackgroundBrush(QBrush(QColor(0, 0, 0))); setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing); + setFocusPolicy(Qt::ClickFocus); setViewportUpdateMode(BoundingRectViewportUpdate); connect(scene, &GameScene::sceneRectChanged, this, &GameView::updateSceneRect); @@ -46,9 +44,6 @@ GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, par connect(scene, &GameScene::sigStopRubberBand, this, &GameView::stopRubberBand); connect(scene, &QGraphicsScene::selectionChanged, this, [this]() { updateTotalSelectionCount(); }); - setFocusDisabled(SettingsCache::instance().getKeepGameChatFocus()); - connect(&SettingsCache::instance(), &SettingsCache::keepGameChatFocusChanged, this, &GameView::setFocusDisabled); - aCloseMostRecentZoneView = new QAction(this); connect(aCloseMostRecentZoneView, &QAction::triggered, scene, &GameScene::closeMostRecentZoneView); @@ -58,40 +53,30 @@ GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, par refreshShortcuts(); 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 + "font-size: 14px; font-weight: bold;"; - const QString totalCountLabelStyle = baseProperties + "font-size: 16px; font-weight: bold;"; - const QString subtypeTallyLabelStyle = baseProperties + "font-size: 12px;"; + const QString countLabelStyle = "color: white; " + "font-size: 14px; " + "font-weight: bold; " + "background-color: rgba(0, 0, 0, 160); " + "border-radius: 3px; " + "padding: 1px 2px;"; dragCountLabel = new QLabel(this); - dragCountLabel->setStyleSheet(dragCountLabelStyle); + dragCountLabel->setStyleSheet(countLabelStyle); dragCountLabel->hide(); dragCountLabel->raise(); totalCountLabel = new QLabel(this); - totalCountLabel->setStyleSheet(totalCountLabelStyle); + totalCountLabel->setStyleSheet(countLabelStyle); totalCountLabel->hide(); - - tallyContainer = new QWidget(this); - tallyContainer->setStyleSheet(subtypeTallyLabelStyle); - tallyLayout = new QGridLayout(tallyContainer); - tallyLayout->setContentsMargins(2, 2, 2, 2); - tallyLayout->setSpacing(2); - tallyContainer->hide(); } void GameView::resizeEvent(QResizeEvent *event) { QGraphicsView::resizeEvent(event); - GameScene *s = static_cast(scene()); - s->processViewSizeChange(event->size()); + GameScene *s = dynamic_cast(scene()); + if (s) + s->processViewSizeChange(event->size()); updateSceneRect(scene()->sceneRect()); updateTotalSelectionCount(event->size()); @@ -104,9 +89,8 @@ void GameView::updateSceneRect(const QRectF &rect) void GameView::startRubberBand(const QPointF &_selectionOrigin) { - if (!rubberBand) { + if (!rubberBand) return; - } selectionOrigin = _selectionOrigin; rubberBand->setGeometry(QRect(mapFromScene(selectionOrigin), QSize(0, 0))); @@ -115,9 +99,8 @@ void GameView::startRubberBand(const QPointF &_selectionOrigin) void GameView::resizeRubberBand(const QPointF &cursorPoint, int selectedCount) { - if (!rubberBand) { + if (!rubberBand) return; - } constexpr int kLabelPaddingInPixels = 4; @@ -162,9 +145,8 @@ void GameView::resizeRubberBand(const QPointF &cursorPoint, int selectedCount) void GameView::stopRubberBand() { - if (!rubberBand) { + if (!rubberBand) return; - } rubberBand->hide(); dragCountLabel->hide(); @@ -176,118 +158,27 @@ void GameView::refreshShortcuts() SettingsCache::instance().shortcuts().getShortcut("Player/aCloseMostRecentZoneView")); } -void GameView::clearTallyLabels() -{ - QtUtils::clearLayoutRec(tallyLayout); -} - -QSize GameView::rebuildTallyLabels(const QList &entries) -{ - clearTallyLabels(); - - 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; - int maxCountWidth = 0; - - int row = 0; - for (const TallyRow &entry : entries) { - auto *nameLabel = new QLabel(entry.name, tallyContainer); - nameLabel->setStyleSheet(nameStyle); - nameLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - tallyLayout->addWidget(nameLabel, row, 0); - - auto *countLabel = new QLabel(entry.value, tallyContainer); - countLabel->setStyleSheet(countStyle); - countLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - tallyLayout->addWidget(countLabel, row, 1); - - QSize nameSize = nameLabel->sizeHint(); - QSize countSize = countLabel->sizeHint(); - maxNameWidth = qMax(maxNameWidth, nameSize.width()); - maxCountWidth = qMax(maxCountWidth, countSize.width()); - totalHeight += qMax(nameSize.height(), countSize.height()); - - ++row; - } - - int spacing = tallyLayout->spacing(); - int margins = tallyLayout->contentsMargins().left() + tallyLayout->contentsMargins().right(); - int verticalMargins = tallyLayout->contentsMargins().top() + tallyLayout->contentsMargins().bottom(); - - int width = maxNameWidth + spacing + maxCountWidth + margins; - int height = totalHeight + (row - 1) * spacing + verticalMargins; - - return QSize(width, height); -} - void GameView::updateTotalSelectionCount(const QSize &viewSize) { - constexpr int kMarginInPixels = 10; - constexpr int kSpacingBetweenLabels = 4; - - int availableWidth = viewSize.isValid() ? viewSize.width() : viewport()->width(); - int availableHeight = viewSize.isValid() ? viewSize.height() : viewport()->height(); + if (!SettingsCache::instance().getShowTotalSelectionCount()) { + totalCountLabel->hide(); + return; + } int count = scene()->selectedItems().count(); - if (!SettingsCache::instance().getShowTotalSelectionCount() || count <= 1) { - totalCountLabel->hide(); - } else { + if (count > 1) { totalCountLabel->setText(QString::number(count)); totalCountLabel->adjustSize(); + constexpr int kMarginInPixels = 10; + int availableWidth = viewSize.isValid() ? viewSize.width() : viewport()->width(); + int availableHeight = viewSize.isValid() ? viewSize.height() : viewport()->height(); int x = availableWidth - totalCountLabel->width() - kMarginInPixels; int y = availableHeight - totalCountLabel->height() - kMarginInPixels; totalCountLabel->move(x, y); totalCountLabel->show(); - } - - TallyType tallyType = - SettingsCache::instance().getShowSubtypeSelectionTally() ? TallyType::Subtypes : TallyType::None; - - GameScene *gameScene = static_cast(scene()); - QList entries = Tally::compute(gameScene->selectedCards(), tallyType); - - if (entries.isEmpty() || count <= 1) { - tallyContainer->hide(); - cachedTallyRows.clear(); - return; - } - - // Only rebuild labels if entries changed - QSize containerSize; - if (entries != cachedTallyRows) { - cachedTallyRows = entries; - containerSize = rebuildTallyLabels(entries); - tallyContainer->resize(containerSize); } else { - containerSize = tallyContainer->size(); + totalCountLabel->hide(); } - - int x = availableWidth - containerSize.width() - kMarginInPixels; - int y; - - if (totalCountLabel->isVisible()) { - y = totalCountLabel->y() - containerSize.height() - kSpacingBetweenLabels; - } else { - y = availableHeight - containerSize.height() - kMarginInPixels; - } - - y = qMax(kMarginInPixels, y); - - tallyContainer->move(x, y); - tallyContainer->show(); -} - -/** - * Disabling focus on the game view will allow chat to maintain the autofocusing behavior of pre 2.10.3, - * at the cost of disabling the zone view search bar. - */ -void GameView::setFocusDisabled(bool disabled) -{ - setFocusPolicy(disabled ? Qt::NoFocus : Qt::ClickFocus); } diff --git a/cockatrice/src/game_graphics/game_view.h b/cockatrice/src/game/game_view.h similarity index 71% rename from cockatrice/src/game_graphics/game_view.h rename to cockatrice/src/game/game_view.h index 3f6b60dbc..a77ab9257 100644 --- a/cockatrice/src/game_graphics/game_view.h +++ b/cockatrice/src/game/game_view.h @@ -1,18 +1,15 @@ /** * @file game_view.h * @ingroup GameGraphics + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef GAMEVIEW_H #define GAMEVIEW_H -#include "tally/tally.h" - #include class GameScene; -class QGridLayout; class QLabel; class QRubberBand; @@ -24,13 +21,7 @@ private: QRubberBand *rubberBand; QLabel *dragCountLabel; QLabel *totalCountLabel; - QWidget *tallyContainer; - QGridLayout *tallyLayout; QPointF selectionOrigin; - QList cachedTallyRows; ///< Cached entries to avoid redundant rebuilds - - QSize rebuildTallyLabels(const QList &entries); - void clearTallyLabels(); protected: void resizeEvent(QResizeEvent *event) override; @@ -40,7 +31,6 @@ private slots: void stopRubberBand(); void refreshShortcuts(); void updateTotalSelectionCount(const QSize &viewSize = QSize()); - void setFocusDisabled(bool disabled); public slots: void updateSceneRect(const QRectF &rect); diff --git a/cockatrice/src/game_graphics/hand_counter.cpp b/cockatrice/src/game/hand_counter.cpp similarity index 100% rename from cockatrice/src/game_graphics/hand_counter.cpp rename to cockatrice/src/game/hand_counter.cpp diff --git a/cockatrice/src/game_graphics/hand_counter.h b/cockatrice/src/game/hand_counter.h similarity index 84% rename from cockatrice/src/game_graphics/hand_counter.h rename to cockatrice/src/game/hand_counter.h index 9aa65d514..2c0175ecc 100644 --- a/cockatrice/src/game_graphics/hand_counter.h +++ b/cockatrice/src/game/hand_counter.h @@ -1,14 +1,14 @@ /** * @file hand_counter.h * @ingroup GameGraphicsPlayers + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef HANDCOUNTER_H #define HANDCOUNTER_H -#include "board/abstract_graphics_item.h" -#include "board/graphics_item_type.h" +#include "../game_graphics/board/abstract_graphics_item.h" +#include "../game_graphics/board/graphics_item_type.h" #include diff --git a/cockatrice/src/game_graphics/log/message_log_widget.cpp b/cockatrice/src/game/log/message_log_widget.cpp similarity index 90% rename from cockatrice/src/game_graphics/log/message_log_widget.cpp rename to cockatrice/src/game/log/message_log_widget.cpp index ccd903b04..09f6e656b 100644 --- a/cockatrice/src/game_graphics/log/message_log_widget.cpp +++ b/cockatrice/src/game/log/message_log_widget.cpp @@ -1,13 +1,13 @@ #include "message_log_widget.h" -#include "../../client/settings/card_counter_settings.h" #include "../../client/sound_engine.h" -#include "../../game/phase.h" -#include "../../game/player/player_logic.h" #include "../../interface/widgets/tabs/tab_game.h" #include "../board/card_item.h" #include "../board/translate_counter_name.h" +#include "../phase.h" +#include "../player/player.h" +#include <../../client/settings/card_counter_settings.h> #include #include #include @@ -105,7 +105,7 @@ void MessageLogWidget::containerProcessingStarted(const GameEventContext &contex } } -void MessageLogWidget::logAlwaysRevealTopCard(PlayerLogic *player, CardZoneLogic *zone, bool reveal) +void MessageLogWidget::logAlwaysRevealTopCard(Player *player, CardZoneLogic *zone, bool reveal) { appendHtmlServerMessage((reveal ? tr("%1 is now keeping the top card %2 revealed.") : tr("%1 is not revealing the top card %2 any longer.")) @@ -113,7 +113,7 @@ void MessageLogWidget::logAlwaysRevealTopCard(PlayerLogic *player, CardZoneLogic .arg(zone->getTranslatedName(true, CaseTopCardsOfZone))); } -void MessageLogWidget::logAlwaysLookAtTopCard(PlayerLogic *player, CardZoneLogic *zone, bool reveal) +void MessageLogWidget::logAlwaysLookAtTopCard(Player *player, CardZoneLogic *zone, bool reveal) { appendHtmlServerMessage((reveal ? tr("%1 can now look at top card %2 at any time.") : tr("%1 no longer can look at top card %2 at any time.")) @@ -121,10 +121,7 @@ void MessageLogWidget::logAlwaysLookAtTopCard(PlayerLogic *player, CardZoneLogic .arg(zone->getTranslatedName(true, CaseTopCardsOfZone))); } -void MessageLogWidget::logAttachCard(PlayerLogic *player, - QString cardName, - PlayerLogic *targetPlayer, - QString targetCardName) +void MessageLogWidget::logAttachCard(Player *player, QString cardName, Player *targetPlayer, QString targetCardName) { appendHtmlServerMessage(tr("%1 attaches %2 to %3's %4.") .arg(sanitizeHtml(player->getPlayerInfo()->getName())) @@ -151,7 +148,7 @@ void MessageLogWidget::logUnconcede(int playerId) true); } -void MessageLogWidget::logConnectionStateChanged(PlayerLogic *player, bool connectionState) +void MessageLogWidget::logConnectionStateChanged(Player *player, bool connectionState) { if (connectionState) { soundEngine->playSound("player_reconnect"); @@ -164,10 +161,10 @@ void MessageLogWidget::logConnectionStateChanged(PlayerLogic *player, bool conne } } -void MessageLogWidget::logCreateArrow(PlayerLogic *player, - PlayerLogic *startPlayer, +void MessageLogWidget::logCreateArrow(Player *player, + Player *startPlayer, QString startCard, - PlayerLogic *targetPlayer, + Player *targetPlayer, QString targetCard, bool playerTarget) { @@ -223,7 +220,7 @@ void MessageLogWidget::logCreateArrow(PlayerLogic *player, } } -void MessageLogWidget::logCreateToken(PlayerLogic *player, QString cardName, QString pt, bool faceDown) +void MessageLogWidget::logCreateToken(Player *player, QString cardName, QString pt, bool faceDown) { if (faceDown) { appendHtmlServerMessage( @@ -236,7 +233,7 @@ void MessageLogWidget::logCreateToken(PlayerLogic *player, QString cardName, QSt } } -void MessageLogWidget::logDeckSelect(PlayerLogic *player, QString deckHash, int sideboardSize) +void MessageLogWidget::logDeckSelect(Player *player, QString deckHash, int sideboardSize) { if (sideboardSize < 0) { appendHtmlServerMessage( @@ -249,13 +246,13 @@ void MessageLogWidget::logDeckSelect(PlayerLogic *player, QString deckHash, int } } -void MessageLogWidget::logDestroyCard(PlayerLogic *player, QString cardName) +void MessageLogWidget::logDestroyCard(Player *player, QString cardName) { appendHtmlServerMessage( tr("%1 destroys %2.").arg(sanitizeHtml(player->getPlayerInfo()->getName())).arg(cardLink(std::move(cardName)))); } -void MessageLogWidget::logMoveCard(PlayerLogic *player, +void MessageLogWidget::logMoveCard(Player *player, CardItem *card, CardZoneLogic *startZone, int oldX, @@ -362,7 +359,7 @@ void MessageLogWidget::logMoveCard(PlayerLogic *player, appendHtmlServerMessage(message); } -void MessageLogWidget::logDrawCards(PlayerLogic *player, int number, bool deckIsEmpty) +void MessageLogWidget::logDrawCards(Player *player, int number, bool deckIsEmpty) { soundEngine->playSound("draw_card"); if (currentContext == MessageContext_Mulligan) { @@ -379,7 +376,7 @@ void MessageLogWidget::logDrawCards(PlayerLogic *player, int number, bool deckIs } } -void MessageLogWidget::logDumpZone(PlayerLogic *player, CardZoneLogic *zone, int numberCards, bool isReversed) +void MessageLogWidget::logDumpZone(Player *player, CardZoneLogic *zone, int numberCards, bool isReversed) { if (numberCards == -1) { appendHtmlServerMessage(tr("%1 is looking at %2.") @@ -395,7 +392,7 @@ void MessageLogWidget::logDumpZone(PlayerLogic *player, CardZoneLogic *zone, int } } -void MessageLogWidget::logFlipCard(PlayerLogic *player, QString cardName, bool faceDown) +void MessageLogWidget::logFlipCard(Player *player, QString cardName, bool faceDown) { if (faceDown) { appendHtmlServerMessage( @@ -421,7 +418,7 @@ void MessageLogWidget::logGameFlooded() appendMessage(tr("You are flooding the game. Please wait a couple of seconds.")); } -void MessageLogWidget::logJoin(PlayerLogic *player) +void MessageLogWidget::logJoin(Player *player) { soundEngine->playSound("player_join"); appendHtmlServerMessage(tr("%1 has joined the game.").arg(sanitizeHtml(player->getPlayerInfo()->getName()))); @@ -438,7 +435,7 @@ void MessageLogWidget::logKicked() appendHtmlServerMessage(tr("You have been kicked out of the game."), true); } -void MessageLogWidget::logLeave(PlayerLogic *player, QString reason) +void MessageLogWidget::logLeave(Player *player, QString reason) { soundEngine->playSound("player_leave"); appendHtmlServerMessage(tr("%1 has left the game (%2).") @@ -453,13 +450,13 @@ void MessageLogWidget::logLeaveSpectator(QString name, QString reason) .arg(sanitizeHtml(std::move(name)), sanitizeHtml(std::move(reason)))); } -void MessageLogWidget::logNotReadyStart(PlayerLogic *player) +void MessageLogWidget::logNotReadyStart(Player *player) { appendHtmlServerMessage( tr("%1 is not ready to start the game any more.").arg(sanitizeHtml(player->getPlayerInfo()->getName()))); } -void MessageLogWidget::logMulligan(PlayerLogic *player, int number) +void MessageLogWidget::logMulligan(Player *player, int number) { if (!player) { return; @@ -479,16 +476,16 @@ void MessageLogWidget::logReplayStarted(int gameId) appendHtmlServerMessage(tr("You are watching a replay of game #%1.").arg(gameId)); } -void MessageLogWidget::logReadyStart(PlayerLogic *player) +void MessageLogWidget::logReadyStart(Player *player) { appendHtmlServerMessage(tr("%1 is ready to start the game.").arg(sanitizeHtml(player->getPlayerInfo()->getName()))); } -void MessageLogWidget::logRevealCards(PlayerLogic *player, +void MessageLogWidget::logRevealCards(Player *player, CardZoneLogic *zone, int cardId, QString cardName, - PlayerLogic *otherPlayer, + Player *otherPlayer, bool faceDown, int amount, bool isLentToAnotherPlayer) @@ -571,14 +568,14 @@ void MessageLogWidget::logRevealCards(PlayerLogic *player, } } -void MessageLogWidget::logReverseTurn(PlayerLogic *player, bool reversed) +void MessageLogWidget::logReverseTurn(Player *player, bool reversed) { appendHtmlServerMessage(tr("%1 reversed turn order, now it's %2.") .arg(sanitizeHtml(player->getPlayerInfo()->getName())) .arg(reversed ? tr("reversed") : tr("normal"))); } -void MessageLogWidget::logRollDie(PlayerLogic *player, int sides, const QList &rolls) +void MessageLogWidget::logRollDie(Player *player, int sides, const QList &rolls) { if (rolls.length() == 1) { const auto roll = rolls.at(0); @@ -615,7 +612,7 @@ void MessageLogWidget::logRollDie(PlayerLogic *player, int sides, const QListplaySound("roll_dice"); } -void MessageLogWidget::logSay(PlayerLogic *player, QString message) +void MessageLogWidget::logSay(Player *player, QString message) { appendMessage(std::move(message), {}, *player->getPlayerInfo()->getUserInfo(), true); } @@ -630,13 +627,13 @@ void MessageLogWidget::logSetActivePhase(int phaseNumber) phase.getName() + ""); } -void MessageLogWidget::logSetActivePlayer(PlayerLogic *player) +void MessageLogWidget::logSetActivePlayer(Player *player) { appendHtml("
" + QDateTime::currentDateTime().toString("[hh:mm:ss] ") + QString(tr("%1's turn.")).arg(player->getPlayerInfo()->getName()) + "
"); } -void MessageLogWidget::logSetAnnotation(PlayerLogic *player, CardItem *card, QString newAnnotation) +void MessageLogWidget::logSetAnnotation(Player *player, CardItem *card, QString newAnnotation) { appendHtmlServerMessage( QString(tr("%1 sets annotation of %2 to %3.")) @@ -645,27 +642,25 @@ void MessageLogWidget::logSetAnnotation(PlayerLogic *player, CardItem *card, QSt .arg(QString(""%1"").arg(sanitizeHtml(std::move(newAnnotation))))); } -void MessageLogWidget::logSetCardCounter(PlayerLogic *player, QString cardName, int counterId, int value, int oldValue) +void MessageLogWidget::logSetCardCounter(Player *player, QString cardName, int counterId, int value, int oldValue) { QString finalStr; int delta = abs(oldValue - value); if (value > oldValue) { - finalStr = tr("%1 places %2 %3%4 counter(s) on %5 (now %6).", "", delta); + finalStr = tr("%1 places %2 \"%3\" counter(s) on %4 (now %5).", "", delta); } else { - finalStr = tr("%1 removes %2 %3%4 counter(s) from %5 (now %6).", "", delta); + finalStr = tr("%1 removes %2 \"%3\" counter(s) from %4 (now %5).", "", delta); } auto &cardCounterSettings = SettingsCache::instance().cardCounters(); - QString hex = cardCounterSettings.color(counterId).name(); appendHtmlServerMessage(finalStr.arg(sanitizeHtml(player->getPlayerInfo()->getName())) .arg("" + QString::number(delta) + "") - .arg("●") .arg(cardCounterSettings.displayName(counterId)) .arg(cardLink(std::move(cardName))) .arg(value)); } -void MessageLogWidget::logSetCounter(PlayerLogic *player, QString counterName, int value, int oldValue) +void MessageLogWidget::logSetCounter(Player *player, QString counterName, int value, int oldValue) { if (counterName == "life") { soundEngine->playSound("life_change"); @@ -680,7 +675,7 @@ void MessageLogWidget::logSetCounter(PlayerLogic *player, QString counterName, i .arg(value - oldValue)); } -void MessageLogWidget::logSetDoesntUntap(PlayerLogic *player, CardItem *card, bool doesntUntap) +void MessageLogWidget::logSetDoesntUntap(Player *player, CardItem *card, bool doesntUntap) { QString str; if (doesntUntap) { @@ -691,7 +686,7 @@ void MessageLogWidget::logSetDoesntUntap(PlayerLogic *player, CardItem *card, bo appendHtmlServerMessage(str.arg(sanitizeHtml(player->getPlayerInfo()->getName())).arg(cardLink(card->getName()))); } -void MessageLogWidget::logSetPT(PlayerLogic *player, CardItem *card, QString newPT) +void MessageLogWidget::logSetPT(Player *player, CardItem *card, QString newPT) { if (currentContext == MessageContext_MoveCard) { return; @@ -718,7 +713,7 @@ void MessageLogWidget::logSetPT(PlayerLogic *player, CardItem *card, QString new } } -void MessageLogWidget::logSetSideboardLock(PlayerLogic *player, bool locked) +void MessageLogWidget::logSetSideboardLock(Player *player, bool locked) { if (locked) { appendHtmlServerMessage( @@ -729,7 +724,7 @@ void MessageLogWidget::logSetSideboardLock(PlayerLogic *player, bool locked) } } -void MessageLogWidget::logSetTapped(PlayerLogic *player, CardItem *card, bool tapped) +void MessageLogWidget::logSetTapped(Player *player, CardItem *card, bool tapped) { if (currentContext == MessageContext_MoveCard) { return; @@ -752,7 +747,7 @@ void MessageLogWidget::logSetTapped(PlayerLogic *player, CardItem *card, bool ta } } -void MessageLogWidget::logShuffle(PlayerLogic *player, CardZoneLogic *zone, int start, int end) +void MessageLogWidget::logShuffle(Player *player, CardZoneLogic *zone, int start, int end) { if (currentContext == MessageContext_Mulligan) { return; @@ -789,14 +784,14 @@ void MessageLogWidget::logSpectatorSay(const ServerInfo_User &spectator, QString appendMessage(std::move(message), {}, spectator, false); } -void MessageLogWidget::logUnattachCard(PlayerLogic *player, QString cardName) +void MessageLogWidget::logUnattachCard(Player *player, QString cardName) { appendHtmlServerMessage(tr("%1 unattaches %2.") .arg(sanitizeHtml(player->getPlayerInfo()->getName())) .arg(cardLink(std::move(cardName)))); } -void MessageLogWidget::logUndoDraw(PlayerLogic *player, QString cardName) +void MessageLogWidget::logUndoDraw(Player *player, QString cardName) { if (cardName.isEmpty()) { appendHtmlServerMessage(tr("%1 undoes their last draw.").arg(sanitizeHtml(player->getPlayerInfo()->getName()))); @@ -808,12 +803,6 @@ void MessageLogWidget::logUndoDraw(PlayerLogic *player, QString cardName) } } -void MessageLogWidget::logUndoDrawFailed(PlayerLogic *player) -{ - appendHtmlServerMessage( - tr("%1 failed to undo their last draw.").arg(sanitizeHtml(player->getPlayerInfo()->getName()))); -} - void MessageLogWidget::setContextJudgeName(QString name) { messagePrefix = QString(""); @@ -847,7 +836,6 @@ void MessageLogWidget::connectToPlayerEventHandler(PlayerEventHandler *playerEve connect(playerEventHandler, &PlayerEventHandler::logDumpZone, this, &MessageLogWidget::logDumpZone); connect(playerEventHandler, &PlayerEventHandler::logDrawCards, this, &MessageLogWidget::logDrawCards); connect(playerEventHandler, &PlayerEventHandler::logUndoDraw, this, &MessageLogWidget::logUndoDraw); - connect(playerEventHandler, &PlayerEventHandler::logUndoDrawFailed, this, &MessageLogWidget::logUndoDrawFailed); connect(playerEventHandler, &PlayerEventHandler::logRevealCards, this, &MessageLogWidget::logRevealCards); connect(playerEventHandler, &PlayerEventHandler::logAlwaysRevealTopCard, this, &MessageLogWidget::logAlwaysRevealTopCard); diff --git a/cockatrice/src/game/log/message_log_widget.h b/cockatrice/src/game/log/message_log_widget.h new file mode 100644 index 000000000..369debd33 --- /dev/null +++ b/cockatrice/src/game/log/message_log_widget.h @@ -0,0 +1,108 @@ +/** + * @file message_log_widget.h + * @ingroup GameWidgets + * @brief TODO: Document this. + */ + +#ifndef MESSAGELOGWIDGET_H +#define MESSAGELOGWIDGET_H + +#include "../../interface/widgets/server/chat_view/chat_view.h" +#include "../zones/logic/card_zone_logic.h" + +class AbstractGame; +class CardItem; +class GameEventContext; +class Player; +class PlayerEventHandler; + +class MessageLogWidget : public ChatView +{ + Q_OBJECT +private: + enum MessageContext + { + MessageContext_None, + MessageContext_MoveCard, + MessageContext_Mulligan + }; + + MessageContext currentContext; + QString messagePrefix, messageSuffix; + + static QPair getFromStr(CardZoneLogic *zone, QString cardName, int position, bool ownerChange); + +public: + void connectToPlayerEventHandler(PlayerEventHandler *player); + MessageLogWidget(TabSupervisor *_tabSupervisor, AbstractGame *_game, QWidget *parent = nullptr); + +public slots: + void containerProcessingDone(); + void containerProcessingStarted(const GameEventContext &context); + void logAlwaysRevealTopCard(Player *player, CardZoneLogic *zone, bool reveal); + void logAlwaysLookAtTopCard(Player *player, CardZoneLogic *zone, bool reveal); + void logAttachCard(Player *player, QString cardName, Player *targetPlayer, QString targetCardName); + void logConcede(int playerId); + void logUnconcede(int playerId); + void logConnectionStateChanged(Player *player, bool connectionState); + void logCreateArrow(Player *player, + Player *startPlayer, + QString startCard, + Player *targetPlayer, + QString targetCard, + bool playerTarget); + void logCreateToken(Player *player, QString cardName, QString pt, bool faceDown); + void logDeckSelect(Player *player, QString deckHash, int sideboardSize); + void logDestroyCard(Player *player, QString cardName); + void logDrawCards(Player *player, int number, bool deckIsEmpty); + void logDumpZone(Player *player, CardZoneLogic *zone, int numberCards, bool isReversed = false); + void logFlipCard(Player *player, QString cardName, bool faceDown); + void logGameClosed(); + void logGameStart(); + void logGameFlooded(); + void logJoin(Player *player); + void logJoinSpectator(QString name); + void logKicked(); + void logLeave(Player *player, QString reason); + void logLeaveSpectator(QString name, QString reason); + void logNotReadyStart(Player *player); + void logMoveCard(Player *player, + CardItem *card, + CardZoneLogic *startZone, + int oldX, + CardZoneLogic *targetZone, + int newX); + void logMulligan(Player *player, int number); + void logReplayStarted(int gameId); + void logReadyStart(Player *player); + void logRevealCards(Player *player, + CardZoneLogic *zone, + int cardId, + QString cardName, + Player *otherPlayer, + bool faceDown, + int amount, + bool isLentToAnotherPlayer); + void logReverseTurn(Player *player, bool reversed); + void logRollDie(Player *player, int sides, const QList &rolls); + void logSay(Player *player, QString message); + void logSetActivePhase(int phase); + void logSetActivePlayer(Player *player); + void logSetAnnotation(Player *player, CardItem *card, QString newAnnotation); + void logSetCardCounter(Player *player, QString cardName, int counterId, int value, int oldValue); + void logSetCounter(Player *player, QString counterName, int value, int oldValue); + void logSetDoesntUntap(Player *player, CardItem *card, bool doesntUntap); + void logSetPT(Player *player, CardItem *card, QString newPT); + void logSetSideboardLock(Player *player, bool locked); + void logSetTapped(Player *player, CardItem *card, bool tapped); + void logShuffle(Player *player, CardZoneLogic *zone, int start, int end); + void logSpectatorSay(const ServerInfo_User &spectator, QString message); + void logUnattachCard(Player *player, QString cardName); + void logUndoDraw(Player *player, QString cardName); + void setContextJudgeName(QString player); + void appendHtmlServerMessage(const QString &html, + bool optionalIsBold = false, + QString optionalFontColor = QString()) override; +}; + +#endif diff --git a/cockatrice/src/game/phase.h b/cockatrice/src/game/phase.h index a888ad43b..2e712932f 100644 --- a/cockatrice/src/game/phase.h +++ b/cockatrice/src/game/phase.h @@ -1,8 +1,8 @@ /** * @file phase.h * @ingroup GameLogic + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef PHASE_H #define PHASE_H diff --git a/cockatrice/src/game_graphics/phases_toolbar.cpp b/cockatrice/src/game/phases_toolbar.cpp similarity index 95% rename from cockatrice/src/game_graphics/phases_toolbar.cpp rename to cockatrice/src/game/phases_toolbar.cpp index 3361f9d55..2341a1d7f 100644 --- a/cockatrice/src/game_graphics/phases_toolbar.cpp +++ b/cockatrice/src/game/phases_toolbar.cpp @@ -21,9 +21,8 @@ PhaseButton::PhaseButton(const QString &_name, QGraphicsItem *parent, QAction *_ activeAnimationTimer = new QTimer(this); connect(activeAnimationTimer, &QTimer::timeout, this, &PhaseButton::updateAnimation); activeAnimationTimer->setSingleShot(false); - } else { + } else activeAnimationCounter = 9; - } setCacheMode(DeviceCoordinateCache); } @@ -64,9 +63,8 @@ void PhaseButton::setWidth(double _width) void PhaseButton::setActive(bool _active) { - if ((active == _active) || !highlightable) { + if ((active == _active) || !highlightable) return; - } active = _active; activeAnimationTimer->start(25); @@ -74,9 +72,8 @@ void PhaseButton::setActive(bool _active) void PhaseButton::updateAnimation() { - if (!highlightable) { + if (!highlightable) return; - } // the counter ticks up to 10 when active and down to 0 when inactive if (active && activeAnimationCounter < 10) { @@ -102,9 +99,8 @@ void PhaseButton::mouseDoubleClickEvent(QGraphicsSceneMouseEvent * /*event*/) void PhaseButton::triggerDoubleClickAction() { - if (doubleClickAction) { + if (doubleClickAction) doubleClickAction->trigger(); - } } PhasesToolbar::PhasesToolbar(QGraphicsItem *parent) @@ -130,9 +126,8 @@ PhasesToolbar::PhasesToolbar(QGraphicsItem *parent) buttonList << untapButton << upkeepButton << drawButton << main1Button << combatStartButton << combatAttackersButton << combatBlockersButton << combatDamageButton << combatEndButton << main2Button << cleanupButton; - for (auto &i : buttonList) { + for (auto &i : buttonList) connect(i, &PhaseButton::clicked, this, &PhasesToolbar::phaseButtonClicked); - } nextTurnButton = new PhaseButton("nextturn", this, nullptr, false); connect(nextTurnButton, &PhaseButton::clicked, this, &PhasesToolbar::actNextTurn); @@ -149,9 +144,8 @@ QRectF PhasesToolbar::boundingRect() const void PhasesToolbar::retranslateUi() { - for (int i = 0; i < buttonList.size(); ++i) { + for (int i = 0; i < buttonList.size(); ++i) buttonList[i]->setToolTip(getLongPhaseName(i)); - } } QString PhasesToolbar::getLongPhaseName(int phase) const @@ -193,9 +187,8 @@ const double PhasesToolbar::marginSize = 3; void PhasesToolbar::rearrangeButtons() { - for (auto &i : buttonList) { + for (auto &i : buttonList) i->setWidth(symbolSize); - } nextTurnButton->setWidth(symbolSize); double y = marginSize; @@ -233,13 +226,11 @@ void PhasesToolbar::setHeight(double _height) void PhasesToolbar::setActivePhase(int phase) { - if (phase >= buttonList.size()) { + if (phase >= buttonList.size()) return; - } - for (int i = 0; i < buttonList.size(); ++i) { + for (int i = 0; i < buttonList.size(); ++i) buttonList[i]->setActive(i == phase); - } } void PhasesToolbar::triggerPhaseAction(int phase) @@ -252,9 +243,8 @@ void PhasesToolbar::triggerPhaseAction(int phase) void PhasesToolbar::phaseButtonClicked() { auto *button = qobject_cast(sender()); - if (button->getActive()) { + if (button->getActive()) button->triggerDoubleClickAction(); - } Command_SetActivePhase cmd; cmd.set_phase(static_cast(buttonList.indexOf(button))); diff --git a/cockatrice/src/game_graphics/phases_toolbar.h b/cockatrice/src/game/phases_toolbar.h similarity index 96% rename from cockatrice/src/game_graphics/phases_toolbar.h rename to cockatrice/src/game/phases_toolbar.h index 39884ef75..215a97dd1 100644 --- a/cockatrice/src/game_graphics/phases_toolbar.h +++ b/cockatrice/src/game/phases_toolbar.h @@ -2,13 +2,13 @@ * @file phases_toolbar.h * @ingroup GameGraphics * @ingroup GameWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef PHASESTOOLBAR_H #define PHASESTOOLBAR_H -#include "board/abstract_graphics_item.h" +#include "../game_graphics/board/abstract_graphics_item.h" #include #include @@ -21,7 +21,7 @@ namespace protobuf class Message; } } // namespace google -class PlayerLogic; +class Player; class GameCommand; class PhaseButton : public QObject, public QGraphicsItem diff --git a/cockatrice/src/game_graphics/player/card_menu_action_type.h b/cockatrice/src/game/player/card_menu_action_type.h similarity index 95% rename from cockatrice/src/game_graphics/player/card_menu_action_type.h rename to cockatrice/src/game/player/card_menu_action_type.h index 4cae22716..1b63674fa 100644 --- a/cockatrice/src/game_graphics/player/card_menu_action_type.h +++ b/cockatrice/src/game/player/card_menu_action_type.h @@ -1,8 +1,8 @@ /** * @file card_menu_action_type.h * @ingroup GameMenusPlayers + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_CARD_MENU_ACTION_TYPE_H #define COCKATRICE_CARD_MENU_ACTION_TYPE_H diff --git a/cockatrice/src/game/player/event_processing_options.h b/cockatrice/src/game/player/event_processing_options.h index 4c7663789..3e743bdb3 100644 --- a/cockatrice/src/game/player/event_processing_options.h +++ b/cockatrice/src/game/player/event_processing_options.h @@ -1,8 +1,8 @@ /** * @file event_processing_options.h * @ingroup GameLogicPlayers + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_EVENT_PROCESSING_OPTIONS_H #define COCKATRICE_EVENT_PROCESSING_OPTIONS_H diff --git a/cockatrice/src/game_graphics/player/menu/abstract_player_component.h b/cockatrice/src/game/player/menu/abstract_player_component.h similarity index 78% rename from cockatrice/src/game_graphics/player/menu/abstract_player_component.h rename to cockatrice/src/game/player/menu/abstract_player_component.h index ee310c428..989300d41 100644 --- a/cockatrice/src/game_graphics/player/menu/abstract_player_component.h +++ b/cockatrice/src/game/player/menu/abstract_player_component.h @@ -19,13 +19,13 @@ class AbstractPlayerComponent public: virtual ~AbstractPlayerComponent() = default; - /** @brief Bind keyboard shortcuts. Called when this player gains focus. */ + /// Bind keyboard shortcuts. Called when this player gains focus. virtual void setShortcutsActive() = 0; - /** @brief Unbind keyboard shortcuts. Called when this player loses focus. */ + /// Unbind keyboard shortcuts. Called when this player loses focus. virtual void setShortcutsInactive() = 0; - /** @brief Retranslate all user-visible strings. Called on language change. */ + /// Retranslate all user-visible strings. Called on language change. virtual void retranslateUi() = 0; }; diff --git a/cockatrice/src/game_graphics/player/menu/card_menu.cpp b/cockatrice/src/game/player/menu/card_menu.cpp similarity index 74% rename from cockatrice/src/game_graphics/player/menu/card_menu.cpp rename to cockatrice/src/game/player/menu/card_menu.cpp index aa94c3be7..66ca5e46b 100644 --- a/cockatrice/src/game_graphics/player/menu/card_menu.cpp +++ b/cockatrice/src/game/player/menu/card_menu.cpp @@ -3,121 +3,89 @@ #include "../../../client/settings/card_counter_settings.h" #include "../../../interface/widgets/tabs/tab_game.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 "../../zones/logic/view_zone_logic.h" #include "../card_menu_action_type.h" -#include "../player_graphics_item.h" +#include "../player.h" +#include "../player_actions.h" #include "move_menu.h" #include "pt_menu.h" -#include #include #include #include -/** - * @brief Creates a circular icon filled with the specified color. - */ -static QIcon createCircleIcon(const QColor &color) -{ - QPixmap pixmap(32, 32); - pixmap.fill(Qt::transparent); - QPainter painter(&pixmap); - painter.setRenderHint(QPainter::Antialiasing); - painter.setPen(Qt::NoPen); - painter.setBrush(color); - painter.drawEllipse(pixmap.rect()); - - return QIcon(pixmap); -} - -template -static QAction *makeAction(QObject *parent, Slot &&slot, bool checkable = false, bool checked = false) -{ - auto *a = new QAction(parent); - a->setCheckable(checkable); - if (checkable) { - a->setChecked(checked); - } - QObject::connect(a, &QAction::triggered, parent, std::forward(slot)); - return a; -} - -CardMenu::CardMenu(PlayerGraphicsItem *_player, const CardItem *_card, bool _shortcutsActive) +CardMenu::CardMenu(Player *_player, const CardItem *_card, bool _shortcutsActive) : player(_player), card(_card), shortcutsActive(_shortcutsActive) { - const QList &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values(); + auto playerActions = player->getPlayerActions(); + + const QList &players = player->getGame()->getPlayerManager()->getPlayers().values(); for (auto playerToAdd : players) { - if (playerToAdd == player->getLogic()) { + if (playerToAdd == player) { continue; } playersInfo.append(qMakePair(playerToAdd->getPlayerInfo()->getName(), playerToAdd->getPlayerInfo()->getId())); } - connect(player->getLogic()->getGame()->getPlayerManager(), &PlayerManager::playerRemoved, this, - &CardMenu::removePlayer); + connect(player->getGame()->getPlayerManager(), &PlayerManager::playerRemoved, this, &CardMenu::removePlayer); - auto *actions = player->getLogic()->getPlayerActions(); - auto *gameScene = player->getGameScene(); - - // Single selection resolver used by all lambdas — called at trigger time - auto sel = [gameScene]() { return gameScene->selectedCards(); }; - - // Unified dispatcher for card menu actions - auto invoke = [actions, sel](CardMenuActionType type) { - return [actions, sel, type]() { actions->cardMenuAction(sel(), type); }; - }; - - // Actions using invoke (type dispatch, need selection) - aTap = makeAction(this, invoke(cmTap)); - aDoesntUntap = makeAction(this, invoke(cmDoesntUntap), /*checkable=*/true, card && card->getDoesntUntap()); - aFlip = makeAction(this, invoke(cmFlip)); - aPeek = makeAction(this, invoke(cmPeek)); - aClone = makeAction(this, invoke(cmClone)); - - // Actions using selection directly - aUnattach = makeAction(this, [actions, sel]() { actions->actUnattach(sel()); }); - aSetAnnotation = makeAction(this, [actions, sel]() { actions->actRequestSetAnnotationDialog(sel()); }); - aPlay = makeAction(this, [actions, sel]() { actions->actPlay(sel()); }); - aPlayFacedown = makeAction(this, [actions, sel]() { actions->actPlayFacedown(sel()); }); - aHide = makeAction(this, [actions, sel]() { actions->actHide(sel()); }); - aReduceLifeByPower = makeAction(this, [actions, sel]() { actions->actReduceLifeByPower(sel()); }); - - // Actions that use activeCard, not selection — direct connection + aTap = new QAction(this); + aTap->setData(cmTap); + connect(aTap, &QAction::triggered, playerActions, &PlayerActions::cardMenuAction); + aDoesntUntap = new QAction(this); + aDoesntUntap->setData(cmDoesntUntap); + aDoesntUntap->setCheckable(true); + aDoesntUntap->setChecked(card != nullptr && card->getDoesntUntap()); + connect(aDoesntUntap, &QAction::triggered, playerActions, &PlayerActions::cardMenuAction); aAttach = new QAction(this); + connect(aAttach, &QAction::triggered, playerActions, &PlayerActions::actAttach); + aUnattach = new QAction(this); + connect(aUnattach, &QAction::triggered, playerActions, &PlayerActions::actUnattach); aDrawArrow = new QAction(this); + connect(aDrawArrow, &QAction::triggered, playerActions, &PlayerActions::actDrawArrow); + aSetAnnotation = new QAction(this); + connect(aSetAnnotation, &QAction::triggered, playerActions, &PlayerActions::actSetAnnotation); + aFlip = new QAction(this); + aFlip->setData(cmFlip); + connect(aFlip, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction); + aPeek = new QAction(this); + aPeek->setData(cmPeek); + connect(aPeek, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction); + aClone = new QAction(this); + aClone->setData(cmClone); + connect(aClone, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction); aSelectAll = new QAction(this); + connect(aSelectAll, &QAction::triggered, playerActions, &PlayerActions::actSelectAll); aSelectRow = new QAction(this); + connect(aSelectRow, &QAction::triggered, playerActions, &PlayerActions::actSelectRow); aSelectColumn = new QAction(this); + connect(aSelectColumn, &QAction::triggered, playerActions, &PlayerActions::actSelectColumn); - 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); + aPlay = new QAction(this); + connect(aPlay, &QAction::triggered, playerActions, &PlayerActions::actPlay); + aHide = new QAction(this); + connect(aHide, &QAction::triggered, playerActions, &PlayerActions::actHide); + aPlayFacedown = new QAction(this); + connect(aPlayFacedown, &QAction::triggered, playerActions, &PlayerActions::actPlayFacedown); aRevealToAll = new QAction(this); mCardCounters = new QMenu; - // Card counters for (int i = 0; i < 6; ++i) { - QColor color = SettingsCache::instance().cardCounters().color(i); - QIcon circleIcon = createCircleIcon(color); - - auto *addAction = makeAction(this, [actions, sel, i]() { actions->actAddCardCounter(sel(), i); }); - addAction->setIcon(circleIcon); - aAddCounter.append(addAction); - - auto *removeAction = makeAction(this, [actions, sel, i]() { actions->actRemoveCardCounter(sel(), i); }); - removeAction->setIcon(circleIcon); - aRemoveCounter.append(removeAction); - - auto *setAction = makeAction(this, [actions, sel, i]() { actions->actRequestSetCardCounterDialog(sel(), i); }); - setAction->setIcon(circleIcon); - aSetCounter.append(setAction); + auto *tempAddCounter = new QAction(this); + tempAddCounter->setData(9 + i * 1000); + auto *tempRemoveCounter = new QAction(this); + tempRemoveCounter->setData(10 + i * 1000); + auto *tempSetCounter = new QAction(this); + tempSetCounter->setData(11 + i * 1000); + aAddCounter.append(tempAddCounter); + aRemoveCounter.append(tempRemoveCounter); + aSetCounter.append(tempSetCounter); + connect(tempAddCounter, &QAction::triggered, playerActions, &PlayerActions::actCardCounterTrigger); + connect(tempRemoveCounter, &QAction::triggered, playerActions, &PlayerActions::actCardCounterTrigger); + connect(tempSetCounter, &QAction::triggered, playerActions, &PlayerActions::actCardCounterTrigger); } setShortcutsActive(); @@ -129,7 +97,7 @@ CardMenu::CardMenu(PlayerGraphicsItem *_player, const CardItem *_card, bool _sho } bool revealedCard = false; - bool writeableCard = player->getLogic()->getPlayerInfo()->getLocalOrJudge(); + bool writeableCard = player->getPlayerInfo()->getLocalOrJudge(); if (auto *view = qobject_cast(card->getZone())) { if (view->getRevealZone()) { if (view->getWriteableRevealZone()) { @@ -166,7 +134,7 @@ CardMenu::CardMenu(PlayerGraphicsItem *_player, const CardItem *_card, bool _sho } } -void CardMenu::removePlayer(PlayerLogic *playerToRemove) +void CardMenu::removePlayer(Player *playerToRemove) { for (auto it = playersInfo.begin(); it != playersInfo.end();) { if (it->second == playerToRemove->getPlayerInfo()->getId()) { @@ -185,8 +153,6 @@ void CardMenu::createTableMenu(bool canModifyCard) addSeparator(); addAction(aClone); addSeparator(); - addAction(aReduceLifeByPower); - addSeparator(); addAction(aSelectAll); addAction(aSelectRow); addRelatedCardView(); @@ -213,8 +179,6 @@ void CardMenu::createTableMenu(bool canModifyCard) addMenu(new PtMenu(player)); addAction(aSetAnnotation); addSeparator(); - addAction(aReduceLifeByPower); - addSeparator(); addAction(aSelectAll); addAction(aSelectRow); @@ -313,9 +277,7 @@ void CardMenu::createHandOrCustomZoneMenu(bool canModifyCard) initContextualPlayersMenu(revealMenu, aRevealToAll); - connect(revealMenu, &QMenu::triggered, this, [this](QAction *action) { - player->getLogic()->getPlayerActions()->actReveal(player->getGameScene()->selectedCards(), action); - }); + connect(revealMenu, &QMenu::triggered, player->getPlayerActions(), &PlayerActions::actReveal); addSeparator(); addAction(aClone); @@ -400,7 +362,8 @@ void CardMenu::addRelatedCardView() QAction *viewCard = viewRelatedCards->addAction(relatedCardName); Q_UNUSED(viewCard); - connect(viewCard, &QAction::triggered, this, [this, cardRef] { emit cardInfoRequested(cardRef); }); + connect(viewCard, &QAction::triggered, player->getGame(), + [this, cardRef] { player->getGame()->getTab()->viewCardInfo(cardRef); }); } } @@ -462,8 +425,7 @@ void CardMenu::addRelatedCardActions() auto *createRelated = new QAction(text, this); createRelated->setData(QVariant(index++)); - connect(createRelated, &QAction::triggered, player->getLogic()->getPlayerActions(), - &PlayerActions::actCreateRelatedCard); + connect(createRelated, &QAction::triggered, player->getPlayerActions(), &PlayerActions::actCreateRelatedCard); addAction(createRelated); } @@ -472,7 +434,7 @@ void CardMenu::addRelatedCardActions() createRelatedCards->setShortcuts( SettingsCache::instance().shortcuts().getShortcut("Player/aCreateRelatedTokens")); } - connect(createRelatedCards, &QAction::triggered, player->getLogic()->getPlayerActions(), + connect(createRelatedCards, &QAction::triggered, player->getPlayerActions(), &PlayerActions::actCreateAllRelatedCards); addAction(createRelatedCards); } @@ -501,7 +463,6 @@ void CardMenu::retranslateUi() aUnattach->setText(tr("Unattac&h")); aDrawArrow->setText(tr("&Draw arrow...")); aSetAnnotation->setText(tr("&Set annotation...")); - aReduceLifeByPower->setText(tr("Reduce life by power")); mCardCounters->setTitle(tr("Ca&rd counters")); @@ -536,7 +497,6 @@ void CardMenu::setShortcutsActive() aUnattach->setShortcuts(shortcuts.getShortcut("Player/aUnattach")); aDrawArrow->setShortcuts(shortcuts.getShortcut("Player/aDrawArrow")); aSetAnnotation->setShortcuts(shortcuts.getShortcut("Player/aSetAnnotation")); - aReduceLifeByPower->setShortcuts(shortcuts.getShortcut("Player/aReduceLifeByPower")); aSelectAll->setShortcuts(shortcuts.getShortcut("Player/aSelectAll")); aSelectRow->setShortcuts(shortcuts.getShortcut("Player/aSelectRow")); diff --git a/cockatrice/src/game_graphics/player/menu/card_menu.h b/cockatrice/src/game/player/menu/card_menu.h similarity index 75% rename from cockatrice/src/game_graphics/player/menu/card_menu.h rename to cockatrice/src/game/player/menu/card_menu.h index d67ef3876..b7f2f8241 100644 --- a/cockatrice/src/game_graphics/player/menu/card_menu.h +++ b/cockatrice/src/game/player/menu/card_menu.h @@ -1,28 +1,23 @@ /** * @file card_menu.h * @ingroup GameMenusCards + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_CARD_MENU_H #define COCKATRICE_CARD_MENU_H #include -#include class CardItem; -class PlayerGraphicsItem; -class PlayerLogic; +class Player; class CardMenu : public QMenu { Q_OBJECT -signals: - void cardInfoRequested(const CardRef &cardRef); - public: - explicit CardMenu(PlayerGraphicsItem *player, const CardItem *card, bool shortcutsActive); - void removePlayer(PlayerLogic *playerToRemove); + explicit CardMenu(Player *player, const CardItem *card, bool shortcutsActive); + void removePlayer(Player *playerToRemove); void createTableMenu(bool canModifyCard); void createStackMenu(bool canModifyCard); void createGraveyardOrExileMenu(bool canModifyCard); @@ -41,12 +36,11 @@ public: QAction *aFlip, *aPeek; QAction *aAttach, *aUnattach; QAction *aSetAnnotation; - QAction *aReduceLifeByPower; QList aAddCounter, aSetCounter, aRemoveCounter; private: - PlayerGraphicsItem *player; + Player *player; const CardItem *card; QList> playersInfo; bool shortcutsActive; diff --git a/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp b/cockatrice/src/game/player/menu/custom_zone_menu.cpp similarity index 63% rename from cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp rename to cockatrice/src/game/player/menu/custom_zone_menu.cpp index 743746cc8..b0f3284c9 100644 --- a/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp +++ b/cockatrice/src/game/player/menu/custom_zone_menu.cpp @@ -1,14 +1,13 @@ #include "custom_zone_menu.h" -#include "../../game/player/player_logic.h" -#include "../player_graphics_item.h" +#include "../player.h" -CustomZoneMenu::CustomZoneMenu(PlayerGraphicsItem *_player) : player(_player) +CustomZoneMenu::CustomZoneMenu(Player *_player) : player(_player) { menuAction()->setVisible(false); - connect(player->getLogic(), &PlayerLogic::clearCustomZonesMenu, this, &CustomZoneMenu::clearCustomZonesMenu); - connect(player->getLogic(), &PlayerLogic::addViewCustomZoneActionToCustomZoneMenu, this, + connect(player, &Player::clearCustomZonesMenu, this, &CustomZoneMenu::clearCustomZonesMenu); + connect(player, &Player::addViewCustomZoneActionToCustomZoneMenu, this, &CustomZoneMenu::addViewCustomZoneActionToCustomZoneMenu); retranslateUi(); @@ -18,7 +17,7 @@ void CustomZoneMenu::retranslateUi() { setTitle(tr("C&ustom Zones")); - if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) { + if (player->getPlayerInfo()->getLocalOrJudge()) { for (auto aViewZone : actions()) { aViewZone->setText(tr("View custom zone '%1'").arg(aViewZone->data().toString())); @@ -38,5 +37,5 @@ void CustomZoneMenu::addViewCustomZoneActionToCustomZoneMenu(QString zoneName) QAction *aViewZone = addAction(tr("View custom zone '%1'").arg(zoneName)); aViewZone->setData(zoneName); connect(aViewZone, &QAction::triggered, this, - [zoneName, this]() { player->getGameScene()->toggleZoneView(player->getLogic(), zoneName, -1); }); + [zoneName, this]() { player->getGameScene()->toggleZoneView(player, zoneName, -1); }); } \ No newline at end of file diff --git a/cockatrice/src/game_graphics/player/menu/custom_zone_menu.h b/cockatrice/src/game/player/menu/custom_zone_menu.h similarity index 80% rename from cockatrice/src/game_graphics/player/menu/custom_zone_menu.h rename to cockatrice/src/game/player/menu/custom_zone_menu.h index 46dd58db6..c4e66754e 100644 --- a/cockatrice/src/game_graphics/player/menu/custom_zone_menu.h +++ b/cockatrice/src/game/player/menu/custom_zone_menu.h @@ -1,8 +1,8 @@ /** * @file custom_zone_menu.h * @ingroup GameMenusZones + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_CUSTOM_ZONE_MENU_H #define COCKATRICE_CUSTOM_ZONE_MENU_H @@ -11,12 +11,12 @@ #include -class PlayerGraphicsItem; +class Player; class CustomZoneMenu : public QMenu, public AbstractPlayerComponent { Q_OBJECT public: - explicit CustomZoneMenu(PlayerGraphicsItem *player); + explicit CustomZoneMenu(Player *player); void retranslateUi() override; void setShortcutsActive() override { @@ -26,7 +26,7 @@ public: } private: - PlayerGraphicsItem *player; + Player *player; private slots: void clearCustomZonesMenu(); void addViewCustomZoneActionToCustomZoneMenu(QString zoneName); diff --git a/cockatrice/src/game_graphics/player/menu/grave_menu.cpp b/cockatrice/src/game/player/menu/grave_menu.cpp similarity index 79% rename from cockatrice/src/game_graphics/player/menu/grave_menu.cpp rename to cockatrice/src/game/player/menu/grave_menu.cpp index 698481f7a..2af62c08a 100644 --- a/cockatrice/src/game_graphics/player/menu/grave_menu.cpp +++ b/cockatrice/src/game/player/menu/grave_menu.cpp @@ -1,22 +1,21 @@ #include "grave_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 "../../abstract_game.h" +#include "../player.h" +#include "../player_actions.h" #include #include #include -GraveyardMenu::GraveyardMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(parent), player(_player) +GraveyardMenu::GraveyardMenu(Player *_player, QWidget *parent) : TearOffMenu(parent), player(_player) { createMoveActions(); createViewActions(); addAction(aViewGraveyard); - if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) { + if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) { mRevealRandomGraveyardCard = addMenu(QString()); connect(mRevealRandomGraveyardCard, &QMenu::aboutToShow, this, &GraveyardMenu::populateRevealRandomMenuWithActivePlayers); @@ -37,9 +36,9 @@ GraveyardMenu::GraveyardMenu(PlayerGraphicsItem *_player, QWidget *parent) : Tea void GraveyardMenu::createMoveActions() { - auto grave = player->getLogic()->getGraveZone(); + auto grave = player->getGraveZone(); - if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) { + if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) { aMoveGraveToTopLibrary = new QAction(this); aMoveGraveToTopLibrary->setData(QList() << ZoneNames::DECK << 0); @@ -61,7 +60,7 @@ void GraveyardMenu::createMoveActions() void GraveyardMenu::createViewActions() { - PlayerActions *playerActions = player->getLogic()->getPlayerActions(); + PlayerActions *playerActions = player->getPlayerActions(); aViewGraveyard = new QAction(this); connect(aViewGraveyard, &QAction::triggered, playerActions, &PlayerActions::actViewGraveyard); @@ -77,11 +76,10 @@ void GraveyardMenu::populateRevealRandomMenuWithActivePlayers() mRevealRandomGraveyardCard->addSeparator(); - const auto &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values(); + const auto &players = player->getGame()->getPlayerManager()->getPlayers().values(); for (auto *other : players) { - if (other == player->getLogic()) { + if (other == player) continue; - } QAction *a = mRevealRandomGraveyardCard->addAction(other->getPlayerInfo()->getName()); a->setData(other->getPlayerInfo()->getId()); connect(a, &QAction::triggered, this, &GraveyardMenu::onRevealRandomTriggered); @@ -91,7 +89,7 @@ void GraveyardMenu::populateRevealRandomMenuWithActivePlayers() void GraveyardMenu::onRevealRandomTriggered() { if (auto *a = qobject_cast(sender())) { - player->getLogic()->getPlayerActions()->actRevealRandomGraveyardCard(a->data().toInt()); + player->getPlayerActions()->actRevealRandomGraveyardCard(a->data().toInt()); } } @@ -101,7 +99,7 @@ void GraveyardMenu::retranslateUi() aViewGraveyard->setText(tr("&View graveyard")); - if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) { + if (player->getPlayerInfo()->getLocalOrJudge()) { moveGraveMenu->setTitle(tr("&Move graveyard to...")); aMoveGraveToTopLibrary->setText(tr("&Top of library")); aMoveGraveToBottomLibrary->setText(tr("&Bottom of library")); diff --git a/cockatrice/src/game_graphics/player/menu/grave_menu.h b/cockatrice/src/game/player/menu/grave_menu.h similarity index 85% rename from cockatrice/src/game_graphics/player/menu/grave_menu.h rename to cockatrice/src/game/player/menu/grave_menu.h index 116261e9b..429173afa 100644 --- a/cockatrice/src/game_graphics/player/menu/grave_menu.h +++ b/cockatrice/src/game/player/menu/grave_menu.h @@ -1,8 +1,8 @@ /** * @file grave_menu.h * @ingroup GameMenusZones + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_GRAVE_MENU_H #define COCKATRICE_GRAVE_MENU_H @@ -13,7 +13,7 @@ #include #include -class PlayerGraphicsItem; +class Player; class GraveyardMenu : public TearOffMenu, public AbstractPlayerComponent { Q_OBJECT @@ -21,7 +21,7 @@ signals: void newPlayerActionCreated(QAction *action); public: - explicit GraveyardMenu(PlayerGraphicsItem *player, QWidget *parent = nullptr); + explicit GraveyardMenu(Player *player, QWidget *parent = nullptr); void createMoveActions(); void createViewActions(); void populateRevealRandomMenuWithActivePlayers(); @@ -40,7 +40,7 @@ public: QAction *aMoveGraveToRfg = nullptr; private: - PlayerGraphicsItem *player; + Player *player; }; #endif // COCKATRICE_GRAVE_MENU_H diff --git a/cockatrice/src/game_graphics/player/menu/hand_menu.cpp b/cockatrice/src/game/player/menu/hand_menu.cpp similarity index 85% rename from cockatrice/src/game_graphics/player/menu/hand_menu.cpp rename to cockatrice/src/game/player/menu/hand_menu.cpp index ba0702f07..d65c136bf 100644 --- a/cockatrice/src/game_graphics/player/menu/hand_menu.cpp +++ b/cockatrice/src/game/player/menu/hand_menu.cpp @@ -2,23 +2,19 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" -#include "../../../game_graphics/zones/hand_zone.h" -#include "../../game/abstract_game.h" -#include "../../game/player/player_actions.h" -#include "../../game/player/player_logic.h" -#include "../player_graphics_item.h" +#include "../../abstract_game.h" +#include "../../zones/hand_zone.h" +#include "../player.h" +#include "../player_actions.h" #include #include #include -HandMenu::HandMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(parent), player(_player) +HandMenu::HandMenu(Player *_player, PlayerActions *actions, QWidget *parent) : TearOffMenu(parent), player(_player) { - auto *actions = player->getLogic()->getPlayerActions(); - - if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) { + if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) { aViewHand = new QAction(this); - connect(aViewHand, &QAction::triggered, actions, &PlayerActions::actViewHand); addAction(aViewHand); @@ -62,7 +58,7 @@ HandMenu::HandMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(p addSeparator(); aMulligan = new QAction(this); - connect(aMulligan, &QAction::triggered, actions, &PlayerActions::actRequestMulliganDialog); + connect(aMulligan, &QAction::triggered, actions, &PlayerActions::actMulligan); addAction(aMulligan); // Mulligan same size @@ -79,7 +75,7 @@ HandMenu::HandMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(p mMoveHandMenu = addTearOffMenu(QString()); - if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) { + if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) { aMoveHandToTopLibrary = new QAction(this); aMoveHandToTopLibrary->setData(QList() << ZoneNames::DECK << 0); aMoveHandToBottomLibrary = new QAction(this); @@ -89,7 +85,7 @@ HandMenu::HandMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(p aMoveHandToRfg = new QAction(this); aMoveHandToRfg->setData(QList() << ZoneNames::EXILE << 0); - auto hand = player->getLogic()->getHandZone(); + auto hand = player->getHandZone(); connect(aMoveHandToTopLibrary, &QAction::triggered, hand, &HandZoneLogic::moveAllToZone); connect(aMoveHandToBottomLibrary, &QAction::triggered, hand, &HandZoneLogic::moveAllToZone); @@ -111,7 +107,7 @@ void HandMenu::retranslateUi() { setTitle(tr("&Hand")); - if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) { + if (player->getPlayerInfo()->getLocalOrJudge()) { aViewHand->setText(tr("&View hand")); mSortHand->setTitle(tr("Sort hand by...")); @@ -170,11 +166,10 @@ void HandMenu::populateRevealHandMenuWithActivePlayers() mRevealHand->addSeparator(); - const auto &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values(); + const auto &players = player->getGame()->getPlayerManager()->getPlayers().values(); for (auto *other : players) { - if (other == player->getLogic()) { + if (other == player) continue; - } QAction *a = mRevealHand->addAction(other->getPlayerInfo()->getName()); a->setData(other->getPlayerInfo()->getId()); connect(a, &QAction::triggered, this, &HandMenu::onRevealHandTriggered); @@ -189,11 +184,10 @@ void HandMenu::populateRevealRandomHandCardMenuWithActivePlayers() mRevealRandomHandCard->addSeparator(); - const auto &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values(); + const auto &players = player->getGame()->getPlayerManager()->getPlayers().values(); for (auto *other : players) { - if (other == player->getLogic()) { + if (other == player) continue; - } QAction *a = mRevealRandomHandCard->addAction(other->getPlayerInfo()->getName()); a->setData(other->getPlayerInfo()->getId()); connect(a, &QAction::triggered, this, &HandMenu::onRevealRandomHandCardTriggered); @@ -203,21 +197,19 @@ void HandMenu::populateRevealRandomHandCardMenuWithActivePlayers() void HandMenu::onRevealHandTriggered() { auto *action = qobject_cast(sender()); - if (!action) { + if (!action) return; - } const int targetId = action->data().toInt(); - player->getLogic()->getPlayerActions()->actRevealHand(targetId); + player->getPlayerActions()->actRevealHand(targetId); } void HandMenu::onRevealRandomHandCardTriggered() { auto *action = qobject_cast(sender()); - if (!action) { + if (!action) return; - } const int targetId = action->data().toInt(); - player->getLogic()->getPlayerActions()->actRevealRandomHandCard(targetId); + player->getPlayerActions()->actRevealRandomHandCard(targetId); } diff --git a/cockatrice/src/game_graphics/player/menu/hand_menu.h b/cockatrice/src/game/player/menu/hand_menu.h similarity index 91% rename from cockatrice/src/game_graphics/player/menu/hand_menu.h rename to cockatrice/src/game/player/menu/hand_menu.h index d5204612b..76434cc98 100644 --- a/cockatrice/src/game_graphics/player/menu/hand_menu.h +++ b/cockatrice/src/game/player/menu/hand_menu.h @@ -1,8 +1,8 @@ /** * @file hand_menu.h * @ingroup GameMenusZones + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_HAND_MENU_H #define COCKATRICE_HAND_MENU_H @@ -13,7 +13,7 @@ #include #include -class PlayerGraphicsItem; +class Player; class PlayerActions; class HandMenu : public TearOffMenu, public AbstractPlayerComponent @@ -21,7 +21,7 @@ class HandMenu : public TearOffMenu, public AbstractPlayerComponent Q_OBJECT public: - HandMenu(PlayerGraphicsItem *player, QWidget *parent = nullptr); + HandMenu(Player *player, PlayerActions *actions, QWidget *parent = nullptr); QMenu *revealHandMenu() const { @@ -43,7 +43,7 @@ private slots: void onRevealRandomHandCardTriggered(); private: - PlayerGraphicsItem *player; + Player *player; QAction *aViewHand = nullptr; QAction *aMulligan = nullptr; diff --git a/cockatrice/src/game_graphics/player/menu/library_menu.cpp b/cockatrice/src/game/player/menu/library_menu.cpp similarity index 86% rename from cockatrice/src/game_graphics/player/menu/library_menu.cpp rename to cockatrice/src/game/player/menu/library_menu.cpp index 4c15e09ec..1bb647d06 100644 --- a/cockatrice/src/game_graphics/player/menu/library_menu.cpp +++ b/cockatrice/src/game/player/menu/library_menu.cpp @@ -3,16 +3,14 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" #include "../../../interface/widgets/tabs/tab_game.h" -#include "../../game/abstract_game.h" -#include "../../game/player/player_actions.h" -#include "../../game/player/player_logic.h" -#include "../player_graphics_item.h" +#include "../../abstract_game.h" +#include "../player.h" +#include "../player_actions.h" #include -#include #include -LibraryMenu::LibraryMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(parent), player(_player) +LibraryMenu::LibraryMenu(Player *_player, QWidget *parent) : TearOffMenu(parent), player(_player) { createDrawActions(); createShuffleActions(); @@ -77,8 +75,8 @@ LibraryMenu::LibraryMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOff bottomLibraryMenu->addSeparator(); bottomLibraryMenu->addAction(aShuffleBottomCards); - connect(player->getLogic(), &PlayerLogic::resetTopCardMenuActions, this, &LibraryMenu::resetTopCardMenuActions); - connect(player->getLogic(), &PlayerLogic::deckChanged, this, &LibraryMenu::enableOpenInDeckEditorAction); + connect(player, &Player::resetTopCardMenuActions, this, &LibraryMenu::resetTopCardMenuActions); + connect(player, &Player::deckChanged, this, &LibraryMenu::enableOpenInDeckEditorAction); retranslateUi(); } @@ -96,41 +94,41 @@ void LibraryMenu::resetTopCardMenuActions() void LibraryMenu::createDrawActions() { - PlayerActions *playerActions = player->getLogic()->getPlayerActions(); + PlayerActions *playerActions = player->getPlayerActions(); - if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) { + if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) { aDrawCard = new QAction(this); connect(aDrawCard, &QAction::triggered, playerActions, &PlayerActions::actDrawCard); aDrawCards = new QAction(this); - connect(aDrawCards, &QAction::triggered, playerActions, &PlayerActions::actRequestDrawCardsDialog); + connect(aDrawCards, &QAction::triggered, playerActions, &PlayerActions::actDrawCards); aUndoDraw = new QAction(this); connect(aUndoDraw, &QAction::triggered, playerActions, &PlayerActions::actUndoDraw); aDrawBottomCard = new QAction(this); connect(aDrawBottomCard, &QAction::triggered, playerActions, &PlayerActions::actDrawBottomCard); aDrawBottomCards = new QAction(this); - connect(aDrawBottomCards, &QAction::triggered, playerActions, &PlayerActions::actRequestDrawBottomCardsDialog); + connect(aDrawBottomCards, &QAction::triggered, playerActions, &PlayerActions::actDrawBottomCards); } } void LibraryMenu::createShuffleActions() { - PlayerActions *playerActions = player->getLogic()->getPlayerActions(); + PlayerActions *playerActions = player->getPlayerActions(); - if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) { + if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) { aShuffle = new QAction(this); connect(aShuffle, &QAction::triggered, playerActions, &PlayerActions::actShuffle); aShuffleTopCards = new QAction(this); - connect(aShuffleTopCards, &QAction::triggered, playerActions, &PlayerActions::actRequestShuffleTopDialog); + connect(aShuffleTopCards, &QAction::triggered, playerActions, &PlayerActions::actShuffleTop); aShuffleBottomCards = new QAction(this); - connect(aShuffleBottomCards, &QAction::triggered, playerActions, &PlayerActions::actRequestShuffleBottomDialog); + connect(aShuffleBottomCards, &QAction::triggered, playerActions, &PlayerActions::actShuffleBottom); } } void LibraryMenu::createMoveActions() { - PlayerActions *playerActions = player->getLogic()->getPlayerActions(); + PlayerActions *playerActions = player->getPlayerActions(); - if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) { + if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) { aMoveTopToPlay = new QAction(this); connect(aMoveTopToPlay, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardToPlay); aMoveTopToPlayFaceDown = new QAction(this); @@ -151,8 +149,7 @@ void LibraryMenu::createMoveActions() connect(aMoveTopCardsToExileFaceDown, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardsToExileFaceDown); aMoveTopCardsUntil = new QAction(this); - connect(aMoveTopCardsUntil, &QAction::triggered, playerActions, - &PlayerActions::actRequestMoveTopCardsUntilDialog); + connect(aMoveTopCardsUntil, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardsUntil); aMoveTopCardToBottom = new QAction(this); connect(aMoveTopCardToBottom, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardToBottom); @@ -184,16 +181,16 @@ void LibraryMenu::createMoveActions() void LibraryMenu::createViewActions() { - PlayerActions *playerActions = player->getLogic()->getPlayerActions(); + PlayerActions *playerActions = player->getPlayerActions(); - if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) { + if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) { aViewLibrary = new QAction(this); connect(aViewLibrary, &QAction::triggered, playerActions, &PlayerActions::actViewLibrary); aViewTopCards = new QAction(this); - connect(aViewTopCards, &QAction::triggered, playerActions, &PlayerActions::actRequestViewTopCardsDialog); + connect(aViewTopCards, &QAction::triggered, playerActions, &PlayerActions::actViewTopCards); aViewBottomCards = new QAction(this); - connect(aViewBottomCards, &QAction::triggered, playerActions, &PlayerActions::actRequestViewBottomCardsDialog); + connect(aViewBottomCards, &QAction::triggered, playerActions, &PlayerActions::actViewBottomCards); aAlwaysRevealTopCard = new QAction(this); aAlwaysRevealTopCard->setCheckable(true); connect(aAlwaysRevealTopCard, &QAction::triggered, playerActions, &PlayerActions::actAlwaysRevealTopCard); @@ -210,7 +207,7 @@ void LibraryMenu::retranslateUi() { setTitle(tr("&Library")); - if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) { + if (player->getPlayerInfo()->getLocalOrJudge()) { aViewLibrary->setText(tr("&View library")); aViewTopCards->setText(tr("View &top cards of library...")); aViewBottomCards->setText(tr("View bottom cards of library...")); @@ -266,11 +263,10 @@ void LibraryMenu::populateRevealLibraryMenuWithActivePlayers() mRevealLibrary->addSeparator(); - const auto &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values(); + const auto &players = player->getGame()->getPlayerManager()->getPlayers().values(); for (auto *other : players) { - if (other == player->getLogic()) { + if (other == player) continue; - } QAction *a = mRevealLibrary->addAction(other->getPlayerInfo()->getName()); a->setData(other->getPlayerInfo()->getId()); connect(a, &QAction::triggered, this, &LibraryMenu::onRevealLibraryTriggered); @@ -281,11 +277,10 @@ void LibraryMenu::populateLendLibraryMenuWithActivePlayers() { mLendLibrary->clear(); - const auto &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values(); + const auto &players = player->getGame()->getPlayerManager()->getPlayers().values(); for (auto *other : players) { - if (other == player->getLogic()) { + if (other == player) continue; - } QAction *a = mLendLibrary->addAction(other->getPlayerInfo()->getName()); a->setData(other->getPlayerInfo()->getId()); connect(a, &QAction::triggered, this, &LibraryMenu::onLendLibraryTriggered); @@ -302,11 +297,10 @@ void LibraryMenu::populateRevealTopCardMenuWithActivePlayers() mRevealTopCard->addSeparator(); - const auto &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values(); + const auto &players = player->getGame()->getPlayerManager()->getPlayers().values(); for (auto *other : players) { - if (other == player->getLogic()) { + if (other == player) continue; - } QAction *a = mRevealTopCard->addAction(other->getPlayerInfo()->getName()); a->setData(other->getPlayerInfo()->getId()); connect(a, &QAction::triggered, this, &LibraryMenu::onRevealTopCardTriggered); @@ -316,33 +310,27 @@ void LibraryMenu::populateRevealTopCardMenuWithActivePlayers() void LibraryMenu::onRevealLibraryTriggered() { if (auto *a = qobject_cast(sender())) { - player->getLogic()->getPlayerActions()->actRevealLibrary(a->data().toInt()); + player->getPlayerActions()->actRevealLibrary(a->data().toInt()); } } void LibraryMenu::onLendLibraryTriggered() { if (auto *a = qobject_cast(sender())) { - player->getLogic()->getPlayerActions()->actLendLibrary(a->data().toInt()); + player->getPlayerActions()->actLendLibrary(a->data().toInt()); } } void LibraryMenu::onRevealTopCardTriggered() { - QWidget *parent = nullptr; - if (auto *view = player->scene() ? player->scene()->views().value(0) : nullptr) { - parent = view->window(); - } if (auto *a = qobject_cast(sender())) { - - int deckSize = player->getLogic()->getDeckZone()->getCards().size(); - bool ok = true; - int number = QInputDialog::getInt(parent, tr("Reveal top cards of library"), + int deckSize = player->getDeckZone()->getCards().size(); + bool ok; + int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Reveal top cards of library"), tr("Number of cards: (max. %1)").arg(deckSize), defaultNumberTopCards, 1, deckSize, 1, &ok); - if (ok) { - player->getLogic()->getPlayerActions()->actRevealTopCards(a->data().toInt(), number); + player->getPlayerActions()->actRevealTopCards(a->data().toInt(), number); defaultNumberTopCards = number; } } diff --git a/cockatrice/src/game_graphics/player/menu/library_menu.h b/cockatrice/src/game/player/menu/library_menu.h similarity index 94% rename from cockatrice/src/game_graphics/player/menu/library_menu.h rename to cockatrice/src/game/player/menu/library_menu.h index bc0e6fb8e..444e8f516 100644 --- a/cockatrice/src/game_graphics/player/menu/library_menu.h +++ b/cockatrice/src/game/player/menu/library_menu.h @@ -1,8 +1,8 @@ /** * @file library_menu.h * @ingroup GameMenusZones + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_LIBRARY_MENU_H #define COCKATRICE_LIBRARY_MENU_H @@ -13,8 +13,7 @@ #include #include -class PlayerGraphicsItem; -class PlayerLogic; +class Player; class PlayerActions; class LibraryMenu : public TearOffMenu, public AbstractPlayerComponent @@ -25,7 +24,7 @@ public slots: void resetTopCardMenuActions(); public: - LibraryMenu(PlayerGraphicsItem *player, QWidget *parent = nullptr); + LibraryMenu(Player *player, QWidget *parent = nullptr); void createDrawActions(); void createShuffleActions(); void createMoveActions(); @@ -112,7 +111,7 @@ public: int defaultNumberTopCards = 1; private: - PlayerGraphicsItem *player; + Player *player; }; #endif // COCKATRICE_LIBRARY_MENU_H diff --git a/cockatrice/src/game_graphics/player/menu/move_menu.cpp b/cockatrice/src/game/player/menu/move_menu.cpp similarity index 64% rename from cockatrice/src/game_graphics/player/menu/move_menu.cpp rename to cockatrice/src/game/player/menu/move_menu.cpp index 5b7209a9f..91e2d8d10 100644 --- a/cockatrice/src/game_graphics/player/menu/move_menu.cpp +++ b/cockatrice/src/game/player/menu/move_menu.cpp @@ -1,11 +1,10 @@ #include "move_menu.h" -#include "../../game/player/player_actions.h" -#include "../../game/player/player_logic.h" #include "../card_menu_action_type.h" -#include "../player_graphics_item.h" +#include "../player.h" +#include "../player_actions.h" -MoveMenu::MoveMenu(PlayerGraphicsItem *player) : QMenu(tr("Move to")) +MoveMenu::MoveMenu(Player *player) : QMenu(tr("Move to")) { aMoveToTopLibrary = new QAction(this); aMoveToTopLibrary->setData(cmMoveToTopLibrary); @@ -21,22 +20,14 @@ MoveMenu::MoveMenu(PlayerGraphicsItem *player) : QMenu(tr("Move to")) aMoveToExile = new QAction(this); aMoveToExile->setData(cmMoveToExile); - auto *actions = player->getLogic()->getPlayerActions(); - - auto invoke = [player](CardMenuActionType type) { - return [type, player]() { - player->getLogic()->getPlayerActions()->cardMenuAction(player->getGameScene()->selectedCards(), type); - }; - }; - - connect(aMoveToTopLibrary, &QAction::triggered, actions, invoke(cmMoveToTopLibrary)); - connect(aMoveToBottomLibrary, &QAction::triggered, actions, invoke(cmMoveToBottomLibrary)); - connect(aMoveToXfromTopOfLibrary, &QAction::triggered, actions, - &PlayerActions::actRequestMoveCardXCardsFromTopDialog); - connect(aMoveToTable, &QAction::triggered, actions, invoke(cmMoveToTable)); - connect(aMoveToHand, &QAction::triggered, actions, invoke(cmMoveToHand)); - connect(aMoveToGraveyard, &QAction::triggered, actions, invoke(cmMoveToGraveyard)); - connect(aMoveToExile, &QAction::triggered, actions, invoke(cmMoveToExile)); + connect(aMoveToTopLibrary, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction); + connect(aMoveToBottomLibrary, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction); + connect(aMoveToXfromTopOfLibrary, &QAction::triggered, player->getPlayerActions(), + &PlayerActions::actMoveCardXCardsFromTop); + connect(aMoveToTable, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction); + connect(aMoveToHand, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction); + connect(aMoveToGraveyard, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction); + connect(aMoveToExile, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction); addAction(aMoveToTopLibrary); addAction(aMoveToXfromTopOfLibrary); diff --git a/cockatrice/src/game_graphics/player/menu/move_menu.h b/cockatrice/src/game/player/menu/move_menu.h similarity index 84% rename from cockatrice/src/game_graphics/player/menu/move_menu.h rename to cockatrice/src/game/player/menu/move_menu.h index 150bdbd3c..dc39cb6a5 100644 --- a/cockatrice/src/game_graphics/player/menu/move_menu.h +++ b/cockatrice/src/game/player/menu/move_menu.h @@ -1,20 +1,20 @@ /** * @file move_menu.h * @ingroup GameMenusZones + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_MOVE_MENU_H #define COCKATRICE_MOVE_MENU_H #include -class PlayerGraphicsItem; +class Player; class MoveMenu : public QMenu { Q_OBJECT public: - explicit MoveMenu(PlayerGraphicsItem *player); + explicit MoveMenu(Player *player); void setShortcutsActive(); void retranslateUi(); diff --git a/cockatrice/src/game/player/menu/player_menu.cpp b/cockatrice/src/game/player/menu/player_menu.cpp new file mode 100644 index 000000000..0dc381e28 --- /dev/null +++ b/cockatrice/src/game/player/menu/player_menu.cpp @@ -0,0 +1,149 @@ +#include "player_menu.h" + +#include "../../../interface/widgets/tabs/tab_game.h" +#include "../../board/card_item.h" +#include "../../zones/hand_zone.h" +#include "../../zones/pile_zone.h" +#include "../../zones/table_zone.h" +#include "card_menu.h" +#include "hand_menu.h" + +#include + +PlayerMenu::PlayerMenu(Player *_player) : QObject(_player), player(_player) +{ + playerMenu = new TearOffMenu(); + + if (player->getPlayerInfo()->getLocalOrJudge()) { + handMenu = addManagedMenu(player, player->getPlayerActions(), playerMenu); + libraryMenu = addManagedMenu(player, playerMenu); + } else { + handMenu = nullptr; + libraryMenu = nullptr; + } + + graveMenu = addManagedMenu(player, playerMenu); + rfgMenu = addManagedMenu(player, playerMenu); + + if (player->getPlayerInfo()->getLocalOrJudge()) { + sideboardMenu = addManagedMenu(player, playerMenu); + customZonesMenu = addManagedMenu(player); + playerMenu->addSeparator(); + + countersMenu = playerMenu->addMenu(QString()); + + utilityMenu = createManagedComponent(player, playerMenu); + } else { + sideboardMenu = nullptr; + customZonesMenu = nullptr; + countersMenu = nullptr; + utilityMenu = nullptr; + } + + if (player->getPlayerInfo()->getLocal()) { + sayMenu = addManagedMenu(player); + } else { + sayMenu = nullptr; + } + + connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this, + &PlayerMenu::refreshShortcuts); + refreshShortcuts(); + + retranslateUi(); +} + +void PlayerMenu::setMenusForGraphicItems() +{ + player->getGraphicsItem()->getTableZoneGraphicsItem()->setMenu(playerMenu); + player->getGraphicsItem()->getGraveyardZoneGraphicsItem()->setMenu(graveMenu, graveMenu->aViewGraveyard); + player->getGraphicsItem()->getRfgZoneGraphicsItem()->setMenu(rfgMenu, rfgMenu->aViewRfg); + if (player->getPlayerInfo()->getLocalOrJudge()) { + player->getGraphicsItem()->getHandZoneGraphicsItem()->setMenu(handMenu); + player->getGraphicsItem()->getDeckZoneGraphicsItem()->setMenu(libraryMenu, libraryMenu->aDrawCard); + player->getGraphicsItem()->getSideboardZoneGraphicsItem()->setMenu(sideboardMenu); + } +} + +QMenu *PlayerMenu::updateCardMenu(const CardItem *card) +{ + if (!card) { + emit cardMenuUpdated(nullptr); + return nullptr; + } + + // If is spectator (as spectators don't need card menus), return + // only update the menu if the card is actually selected + if ((player->getGame()->getPlayerManager()->isSpectator() && !player->getGame()->getPlayerManager()->isJudge()) || + player->getGame()->getActiveCard() != card) { + return nullptr; + } + + QMenu *menu = new CardMenu(player, card, shortcutsActive); + emit cardMenuUpdated(menu); + + return menu; +} + +void PlayerMenu::retranslateUi() +{ + playerMenu->setTitle(tr("Player \"%1\"").arg(player->getPlayerInfo()->getName())); + + for (auto *component : managedComponents) { + component->retranslateUi(); + } + + if (countersMenu) { + countersMenu->setTitle(tr("&Counters")); + } + + QMapIterator counterIterator(player->getCounters()); + while (counterIterator.hasNext()) { + counterIterator.next().value()->retranslateUi(); + } +} + +void PlayerMenu::refreshShortcuts() +{ + if (shortcutsActive) { + // Judges get access to every player's menus but only want shortcuts to be set for their own. + if (player->getPlayerInfo()->getLocalOrJudge() && !player->getPlayerInfo()->getLocal()) { + setShortcutsInactive(); + } else { + setShortcutsActive(); + } + } else { + setShortcutsInactive(); + } +} + +void PlayerMenu::setShortcutsActive() +{ + shortcutsActive = true; + + for (auto *component : managedComponents) { + component->setShortcutsActive(); + } + + // Counters implement AbstractPlayerComponent but are iterated via Player::counters + // (the authoritative source) rather than managedComponents to avoid a redundant + // list that must stay in sync with the map. + QMapIterator counterIterator(player->getCounters()); + while (counterIterator.hasNext()) { + counterIterator.next().value()->setShortcutsActive(); + } +} + +void PlayerMenu::setShortcutsInactive() +{ + shortcutsActive = false; + + for (auto *component : managedComponents) { + component->setShortcutsInactive(); + } + + QMapIterator counterIterator(player->getCounters()); + while (counterIterator.hasNext()) { + counterIterator.next().value()->setShortcutsInactive(); + } +} \ No newline at end of file diff --git a/cockatrice/src/game_graphics/player/menu/player_menu.h b/cockatrice/src/game/player/menu/player_menu.h similarity index 70% rename from cockatrice/src/game_graphics/player/menu/player_menu.h rename to cockatrice/src/game/player/menu/player_menu.h index 62ba66df7..104c5a930 100644 --- a/cockatrice/src/game_graphics/player/menu/player_menu.h +++ b/cockatrice/src/game/player/menu/player_menu.h @@ -8,6 +8,7 @@ #define COCKATRICE_PLAYER_MENU_H #include "../../../interface/widgets/menus/tearoff_menu.h" +#include "../player.h" #include "custom_zone_menu.h" #include "grave_menu.h" #include "hand_menu.h" @@ -22,31 +23,26 @@ #include class CardItem; -class CardMenu; -class PlayerGraphicsItem; class PlayerMenu : public QObject { Q_OBJECT signals: - void cardMenuUpdated(CardMenu *cardMenu); - void cardInfoRequested(const CardRef &cardRef); - void shortcutsActivated(); - void shortcutsDeactivated(); - void retranslateRequested(); + void cardMenuUpdated(QMenu *cardMenu); public slots: void setMenusForGraphicItems(); - QMenu *updateCardMenu(const CardItem *card); private slots: void refreshShortcuts(); public: - explicit PlayerMenu(PlayerGraphicsItem *player); - /** @brief Retranslate all user-visible strings. Called on language change. */ + explicit PlayerMenu(Player *player); + /// Lifecycle methods: delegate to all managedComponents, plus counters separately via player->getCounters(). void retranslateUi(); + QMenu *updateCardMenu(const CardItem *card); + [[nodiscard]] QMenu *getPlayerMenu() const { return playerMenu; @@ -72,13 +68,13 @@ public: return shortcutsActive; } - /** @brief Bind keyboard shortcuts. Called when this player gains focus. */ + /// Delegates to all managedComponents, plus counters separately. void setShortcutsActive(); - /** @brief Unbind keyboard shortcuts. Called when this player loses focus. */ + /// Delegates to all managedComponents, plus counters separately. void setShortcutsInactive(); private: - PlayerGraphicsItem *player; + Player *player; TearOffMenu *playerMenu; QMenu *countersMenu; HandMenu *handMenu; @@ -90,13 +86,11 @@ private: SayMenu *sayMenu; CustomZoneMenu *customZonesMenu; - /** @brief Drives AbstractPlayerComponent lifecycle delegation. Counters are iterated separately via - * player->getCounters(). - */ + /// Drives AbstractPlayerComponent lifecycle delegation. Counters are iterated separately via player->getCounters(). QList managedComponents; bool shortcutsActive = false; - /** @brief Creates component, adds it as a submenu of playerMenu, and registers in managedComponents. */ + /// Creates component, adds it as a submenu of playerMenu, and registers in managedComponents. template MenuT *addManagedMenu(Args &&...args) { auto *menu = new MenuT(std::forward(args)...); @@ -105,7 +99,7 @@ private: return menu; } - /** @brief Creates component and registers in managedComponents, but does NOT add it as a submenu. */ + /// Creates component and registers in managedComponents, but does NOT add it as a submenu. template ComponentT *createManagedComponent(Args &&...args) { auto *component = new ComponentT(std::forward(args)...); diff --git a/cockatrice/src/game_graphics/player/menu/pt_menu.cpp b/cockatrice/src/game/player/menu/pt_menu.cpp similarity index 51% rename from cockatrice/src/game_graphics/player/menu/pt_menu.cpp rename to cockatrice/src/game/player/menu/pt_menu.cpp index a01be9424..dae03e07f 100644 --- a/cockatrice/src/game_graphics/player/menu/pt_menu.cpp +++ b/cockatrice/src/game/player/menu/pt_menu.cpp @@ -1,43 +1,32 @@ #include "pt_menu.h" -#include "../../game/player/player_actions.h" -#include "../../game/player/player_logic.h" -#include "../player_graphics_item.h" +#include "../player.h" +#include "../player_actions.h" -PtMenu::PtMenu(PlayerGraphicsItem *player) : QMenu(tr("Power / toughness")) +PtMenu::PtMenu(Player *player) : QMenu(tr("Power / toughness")) { - PlayerActions *playerActions = player->getLogic()->getPlayerActions(); + PlayerActions *playerActions = player->getPlayerActions(); aIncP = new QAction(this); - connect(aIncP, &QAction::triggered, playerActions, - [player, playerActions] { playerActions->actIncP(player->getGameScene()->selectedCards()); }); + connect(aIncP, &QAction::triggered, playerActions, &PlayerActions::actIncP); aDecP = new QAction(this); - connect(aDecP, &QAction::triggered, playerActions, - [player, playerActions] { playerActions->actDecP(player->getGameScene()->selectedCards()); }); + connect(aDecP, &QAction::triggered, playerActions, &PlayerActions::actDecP); aIncT = new QAction(this); - connect(aIncT, &QAction::triggered, playerActions, - [player, playerActions] { playerActions->actIncT(player->getGameScene()->selectedCards()); }); + connect(aIncT, &QAction::triggered, playerActions, &PlayerActions::actIncT); aDecT = new QAction(this); - connect(aDecT, &QAction::triggered, playerActions, - [player, playerActions] { playerActions->actDecT(player->getGameScene()->selectedCards()); }); + connect(aDecT, &QAction::triggered, playerActions, &PlayerActions::actDecT); aIncPT = new QAction(this); - connect(aIncPT, &QAction::triggered, playerActions, - [player, playerActions] { playerActions->actIncPT(player->getGameScene()->selectedCards()); }); + connect(aIncPT, &QAction::triggered, playerActions, [playerActions] { playerActions->actIncPT(); }); aDecPT = new QAction(this); - connect(aDecPT, &QAction::triggered, playerActions, - [player, playerActions] { playerActions->actDecPT(player->getGameScene()->selectedCards()); }); + connect(aDecPT, &QAction::triggered, playerActions, &PlayerActions::actDecPT); aFlowP = new QAction(this); - connect(aFlowP, &QAction::triggered, playerActions, - [player, playerActions] { playerActions->actFlowP(player->getGameScene()->selectedCards()); }); + connect(aFlowP, &QAction::triggered, playerActions, &PlayerActions::actFlowP); aFlowT = new QAction(this); - connect(aFlowT, &QAction::triggered, playerActions, - [player, playerActions] { playerActions->actFlowT(player->getGameScene()->selectedCards()); }); + connect(aFlowT, &QAction::triggered, playerActions, &PlayerActions::actFlowT); aSetPT = new QAction(this); - connect(aSetPT, &QAction::triggered, playerActions, - [player, playerActions] { playerActions->actRequestSetPTDialog(player->getGameScene()->selectedCards()); }); + connect(aSetPT, &QAction::triggered, playerActions, &PlayerActions::actSetPT); aResetPT = new QAction(this); - connect(aResetPT, &QAction::triggered, playerActions, - [player, playerActions] { playerActions->actResetPT(player->getGameScene()->selectedCards()); }); + connect(aResetPT, &QAction::triggered, playerActions, &PlayerActions::actResetPT); addAction(aIncP); addAction(aDecP); diff --git a/cockatrice/src/game_graphics/player/menu/pt_menu.h b/cockatrice/src/game/player/menu/pt_menu.h similarity index 84% rename from cockatrice/src/game_graphics/player/menu/pt_menu.h rename to cockatrice/src/game/player/menu/pt_menu.h index 72f828801..44112e54f 100644 --- a/cockatrice/src/game_graphics/player/menu/pt_menu.h +++ b/cockatrice/src/game/player/menu/pt_menu.h @@ -1,21 +1,21 @@ /** * @file pt_menu.h * @ingroup GameMenusCards + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_PT_MENU_H #define COCKATRICE_PT_MENU_H #include -class PlayerGraphicsItem; +class Player; class PtMenu : public QMenu { Q_OBJECT public: - explicit PtMenu(PlayerGraphicsItem *player); + explicit PtMenu(Player *player); void retranslateUi(); void setShortcutsActive(); diff --git a/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp b/cockatrice/src/game/player/menu/rfg_menu.cpp similarity index 78% rename from cockatrice/src/game_graphics/player/menu/rfg_menu.cpp rename to cockatrice/src/game/player/menu/rfg_menu.cpp index 45abadbf7..8a101c04c 100644 --- a/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp +++ b/cockatrice/src/game/player/menu/rfg_menu.cpp @@ -1,19 +1,18 @@ #include "rfg_menu.h" -#include "../../game/player/player_actions.h" -#include "../../game/player/player_logic.h" -#include "../player_graphics_item.h" +#include "../player.h" +#include "../player_actions.h" #include -RfgMenu::RfgMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(parent), player(_player) +RfgMenu::RfgMenu(Player *_player, QWidget *parent) : TearOffMenu(parent), player(_player) { createMoveActions(); createViewActions(); addAction(aViewRfg); - if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) { + if (player->getPlayerInfo()->getLocalOrJudge()) { addSeparator(); moveRfgMenu = addTearOffMenu(QString()); moveRfgMenu->addAction(aMoveRfgToTopLibrary); @@ -29,8 +28,8 @@ RfgMenu::RfgMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(par void RfgMenu::createMoveActions() { - if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) { - auto rfg = player->getLogic()->getRfgZone(); + if (player->getPlayerInfo()->getLocalOrJudge()) { + auto rfg = player->getRfgZone(); aMoveRfgToTopLibrary = new QAction(this); aMoveRfgToTopLibrary->setData(QList() << ZoneNames::DECK << 0); @@ -50,7 +49,7 @@ void RfgMenu::createMoveActions() void RfgMenu::createViewActions() { - PlayerActions *playerActions = player->getLogic()->getPlayerActions(); + PlayerActions *playerActions = player->getPlayerActions(); aViewRfg = new QAction(this); connect(aViewRfg, &QAction::triggered, playerActions, &PlayerActions::actViewRfg); @@ -62,7 +61,7 @@ void RfgMenu::retranslateUi() aViewRfg->setText(tr("&View exile")); - if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) { + if (player->getPlayerInfo()->getLocalOrJudge()) { moveRfgMenu->setTitle(tr("&Move exile to...")); aMoveRfgToTopLibrary->setText(tr("&Top of library")); aMoveRfgToBottomLibrary->setText(tr("&Bottom of library")); diff --git a/cockatrice/src/game_graphics/player/menu/rfg_menu.h b/cockatrice/src/game/player/menu/rfg_menu.h similarity index 83% rename from cockatrice/src/game_graphics/player/menu/rfg_menu.h rename to cockatrice/src/game/player/menu/rfg_menu.h index f5dd888e4..8f79b2f4a 100644 --- a/cockatrice/src/game_graphics/player/menu/rfg_menu.h +++ b/cockatrice/src/game/player/menu/rfg_menu.h @@ -1,8 +1,8 @@ /** * @file rfg_menu.h * @ingroup GameMenusZones + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_RFG_MENU_H #define COCKATRICE_RFG_MENU_H @@ -13,12 +13,12 @@ #include #include -class PlayerGraphicsItem; +class Player; class RfgMenu : public TearOffMenu, public AbstractPlayerComponent { Q_OBJECT public: - explicit RfgMenu(PlayerGraphicsItem *player, QWidget *parent = nullptr); + explicit RfgMenu(Player *player, QWidget *parent = nullptr); void createMoveActions(); void createViewActions(); void retranslateUi() override; @@ -38,7 +38,7 @@ public: QAction *aMoveRfgToGrave = nullptr; private: - PlayerGraphicsItem *player; + Player *player; }; #endif // COCKATRICE_RFG_MENU_H diff --git a/cockatrice/src/game_graphics/player/menu/say_menu.cpp b/cockatrice/src/game/player/menu/say_menu.cpp similarity index 78% rename from cockatrice/src/game_graphics/player/menu/say_menu.cpp rename to cockatrice/src/game/player/menu/say_menu.cpp index 336b70f0d..116fba49a 100644 --- a/cockatrice/src/game_graphics/player/menu/say_menu.cpp +++ b/cockatrice/src/game/player/menu/say_menu.cpp @@ -1,11 +1,10 @@ #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 "../player.h" +#include "../player_actions.h" -SayMenu::SayMenu(PlayerGraphicsItem *_player) : player(_player) +SayMenu::SayMenu(Player *_player) : player(_player) { connect(&SettingsCache::instance().messages(), &MessageSettings::messageMacrosChanged, this, &SayMenu::initSayMenu); initSayMenu(); @@ -45,7 +44,7 @@ void SayMenu::initSayMenu() for (int i = 0; i < count; ++i) { auto *newAction = new QAction(SettingsCache::instance().messages().getMessageAt(i), this); - connect(newAction, &QAction::triggered, player->getLogic()->getPlayerActions(), &PlayerActions::actSayMessage); + connect(newAction, &QAction::triggered, player->getPlayerActions(), &PlayerActions::actSayMessage); addAction(newAction); } diff --git a/cockatrice/src/game_graphics/player/menu/say_menu.h b/cockatrice/src/game/player/menu/say_menu.h similarity index 78% rename from cockatrice/src/game_graphics/player/menu/say_menu.h rename to cockatrice/src/game/player/menu/say_menu.h index 3ff160d05..fadf5f368 100644 --- a/cockatrice/src/game_graphics/player/menu/say_menu.h +++ b/cockatrice/src/game/player/menu/say_menu.h @@ -1,8 +1,8 @@ /** * @file say_menu.h * @ingroup GameMenusPlayers + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_SAY_MENU_H #define COCKATRICE_SAY_MENU_H @@ -11,12 +11,12 @@ #include -class PlayerGraphicsItem; +class Player; class SayMenu : public QMenu, public AbstractPlayerComponent { Q_OBJECT public: - explicit SayMenu(PlayerGraphicsItem *player); + explicit SayMenu(Player *player); void retranslateUi() override; void setShortcutsActive() override; @@ -26,7 +26,7 @@ private slots: void initSayMenu(); private: - PlayerGraphicsItem *player; + Player *player; bool shortcutsActive = false; }; diff --git a/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp b/cockatrice/src/game/player/menu/sideboard_menu.cpp similarity index 56% rename from cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp rename to cockatrice/src/game/player/menu/sideboard_menu.cpp index 0dd7894d2..beaabfcc6 100644 --- a/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp +++ b/cockatrice/src/game/player/menu/sideboard_menu.cpp @@ -1,16 +1,14 @@ #include "sideboard_menu.h" -#include "../../game/player/player_actions.h" -#include "../../game/player/player_logic.h" -#include "../player_graphics_item.h" +#include "../player.h" +#include "../player_actions.h" -SideboardMenu::SideboardMenu(PlayerGraphicsItem *player, QMenu *playerMenu) : QMenu(playerMenu) +SideboardMenu::SideboardMenu(Player *player, QMenu *playerMenu) : QMenu(playerMenu) { aViewSideboard = new QAction(this); - connect(aViewSideboard, &QAction::triggered, player->getLogic()->getPlayerActions(), - &PlayerActions::actViewSideboard); + connect(aViewSideboard, &QAction::triggered, player->getPlayerActions(), &PlayerActions::actViewSideboard); - if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) { + if (player->getPlayerInfo()->getLocalOrJudge()) { addAction(aViewSideboard); } diff --git a/cockatrice/src/game_graphics/player/menu/sideboard_menu.h b/cockatrice/src/game/player/menu/sideboard_menu.h similarity index 74% rename from cockatrice/src/game_graphics/player/menu/sideboard_menu.h rename to cockatrice/src/game/player/menu/sideboard_menu.h index b3b547291..4a77d1b52 100644 --- a/cockatrice/src/game_graphics/player/menu/sideboard_menu.h +++ b/cockatrice/src/game/player/menu/sideboard_menu.h @@ -1,8 +1,8 @@ /** * @file sideboard_menu.h * @ingroup GameMenusZones + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_SIDEBOARD_MENU_H #define COCKATRICE_SIDEBOARD_MENU_H @@ -11,19 +11,19 @@ #include -class PlayerGraphicsItem; +class Player; class SideboardMenu : public QMenu, public AbstractPlayerComponent { Q_OBJECT public: - explicit SideboardMenu(PlayerGraphicsItem *player, QMenu *playerMenu); + explicit SideboardMenu(Player *player, QMenu *playerMenu); void retranslateUi() override; void setShortcutsActive() override; void setShortcutsInactive() override; private: - PlayerGraphicsItem *player; + Player *player; QAction *aViewSideboard; }; diff --git a/cockatrice/src/game_graphics/player/menu/utility_menu.cpp b/cockatrice/src/game/player/menu/utility_menu.cpp similarity index 70% rename from cockatrice/src/game_graphics/player/menu/utility_menu.cpp rename to cockatrice/src/game/player/menu/utility_menu.cpp index 61a822b21..bcb4683fd 100644 --- a/cockatrice/src/game_graphics/player/menu/utility_menu.cpp +++ b/cockatrice/src/game/player/menu/utility_menu.cpp @@ -1,49 +1,40 @@ #include "utility_menu.h" #include "../../../interface/deck_loader/deck_loader.h" -#include "../../game/player/player_actions.h" -#include "../../game/player/player_logic.h" -#include "../player_graphics_item.h" +#include "../player.h" +#include "../player_actions.h" #include "player_menu.h" #include #include -UtilityMenu::UtilityMenu(PlayerGraphicsItem *_player, QMenu *playerMenu) : QMenu(playerMenu), player(_player) +UtilityMenu::UtilityMenu(Player *_player, QMenu *playerMenu) : QMenu(playerMenu), player(_player) { - PlayerActions *playerActions = player->getLogic()->getPlayerActions(); - connect(playerActions, &PlayerActions::requestEnableAndSetCreateAnotherTokenAction, this, - &UtilityMenu::setAndEnableCreateAnotherTokenAction); - connect(playerActions, &PlayerActions::requestSetLastToken, this, &UtilityMenu::setLastToken); + PlayerActions *playerActions = player->getPlayerActions(); - if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) { + if (player->getPlayerInfo()->getLocalOrJudge()) { aUntapAll = new QAction(this); connect(aUntapAll, &QAction::triggered, playerActions, &PlayerActions::actUntapAll); aRollDie = new QAction(this); - connect(aRollDie, &QAction::triggered, playerActions, &PlayerActions::actRequestRollDieDialog); + connect(aRollDie, &QAction::triggered, playerActions, &PlayerActions::actRollDie); aFlipCoin = new QAction(this); connect(aFlipCoin, &QAction::triggered, playerActions, &PlayerActions::actFlipCoin); aCreateToken = new QAction(this); - connect(aCreateToken, &QAction::triggered, playerActions, [this]() { - player->getLogic()->getPlayerActions()->actRequestCreateTokenDialog(getPredefinedTokens()); - }); + connect(aCreateToken, &QAction::triggered, playerActions, &PlayerActions::actCreateToken); aCreateAnotherToken = new QAction(this); connect(aCreateAnotherToken, &QAction::triggered, playerActions, &PlayerActions::actCreateAnotherToken); aCreateAnotherToken->setEnabled(false); aIncrementAllCardCounters = new QAction(this); - connect(aIncrementAllCardCounters, &QAction::triggered, playerActions, [this]() { - player->getLogic()->getPlayerActions()->actIncrementAllCardCounters( - player->getGameScene()->selectedCards()); - }); + connect(aIncrementAllCardCounters, &QAction::triggered, player, &Player::incrementAllCardCounters); createPredefinedTokenMenu = new QMenu(QString()); createPredefinedTokenMenu->setEnabled(false); - connect(player->getLogic(), &PlayerLogic::deckChanged, this, &UtilityMenu::populatePredefinedTokensMenu); + connect(player, &Player::deckChanged, this, &UtilityMenu::populatePredefinedTokensMenu); playerMenu->addAction(aIncrementAllCardCounters); playerMenu->addSeparator(); @@ -74,7 +65,7 @@ void UtilityMenu::populatePredefinedTokensMenu() clear(); setEnabled(false); predefinedTokens.clear(); - const DeckList &deckList = player->getLogic()->getDeck(); + const DeckList &deckList = player->getDeck(); if (deckList.isEmpty()) { return; @@ -92,24 +83,14 @@ void UtilityMenu::populatePredefinedTokensMenu() if (i < 10) { a->setShortcut(QKeySequence("Alt+" + QString::number((i + 1) % 10))); } - connect(a, &QAction::triggered, player->getLogic()->getPlayerActions(), - &PlayerActions::actCreatePredefinedToken); + connect(a, &QAction::triggered, player->getPlayerActions(), &PlayerActions::actCreatePredefinedToken); } } } -void UtilityMenu::setLastToken(CardInfoPtr lastToken) -{ - if (!createAnotherTokenActionExists()) { - return; - } - - player->getLogic()->getPlayerActions()->setLastTokenInfo(lastToken); -} - void UtilityMenu::retranslateUi() { - if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) { + if (player->getPlayerInfo()->getLocalOrJudge()) { aIncrementAllCardCounters->setText(tr("Increment all card counters")); aUntapAll->setText(tr("&Untap all permanents")); aRollDie->setText(tr("R&oll die...")); @@ -124,7 +105,7 @@ void UtilityMenu::setShortcutsActive() { ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts(); - if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) { + if (player->getPlayerInfo()->getLocalOrJudge()) { aIncrementAllCardCounters->setShortcuts(shortcuts.getShortcut("Player/aIncrementAllCardCounters")); aUntapAll->setShortcuts(shortcuts.getShortcut("Player/aUntapAll")); aRollDie->setShortcuts(shortcuts.getShortcut("Player/aRollDie")); @@ -136,7 +117,7 @@ void UtilityMenu::setShortcutsActive() void UtilityMenu::setShortcutsInactive() { - if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) { + if (player->getPlayerInfo()->getLocalOrJudge()) { aUntapAll->setShortcut(QKeySequence()); aRollDie->setShortcut(QKeySequence()); aFlipCoin->setShortcut(QKeySequence()); diff --git a/cockatrice/src/game_graphics/player/menu/utility_menu.h b/cockatrice/src/game/player/menu/utility_menu.h similarity index 76% rename from cockatrice/src/game_graphics/player/menu/utility_menu.h rename to cockatrice/src/game/player/menu/utility_menu.h index bdc2a81a5..117a7e13a 100644 --- a/cockatrice/src/game_graphics/player/menu/utility_menu.h +++ b/cockatrice/src/game/player/menu/utility_menu.h @@ -1,8 +1,8 @@ /** * @file utility_menu.h * @ingroup GameMenusPlayers + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_UTILITY_MENU_H #define COCKATRICE_UTILITY_MENU_H @@ -10,21 +10,19 @@ #include "abstract_player_component.h" #include -#include -class PlayerGraphicsItem; +class Player; class UtilityMenu : public QMenu, public AbstractPlayerComponent { Q_OBJECT public slots: void populatePredefinedTokensMenu(); - void setLastToken(CardInfoPtr lastToken); void retranslateUi() override; void setShortcutsActive() override; void setShortcutsInactive() override; public: - explicit UtilityMenu(PlayerGraphicsItem *player, QMenu *playerMenu); + explicit UtilityMenu(Player *player, QMenu *playerMenu); [[nodiscard]] bool createAnotherTokenActionExists() const { @@ -33,7 +31,7 @@ public: void setAndEnableCreateAnotherTokenAction(QString text) { - aCreateAnotherToken->setText(tr("C&reate another %1 token").arg(text)); + aCreateAnotherToken->setText(text); aCreateAnotherToken->setEnabled(true); } @@ -43,7 +41,7 @@ public: } private: - PlayerGraphicsItem *player; + Player *player; QStringList predefinedTokens; QMenu *createPredefinedTokenMenu; diff --git a/cockatrice/src/game/player/player_logic.cpp b/cockatrice/src/game/player/player.cpp similarity index 53% rename from cockatrice/src/game/player/player_logic.cpp rename to cockatrice/src/game/player/player.cpp index 485e2fc5c..ac4149f0e 100644 --- a/cockatrice/src/game/player/player_logic.cpp +++ b/cockatrice/src/game/player/player.cpp @@ -1,18 +1,18 @@ -#include "player_logic.h" +#include "player.h" -#include "../../game_graphics/board/arrow_item.h" -#include "../../game_graphics/board/card_item.h" -#include "../../game_graphics/board/counter_general.h" -#include "../../game_graphics/game_scene.h" -#include "../../game_graphics/player/player_target.h" -#include "../../game_graphics/zones/hand_zone.h" -#include "../../game_graphics/zones/pile_zone.h" -#include "../../game_graphics/zones/stack_zone.h" -#include "../../game_graphics/zones/table_zone.h" #include "../../interface/theme_manager.h" #include "../../interface/widgets/tabs/tab_game.h" +#include "../board/arrow_item.h" +#include "../board/card_item.h" #include "../board/card_list.h" +#include "../board/counter_general.h" +#include "../game_scene.h" +#include "../zones/hand_zone.h" +#include "../zones/pile_zone.h" +#include "../zones/stack_zone.h" +#include "../zones/table_zone.h" #include "player_actions.h" +#include "player_target.h" #include #include @@ -29,15 +29,37 @@ #include #include -PlayerLogic::PlayerLogic(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent) +Player::Player(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)), active(false), conceded(false), zoneId(0), dialogSemaphore(false) { initializeZones(); + + playerMenu = new PlayerMenu(this); + graphicsItem = new PlayerGraphicsItem(this); + playerMenu->setMenusForGraphicItems(); + + connect(this, &Player::activeChanged, graphicsItem, &PlayerGraphicsItem::onPlayerActiveChanged); + + connect(this, &Player::openDeckEditor, game->getTab(), &TabGame::openDeckEditor); + + forwardActionSignalsToEventHandler(); } -void PlayerLogic::initializeZones() +// Event Handler is the controller i.e. everything hooks up to this to know about player state +// Player should forward (private) signals to the event handler + +void Player::forwardActionSignalsToEventHandler() +{ + connect(playerActions, &PlayerActions::logSetTapped, playerEventHandler, &PlayerEventHandler::logSetTapped); + connect(playerActions, &PlayerActions::logSetDoesntUntap, playerEventHandler, + &PlayerEventHandler::logSetDoesntUntap); + connect(playerActions, &PlayerActions::logSetAnnotation, playerEventHandler, &PlayerEventHandler::logSetAnnotation); + connect(playerActions, &PlayerActions::logSetPT, playerEventHandler, &PlayerEventHandler::logSetPT); +} + +void Player::initializeZones() { addZone(new PileZoneLogic(this, ZoneNames::DECK, false, true, false, this)); addZone(new PileZoneLogic(this, ZoneNames::GRAVE, false, false, true, this)); @@ -50,22 +72,22 @@ void PlayerLogic::initializeZones() addZone(new HandZoneLogic(this, ZoneNames::HAND, false, false, visibleHand, this)); } -PlayerLogic::~PlayerLogic() +Player::~Player() { qCInfo(PlayerLog) << "Player destructor:" << getPlayerInfo()->getName(); QMapIterator i(zones); - while (i.hasNext()) { + while (i.hasNext()) delete i.next().value(); - } zones.clear(); + delete playerMenu; delete getPlayerInfo()->userInfo; } -void PlayerLogic::clear() +void Player::clear() { - emit arrowsClearedLocally(); + clearArrows(); QMapIterator i(zones); while (i.hasNext()) { @@ -75,11 +97,12 @@ void PlayerLogic::clear() clearCounters(); } -void PlayerLogic::setConceded(bool _conceded) +void Player::setConceded(bool _conceded) { if (conceded != _conceded) { conceded = _conceded; + getGraphicsItem()->setVisible(!conceded); if (conceded) { clear(); } @@ -87,15 +110,13 @@ void PlayerLogic::setConceded(bool _conceded) } } -void PlayerLogic::setZoneId(int _zoneId) +void Player::setZoneId(int _zoneId) { - if (zoneId != _zoneId) { - zoneId = _zoneId; - emit zoneIdChanged(zoneId); - } + zoneId = _zoneId; + graphicsItem->getPlayerArea()->setPlayerZoneId(zoneId); } -void PlayerLogic::processPlayerInfo(const ServerInfo_Player &info) +void Player::processPlayerInfo(const ServerInfo_Player &info) { static QSet builtinZones{/* PileZones */ ZoneNames::DECK, ZoneNames::GRAVE, ZoneNames::EXILE, ZoneNames::SIDEBOARD, @@ -106,7 +127,7 @@ void PlayerLogic::processPlayerInfo(const ServerInfo_Player &info) /* HandZone */ ZoneNames::HAND}; clearCounters(); - emit arrowsClearedLocally(); + clearArrows(); QMutableMapIterator zoneIt(zones); while (zoneIt.hasNext()) { @@ -193,7 +214,7 @@ void PlayerLogic::processPlayerInfo(const ServerInfo_Player &info) setConceded(info.properties().conceded()); } -void PlayerLogic::processCardAttachment(const ServerInfo_Player &info) +void Player::processCardAttachment(const ServerInfo_Player &info) { const int zoneListSize = info.zone_list_size(); for (int i = 0; i < zoneListSize; ++i) { @@ -222,17 +243,16 @@ void PlayerLogic::processCardAttachment(const ServerInfo_Player &info) const int arrowListSize = info.arrow_list_size(); for (int i = 0; i < arrowListSize; ++i) { - emit arrowCreateRequested(QSharedPointer::create( - ArrowData::fromProto(info.arrow_list(i), getPlayerInfo()->getId(), getPlayerInfo()->getLocal()))); + addArrow(info.arrow_list(i)); } } -void PlayerLogic::addCard(CardItem *card) +void Player::addCard(CardItem *card) { emit newCardAdded(card); } -void PlayerLogic::deleteCard(CardItem *card) +void Player::deleteCard(CardItem *card) { if (card == nullptr) { return; @@ -243,60 +263,179 @@ void PlayerLogic::deleteCard(CardItem *card) } } -void PlayerLogic::setDeck(const DeckList &_deck) +void Player::setDeck(const DeckList &_deck) { deck = _deck; emit deckChanged(); } -CounterState *PlayerLogic::addCounter(const ServerInfo_Counter &counter) +AbstractCounter *Player::addCounter(const ServerInfo_Counter &counter) { return addCounter(counter.id(), QString::fromStdString(counter.name()), convertColorToQColor(counter.counter_color()), counter.radius(), counter.count()); } -CounterState *PlayerLogic::addCounter(int id, const QString &name, const QColor &color, int radius, int value) +AbstractCounter *Player::addCounter(int counterId, const QString &name, QColor color, int radius, int value) { - if (counters.contains(id)) { + if (counters.contains(counterId)) { return nullptr; } - auto *state = new CounterState(id, name, color, radius, value, this); - counters.insert(id, state); - emit counterAdded(state); - return state; + + AbstractCounter *ctr; + if (name == "life") { + ctr = getGraphicsItem()->getPlayerTarget()->addCounter(counterId, name, value); + } else { + ctr = new GeneralCounter(this, counterId, name, color, radius, value, true, graphicsItem); + } + counters.insert(counterId, ctr); + + if (playerMenu->getCountersMenu() && ctr->getMenu()) { + playerMenu->getCountersMenu()->addMenu(ctr->getMenu()); + } + if (playerMenu->getShortcutsActive()) { + ctr->setShortcutsActive(); + } + emit rearrangeCounters(); + return ctr; } -void PlayerLogic::delCounter(int id) +void Player::delCounter(int counterId) { - auto *state = counters.take(id); - if (!state) { + AbstractCounter *ctr = counters.value(counterId, 0); + if (!ctr) { return; } - emit counterRemoved(id); - state->deleteLater(); + + ctr->delCounter(); + counters.remove(counterId); + emit rearrangeCounters(); } -void PlayerLogic::clearCounters() +void Player::clearCounters() { - for (int id : counters.keys()) { - emit counterRemoved(id); + QMapIterator counterIterator(counters); + while (counterIterator.hasNext()) { + counterIterator.next().value()->delCounter(); } - qDeleteAll(counters); counters.clear(); } -CounterState *PlayerLogic::getLifeCounter() const +void Player::incrementAllCardCounters() { - for (auto *s : counters.values()) { - if (s->getName() == "life") { - return s; + QList cardsToUpdate; + + auto selectedItems = getGameScene()->selectedItems(); + if (!selectedItems.isEmpty()) { + // If cards are selected, only update those + for (const auto &item : selectedItems) { + auto *card = static_cast(item); + cardsToUpdate.append(card); + } + } else { + // If no cards selected, update all cards on table + const CardList &tableCards = getTableZone()->getCards(); + cardsToUpdate = tableCards; + } + + QList commandList; + + for (const auto *card : cardsToUpdate) { + const auto &cardCounters = card->getCounters(); + + QMapIterator counterIterator(cardCounters); + while (counterIterator.hasNext()) { + counterIterator.next(); + int counterId = counterIterator.key(); + int currentValue = counterIterator.value(); + if (currentValue >= MAX_COUNTERS_ON_CARD) { + continue; + } + + auto cmd = std::make_unique(); + cmd->set_zone(card->getZone()->getName().toStdString()); + cmd->set_card_id(card->getId()); + cmd->set_counter_id(counterId); + cmd->set_counter_value(currentValue + 1); + commandList.append(cmd.release()); } } - return nullptr; + + if (!commandList.isEmpty()) { + playerActions->sendGameCommand(playerActions->prepareGameCommand(commandList)); + } } -bool PlayerLogic::clearCardsToDelete() +ArrowItem *Player::addArrow(const ServerInfo_Arrow &arrow) +{ + const QMap &playerList = game->getPlayerManager()->getPlayers(); + Player *startPlayer = playerList.value(arrow.start_player_id(), 0); + Player *targetPlayer = playerList.value(arrow.target_player_id(), 0); + if (!startPlayer || !targetPlayer) { + return nullptr; + } + + CardZoneLogic *startZone = startPlayer->getZones().value(QString::fromStdString(arrow.start_zone()), 0); + CardZoneLogic *targetZone = nullptr; + if (arrow.has_target_zone()) { + targetZone = targetPlayer->getZones().value(QString::fromStdString(arrow.target_zone()), 0); + } + if (!startZone || (!targetZone && arrow.has_target_zone())) { + return nullptr; + } + + CardItem *startCard = startZone->getCard(arrow.start_card_id()); + CardItem *targetCard = nullptr; + if (targetZone) { + targetCard = targetZone->getCard(arrow.target_card_id()); + } + if (!startCard || (!targetCard && arrow.has_target_card_id())) { + return nullptr; + } + + if (targetCard) { + return addArrow(arrow.id(), startCard, targetCard, convertColorToQColor(arrow.arrow_color())); + } else { + return addArrow(arrow.id(), startCard, targetPlayer->getGraphicsItem()->getPlayerTarget(), + convertColorToQColor(arrow.arrow_color())); + } +} + +ArrowItem *Player::addArrow(int arrowId, CardItem *startCard, ArrowTarget *targetItem, const QColor &color) +{ + auto *arrow = new ArrowItem(this, arrowId, startCard, targetItem, color); + arrows.insert(arrowId, arrow); + + getGameScene()->addItem(arrow); + return arrow; +} + +void Player::delArrow(int arrowId) +{ + ArrowItem *arr = arrows.value(arrowId, 0); + if (!arr) { + return; + } + arr->delArrow(); +} + +void Player::removeArrow(ArrowItem *arrow) +{ + if (arrow->getId() != -1) { + arrows.remove(arrow->getId()); + } +} + +void Player::clearArrows() +{ + QMapIterator arrowIterator(arrows); + while (arrowIterator.hasNext()) { + arrowIterator.next().value()->delArrow(); + } + arrows.clear(); +} + +bool Player::clearCardsToDelete() { if (cardsToDelete.isEmpty()) { return false; @@ -312,22 +451,28 @@ bool PlayerLogic::clearCardsToDelete() return true; } -void PlayerLogic::setActive(bool _active) +void Player::setActive(bool _active) { active = _active; emit activeChanged(active); } -void PlayerLogic::onRequestZoneViewToggle(const QString &zoneName, int numberCards, bool isReversed) -{ - emit requestZoneViewToggle(this, zoneName, numberCards, isReversed); -} -void PlayerLogic::updateZones() +void Player::updateZones() { getTableZone()->reorganizeCards(); } -void PlayerLogic::setGameStarted() +PlayerGraphicsItem *Player::getGraphicsItem() +{ + return graphicsItem; +} + +GameScene *Player::getGameScene() +{ + return getGraphicsItem()->getGameScene(); +} + +void Player::setGameStarted() { if (playerInfo->local) { emit resetTopCardMenuActions(); diff --git a/cockatrice/src/game/player/player_logic.h b/cockatrice/src/game/player/player.h similarity index 72% rename from cockatrice/src/game/player/player_logic.h rename to cockatrice/src/game/player/player.h index a89cb6eed..e9c008821 100644 --- a/cockatrice/src/game/player/player_logic.h +++ b/cockatrice/src/game/player/player.h @@ -1,21 +1,23 @@ /** * @file player.h * @ingroup GameLogicPlayers + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef PLAYER_H #define PLAYER_H -#include "../../game_graphics/player/player_area.h" +#include "../../game_graphics/board/abstract_graphics_item.h" #include "../../interface/widgets/menus/tearoff_menu.h" -#include "../board/arrow_data.h" #include "../interface/deck_loader/loaded_deck.h" -#include "../zones/hand_zone_logic.h" -#include "../zones/pile_zone_logic.h" -#include "../zones/stack_zone_logic.h" -#include "../zones/table_zone_logic.h" +#include "../zones/logic/hand_zone_logic.h" +#include "../zones/logic/pile_zone_logic.h" +#include "../zones/logic/stack_zone_logic.h" +#include "../zones/logic/table_zone_logic.h" +#include "menu/player_menu.h" +#include "player_area.h" #include "player_event_handler.h" +#include "player_graphics_item.h" #include "player_info.h" #include @@ -37,6 +39,7 @@ class Message; } } // namespace google class AbstractCardItem; +class AbstractCounter; class AbstractGame; class ArrowItem; class ArrowTarget; @@ -52,7 +55,6 @@ class PlayerMenu; class QAction; class QMenu; class ServerInfo_Arrow; -class ServerInfo_Card; class ServerInfo_Counter; class ServerInfo_Player; class ServerInfo_User; @@ -60,41 +62,28 @@ class TabGame; const int MAX_TOKENS_PER_DIALOG = 99; -class PlayerLogic : public QObject +class Player : public QObject { Q_OBJECT signals: void openDeckEditor(const LoadedDeck &deck); - void requestZoneViewToggle(PlayerLogic *player, const QString &zoneName, int numberCards, bool isReversed); - void requestRevealedZoneView(PlayerLogic *player, - CardZoneLogic *zone, - const QList &cardList, - bool withWritePermission); void deckChanged(); void newCardAdded(AbstractCardItem *card); - void requestCardMenuUpdate(const CardItem *card); - void counterAdded(CounterState *state); - void counterRemoved(int counterId); void rearrangeCounters(); void activeChanged(bool active); - void zoneIdChanged(int zoneId); void concededChanged(int playerId, bool conceded); void clearCustomZonesMenu(); void addViewCustomZoneActionToCustomZoneMenu(QString zoneName); void resetTopCardMenuActions(); - void arrowCreateRequested(QSharedPointer data); - void arrowDeleteRequested(int creatorId, int arrowId); - void arrowDeleted(int creatorId, int arrowId); - void arrowsClearedLocally(); // fires on clear() and processPlayerInfo public slots: void setActive(bool _active); - void onRequestZoneViewToggle(const QString &zoneName, int numberCards, bool isReversed); public: - PlayerLogic(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent); - ~PlayerLogic() override; + Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent); + void forwardActionSignalsToEventHandler(); + ~Player() override; void initializeZones(); void updateZones(); @@ -118,6 +107,10 @@ public: return game; } + GameScene *getGameScene(); + + [[nodiscard]] PlayerGraphicsItem *getGraphicsItem(); + [[nodiscard]] PlayerActions *getPlayerActions() const { return playerActions; @@ -133,6 +126,11 @@ public: return playerInfo; } + [[nodiscard]] PlayerMenu *getPlayerMenu() const + { + return playerMenu; + } + void setDeck(const DeckList &_deck); [[nodiscard]] const DeckList &getDeck() const @@ -191,20 +189,27 @@ public: return qobject_cast(zones.value(ZoneNames::HAND)); } - CounterState *addCounter(const ServerInfo_Counter &counter); - CounterState *addCounter(int id, const QString &name, const QColor &color, int radius, int value); + AbstractCounter *addCounter(const ServerInfo_Counter &counter); + AbstractCounter *addCounter(int counterId, const QString &name, QColor color, int radius, int value); void delCounter(int counterId); void clearCounters(); + void incrementAllCardCounters(); - QMap getCounters() const + QMap getCounters() { return counters; } - /** - * Gets the counter that represents the life total. - */ - CounterState *getLifeCounter() const; + ArrowItem *addArrow(const ServerInfo_Arrow &arrow); + ArrowItem *addArrow(int arrowId, CardItem *startCard, ArrowTarget *targetItem, const QColor &color); + void delArrow(int arrowId); + void removeArrow(ArrowItem *arrow); + void clearArrows(); + + const QMap &getArrows() const + { + return arrows; + } void setConceded(bool _conceded); bool getConceded() const @@ -231,6 +236,8 @@ private: PlayerInfo *playerInfo; PlayerEventHandler *playerEventHandler; PlayerActions *playerActions; + PlayerMenu *playerMenu; + PlayerGraphicsItem *graphicsItem; bool active; bool conceded; @@ -239,10 +246,13 @@ private: int zoneId; QMap zones; - QMap counters; + QMap counters; + QMap arrows; bool dialogSemaphore; QList cardsToDelete; + + // void eventConnectionStateChanged(const Event_ConnectionStateChanged &event); }; class AnnotationDialog : public QInputDialog diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp index df9eb8a1d..92c4b16bf 100644 --- a/cockatrice/src/game/player/player_actions.cpp +++ b/cockatrice/src/game/player/player_actions.cpp @@ -1,13 +1,15 @@ #include "player_actions.h" -#include "../../game_graphics/dialogs/dlg_move_top_cards_until.h" -#include "../../game_graphics/dialogs/dlg_roll_dice.h" -#include "../../game_graphics/player/card_menu_action_type.h" -#include "../../game_graphics/zones/hand_zone.h" -#include "../../game_graphics/zones/table_zone.h" #include "../../interface/widgets/tabs/tab_game.h" #include "../../interface/widgets/utility/get_text_with_max.h" -#include "../zones/view_zone_logic.h" +#include "../board/card_item.h" +#include "../client/settings/card_counter_settings.h" +#include "../dialogs/dlg_move_top_cards_until.h" +#include "../dialogs/dlg_roll_dice.h" +#include "../zones/hand_zone.h" +#include "../zones/logic/view_zone_logic.h" +#include "../zones/table_zone.h" +#include "card_menu_action_type.h" #include #include @@ -17,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -27,19 +28,16 @@ #include #include #include -#include -#include #include +#include #include // milliseconds in between triggers of the move top cards until action static constexpr int MOVE_TOP_CARD_UNTIL_INTERVAL = 100; -PlayerActions::PlayerActions(PlayerLogic *_player) +PlayerActions::PlayerActions(Player *_player) : QObject(_player), player(_player), lastTokenTableRow(0), movingCardsUntil(false) { - connect(this, &PlayerActions::requestZoneViewToggle, player, &PlayerLogic::onRequestZoneViewToggle); - moveTopCardTimer = new QTimer(this); moveTopCardTimer->setInterval(MOVE_TOP_CARD_UNTIL_INTERVAL); moveTopCardTimer->setSingleShot(true); @@ -86,9 +84,8 @@ void PlayerActions::playCard(CardItem *card, bool faceDown) cardToMove->set_pt(info.getPowTough().toStdString()); } cardToMove->set_tapped(!faceDown && info.getUiAttributes().cipt); - if (tableRow != 3) { + if (tableRow != 3) cmd.set_target_zone(ZoneNames::TABLE); - } cmd.set_x(gridPoint.x()); cmd.set_y(gridPoint.y()); } @@ -134,12 +131,12 @@ void PlayerActions::playCardToTable(const CardItem *card, bool faceDown) void PlayerActions::actViewLibrary() { - emit requestZoneViewToggle(ZoneNames::DECK, -1); + player->getGameScene()->toggleZoneView(player, ZoneNames::DECK, -1); } void PlayerActions::actViewHand() { - emit requestZoneViewToggle(ZoneNames::HAND, -1); + player->getGameScene()->toggleZoneView(player, ZoneNames::HAND, -1); } /** @@ -171,45 +168,49 @@ void PlayerActions::actSortHand() static QList defaultOptions = {CardList::SortByName, CardList::SortByPrinting}; - emit requestSortHand(sortOptions + defaultOptions); + player->getGraphicsItem()->getHandZoneGraphicsItem()->sortHand(sortOptions + defaultOptions); } -void PlayerActions::actRequestViewTopCardsDialog() +void PlayerActions::actViewTopCards() { - emit requestViewTopCardsDialog(defaultNumberTopCards, player->getDeckZone()->getCards().size()); + int deckSize = player->getDeckZone()->getCards().size(); + bool ok; + int number = QInputDialog::getInt(player->getGame()->getTab(), tr("View top cards of library"), + tr("Number of cards: (max. %1)").arg(deckSize), defaultNumberTopCards, 1, + deckSize, 1, &ok); + if (ok) { + defaultNumberTopCards = number; + player->getGameScene()->toggleZoneView(player, ZoneNames::DECK, number); + } } -void PlayerActions::actViewTopCards(int number) +void PlayerActions::actViewBottomCards() { - defaultNumberTopCards = number; - emit requestZoneViewToggle(ZoneNames::DECK, number); + int deckSize = player->getDeckZone()->getCards().size(); + bool ok; + int number = QInputDialog::getInt(player->getGame()->getTab(), tr("View bottom cards of library"), + tr("Number of cards: (max. %1)").arg(deckSize), defaultNumberBottomCards, 1, + deckSize, 1, &ok); + if (ok) { + defaultNumberBottomCards = number; + player->getGameScene()->toggleZoneView(player, ZoneNames::DECK, number, true); + } } -void PlayerActions::actRequestViewBottomCardsDialog() -{ - emit requestViewBottomCardsDialog(defaultNumberBottomCards, player->getDeckZone()->getCards().size()); -} - -void PlayerActions::actViewBottomCards(int number) -{ - defaultNumberBottomCards = number; - emit requestZoneViewToggle(ZoneNames::DECK, number, true); -} - -void PlayerActions::actAlwaysRevealTopCard(bool alwaysRevealTopCard) +void PlayerActions::actAlwaysRevealTopCard() { Command_ChangeZoneProperties cmd; cmd.set_zone_name(ZoneNames::DECK); - cmd.set_always_reveal_top_card(alwaysRevealTopCard); + cmd.set_always_reveal_top_card(player->getPlayerMenu()->getLibraryMenu()->isAlwaysRevealTopCardChecked()); sendGameCommand(cmd); } -void PlayerActions::actAlwaysLookAtTopCard(bool alwaysRevealTopCard) +void PlayerActions::actAlwaysLookAtTopCard() { Command_ChangeZoneProperties cmd; cmd.set_zone_name(ZoneNames::DECK); - cmd.set_always_look_at_top_card(alwaysRevealTopCard); + cmd.set_always_look_at_top_card(player->getPlayerMenu()->getLibraryMenu()->isAlwaysLookAtTopCardChecked()); sendGameCommand(cmd); } @@ -221,17 +222,17 @@ void PlayerActions::actOpenDeckInDeckEditor() void PlayerActions::actViewGraveyard() { - emit requestZoneViewToggle(ZoneNames::GRAVE, -1); + player->getGameScene()->toggleZoneView(player, ZoneNames::GRAVE, -1); } void PlayerActions::actViewRfg() { - emit requestZoneViewToggle(ZoneNames::EXILE, -1); + player->getGameScene()->toggleZoneView(player, ZoneNames::EXILE, -1); } void PlayerActions::actViewSideboard() { - emit requestZoneViewToggle(ZoneNames::SIDEBOARD, -1); + player->getGameScene()->toggleZoneView(player, ZoneNames::SIDEBOARD, -1); } void PlayerActions::actShuffle() @@ -239,20 +240,18 @@ void PlayerActions::actShuffle() sendGameCommand(Command_Shuffle()); } -void PlayerActions::actRequestShuffleTopDialog() +void PlayerActions::actShuffleTop() { const int maxCards = player->getDeckZone()->getCards().size(); if (maxCards == 0) { return; } - emit requestShuffleTopDialog(defaultNumberTopCards, maxCards); -} - -void PlayerActions::actShuffleTop(int number) -{ - const int maxCards = player->getDeckZone()->getCards().size(); - if (maxCards == 0) { + bool ok; + int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Shuffle top cards of library"), + tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberTopCards, 1, + maxCards, 1, &ok); + if (!ok) { return; } @@ -270,20 +269,18 @@ void PlayerActions::actShuffleTop(int number) sendGameCommand(cmd); } -void PlayerActions::actRequestShuffleBottomDialog() +void PlayerActions::actShuffleBottom() { const int maxCards = player->getDeckZone()->getCards().size(); if (maxCards == 0) { return; } - emit requestShuffleBottomDialog(defaultNumberBottomCards, maxCards); -} - -void PlayerActions::actShuffleBottom(int number) -{ - const int maxCards = player->getDeckZone()->getCards().size(); - if (maxCards == 0) { + bool ok; + int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Shuffle bottom cards of library"), + tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberBottomCards, 1, + maxCards, 1, &ok); + if (!ok) { return; } @@ -308,18 +305,21 @@ void PlayerActions::actDrawCard() sendGameCommand(cmd); } -void PlayerActions::actRequestMulliganDialog() +void PlayerActions::actMulligan() { int startSize = SettingsCache::instance().getStartingHandSize(); int handSize = player->getHandZone()->getCards().size(); int deckSize = player->getDeckZone()->getCards().size() + handSize; - emit requestMulliganDialog(startSize, handSize, deckSize); -} + bool ok; + int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Draw hand"), + tr("Number of cards: (max. %1)").arg(deckSize) + '\n' + + tr("0 and lower are in comparison to current hand size"), + startSize, -handSize, deckSize, 1, &ok); -void PlayerActions::actMulligan(int number) -{ - int handSize = player->getHandZone()->getCards().size(); + if (!ok) { + return; + } if (number < 1) { number = handSize + number; @@ -353,19 +353,19 @@ void PlayerActions::doMulligan(int number) sendGameCommand(cmd); } -void PlayerActions::actRequestDrawCardsDialog() +void PlayerActions::actDrawCards() { int deckSize = player->getDeckZone()->getCards().size(); - - emit requestDrawCardsDialog(defaultNumberTopCards, deckSize); -} - -void PlayerActions::actDrawCards(int number) -{ - defaultNumberTopCards = number; - Command_DrawCards cmd; - cmd.set_number(static_cast(number)); - sendGameCommand(cmd); + bool ok; + int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Draw cards"), + tr("Number of cards: (max. %1)").arg(deckSize), defaultNumberTopCards, 1, + deckSize, 1, &ok); + if (ok) { + defaultNumberTopCards = number; + Command_DrawCards cmd; + cmd.set_number(static_cast(number)); + sendGameCommand(cmd); + } } void PlayerActions::actUndoDraw() @@ -423,40 +423,36 @@ void PlayerActions::actMoveTopCardToExile() void PlayerActions::actMoveTopCardsToGrave() { - actRequestMoveTopCardsToDialog(ZoneNames::GRAVE, tr("grave"), false); + moveTopCardsTo(ZoneNames::GRAVE, tr("grave"), false); } void PlayerActions::actMoveTopCardsToGraveFaceDown() { - actRequestMoveTopCardsToDialog(ZoneNames::GRAVE, tr("grave"), true); + moveTopCardsTo(ZoneNames::GRAVE, tr("grave"), true); } void PlayerActions::actMoveTopCardsToExile() { - actRequestMoveTopCardsToDialog(ZoneNames::EXILE, tr("exile"), false); + moveTopCardsTo(ZoneNames::EXILE, tr("exile"), false); } void PlayerActions::actMoveTopCardsToExileFaceDown() { - actRequestMoveTopCardsToDialog(ZoneNames::EXILE, tr("exile"), true); + moveTopCardsTo(ZoneNames::EXILE, tr("exile"), true); } -void PlayerActions::actRequestMoveTopCardsToDialog(const QString &targetZone, - const QString &zoneDisplayName, - bool faceDown) +void PlayerActions::moveTopCardsTo(const QString &targetZone, const QString &zoneDisplayName, bool faceDown) { const int maxCards = player->getDeckZone()->getCards().size(); if (maxCards == 0) { return; } - emit requestMoveTopCardsToDialog(defaultNumberTopCards, maxCards, targetZone, zoneDisplayName, faceDown); -} - -void PlayerActions::moveTopCardsTo(int number, const QString &targetZone, bool faceDown) -{ - const int maxCards = player->getDeckZone()->getCards().size(); - if (maxCards == 0) { + bool ok; + int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Move top cards to %1").arg(zoneDisplayName), + tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberTopCards, 1, + maxCards, 1, &ok); + if (!ok) { return; } @@ -483,16 +479,17 @@ void PlayerActions::moveTopCardsTo(int number, const QString &targetZone, bool f sendGameCommand(cmd); } -void PlayerActions::actRequestMoveTopCardsUntilDialog() +void PlayerActions::actMoveTopCardsUntil() { stopMoveTopCardsUntil(); - emit requestMoveTopCardsUntilDialog(movingCardsUntilOptions); -} + DlgMoveTopCardsUntil dlg(player->getGame()->getTab(), movingCardsUntilOptions); + if (!dlg.exec()) { + return; + } -void PlayerActions::moveTopCardsUntil(const QString &expr, MoveTopCardsUntilOptions options) -{ - movingCardsUntilOptions = options; + auto expr = dlg.getExpr(); + movingCardsUntilOptions = dlg.getOptions(); if (player->getDeckZone()->getCards().empty()) { stopMoveTopCardsUntil(); @@ -621,40 +618,36 @@ void PlayerActions::actMoveBottomCardToExile() void PlayerActions::actMoveBottomCardsToGrave() { - actRequestMoveBottomCardsToDialog(ZoneNames::GRAVE, tr("grave"), false); + moveBottomCardsTo(ZoneNames::GRAVE, tr("grave"), false); } void PlayerActions::actMoveBottomCardsToGraveFaceDown() { - actRequestMoveBottomCardsToDialog(ZoneNames::GRAVE, tr("grave"), true); + moveBottomCardsTo(ZoneNames::GRAVE, tr("grave"), true); } void PlayerActions::actMoveBottomCardsToExile() { - actRequestMoveBottomCardsToDialog(ZoneNames::EXILE, tr("exile"), false); + moveBottomCardsTo(ZoneNames::EXILE, tr("exile"), false); } void PlayerActions::actMoveBottomCardsToExileFaceDown() { - actRequestMoveBottomCardsToDialog(ZoneNames::EXILE, tr("exile"), true); + moveBottomCardsTo(ZoneNames::EXILE, tr("exile"), true); } -void PlayerActions::actRequestMoveBottomCardsToDialog(const QString &targetZone, - const QString &zoneDisplayName, - bool faceDown) +void PlayerActions::moveBottomCardsTo(const QString &targetZone, const QString &zoneDisplayName, bool faceDown) { const int maxCards = player->getDeckZone()->getCards().size(); if (maxCards == 0) { return; } - emit requestMoveBottomCardsToDialog(defaultNumberBottomCards, maxCards, targetZone, zoneDisplayName, faceDown); -} - -void PlayerActions::moveBottomCardsTo(int number, const QString &targetZone, bool faceDown) -{ - const int maxCards = player->getDeckZone()->getCards().size(); - if (maxCards == 0) { + bool ok; + int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Move bottom cards to %1").arg(zoneDisplayName), + tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberBottomCards, 1, + maxCards, 1, &ok); + if (!ok) { return; } @@ -766,24 +759,20 @@ void PlayerActions::actDrawBottomCard() sendGameCommand(cmd); } -void PlayerActions::actRequestDrawBottomCardsDialog() +void PlayerActions::actDrawBottomCards() { const int maxCards = player->getDeckZone()->getCards().size(); if (maxCards == 0) { return; } - emit requestDrawBottomCardsDialog(defaultNumberBottomCards, maxCards); -} - -void PlayerActions::actDrawBottomCards(int number) -{ - const int maxCards = player->getDeckZone()->getCards().size(); - if (maxCards == 0) { + bool ok; + int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Draw bottom cards"), + tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberBottomCards, 1, + maxCards, 1, &ok); + if (!ok) { return; - } - - if (number > maxCards) { + } else if (number > maxCards) { number = maxCards; } defaultNumberBottomCards = number; @@ -850,16 +839,16 @@ void PlayerActions::actUntapAll() sendGameCommand(cmd); } -void PlayerActions::actRequestRollDieDialog() +void PlayerActions::actRollDie() { - emit requestRollDieDialog(); -} + DlgRollDice dlg(player->getGame()->getTab()); + if (!dlg.exec()) { + return; + } -void PlayerActions::actRollDie(int sides, int count) -{ Command_RollDie cmd; - cmd.set_sides(sides); - cmd.set_count(count); + cmd.set_sides(dlg.getDieSideCount()); + cmd.set_count(dlg.getDiceToRollCount()); sendGameCommand(cmd); } @@ -871,26 +860,26 @@ void PlayerActions::actFlipCoin() sendGameCommand(cmd); } -void PlayerActions::actRequestCreateTokenDialog(const QStringList &predefinedTokens) +void PlayerActions::actCreateToken() { - emit requestCreateTokenDialog(predefinedTokens); -} + DlgCreateToken dlg(player->getPlayerMenu()->getUtilityMenu()->getPredefinedTokens(), player->getGame()->getTab()); + if (!dlg.exec()) { + return; + } -void PlayerActions::actCreateToken(TokenInfo tokenToCreate) -{ - lastTokenInfo = tokenToCreate; + lastTokenInfo = dlg.getTokenInfo(); ExactCard correctedCard = CardDatabaseManager::query()->guessCard({lastTokenInfo.name, lastTokenInfo.providerId}); if (correctedCard) { lastTokenInfo.name = correctedCard.getName(); - int tableRow = lastTokenInfo.faceDown ? 2 : correctedCard.getInfo().getUiAttributes().tableRow; - lastTokenTableRow = TableZone::tableRowToGridY(tableRow); + lastTokenTableRow = TableZone::tableRowToGridY(correctedCard.getInfo().getUiAttributes().tableRow); if (lastTokenInfo.pt.isEmpty()) { lastTokenInfo.pt = correctedCard.getInfo().getPowTough(); } } - emit requestEnableAndSetCreateAnotherTokenAction(lastTokenInfo.name); + player->getPlayerMenu()->getUtilityMenu()->setAndEnableCreateAnotherTokenAction( + tr("C&reate another %1 token").arg(lastTokenInfo.name)); actCreateAnotherToken(); } @@ -921,12 +910,8 @@ void PlayerActions::setLastToken(CardInfoPtr cardInfo) return; } - emit requestSetLastToken(cardInfo); -} - -void PlayerActions::setLastTokenInfo(CardInfoPtr cardInfo) -{ - if (cardInfo == nullptr) { + UtilityMenu *utilityMenu = player->getPlayerMenu()->getUtilityMenu(); + if (utilityMenu == nullptr || !utilityMenu->createAnotherTokenActionExists()) { return; } @@ -940,7 +925,7 @@ void PlayerActions::setLastTokenInfo(CardInfoPtr cardInfo) lastTokenTableRow = TableZone::tableRowToGridY(cardInfo->getUiAttributes().tableRow); - emit requestEnableAndSetCreateAnotherTokenAction(lastTokenInfo.name); + utilityMenu->setAndEnableCreateAnotherTokenAction(tr("C&reate another %1 token").arg(lastTokenInfo.name)); } void PlayerActions::actCreatePredefinedToken() @@ -959,17 +944,23 @@ void PlayerActions::actCreatePredefinedToken() 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(action->data().toInt()); - actRequestCreateRelatedFromRelationDialog(sourceCard, cardRelation); + + /* + * If we make a token via "Token: TokenName" + * then let's allow it to be created via "create another token" + */ + if (createRelatedFromRelation(sourceCard, cardRelation) && cardRelation->getCanCreateAnother()) { + ExactCard relatedCard = CardDatabaseManager::query()->getCardFromSameSet(cardRelation->getName(), + sourceCard->getCard().getPrinting()); + setLastToken(relatedCard.getCardPtr()); + } } void PlayerActions::actCreateAllRelatedCards() @@ -989,9 +980,7 @@ void PlayerActions::actCreateAllRelatedCards() if (relatedCards.length() == 1) { cardRelation = relatedCards.at(0); - lastRelatedCreationSucceeded = false; // reset before emit - actRequestCreateRelatedFromRelationDialog(sourceCard, cardRelation); - if (lastRelatedCreationSucceeded) { + if (createRelatedFromRelation(sourceCard, cardRelation)) { ++tokensTypesCreated; } } else { @@ -1003,25 +992,21 @@ void PlayerActions::actCreateAllRelatedCards() } } switch (nonExcludedRelatedCards.length()) { - case 1: + case 1: // if nonExcludedRelatedCards == 1 cardRelation = nonExcludedRelatedCards.at(0); - lastRelatedCreationSucceeded = false; // reset before emit - actRequestCreateRelatedFromRelationDialog(sourceCard, cardRelation); - if (lastRelatedCreationSucceeded) { + if (createRelatedFromRelation(sourceCard, cardRelation)) { ++tokensTypesCreated; } break; - // If all are marked "Exclude", then treat the situation as if none of them are. // We won't accept "garbage in, garbage out", here. - case 0: + case 0: // else if nonExcludedRelatedCards == 0 for (CardRelation *cardRelationAll : relatedCards) { if (!cardRelationAll->getDoesAttach() && !cardRelationAll->getIsVariable()) { dbName = cardRelationAll->getName(); bool persistent = cardRelationAll->getIsPersistent(); - bool faceDown = cardRelationAll->getIsFaceDown(); for (int i = 0; i < cardRelationAll->getDefaultCount(); ++i) { - createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent, faceDown); + createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent); } ++tokensTypesCreated; if (tokensTypesCreated == 1) { @@ -1030,15 +1015,13 @@ void PlayerActions::actCreateAllRelatedCards() } } break; - - default: + default: // else for (CardRelation *cardRelationNotExcluded : nonExcludedRelatedCards) { if (!cardRelationNotExcluded->getDoesAttach() && !cardRelationNotExcluded->getIsVariable()) { dbName = cardRelationNotExcluded->getName(); bool persistent = cardRelationNotExcluded->getIsPersistent(); - bool faceDown = cardRelationNotExcluded->getIsFaceDown(); for (int i = 0; i < cardRelationNotExcluded->getDefaultCount(); ++i) { - createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent, faceDown); + createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent); } ++tokensTypesCreated; if (tokensTypesCreated == 1) { @@ -1060,89 +1043,47 @@ void PlayerActions::actCreateAllRelatedCards() } } -void PlayerActions::actRequestCreateRelatedFromRelationDialog(const CardItem *sourceCard, - const CardRelation *cardRelation) -{ - emit requestCreateRelatedFromRelationDialog(sourceCard, cardRelation); -} - -bool PlayerActions::createRelatedFromRelation(const CardItem *sourceCard, - const CardRelation *cardRelation, - int variableCount) +bool PlayerActions::createRelatedFromRelation(const CardItem *sourceCard, const CardRelation *cardRelation) { if (sourceCard == nullptr || cardRelation == nullptr) { return false; } - - const QString dbName = cardRelation->getName(); - const bool persistent = cardRelation->getIsPersistent(); - const bool faceDown = cardRelation->getIsFaceDown(); - - // Variable relations always use DoesNotAttach, regardless of the count the user - // entered. + QString dbName = cardRelation->getName(); + bool persistent = cardRelation->getIsPersistent(); if (cardRelation->getIsVariable()) { - if (variableCount <= 0) { + bool ok; + player->setDialogSemaphore(true); + int count = QInputDialog::getInt(player->getGame()->getTab(), tr("Create tokens"), tr("Number:"), + cardRelation->getDefaultCount(), 1, MAX_TOKENS_PER_DIALOG, 1, &ok); + player->setDialogSemaphore(false); + if (!ok) { return false; } - for (int i = 0; i < variableCount; ++i) { - createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent, faceDown); - } - return true; - } - - const int count = cardRelation->getDefaultCount(); - - if (count > 1) { for (int i = 0; i < count; ++i) { - createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent, faceDown); + createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent); + } + } else if (cardRelation->getDefaultCount() > 1) { + for (int i = 0; i < cardRelation->getDefaultCount(); ++i) { + createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent); } - return true; - } - - CardRelationType attachType; - // do not attempt to attach to another player's cards, this causes the card to attempt to attach to the same - // cardid on the local player's field instead, which is an entirely different card! - if (player->getPlayerInfo()->getLocalOrJudge()) { - attachType = cardRelation->getAttachType(); } else { - attachType = CardRelationType::DoesNotAttach; - } + auto attachType = cardRelation->getAttachType(); - // move card onto table first if attaching from some other zone - // we only do this for AttachTo because cross-zone TransformInto is already handled server-side - if (attachType == CardRelationType::AttachTo && sourceCard->getZone()->getName() != ZoneNames::TABLE) { - playCardToTable(sourceCard, false); - } + // move card onto table first if attaching from some other zone + // we only do this for AttachTo because cross-zone TransformInto is already handled server-side + if (attachType == CardRelationType::AttachTo && sourceCard->getZone()->getName() != ZoneNames::TABLE) { + playCardToTable(sourceCard, false); + } - createCard(sourceCard, dbName, attachType, persistent, faceDown); + createCard(sourceCard, dbName, attachType, persistent); + } return true; } -void PlayerActions::onRelatedCardCreated(const CardItem *sourceCard, const CardRelation *cardRelation) -{ - if (sourceCard == nullptr || cardRelation == nullptr) { - return; - } - - /* - * If we make a token via "Token: TokenName" - * then let's allow it to be created via "create another token" - */ - if (!cardRelation->getCanCreateAnother()) { - return; - } - - ExactCard relatedCard = - CardDatabaseManager::query()->getCardFromSameSet(cardRelation->getName(), sourceCard->getCard().getPrinting()); - - setLastToken(relatedCard.getCardPtr()); -} - void PlayerActions::createCard(const CardItem *sourceCard, const QString &dbCardName, CardRelationType attachType, - bool persistent, - bool faceDown) + bool persistent) { CardInfoPtr cardInfo = CardDatabaseManager::query()->getCardInfo(dbCardName); @@ -1177,7 +1118,6 @@ void PlayerActions::createCard(const CardItem *sourceCard, cmd.set_destroy_on_zone_change(!persistent); cmd.set_x(gridPoint.x()); cmd.set_y(gridPoint.y()); - cmd.set_face_down(faceDown); ExactCard relatedCard = CardDatabaseManager::query()->getCardFromSameSet(cardInfo->getName(), sourceCard->getCard().getPrinting()); @@ -1217,29 +1157,95 @@ void PlayerActions::actSayMessage() sendGameCommand(cmd); } -void PlayerActions::actRequestMoveCardXCardsFromTopDialog() +void PlayerActions::setCardAttrHelper(const GameEventContext &context, + CardItem *card, + CardAttribute attribute, + const QString &avalue, + bool allCards, + EventProcessingOptions options) { - int deckSize = player->getDeckZone()->getCards().size() + 1; // add the card to move to the deck + if (card == nullptr) { + return; + } - emit requestMoveCardXCardsFromTopDialog(defaultNumberTopCardsToPlaceBelow, deckSize); + bool moveCardContext = context.HasExtension(Context_MoveCard::ext); + switch (attribute) { + case AttrTapped: { + bool tapped = avalue == "1"; + if (!(!tapped && card->getDoesntUntap() && allCards)) { + if (!allCards) { + emit logSetTapped(player, card, tapped); + } + bool canAnimate = !options.testFlag(SKIP_TAP_ANIMATION) && !moveCardContext; + card->setTapped(tapped, canAnimate); + } + break; + } + case AttrAttacking: { + card->setAttacking(avalue == "1"); + break; + } + case AttrFaceDown: { + card->setFaceDown(avalue == "1"); + break; + } + case AttrColor: { + card->setColor(avalue); + break; + } + case AttrAnnotation: { + emit logSetAnnotation(player, card, avalue); + card->setAnnotation(avalue); + break; + } + case AttrDoesntUntap: { + bool value = (avalue == "1"); + emit logSetDoesntUntap(player, card, value); + card->setDoesntUntap(value); + break; + } + case AttrPT: { + emit logSetPT(player, card, avalue); + card->setPT(avalue); + break; + } + } } -void PlayerActions::actMoveCardXCardsFromTop(QList selectedCards, int number) +void PlayerActions::actMoveCardXCardsFromTop() { + int deckSize = player->getDeckZone()->getCards().size() + 1; // add the card to move to the deck + bool ok; + int number = + QInputDialog::getInt(player->getGame()->getTab(), tr("Place card X cards from top of library"), + tr("Which position should this card be placed:") + "\n" + tr("(max. %1)").arg(deckSize), + defaultNumberTopCardsToPlaceBelow, 1, deckSize, 1, &ok); + number -= 1; // indexes start at 0 + + if (!ok) { + return; + } + defaultNumberTopCardsToPlaceBelow = number; - if (selectedCards.isEmpty()) { + QList sel = player->getGameScene()->selectedItems(); + if (sel.isEmpty()) { return; } + QList cardList; + while (!sel.isEmpty()) { + cardList.append(qgraphicsitem_cast(sel.takeFirst())); + } + QList commandList; ListOfCardsToMove idList; - for (const auto &i : selectedCards) { + for (const auto &i : cardList) { idList.add_card()->set_card_id(i->getId()); } - int startPlayerId = selectedCards[0]->getZone()->getPlayer()->getPlayerInfo()->getId(); - QString startZone = selectedCards[0]->getZone()->getName(); + int startPlayerId = cardList[0]->getZone()->getPlayer()->getPlayerInfo()->getId(); + QString startZone = cardList[0]->getZone()->getName(); auto *cmd = new Command_MoveCard; cmd->set_start_player_id(startPlayerId); @@ -1258,14 +1264,15 @@ void PlayerActions::actMoveCardXCardsFromTop(QList selectedCards, in } } -void PlayerActions::actIncPT(QList selectedCards, int deltaP, int deltaT) +void PlayerActions::actIncPT(int deltaP, int deltaT) { int playerid = player->getPlayerInfo()->getId(); QList commandList; - for (auto card : selectedCards) { + for (const auto &item : player->getGameScene()->selectedItems()) { + auto *card = static_cast(item); QString pt = card->getPT(); - const auto ptList = CardItem::parsePT(pt); + const auto ptList = parsePT(pt); QString newpt; if (ptList.isEmpty()) { newpt = QString::number(deltaP) + (deltaT ? "/" + QString::number(deltaT) : ""); @@ -1291,11 +1298,12 @@ void PlayerActions::actIncPT(QList selectedCards, int deltaP, int de player->getGame()->getGameEventHandler()->sendGameCommand(prepareGameCommand(commandList), playerid); } -void PlayerActions::actResetPT(QList selectedCards) +void PlayerActions::actResetPT() { int playerid = player->getPlayerInfo()->getId(); QList commandList; - for (auto card : selectedCards) { + for (const auto &item : player->getGameScene()->selectedItems()) { + auto *card = static_cast(item); QString ptString; if (!card->getFaceDown()) { // leave the pt empty if the card is face down ExactCard ec = card->getCard(); @@ -1324,32 +1332,68 @@ void PlayerActions::actResetPT(QList selectedCards) } } -void PlayerActions::actRequestSetPTDialog(QList selectedCards) +QVariantList PlayerActions::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 PlayerActions::actSetPT() { QString oldPT; + int playerid = player->getPlayerInfo()->getId(); - for (auto card : selectedCards) { + auto sel = player->getGameScene()->selectedItems(); + for (const auto &item : sel) { + auto *card = static_cast(item); if (!card->getPT().isEmpty()) { oldPT = card->getPT(); } } + bool ok; + player->setDialogSemaphore(true); + QString pt = getTextWithMax(player->getGame()->getTab(), tr("Change power/toughness"), tr("Change stats to:"), + QLineEdit::Normal, oldPT, &ok); + player->setDialogSemaphore(false); + if (player->clearCardsToDelete() || !ok) { + return; + } - emit requestSetPTDialog(oldPT); -} - -void PlayerActions::actSetPT(QList selectedCards, const QString &pt) -{ - int playerid = player->getPlayerInfo()->getId(); - - const auto ptList = CardItem::parsePT(pt); + const auto ptList = parsePT(pt); bool empty = ptList.isEmpty(); QList commandList; - for (auto card : selectedCards) { + for (const auto &item : sel) { + auto *card = static_cast(item); auto *cmd = new Command_SetCardAttr; QString newpt = QString(); if (!empty) { - const auto oldpt = CardItem::parsePT(card->getPT()); + const auto oldpt = parsePT(card->getPT()); int ptIter = 0; for (const auto &_item : ptList) { #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) @@ -1389,69 +1433,44 @@ void PlayerActions::actDrawArrow() } } -void PlayerActions::actIncP(QList selectedCards) +void PlayerActions::actIncP() { - actIncPT(selectedCards, 1, 0); + actIncPT(1, 0); } -void PlayerActions::actDecP(QList selectedCards) +void PlayerActions::actDecP() { - actIncPT(selectedCards, -1, 0); + actIncPT(-1, 0); } -void PlayerActions::actIncT(QList selectedCards) +void PlayerActions::actIncT() { - actIncPT(selectedCards, 0, 1); + actIncPT(0, 1); } -void PlayerActions::actDecT(QList selectedCards) +void PlayerActions::actDecT() { - actIncPT(selectedCards, 0, -1); + actIncPT(0, -1); } -void PlayerActions::actIncPT(QList selectedCards) +void PlayerActions::actIncPT() { - actIncPT(selectedCards, 1, 1); + actIncPT(1, 1); } -void PlayerActions::actDecPT(QList selectedCards) +void PlayerActions::actDecPT() { - actIncPT(selectedCards, -1, -1); + actIncPT(-1, -1); } -void PlayerActions::actFlowP(QList selectedCards) +void PlayerActions::actFlowP() { - actIncPT(selectedCards, 1, -1); + actIncPT(1, -1); } -void PlayerActions::actFlowT(QList selectedCards) +void PlayerActions::actFlowT() { - actIncPT(selectedCards, -1, 1); -} - -void PlayerActions::actReduceLifeByPower(QList selectedCards) -{ - // find life counter - auto lifeCounter = player->getLifeCounter(); - if (!lifeCounter) { - return; - } - - // calculate total power; - int total = 0; - for (auto card : selectedCards) { - 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); - } - } - - // send cmd - Command_IncCounter cmd; - cmd.set_counter_id(lifeCounter->getId()); - cmd.set_delta(-total); - sendGameCommand(prepareGameCommand(cmd)); + actIncPT(-1, 1); } void AnnotationDialog::keyPressEvent(QKeyEvent *event) @@ -1464,22 +1483,33 @@ void AnnotationDialog::keyPressEvent(QKeyEvent *event) QInputDialog::keyPressEvent(event); } -void PlayerActions::actRequestSetAnnotationDialog(QList selectedCards) +void PlayerActions::actSetAnnotation() { QString oldAnnotation; - for (auto card : selectedCards) { + auto sel = player->getGameScene()->selectedItems(); + for (const auto &item : sel) { + auto *card = static_cast(item); if (!card->getAnnotation().isEmpty()) { oldAnnotation = card->getAnnotation(); } } - emit requestSetAnnotationDialog(oldAnnotation); -} + player->setDialogSemaphore(true); + AnnotationDialog *dialog = new AnnotationDialog(player->getGame()->getTab()); + dialog->setOptions(QInputDialog::UsePlainTextEditForTextInput); + dialog->setWindowTitle(tr("Set annotation")); + dialog->setLabelText(tr("Please enter the new annotation:")); + dialog->setTextValue(oldAnnotation); + bool ok = dialog->exec(); + player->setDialogSemaphore(false); + if (player->clearCardsToDelete() || !ok) { + return; + } + QString annotation = dialog->textValue().left(MAX_NAME_LENGTH); -void PlayerActions::actSetAnnotation(QList selectedCards, const QString &annotation) -{ QList commandList; - for (auto card : selectedCards) { + for (const auto &item : sel) { + auto *card = static_cast(item); auto *cmd = new Command_SetCardAttr; cmd->set_zone(card->getZone()->getName().toStdString()); cmd->set_card_id(card->getId()); @@ -1500,10 +1530,12 @@ void PlayerActions::actAttach() card->drawAttachArrow(); } -void PlayerActions::actUnattach(QList selectedCards) +void PlayerActions::actUnattach() { QList commandList; - for (auto card : selectedCards) { + for (QGraphicsItem *item : player->getGameScene()->selectedItems()) { + auto *card = static_cast(item); + if (!card->getAttachedTo()) { continue; } @@ -1516,108 +1548,81 @@ void PlayerActions::actUnattach(QList selectedCards) sendGameCommand(prepareGameCommand(commandList)); } -void PlayerActions::actAddCardCounter(QList selectedCards, int counterId) -{ - offsetCardCounter(selectedCards, counterId, 1); -} - -void PlayerActions::actRemoveCardCounter(QList selectedCards, int counterId) -{ - offsetCardCounter(selectedCards, counterId, -1); -} - -void PlayerActions::offsetCardCounter(QList selectedCards, int counterId, int offset) +void PlayerActions::actCardCounterTrigger() { + auto *action = static_cast(sender()); + int counterId = action->data().toInt() / 1000; QList commandList; - for (auto card : selectedCards) { - int oldValue = card->getCounters().value(counterId, 0); - - // Overflow-safe clamp to the server-enforced range [0, MAX_COUNTER_VALUE]; - // a result differing from oldValue also corrects an out-of-range cached value. - // Callers only ever pass offset == ±1 (actAddCardCounter / actRemoveCardCounter). - // This client-side clamp is a defense-in-depth UX check, consistent with - // actSetCardCounter and actIncrementAllCardCounters; the server remains the - // authoritative enforcer of the bounds. - int newValue = addClamped(oldValue, offset, 0, MAX_COUNTER_VALUE); - if (newValue != oldValue) { - auto *cmd = new Command_SetCardCounter; - cmd->set_zone(card->getZone()->getName().toStdString()); - cmd->set_card_id(card->getId()); - cmd->set_counter_id(counterId); - cmd->set_counter_value(newValue); - commandList.append(cmd); + switch (action->data().toInt() % 1000) { + case 9: { // increment counter + for (const auto &item : player->getGameScene()->selectedItems()) { + auto *card = static_cast(item); + if (card->getCounters().value(counterId, 0) < MAX_COUNTERS_ON_CARD) { + auto *cmd = new Command_SetCardCounter; + cmd->set_zone(card->getZone()->getName().toStdString()); + cmd->set_card_id(card->getId()); + cmd->set_counter_id(counterId); + cmd->set_counter_value(card->getCounters().value(counterId, 0) + 1); + commandList.append(cmd); + } + } + break; } - } + case 10: { // decrement counter + for (const auto &item : player->getGameScene()->selectedItems()) { + auto *card = static_cast(item); + if (card->getCounters().value(counterId, 0)) { + auto *cmd = new Command_SetCardCounter; + cmd->set_zone(card->getZone()->getName().toStdString()); + cmd->set_card_id(card->getId()); + cmd->set_counter_id(counterId); + cmd->set_counter_value(card->getCounters().value(counterId, 0) - 1); + commandList.append(cmd); + } + } + break; + } + case 11: { // set counter with dialog + player->setDialogSemaphore(true); - sendGameCommand(prepareGameCommand(commandList)); -} - -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"; - if (selectedCards.size() == 1) { - auto *card = selectedCards.first(); - oldValueForDlg = QString::number(card->getCounters().value(counterId, 0)); - } - - emit requestSetCardCounterDialog(counterId, oldValueForDlg); -} - -void PlayerActions::actSetCardCounter(QList selectedCards, int counterId, const QString &counterValue) -{ - QList commandList; - for (auto card : selectedCards) { - int oldValue = card->getCounters().value(counterId, 0); - Expression exp(oldValue); - double parsed = exp.parse(counterValue); - // Clamp in double precision first to avoid UB, then cast - int number = static_cast(qBound(0.0, parsed, static_cast(MAX_COUNTER_VALUE))); - - auto *cmd = new Command_SetCardCounter; - cmd->set_zone(card->getZone()->getName().toStdString()); - cmd->set_card_id(card->getId()); - cmd->set_counter_id(counterId); - cmd->set_counter_value(number); - commandList.append(cmd); - } - - sendGameCommand(prepareGameCommand(commandList)); -} - -void PlayerActions::actIncrementAllCardCounters(QList cardsToUpdate) -{ - if (cardsToUpdate.isEmpty()) { - // If no cards selected, update all cards on table - cardsToUpdate = static_cast>(player->getTableZone()->getCards()); - } - - QList commandList; - - for (const auto *card : cardsToUpdate) { - const auto &cardCounters = card->getCounters(); - - QMapIterator counterIterator(cardCounters); - while (counterIterator.hasNext()) { - counterIterator.next(); - int counterId = counterIterator.key(); - int currentValue = counterIterator.value(); - if (currentValue >= MAX_COUNTER_VALUE) { - continue; + // If a single card is selected, we show the old value in the dialog. Otherwise, we show "x" + QList sel = player->getGameScene()->selectedItems(); + QString oldValueForDlg = "x"; + if (sel.size() == 1) { + auto *card = dynamic_cast(sel.first()); + oldValueForDlg = QString::number(card->getCounters().value(counterId, 0)); } - auto cmd = std::make_unique(); - cmd->set_zone(card->getZone()->getName().toStdString()); - cmd->set_card_id(card->getId()); - cmd->set_counter_id(counterId); - cmd->set_counter_value(currentValue + 1); - commandList.append(cmd.release()); - } - } + auto &cardCounterSettings = SettingsCache::instance().cardCounters(); + QString counterName = cardCounterSettings.displayName(counterId); - if (!commandList.isEmpty()) { - sendGameCommand(prepareGameCommand(commandList)); + AbstractCounterDialog dialog(counterName, oldValueForDlg, player->getGame()->getTab()); + int ok = dialog.exec(); + + player->setDialogSemaphore(false); + if (player->clearCardsToDelete() || !ok) { + return; + } + + for (const auto &item : sel) { + auto *card = dynamic_cast(item); + + int oldValue = card->getCounters().value(counterId, 0); + Expression exp(oldValue); + int number = static_cast(exp.parse(dialog.textValue())); + + auto *cmd = new Command_SetCardCounter; + cmd->set_zone(card->getZone()->getName().toStdString()); + cmd->set_card_id(card->getId()); + cmd->set_counter_id(counterId); + cmd->set_counter_value(number); + commandList.append(cmd); + } + break; + } + default:; } + sendGameCommand(prepareGameCommand(commandList)); } /** @@ -1632,8 +1637,14 @@ static bool isUnwritableRevealZone(CardZoneLogic *zone) return false; } -void PlayerActions::playSelectedCards(QList selectedCards, const bool faceDown) +void PlayerActions::playSelectedCards(const bool faceDown) { + QList selectedCards; + for (const auto &item : player->getGameScene()->selectedItems()) { + auto *card = static_cast(item); + selectedCards.append(card); + } + // 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 // out the cards one-by-one. @@ -1647,19 +1658,19 @@ void PlayerActions::playSelectedCards(QList selectedCards, const boo } } -void PlayerActions::actPlay(QList selectedCards) +void PlayerActions::actPlay() { - playSelectedCards(selectedCards, false); + playSelectedCards(false); } -void PlayerActions::actPlayFacedown(QList selectedCards) +void PlayerActions::actPlayFacedown() { - playSelectedCards(selectedCards, true); + playSelectedCards(true); } -void PlayerActions::actHide(QList selectedCards) +void PlayerActions::actHide() { - for (const auto &item : selectedCards) { + for (const auto &item : player->getGameScene()->selectedItems()) { auto *card = static_cast(item); if (card && isUnwritableRevealZone(card->getZone())) { card->getZone()->removeCard(card); @@ -1667,7 +1678,7 @@ void PlayerActions::actHide(QList selectedCards) } } -void PlayerActions::actReveal(QList selectedCards, QAction *action) +void PlayerActions::actReveal(QAction *action) { const int otherPlayerId = action->data().toInt(); @@ -1676,7 +1687,9 @@ void PlayerActions::actReveal(QList selectedCards, QAction *action) cmd.set_player_id(otherPlayerId); } - for (auto card : selectedCards) { + QList sel = player->getGameScene()->selectedItems(); + while (!sel.isEmpty()) { + const auto *card = qgraphicsitem_cast(sel.takeFirst()); if (!cmd.has_zone_name()) { cmd.set_zone_name(card->getZone()->getName().toStdString()); } @@ -1758,14 +1771,19 @@ void PlayerActions::actRevealRandomGraveyardCard(int revealToPlayerId) sendGameCommand(cmd); } -void PlayerActions::cardMenuAction(QList selectedCards, CardMenuActionType type) +void PlayerActions::cardMenuAction() { - QList cardList = selectedCards; + auto *a = dynamic_cast(sender()); + QList sel = player->getGameScene()->selectedItems(); + QList cardList; + while (!sel.isEmpty()) { + cardList.append(qgraphicsitem_cast(sel.takeFirst())); + } QList commandList; - if (type <= cmClone) { + if (a->data().toInt() <= (int)cmClone) { for (const auto &card : cardList) { - switch (type) { + switch (static_cast(a->data().toInt())) { // Leaving both for compatibility with server case cmUntap: // fallthrough @@ -1833,7 +1851,7 @@ void PlayerActions::cardMenuAction(QList selectedCards, CardMenuActi return; } - PlayerLogic *startPlayer = zone->getPlayer(); + Player *startPlayer = zone->getPlayer(); if (!startPlayer) { return; } @@ -1846,7 +1864,7 @@ void PlayerActions::cardMenuAction(QList selectedCards, CardMenuActi idList.add_card()->set_card_id(i->getId()); } - switch (type) { + switch (static_cast(a->data().toInt())) { case cmMoveToTopLibrary: { auto *cmd = new Command_MoveCard; cmd->set_start_player_id(startPlayerId); diff --git a/cockatrice/src/game/player/player_actions.h b/cockatrice/src/game/player/player_actions.h index fa4d54110..08e016f2a 100644 --- a/cockatrice/src/game/player/player_actions.h +++ b/cockatrice/src/game/player/player_actions.h @@ -2,23 +2,21 @@ * @file player_actions.h * @ingroup GameLogicActions * @ingroup GameLogicPlayers + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_PLAYER_ACTIONS_H #define COCKATRICE_PLAYER_ACTIONS_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 "../dialogs/dlg_create_token.h" +#include "../dialogs/dlg_move_top_cards_until.h" #include "event_processing_options.h" -#include "player_logic.h" +#include "player.h" #include #include #include #include +#include namespace google { @@ -28,21 +26,28 @@ class Message; } } // namespace google +class CardItem; class Command_MoveCard; class GameEventContext; class PendingCommand; -class PlayerLogic; +class Player; class PlayerActions : public QObject { Q_OBJECT +signals: + void logSetTapped(Player *player, CardItem *card, bool tapped); + void logSetAnnotation(Player *player, CardItem *card, QString newAnnotation); + void logSetDoesntUntap(Player *player, CardItem *card, bool doesntUntap); + void logSetPT(Player *player, CardItem *card, QString newPT); + public: enum CardsToReveal { RANDOM_CARD_FROM_ZONE = -2 }; - explicit PlayerActions(PlayerLogic *player); + explicit PlayerActions(Player *player); void sendGameCommand(PendingCommand *pend); void sendGameCommand(const google::protobuf::Message &command); @@ -50,6 +55,13 @@ public: PendingCommand *prepareGameCommand(const ::google::protobuf::Message &cmd); PendingCommand *prepareGameCommand(const QList &cmdList); + void setCardAttrHelper(const GameEventContext &context, + CardItem *card, + CardAttribute attribute, + const QString &avalue, + bool allCards, + EventProcessingOptions options); + void moveOneCardUntil(CardItem *card); void stopMoveTopCardsUntil(); @@ -58,75 +70,30 @@ public: return movingCardsUntil; } -signals: - void requestViewTopCardsDialog(int defaultNumberTopCards, int deckSize); - void requestViewBottomCardsDialog(int defaultNumberBottomCards, int deckSize); - void requestShuffleTopDialog(int defaultNumberTopCards, int maxCards); - void requestShuffleBottomDialog(int defaultNumberBottomCards, int maxCards); - void requestMulliganDialog(int startSize, int handSize, int deckSize); - void requestDrawCardsDialog(int defaultNumberTopCards, int deckSize); - void requestMoveTopCardsToDialog(int defaultNumberTopCards, - int maxCards, - const QString &targetZone, - const QString &zoneDisplayName, - bool faceDown); - void requestMoveTopCardsUntilDialog(MoveTopCardsUntilOptions options); - void requestMoveBottomCardsToDialog(int defaultNumberBottomCards, - int maxCards, - const QString &targetZone, - const QString &zoneDisplayName, - bool faceDown); - void requestDrawBottomCardsDialog(int defaultNumberBottomCards, int maxCards); - void requestRollDieDialog(); - void requestCreateTokenDialog(const QStringList &predefinedTokens); - void requestCreateRelatedFromRelationDialog(const CardItem *sourceCard, const CardRelation *cardRelation); - void requestMoveCardXCardsFromTopDialog(int defaultNumberTopCardsToPlaceBelow, int deckSize); - void requestSetPTDialog(const QString &oldPT); - void requestSetAnnotationDialog(const QString &oldAnnotation); - void requestSetCardCounterDialog(int counterId, const QString &oldValueForDlg); - void requestZoneViewToggle(const QString &zoneName, int numberCards, bool isReversed = false); - void requestSortHand(const QList &options); - void requestEnableAndSetCreateAnotherTokenAction(const QString &lastTokenName); - void requestSetLastToken(CardInfoPtr lastToken); - public slots: void setLastToken(CardInfoPtr cardInfo); - void setLastTokenInfo(CardInfoPtr cardInfo); void playCard(CardItem *c, bool faceDown); void playCardToTable(const CardItem *c, bool faceDown); void actUntapAll(); - void actRequestRollDieDialog(); - void actRollDie(int sides, int count); + void actRollDie(); void actFlipCoin(); - void actRequestCreateTokenDialog(const QStringList &predefinedTokens); - void actCreateToken(TokenInfo tokenToCreate); + void actCreateToken(); void actCreateAnotherToken(); - 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; - } void actShuffle(); - void actRequestShuffleTopDialog(); - void actShuffleTop(int number); - void actRequestShuffleBottomDialog(); - void actShuffleBottom(int number); + void actShuffleTop(); + void actShuffleBottom(); void actDrawCard(); - void actRequestDrawCardsDialog(); - void actDrawCards(int number); + void actDrawCards(); void actUndoDraw(); - void actRequestMulliganDialog(); - void actMulligan(int number); + void actMulligan(); void actMulliganSameSize(); void actMulliganMinusOne(); void doMulligan(int number); - void actPlay(QList selectedCards); - void actPlayFacedown(QList selectedCards); - void actHide(QList selectedCards); + void actPlay(); + void actPlayFacedown(); + void actHide(); void actMoveTopCardToPlay(); void actMoveTopCardToPlayFaceDown(); @@ -136,14 +103,10 @@ public slots: void actMoveTopCardsToGraveFaceDown(); void actMoveTopCardsToExile(); void actMoveTopCardsToExileFaceDown(); - void actRequestMoveTopCardsUntilDialog(); - void moveTopCardsUntil(const QString &expr, MoveTopCardsUntilOptions options); + void actMoveTopCardsUntil(); void actMoveTopCardToBottom(); - void actRequestMoveTopCardsToDialog(const QString &targetZone, const QString &zoneDisplayName, bool faceDown); - void moveTopCardsTo(int number, const QString &targetZone, bool faceDown); void actDrawBottomCard(); - void actRequestDrawBottomCardsDialog(); - void actDrawBottomCards(int number); + void actDrawBottomCards(); void actMoveBottomCardToPlay(); void actMoveBottomCardToPlayFaceDown(); void actMoveBottomCardToGrave(); @@ -153,8 +116,6 @@ public slots: void actMoveBottomCardsToExile(); void actMoveBottomCardsToExileFaceDown(); void actMoveBottomCardToTop(); - void actRequestMoveBottomCardsToDialog(const QString &targetZone, const QString &zoneDisplayName, bool faceDown); - void moveBottomCardsTo(int number, const QString &targetZone, bool faceDown); void actSelectAll(); void actSelectRow(); @@ -162,12 +123,10 @@ public slots: void actViewLibrary(); void actViewHand(); - void actRequestViewTopCardsDialog(); - void actViewTopCards(int number); - void actRequestViewBottomCardsDialog(); - void actViewBottomCards(int number); - void actAlwaysRevealTopCard(bool alwaysRevealTopCard); - void actAlwaysLookAtTopCard(bool alwaysRevealTopCard); + void actViewTopCards(); + void actViewBottomCards(); + void actAlwaysRevealTopCard(); + void actAlwaysLookAtTopCard(); void actViewGraveyard(); void actLendLibrary(int lendToPlayerId); void actRevealTopCards(int revealToPlayerId, int amount); @@ -182,44 +141,34 @@ public slots: 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 actMoveCardXCardsFromTop(); + void actCardCounterTrigger(); void actAttach(); - void actUnattach(QList selectedCards); + void actUnattach(); 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); - - void actReduceLifeByPower(QList selectedCards); - - void actRequestSetAnnotationDialog(QList selectedCards); - void actSetAnnotation(QList selectedCards, const QString &annotation); - void actReveal(QList selectedCards, QAction *action); + void actIncPT(int deltaP, int deltaT); + void actResetPT(); + void actSetPT(); + void actIncP(); + void actDecP(); + void actIncT(); + void actDecT(); + void actIncPT(); + void actDecPT(); + void actFlowP(); + void actFlowT(); + void actSetAnnotation(); + void actReveal(QAction *action); void actRevealHand(int revealToPlayerId); void actRevealRandomHandCard(int revealToPlayerId); void actRevealLibrary(int revealToPlayerId); void actSortHand(); - void cardMenuAction(QList selectedCards, CardMenuActionType type); + void cardMenuAction(); private: - PlayerLogic *player; + Player *player; int defaultNumberTopCards = 1; int defaultNumberTopCardsToPlaceBelow = 1; @@ -235,20 +184,21 @@ private: int movingCardsUntilCounter = 0; MoveTopCardsUntilOptions movingCardsUntilOptions; - bool lastRelatedCreationSucceeded = false; + void moveTopCardsTo(const QString &targetZone, const QString &zoneDisplayName, bool faceDown); + void moveBottomCardsTo(const QString &targetZone, const QString &zoneDisplayName, bool faceDown); void createCard(const CardItem *sourceCard, const QString &dbCardName, CardRelationType attach = CardRelationType::DoesNotAttach, - bool persistent = false, - bool faceDown = false); + bool persistent = false); + bool createRelatedFromRelation(const CardItem *sourceCard, const CardRelation *cardRelation); - void playSelectedCards(QList selectedCards, bool faceDown = false); + void playSelectedCards(bool faceDown = false); void cmdSetTopCard(Command_MoveCard &cmd); void cmdSetBottomCard(Command_MoveCard &cmd); - void offsetCardCounter(QList selectedCards, int counterId, int offset); + QVariantList parsePT(const QString &pt); }; #endif // COCKATRICE_PLAYER_ACTIONS_H diff --git a/cockatrice/src/game_graphics/player/player_area.cpp b/cockatrice/src/game/player/player_area.cpp similarity index 100% rename from cockatrice/src/game_graphics/player/player_area.cpp rename to cockatrice/src/game/player/player_area.cpp diff --git a/cockatrice/src/game_graphics/player/player_area.h b/cockatrice/src/game/player/player_area.h similarity index 91% rename from cockatrice/src/game_graphics/player/player_area.h rename to cockatrice/src/game/player/player_area.h index d73547f81..ec0d23cb6 100644 --- a/cockatrice/src/game_graphics/player/player_area.h +++ b/cockatrice/src/game/player/player_area.h @@ -1,13 +1,13 @@ /** * @file player_area.h * @ingroup GameGraphicsPlayers + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_PLAYER_AREA_H #define COCKATRICE_PLAYER_AREA_H -#include "../board/graphics_item_type.h" +#include "../../game_graphics/board/graphics_item_type.h" #include "QGraphicsItem" /** diff --git a/cockatrice/src/game/player/player_event_handler.cpp b/cockatrice/src/game/player/player_event_handler.cpp index bc48298f7..6fb1ff19a 100644 --- a/cockatrice/src/game/player/player_event_handler.cpp +++ b/cockatrice/src/game/player/player_event_handler.cpp @@ -1,13 +1,12 @@ #include "player_event_handler.h" -#include "../../game_graphics/board/arrow_item.h" -#include "../../game_graphics/board/card_item.h" -#include "../../game_graphics/zones/view_zone.h" #include "../../interface/widgets/tabs/tab_game.h" -#include "../board/arrow_data.h" +#include "../board/arrow_item.h" +#include "../board/card_item.h" #include "../board/card_list.h" +#include "../zones/view_zone.h" +#include "player.h" #include "player_actions.h" -#include "player_logic.h" #include #include @@ -23,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -32,12 +30,10 @@ #include #include #include -#include #include -PlayerEventHandler::PlayerEventHandler(PlayerLogic *_player) : QObject(_player), player(_player) +PlayerEventHandler::PlayerEventHandler(Player *_player) : QObject(_player), player(_player) { - connect(this, &PlayerEventHandler::requestCardMenuUpdate, player, &PlayerLogic::requestCardMenuUpdate); } void PlayerEventHandler::eventGameSay(const Event_GameSay &event) @@ -93,40 +89,25 @@ void PlayerEventHandler::eventRollDie(const Event_RollDie &event) void PlayerEventHandler::eventCreateArrow(const Event_CreateArrow &event) { - auto data = QSharedPointer::create(ArrowData::fromProto( - event.arrow_info(), player->getPlayerInfo()->getId(), player->getPlayerInfo()->getLocal())); - - const auto &playerList = player->getGame()->getPlayerManager()->getPlayers(); - PlayerLogic *startPlayer = playerList.value(data->startPlayerId); - PlayerLogic *targetPlayer = playerList.value(data->targetPlayerId); - - QString startCardName, targetCardName; - if (startPlayer) { - if (auto *zone = startPlayer->getZones().value(data->startZone)) { - if (auto *card = zone->getCard(data->startCardId)) { - startCardName = card->getName(); - } - } - } - if (!data->isPlayerTargeted() && targetPlayer) { - if (auto *zone = targetPlayer->getZones().value(data->targetZone)) { - if (auto *card = zone->getCard(data->targetCardId)) { - targetCardName = card->getName(); - } - } + ArrowItem *arrow = player->addArrow(event.arrow_info()); + if (!arrow) { + return; } - emit player->arrowCreateRequested(data); - - if (startPlayer && targetPlayer && !startCardName.isEmpty() && - (data->isPlayerTargeted() || !targetCardName.isEmpty())) { - emit logCreateArrow(player, startPlayer, startCardName, targetPlayer, targetCardName, data->isPlayerTargeted()); + auto *startCard = static_cast(arrow->getStartItem()); + auto *targetCard = qgraphicsitem_cast(arrow->getTargetItem()); + if (targetCard) { + emit logCreateArrow(player, startCard->getOwner(), startCard->getName(), targetCard->getOwner(), + targetCard->getName(), false); + } else { + emit logCreateArrow(player, startCard->getOwner(), startCard->getName(), arrow->getTargetItem()->getOwner(), + QString(), true); } } void PlayerEventHandler::eventDeleteArrow(const Event_DeleteArrow &event) { - emit player->arrowDeleted(player->getPlayerInfo()->getId(), event.arrow_id()); + player->delArrow(event.arrow_id()); } void PlayerEventHandler::eventCreateToken(const Event_CreateToken &event) @@ -168,8 +149,8 @@ void PlayerEventHandler::eventSetCardAttr(const Event_SetCardAttr &event, if (!event.has_card_id()) { const CardList &cards = zone->getCards(); for (int i = 0; i < cards.size(); ++i) { - setCardAttrHelper(context, cards.at(i), event.attribute(), QString::fromStdString(event.attr_value()), true, - options); + player->getPlayerActions()->setCardAttrHelper(context, cards.at(i), event.attribute(), + QString::fromStdString(event.attr_value()), true, options); } if (event.attribute() == AttrTapped) { emit logSetTapped(player, nullptr, event.attr_value() == "1"); @@ -180,62 +161,8 @@ void PlayerEventHandler::eventSetCardAttr(const Event_SetCardAttr &event, qWarning() << "PlayerEventHandler::eventSetCardAttr: card id=" << event.card_id() << "not found"; return; } - setCardAttrHelper(context, card, event.attribute(), QString::fromStdString(event.attr_value()), false, options); - } -} - -void PlayerEventHandler::setCardAttrHelper(const GameEventContext &context, - CardItem *card, - CardAttribute attribute, - const QString &avalue, - bool allCards, - EventProcessingOptions options) -{ - if (card == nullptr) { - return; - } - - bool moveCardContext = context.HasExtension(Context_MoveCard::ext); - switch (attribute) { - case AttrTapped: { - bool tapped = avalue == "1"; - if (!(!tapped && card->getDoesntUntap() && allCards)) { - if (!allCards) { - emit logSetTapped(player, card, tapped); - } - bool canAnimate = !options.testFlag(SKIP_TAP_ANIMATION) && !moveCardContext; - card->setTapped(tapped, canAnimate); - } - break; - } - case AttrAttacking: { - card->setAttacking(avalue == "1"); - break; - } - case AttrFaceDown: { - card->setFaceDown(avalue == "1"); - break; - } - case AttrColor: { - card->setColor(avalue); - break; - } - case AttrAnnotation: { - emit logSetAnnotation(player, card, avalue); - card->setAnnotation(avalue); - break; - } - case AttrDoesntUntap: { - bool value = (avalue == "1"); - emit logSetDoesntUntap(player, card, value); - card->setDoesntUntap(value); - break; - } - case AttrPT: { - emit logSetPT(player, card, avalue); - card->setPT(avalue); - break; - } + player->getPlayerActions()->setCardAttrHelper(context, card, event.attribute(), + QString::fromStdString(event.attr_value()), false, options); } } @@ -253,7 +180,7 @@ void PlayerEventHandler::eventSetCardCounter(const Event_SetCardCounter &event) int oldValue = card->getCounters().value(event.counter_id(), 0); card->setCounter(event.counter_id(), event.counter_value()); - emit requestCardMenuUpdate(card); + player->getPlayerMenu()->updateCardMenu(card); emit logSetCardCounter(player, card->getName(), event.counter_id(), event.counter_value(), oldValue); } @@ -264,7 +191,7 @@ void PlayerEventHandler::eventCreateCounter(const Event_CreateCounter &event) void PlayerEventHandler::eventSetCounter(const Event_SetCounter &event) { - CounterState *ctr = player->getCounters().value(event.counter_id(), nullptr); + AbstractCounter *ctr = player->getCounters().value(event.counter_id(), 0); if (!ctr) { return; } @@ -280,7 +207,7 @@ void PlayerEventHandler::eventDelCounter(const Event_DelCounter &event) void PlayerEventHandler::eventDumpZone(const Event_DumpZone &event) { - PlayerLogic *zoneOwner = player->getGame()->getPlayerManager()->getPlayers().value(event.zone_owner_id(), 0); + Player *zoneOwner = player->getGame()->getPlayerManager()->getPlayers().value(event.zone_owner_id(), 0); if (!zoneOwner) { return; } @@ -293,13 +220,13 @@ void PlayerEventHandler::eventDumpZone(const Event_DumpZone &event) void PlayerEventHandler::eventMoveCard(const Event_MoveCard &event, const GameEventContext &context) { - PlayerLogic *startPlayer = player->getGame()->getPlayerManager()->getPlayers().value(event.start_player_id()); + Player *startPlayer = player->getGame()->getPlayerManager()->getPlayers().value(event.start_player_id()); if (!startPlayer) { return; } QString startZoneString = QString::fromStdString(event.start_zone()); CardZoneLogic *startZone = startPlayer->getZones().value(startZoneString, 0); - PlayerLogic *targetPlayer = player->getGame()->getPlayerManager()->getPlayers().value(event.target_player_id()); + Player *targetPlayer = player->getGame()->getPlayerManager()->getPlayers().value(event.target_player_id()); if (!targetPlayer) { return; } @@ -370,8 +297,29 @@ void PlayerEventHandler::eventMoveCard(const Event_MoveCard &event, const GameEv targetZone->addCard(card, true, x, y); - emit cardZoneChanged(card, startZone == targetZone); - emit requestCardMenuUpdate(card); + // Look at all arrows from and to the card. + // If the card was moved to another zone, delete the arrows, otherwise update them. + QMapIterator playerIterator(player->getGame()->getPlayerManager()->getPlayers()); + while (playerIterator.hasNext()) { + Player *p = playerIterator.next().value(); + + QList arrowsToDelete; + QMapIterator arrowIterator(p->getArrows()); + while (arrowIterator.hasNext()) { + ArrowItem *arrow = arrowIterator.next().value(); + if ((arrow->getStartItem() == card) || (arrow->getTargetItem() == card)) { + if (startZone == targetZone) { + arrow->updatePath(); + } else { + arrowsToDelete.append(arrow); + } + } + } + for (auto &i : arrowsToDelete) { + i->delArrow(); + } + } + player->getPlayerMenu()->updateCardMenu(card); if (player->getPlayerActions()->isMovingCardsUntil() && startZoneString == ZoneNames::DECK && targetZone->getName() == ZoneNames::STACK) { @@ -398,7 +346,7 @@ void PlayerEventHandler::eventFlipCard(const Event_FlipCard &event) emit logFlipCard(player, card->getName(), event.face_down()); card->setFaceDown(event.face_down()); - emit requestCardMenuUpdate(card); + player->getPlayerMenu()->updateCardMenu(card); } void PlayerEventHandler::eventDestroyCard(const Event_DestroyCard &event) @@ -426,8 +374,8 @@ void PlayerEventHandler::eventDestroyCard(const Event_DestroyCard &event) void PlayerEventHandler::eventAttachCard(const Event_AttachCard &event) { - const QMap &playerList = player->getGame()->getPlayerManager()->getPlayers(); - PlayerLogic *targetPlayer = nullptr; + const QMap &playerList = player->getGame()->getPlayerManager()->getPlayers(); + Player *targetPlayer = nullptr; CardZoneLogic *targetZone = nullptr; CardItem *targetCard = nullptr; if (event.has_target_player_id()) { @@ -467,7 +415,7 @@ void PlayerEventHandler::eventAttachCard(const Event_AttachCard &event) } else { emit logUnattachCard(player, startCard->getName()); } - emit requestCardMenuUpdate(startCard); + player->getPlayerMenu()->updateCardMenu(startCard); } void PlayerEventHandler::eventDrawCards(const Event_DrawCards &event) @@ -504,7 +452,7 @@ void PlayerEventHandler::eventRevealCards(const Event_RevealCards &event, EventP if (!zone) { return; } - PlayerLogic *otherPlayer = nullptr; + Player *otherPlayer = nullptr; if (event.has_other_player_id()) { otherPlayer = player->getGame()->getPlayerManager()->getPlayers().value(event.other_player_id()); if (!otherPlayer) { @@ -553,7 +501,7 @@ void PlayerEventHandler::eventRevealCards(const Event_RevealCards &event, EventP } if (!options.testFlag(SKIP_REVEAL_WINDOW) && showZoneView && !cardList.isEmpty()) { - emit player->requestRevealedZoneView(player, zone, cardList, event.grant_write_access()); + player->getGameScene()->addRevealedZoneView(player, zone, cardList, event.grant_write_access()); } emit logRevealCards(player, zone, cardId, cardName, otherPlayer, false, @@ -579,18 +527,6 @@ void PlayerEventHandler::eventChangeZoneProperties(const Event_ChangeZonePropert } } -void PlayerEventHandler::eventGameLogNotice(const Event_GameLogNotice &event) -{ - Event_GameLogNotice::NoticeType type = event.notice_type(); - switch (type) { - case Event_GameLogNotice::UNDO_DRAW_FAILED: - emit logUndoDrawFailed(player); - break; - default: - qWarning() << "Received Event_GameLogNotice with unknown noticeType: " << type; - } -} - void PlayerEventHandler::processGameEvent(GameEvent::GameEventType type, const GameEvent &event, const GameEventContext &context, @@ -654,9 +590,6 @@ void PlayerEventHandler::processGameEvent(GameEvent::GameEventType type, case GameEvent::CHANGE_ZONE_PROPERTIES: eventChangeZoneProperties(event.GetExtension(Event_ChangeZoneProperties::ext)); break; - case GameEvent::GAME_LOG_NOTICE: - eventGameLogNotice(event.GetExtension(Event_GameLogNotice::ext)); - break; default: { qWarning() << "unhandled game event" << type; } diff --git a/cockatrice/src/game/player/player_event_handler.h b/cockatrice/src/game/player/player_event_handler.h index cfd82933f..5d1ddd4b4 100644 --- a/cockatrice/src/game/player/player_event_handler.h +++ b/cockatrice/src/game/player/player_event_handler.h @@ -1,21 +1,20 @@ /** * @file player_event_handler.h * @ingroup GameLogicPlayers + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_PLAYER_EVENT_HANDLER_H #define COCKATRICE_PLAYER_EVENT_HANDLER_H #include "event_processing_options.h" #include -#include #include #include class CardItem; class CardZoneLogic; -class PlayerLogic; +class Player; class Event_AttachCard; class Event_ChangeZoneProperties; class Event_CreateArrow; @@ -35,58 +34,53 @@ class Event_SetCardAttr; class Event_SetCardCounter; class Event_SetCounter; class Event_Shuffle; -class Event_GameLogNotice; - class PlayerEventHandler : public QObject { Q_OBJECT signals: - void logSay(PlayerLogic *player, QString message); - void logShuffle(PlayerLogic *player, CardZoneLogic *zone, int start, int end); - void logRollDie(PlayerLogic *player, int sides, const QList &rolls); - void logCreateArrow(PlayerLogic *player, - PlayerLogic *startPlayer, + void logSay(Player *player, QString message); + void logShuffle(Player *player, CardZoneLogic *zone, int start, int end); + void logRollDie(Player *player, int sides, const QList &rolls); + void logCreateArrow(Player *player, + Player *startPlayer, QString startCard, - PlayerLogic *targetPlayer, + Player *targetPlayer, QString targetCard, bool _playerTarget); - void logCreateToken(PlayerLogic *player, QString cardName, QString pt, bool faceDown); - void logDrawCards(PlayerLogic *player, int number, bool deckIsEmpty); - void logUndoDraw(PlayerLogic *player, QString cardName); - void logUndoDrawFailed(PlayerLogic *player); - void logMoveCard(PlayerLogic *player, + void logCreateToken(Player *player, QString cardName, QString pt, bool faceDown); + void logDrawCards(Player *player, int number, bool deckIsEmpty); + void logUndoDraw(Player *player, QString cardName); + void logMoveCard(Player *player, CardItem *card, CardZoneLogic *startZone, int oldX, CardZoneLogic *targetZone, int newX); - void logFlipCard(PlayerLogic *player, QString cardName, bool faceDown); - void logDestroyCard(PlayerLogic *player, QString cardName); - 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, CardItem *card, bool tapped); - void logSetCounter(PlayerLogic *player, QString counterName, int value, int oldValue); - 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, + void logFlipCard(Player *player, QString cardName, bool faceDown); + void logDestroyCard(Player *player, QString cardName); + void logAttachCard(Player *player, QString cardName, Player *targetPlayer, QString targetCardName); + void logUnattachCard(Player *player, QString cardName); + void logSetCardCounter(Player *player, QString cardName, int counterId, int value, int oldValue); + void logSetTapped(Player *player, CardItem *card, bool tapped); + void logSetCounter(Player *player, QString counterName, int value, int oldValue); + void logSetDoesntUntap(Player *player, CardItem *card, bool doesntUntap); + void logSetPT(Player *player, CardItem *card, QString newPT); + void logSetAnnotation(Player *player, CardItem *card, QString newAnnotation); + void logDumpZone(Player *player, CardZoneLogic *zone, int numberCards, bool isReversed = false); + void logRevealCards(Player *player, CardZoneLogic *zone, int cardId, QString cardName, - PlayerLogic *otherPlayer, + Player *otherPlayer, bool faceDown, int amount, bool isLentToAnotherPlayer = false); - void logAlwaysRevealTopCard(PlayerLogic *player, CardZoneLogic *zone, bool reveal); - void logAlwaysLookAtTopCard(PlayerLogic *player, CardZoneLogic *zone, bool reveal); - void cardZoneChanged(CardItem *card, bool sameZone); - void requestCardMenuUpdate(const CardItem *card); + void logAlwaysRevealTopCard(Player *player, CardZoneLogic *zone, bool reveal); + void logAlwaysLookAtTopCard(Player *player, CardZoneLogic *zone, bool reveal); public: - PlayerEventHandler(PlayerLogic *player); + PlayerEventHandler(Player *player); void processGameEvent(GameEvent::GameEventType type, const GameEvent &event, @@ -113,17 +107,9 @@ public: void eventDrawCards(const Event_DrawCards &event); void eventRevealCards(const Event_RevealCards &event, EventProcessingOptions options); void eventChangeZoneProperties(const Event_ChangeZoneProperties &event); - void eventGameLogNotice(const Event_GameLogNotice &event); private: - PlayerLogic *player; - - void setCardAttrHelper(const GameEventContext &context, - CardItem *card, - CardAttribute attribute, - const QString &avalue, - bool allCards, - EventProcessingOptions options); + Player *player; }; #endif // COCKATRICE_PLAYER_EVENT_HANDLER_H diff --git a/cockatrice/src/game_graphics/player/player_graphics_item.cpp b/cockatrice/src/game/player/player_graphics_item.cpp similarity index 63% rename from cockatrice/src/game_graphics/player/player_graphics_item.cpp rename to cockatrice/src/game/player/player_graphics_item.cpp index e0194abda..bcc4b7f72 100644 --- a/cockatrice/src/game_graphics/player/player_graphics_item.cpp +++ b/cockatrice/src/game/player/player_graphics_item.cpp @@ -1,54 +1,20 @@ #include "player_graphics_item.h" -#include "../../game/player/player_actions.h" #include "../../interface/widgets/tabs/tab_game.h" #include "../board/abstract_card_item.h" -#include "../board/counter_general.h" #include "../hand_counter.h" #include "../zones/hand_zone.h" #include "../zones/pile_zone.h" #include "../zones/stack_zone.h" #include "../zones/table_zone.h" -#include "menu/player_menu.h" -#include "player_dialogs.h" -#include - -PlayerGraphicsItem::PlayerGraphicsItem(PlayerLogic *_player) : player(_player) +PlayerGraphicsItem::PlayerGraphicsItem(Player *_player) : player(_player) { connect(&SettingsCache::instance(), &SettingsCache::horizontalHandChanged, this, &PlayerGraphicsItem::rearrangeZones); connect(&SettingsCache::instance(), &SettingsCache::handJustificationChanged, this, &PlayerGraphicsItem::rearrangeZones); - connect(player, &PlayerLogic::rearrangeCounters, this, &PlayerGraphicsItem::rearrangeCounters); - connect(player, &PlayerLogic::activeChanged, this, &PlayerGraphicsItem::onPlayerActiveChanged); - connect(player, &PlayerLogic::concededChanged, this, [this](int, bool c) { setVisible(!c); }); - connect(player, &PlayerLogic::zoneIdChanged, this, [this](int id) { playerArea->setPlayerZoneId(id); }); - - connect(player, &PlayerLogic::counterAdded, this, &PlayerGraphicsItem::onCounterAdded); - connect(player, &PlayerLogic::counterRemoved, this, &PlayerGraphicsItem::onCounterRemoved); - - playerMenu = new PlayerMenu(this); - - connect(playerMenu, &PlayerMenu::shortcutsActivated, this, [this]() { - for (auto *ctr : counterWidgets) { - ctr->setShortcutsActive(); - } - }); - connect(playerMenu, &PlayerMenu::shortcutsDeactivated, this, [this]() { - for (auto *ctr : counterWidgets) { - ctr->setShortcutsInactive(); - } - }); - connect(playerMenu, &PlayerMenu::retranslateRequested, this, [this]() { - for (auto *ctr : counterWidgets) { - ctr->retranslateUi(); - } - }); - - playerDialogs = new PlayerDialogs(this, player->getPlayerActions()); - - connect(playerDialogs, &PlayerDialogs::requestDialogSemaphore, player, &PlayerLogic::setDialogSemaphore); + connect(player, &Player::rearrangeCounters, this, &PlayerGraphicsItem::rearrangeCounters); playerArea = new PlayerArea(this); @@ -59,11 +25,6 @@ PlayerGraphicsItem::PlayerGraphicsItem(PlayerLogic *_player) : player(_player) initializeZones(); - connect(player, &PlayerLogic::addViewCustomZoneActionToCustomZoneMenu, this, - &PlayerGraphicsItem::onCustomZoneAdded); - - playerMenu->setMenusForGraphicItems(); - connect(tableZoneGraphicsItem, &TableZone::sizeChanged, this, &PlayerGraphicsItem::updateBoundingRect); updateBoundingRect(); @@ -74,12 +35,17 @@ PlayerGraphicsItem::PlayerGraphicsItem(PlayerLogic *_player) : player(_player) void PlayerGraphicsItem::retranslateUi() { - playerMenu->retranslateUi(); + player->getPlayerMenu()->retranslateUi(); QMapIterator zoneIterator(player->getZones()); while (zoneIterator.hasNext()) { emit zoneIterator.next().value()->retranslateUi(); } + + QMapIterator counterIterator(player->getCounters()); + while (counterIterator.hasNext()) { + counterIterator.next().value()->retranslateUi(); + } } void PlayerGraphicsItem::onPlayerActiveChanged(bool _active) @@ -110,33 +76,18 @@ void PlayerGraphicsItem::initializeZones() rfgZoneGraphicsItem = new PileZone(player->getRfgZone(), this); rfgZoneGraphicsItem->setPos(base + QPointF(0, 2 * h + h2 + 10)); - tableZoneGraphicsItem = new TableZone(player->getTableZone(), mirrored, this); + tableZoneGraphicsItem = new TableZone(player->getTableZone(), this); connect(tableZoneGraphicsItem, &TableZone::sizeChanged, this, &PlayerGraphicsItem::updateBoundingRect); - connect(this, &PlayerGraphicsItem::mirroredChanged, tableZoneGraphicsItem, &TableZone::setMirrored); stackZoneGraphicsItem = new StackZone(player->getStackZone(), static_cast(tableZoneGraphicsItem->boundingRect().height()), this); handZoneGraphicsItem = new HandZone(player->getHandZone(), static_cast(tableZoneGraphicsItem->boundingRect().height()), this); - connect(player->getPlayerActions(), &PlayerActions::requestSortHand, handZoneGraphicsItem, &HandZone::sortHand); connect(handZoneGraphicsItem->getLogic(), &HandZoneLogic::cardCountChanged, handCounter, &HandCounter::updateNumber); connect(handCounter, &HandCounter::showContextMenu, handZoneGraphicsItem, &HandZone::showContextMenu); - - zoneGraphicsItems.insert(player->getDeckZone()->getName(), deckZoneGraphicsItem); - zoneGraphicsItems.insert(player->getGraveZone()->getName(), graveyardZoneGraphicsItem); - zoneGraphicsItems.insert(player->getRfgZone()->getName(), rfgZoneGraphicsItem); - zoneGraphicsItems.insert(player->getSideboardZone()->getName(), sideboardGraphicsItem); - zoneGraphicsItems.insert(player->getTableZone()->getName(), tableZoneGraphicsItem); - zoneGraphicsItems.insert(player->getStackZone()->getName(), stackZoneGraphicsItem); - zoneGraphicsItems.insert(player->getHandZone()->getName(), handZoneGraphicsItem); -} - -void PlayerGraphicsItem::onCustomZoneAdded(QString customZoneName) -{ - zoneGraphicsItems.insert(customZoneName, nullptr); // Custom zone view goes here, if we ever implement it. } QRectF PlayerGraphicsItem::boundingRect() const @@ -177,53 +128,24 @@ void PlayerGraphicsItem::setMirrored(bool _mirrored) { if (mirrored != _mirrored) { mirrored = _mirrored; - emit mirroredChanged(mirrored); rearrangeZones(); } } -void PlayerGraphicsItem::onCounterAdded(CounterState *state) -{ - AbstractCounter *widget; - if (state->getName() == "life") { - widget = playerTarget->addCounter(state); - } else { - widget = new GeneralCounter(state, player, true, this); - } - counterWidgets.insert(state->getId(), widget); - - if (playerMenu->getCountersMenu() && widget->getMenu()) { - playerMenu->getCountersMenu()->addMenu(widget->getMenu()); - } - - if (playerMenu->getShortcutsActive()) { - widget->setShortcutsActive(); - } - - rearrangeCounters(); -} - -void PlayerGraphicsItem::onCounterRemoved(int counterId) -{ - auto *widget = counterWidgets.take(counterId); - if (!widget) { - return; - } - if (playerMenu->getCountersMenu() && widget->getMenu()) { - playerMenu->getCountersMenu()->removeAction(widget->getMenu()->menuAction()); - } - widget->delCounter(); - rearrangeCounters(); -} - void PlayerGraphicsItem::rearrangeCounters() { - qreal ySize = boundingRect().y() + 80; - constexpr qreal padding = 5; - for (auto *ctr : counterWidgets.values()) { + qreal marginTop = 80; + const qreal padding = 5; + qreal ySize = boundingRect().y() + marginTop; + + // Place objects + for (const auto &counter : player->getCounters()) { + AbstractCounter *ctr = counter; + if (!ctr->getShownInCounterArea()) { continue; } + QRectF br = ctr->boundingRect(); ctr->setPos((counterAreaWidth - br.width()) / 2, ySize); ySize += br.height() + padding; @@ -236,11 +158,11 @@ void PlayerGraphicsItem::rearrangeZones() if (SettingsCache::instance().getHorizontalHand()) { if (mirrored) { if (player->getHandZone()->contentsKnown()) { - handVisible = true; + player->getPlayerInfo()->setHandVisible(true); handZoneGraphicsItem->setPos(base); base += QPointF(0, handZoneGraphicsItem->boundingRect().height()); } else { - handVisible = false; + player->getPlayerInfo()->setHandVisible(false); } stackZoneGraphicsItem->setPos(base); @@ -254,16 +176,16 @@ void PlayerGraphicsItem::rearrangeZones() base += QPointF(0, tableZoneGraphicsItem->boundingRect().height()); if (player->getHandZone()->contentsKnown()) { - handVisible = true; + player->getPlayerInfo()->setHandVisible(true); handZoneGraphicsItem->setPos(base); } else { - handVisible = false; + player->getPlayerInfo()->setHandVisible(false); } } handZoneGraphicsItem->setWidth(tableZoneGraphicsItem->getWidth() + stackZoneGraphicsItem->boundingRect().width()); } else { - handVisible = true; + player->getPlayerInfo()->setHandVisible(true); handZoneGraphicsItem->setPos(base); base += QPointF(handZoneGraphicsItem->boundingRect().width(), 0); @@ -273,7 +195,7 @@ void PlayerGraphicsItem::rearrangeZones() tableZoneGraphicsItem->setPos(base); } - handZoneGraphicsItem->setVisible(handVisible); + handZoneGraphicsItem->setVisible(player->getPlayerInfo()->getHandVisible()); handZoneGraphicsItem->updateOrientation(); tableZoneGraphicsItem->reorganizeCards(); updateBoundingRect(); @@ -285,7 +207,8 @@ void PlayerGraphicsItem::updateBoundingRect() prepareGeometryChange(); qreal width = CardDimensions::HEIGHT_F + 15 + counterAreaWidth + stackZoneGraphicsItem->boundingRect().width(); if (SettingsCache::instance().getHorizontalHand()) { - qreal handHeight = handVisible ? handZoneGraphicsItem->boundingRect().height() : 0; + qreal handHeight = + player->getPlayerInfo()->getHandVisible() ? handZoneGraphicsItem->boundingRect().height() : 0; bRect = QRectF(0, 0, width + tableZoneGraphicsItem->boundingRect().width(), tableZoneGraphicsItem->boundingRect().height() + handHeight); } else { diff --git a/cockatrice/src/game_graphics/player/player_graphics_item.h b/cockatrice/src/game/player/player_graphics_item.h similarity index 74% rename from cockatrice/src/game_graphics/player/player_graphics_item.h rename to cockatrice/src/game/player/player_graphics_item.h index d02234ded..cba664dd9 100644 --- a/cockatrice/src/game_graphics/player/player_graphics_item.h +++ b/cockatrice/src/game/player/player_graphics_item.h @@ -1,21 +1,18 @@ /** * @file player_graphics_item.h * @ingroup GameGraphicsPlayers + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_PLAYER_GRAPHICS_ITEM_H #define COCKATRICE_PLAYER_GRAPHICS_ITEM_H -#include "../../game/player/player_logic.h" -#include "../board/abstract_counter.h" #include "../game_scene.h" +#include "player.h" #include class HandZone; class PileZone; -class PlayerDialogs; -class PlayerMenu; class PlayerTarget; class StackZone; class TableZone; @@ -37,7 +34,7 @@ public: static constexpr int counterAreaWidth = 55; - explicit PlayerGraphicsItem(PlayerLogic *player); + explicit PlayerGraphicsItem(Player *player); void initializeZones(); [[nodiscard]] QRectF boundingRect() const override; @@ -57,16 +54,11 @@ public: return static_cast(scene()); } - PlayerLogic *getLogic() const + Player *getPlayer() const { return player; } - [[nodiscard]] PlayerMenu *getPlayerMenu() const - { - return playerMenu; - } - PlayerArea *getPlayerArea() const { return playerArea; @@ -77,11 +69,6 @@ public: return playerTarget; } - CardZone *getZoneGraphicsItem(const QString &name) const - { - return zoneGraphicsItems.value(name, nullptr); - } - [[nodiscard]] PileZone *getDeckZoneGraphicsItem() const { return deckZoneGraphicsItem; @@ -115,26 +102,16 @@ public: public slots: void onPlayerActiveChanged(bool _active); - void onCustomZoneAdded(QString customZoneName); - void onCounterAdded(CounterState *state); - void onCounterRemoved(int counterId); - void rearrangeCounters(); void retranslateUi(); signals: void sizeChanged(); void playerCountChanged(); - void mirroredChanged(bool isMirrored); - void cardInfoRequested(const CardRef &cardRef); private: - PlayerLogic *player; - PlayerMenu *playerMenu; - PlayerDialogs *playerDialogs; + Player *player; PlayerArea *playerArea; PlayerTarget *playerTarget; - QMap counterWidgets; - QMap zoneGraphicsItems; PileZone *deckZoneGraphicsItem; PileZone *sideboardGraphicsItem; PileZone *graveyardZoneGraphicsItem; @@ -144,11 +121,11 @@ private: HandZone *handZoneGraphicsItem; QRectF bRect; bool mirrored; - bool handVisible = false; private slots: void updateBoundingRect(); void rearrangeZones(); + void rearrangeCounters(); }; #endif // COCKATRICE_PLAYER_GRAPHICS_ITEM_H diff --git a/cockatrice/src/game/player/player_info.cpp b/cockatrice/src/game/player/player_info.cpp index c4debde0f..8507f75eb 100644 --- a/cockatrice/src/game/player/player_info.cpp +++ b/cockatrice/src/game/player/player_info.cpp @@ -1,7 +1,7 @@ #include "player_info.h" PlayerInfo::PlayerInfo(const ServerInfo_User &info, int _id, bool _local, bool _judge) - : id(_id), local(_local), judge(_judge) + : id(_id), local(_local), judge(_judge), handVisible(false) { userInfo = new ServerInfo_User; userInfo->CopyFrom(info); diff --git a/cockatrice/src/game/player/player_info.h b/cockatrice/src/game/player/player_info.h index 4ec39edbd..2e9b49d6d 100644 --- a/cockatrice/src/game/player/player_info.h +++ b/cockatrice/src/game/player/player_info.h @@ -1,13 +1,13 @@ /** * @file player_info.h * @ingroup GameLogicPlayers + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_PLAYER_INFO_H #define COCKATRICE_PLAYER_INFO_H -#include "../../game_graphics/player/player_target.h" +#include "player_target.h" #include #include @@ -22,6 +22,7 @@ public: int id; bool local; bool judge; + bool handVisible; int getId() const { @@ -50,6 +51,16 @@ public: return judge; } + void setHandVisible(bool _handVisible) + { + handVisible = _handVisible; + } + + bool getHandVisible() const + { + return handVisible; + } + QString getName() const { return QString::fromStdString(userInfo->name()); diff --git a/cockatrice/src/game_graphics/player/player_list_widget.cpp b/cockatrice/src/game/player/player_list_widget.cpp similarity index 92% rename from cockatrice/src/game_graphics/player/player_list_widget.cpp rename to cockatrice/src/game/player/player_list_widget.cpp index 6b1cf6cc6..9506e0729 100644 --- a/cockatrice/src/game_graphics/player/player_list_widget.cpp +++ b/cockatrice/src/game/player/player_list_widget.cpp @@ -43,9 +43,8 @@ PlayerListTWI::PlayerListTWI() : QTreeWidgetItem(Type) bool PlayerListTWI::operator<(const QTreeWidgetItem &other) const { // Sort by spectator/player - if (data(1, Qt::UserRole) != other.data(1, Qt::UserRole)) { + if (data(1, Qt::UserRole) != other.data(1, Qt::UserRole)) return data(1, Qt::UserRole).toBool(); - } // Sort by player ID return data(4, Qt::UserRole + 1).toInt() < other.data(4, Qt::UserRole + 1).toInt(); @@ -107,14 +106,12 @@ void PlayerListWidget::addPlayer(const ServerInfo_PlayerProperties &player) void PlayerListWidget::updatePlayerProperties(const ServerInfo_PlayerProperties &prop, int playerId) { - if (playerId == -1) { + if (playerId == -1) playerId = prop.player_id(); - } QTreeWidgetItem *player = players.value(playerId, 0); - if (!player) { + if (!player) return; - } bool isSpectator = prop.has_spectator() && prop.spectator(); if (prop.has_judge() || prop.has_spectator()) { @@ -129,16 +126,13 @@ void PlayerListWidget::updatePlayerProperties(const ServerInfo_PlayerProperties } if (!isSpectator) { - if (prop.has_conceded()) { + if (prop.has_conceded()) player->setData(2, Qt::UserRole, prop.conceded()); - } - if (prop.has_ready_start()) { + if (prop.has_ready_start()) player->setData(2, Qt::UserRole + 1, prop.ready_start()); - } - if (prop.has_conceded() || prop.has_ready_start()) { + if (prop.has_conceded() || prop.has_ready_start()) player->setIcon(2, gameStarted ? (prop.conceded() ? concededIcon : QIcon()) : (prop.ready_start() ? readyIcon : notReadyIcon)); - } } if (prop.has_user_info()) { player->setData(3, Qt::UserRole, prop.user_info().user_level()); @@ -147,35 +141,30 @@ void PlayerListWidget::updatePlayerProperties(const ServerInfo_PlayerProperties QString::fromStdString(prop.user_info().privlevel()))); player->setText(4, QString::fromStdString(prop.user_info().name())); const QString country = QString::fromStdString(prop.user_info().country()); - if (!country.isEmpty()) { + if (!country.isEmpty()) player->setIcon(4, QIcon(CountryPixmapGenerator::generatePixmap(12, country))); - } player->setData(4, Qt::UserRole, QString::fromStdString(prop.user_info().name())); } - if (prop.has_player_id()) { + if (prop.has_player_id()) player->setData(4, Qt::UserRole + 1, prop.player_id()); - } if (!isSpectator) { if (prop.has_deck_hash()) { player->setText(5, QString::fromStdString(prop.deck_hash())); } - if (prop.has_sideboard_locked()) { + if (prop.has_sideboard_locked()) player->setIcon(5, prop.sideboard_locked() ? lockIcon : QIcon()); - } } - if (prop.has_ping_seconds()) { + if (prop.has_ping_seconds()) player->setIcon(0, QIcon(PingPixmapGenerator::generatePixmap(12, prop.ping_seconds(), 10))); - } } void PlayerListWidget::removePlayer(int playerId) { QTreeWidgetItem *player = players.value(playerId, 0); - if (!player) { + if (!player) return; - } players.remove(playerId); delete takeTopLevelItem(indexOfTopLevelItem(player)); } @@ -204,14 +193,13 @@ void PlayerListWidget::setGameStarted(bool _gameStarted, bool resuming) QTreeWidgetItem *twi = i.next().value(); bool isPlayer = twi->data(1, Qt::UserRole).toBool(); - if (!isPlayer) { + if (!isPlayer) continue; - } if (gameStarted) { - if (resuming) { + if (resuming) twi->setIcon(2, twi->data(2, Qt::UserRole).toBool() ? concededIcon : QIcon()); - } else { + else { twi->setData(2, Qt::UserRole, false); twi->setIcon(2, QIcon()); } @@ -223,9 +211,8 @@ void PlayerListWidget::setGameStarted(bool _gameStarted, bool resuming) void PlayerListWidget::showContextMenu(const QPoint &pos, const QModelIndex &index) { - if (!userContextMenu) { + if (!userContextMenu) return; - } const QString &userName = index.sibling(index.row(), 4).data(Qt::UserRole).toString(); int playerId = index.sibling(index.row(), 4).data(Qt::UserRole + 1).toInt(); diff --git a/cockatrice/src/game_graphics/player/player_list_widget.h b/cockatrice/src/game/player/player_list_widget.h similarity index 96% rename from cockatrice/src/game_graphics/player/player_list_widget.h rename to cockatrice/src/game/player/player_list_widget.h index a53cfa989..8f1487563 100644 --- a/cockatrice/src/game_graphics/player/player_list_widget.h +++ b/cockatrice/src/game/player/player_list_widget.h @@ -1,13 +1,13 @@ /** * @file player_list_widget.h * @ingroup GameWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef PLAYERLISTWIDGET_H #define PLAYERLISTWIDGET_H -#include "../../game/player/player_logic.h" +#include "player.h" #include #include diff --git a/cockatrice/src/game/player/player_manager.cpp b/cockatrice/src/game/player/player_manager.cpp index 6772d3ff1..e283d2196 100644 --- a/cockatrice/src/game/player/player_manager.cpp +++ b/cockatrice/src/game/player/player_manager.cpp @@ -1,38 +1,35 @@ #include "player_manager.h" #include "../abstract_game.h" -#include "player_logic.h" +#include "player.h" PlayerManager::PlayerManager(AbstractGame *_game, int _localPlayerId, bool _localPlayerIsJudge, bool localPlayerIsSpectator) - : QObject(_game), game(_game), players(QMap()), localPlayerId(_localPlayerId), + : QObject(_game), game(_game), players(QMap()), localPlayerId(_localPlayerId), localPlayerIsJudge(_localPlayerIsJudge), localPlayerIsSpectator(localPlayerIsSpectator) { } bool PlayerManager::isMainPlayerConceded() const { - PlayerLogic *player = players.value(localPlayerId, nullptr); + Player *player = players.value(localPlayerId, nullptr); return player && player->getConceded(); } -PlayerLogic *PlayerManager::getActiveLocalPlayer(int activePlayer) const +Player *PlayerManager::getActiveLocalPlayer(int activePlayer) const { - PlayerLogic *active = players.value(activePlayer, 0); - if (active) { - if (active->getPlayerInfo()->getLocal()) { + Player *active = players.value(activePlayer, 0); + if (active) + if (active->getPlayerInfo()->getLocal()) return active; - } - } - QMapIterator playerIterator(players); + QMapIterator playerIterator(players); while (playerIterator.hasNext()) { - PlayerLogic *temp = playerIterator.next().value(); - if (temp->getPlayerInfo()->getLocal()) { + Player *temp = playerIterator.next().value(); + if (temp->getPlayerInfo()->getLocal()) return temp; - } } return nullptr; @@ -43,11 +40,11 @@ bool PlayerManager::isLocalPlayer(int playerId) return game->getGameState()->getIsLocalGame() || playerId == localPlayerId; } -PlayerLogic *PlayerManager::addPlayer(int playerId, const ServerInfo_User &info) +Player *PlayerManager::addPlayer(int playerId, const ServerInfo_User &info) { - auto *newPlayer = new PlayerLogic(info, playerId, isLocalPlayer(playerId) || game->getGameState()->getIsLocalGame(), - isJudge(), getGame()); - connect(newPlayer, &PlayerLogic::concededChanged, this, &PlayerManager::onPlayerConceded); + auto *newPlayer = new Player(info, playerId, isLocalPlayer(playerId) || game->getGameState()->getIsLocalGame(), + isJudge(), getGame()); + connect(newPlayer, &Player::concededChanged, this, &PlayerManager::onPlayerConceded); players.insert(playerId, newPlayer); emit playerAdded(newPlayer); emit playerCountChanged(); @@ -56,7 +53,7 @@ PlayerLogic *PlayerManager::addPlayer(int playerId, const ServerInfo_User &info) void PlayerManager::removePlayer(int playerId) { - PlayerLogic *player = getPlayer(playerId); + Player *player = getPlayer(playerId); if (!player) { return; } @@ -66,12 +63,11 @@ void PlayerManager::removePlayer(int playerId) player->deleteLater(); } -PlayerLogic *PlayerManager::getPlayer(int playerId) const +Player *PlayerManager::getPlayer(int playerId) const { - PlayerLogic *player = players.value(playerId, 0); - if (!player) { + Player *player = players.value(playerId, 0); + if (!player) return nullptr; - } return player; } diff --git a/cockatrice/src/game/player/player_manager.h b/cockatrice/src/game/player/player_manager.h index 2f8b87af8..0f813b3e4 100644 --- a/cockatrice/src/game/player/player_manager.h +++ b/cockatrice/src/game/player/player_manager.h @@ -1,8 +1,8 @@ /** * @file player_manager.h * @ingroup GameLogicPlayers + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_PLAYER_MANAGER_H #define COCKATRICE_PLAYER_MANAGER_H @@ -12,7 +12,7 @@ #include class AbstractGame; -class PlayerLogic; +class Player; class PlayerManager : public QObject { Q_OBJECT @@ -21,7 +21,7 @@ public: PlayerManager(AbstractGame *_game, int _localPlayerId, bool _localPlayerIsJudge, bool localPlayerIsSpectator); AbstractGame *game; - QMap players; + QMap players; int localPlayerId; bool localPlayerIsJudge; bool localPlayerIsSpectator; @@ -42,7 +42,7 @@ public: return localPlayerId; } - [[nodiscard]] const QMap &getPlayers() const + [[nodiscard]] const QMap &getPlayers() const { return players; } @@ -52,14 +52,14 @@ public: return players.size(); } - [[nodiscard]] PlayerLogic *getActiveLocalPlayer(int activePlayer) const; + [[nodiscard]] Player *getActiveLocalPlayer(int activePlayer) const; bool isLocalPlayer(int playerId); - PlayerLogic *addPlayer(int playerId, const ServerInfo_User &info); + Player *addPlayer(int playerId, const ServerInfo_User &info); void removePlayer(int playerId); - [[nodiscard]] PlayerLogic *getPlayer(int playerId) const; + [[nodiscard]] Player *getPlayer(int playerId) const; void onPlayerConceded(int playerId, bool conceded); @@ -106,8 +106,8 @@ public: } signals: - void playerAdded(PlayerLogic *player); - void playerRemoved(PlayerLogic *player); + void playerAdded(Player *player); + void playerRemoved(Player *player); void activeLocalPlayerConceded(); void activeLocalPlayerUnconceded(); void playerConceded(int playerId); diff --git a/cockatrice/src/game_graphics/player/player_target.cpp b/cockatrice/src/game/player/player_target.cpp similarity index 92% rename from cockatrice/src/game_graphics/player/player_target.cpp rename to cockatrice/src/game/player/player_target.cpp index 567f3d44d..a7a5cc5e7 100644 --- a/cockatrice/src/game_graphics/player/player_target.cpp +++ b/cockatrice/src/game/player/player_target.cpp @@ -1,7 +1,7 @@ #include "player_target.h" -#include "../../game/player/player_logic.h" #include "../../interface/pixel_map_generator.h" +#include "player.h" #include #include @@ -9,8 +9,8 @@ #include #include -PlayerCounter::PlayerCounter(CounterState *state, PlayerLogic *player, QGraphicsItem *parent) - : AbstractCounter(state, player, false, false, parent) +PlayerCounter::PlayerCounter(Player *_player, int _id, const QString &_name, int _value, QGraphicsItem *parent) + : AbstractCounter(_player, _id, _name, false, _value, false, parent) { } @@ -47,7 +47,7 @@ void PlayerCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /* painter->drawText(translatedRect, Qt::AlignCenter, QString::number(value)); } -PlayerTarget::PlayerTarget(PlayerLogic *_owner, QGraphicsItem *parentItem) +PlayerTarget::PlayerTarget(Player *_owner, QGraphicsItem *parentItem) : ArrowTarget(_owner, parentItem), playerCounter(nullptr) { setCacheMode(DeviceCoordinateCache); @@ -128,9 +128,8 @@ void PlayerTarget::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*o resetPainterTransform(painter); QString name = QString::fromStdString(info->name()); - if (name.size() > 13) { + if (name.size() > 13) name = name.mid(0, 10) + "..."; - } QFont font; font.setPixelSize(qMax(qRound(translatedNameRect.height() / 1.5), 9)); @@ -145,21 +144,22 @@ void PlayerTarget::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*o painter->setPen(pen); painter->drawRect(boundingRect().adjusted(border / 2, border / 2, -border / 2, -border / 2)); - if (getBeingPointedAt()) { + if (getBeingPointedAt()) painter->fillRect(boundingRect(), QBrush(QColor(255, 0, 0, 100))); - } } -AbstractCounter *PlayerTarget::addCounter(CounterState *state) +AbstractCounter *PlayerTarget::addCounter(int _counterId, const QString &_name, int _value) { if (playerCounter) { disconnect(playerCounter, nullptr, this, nullptr); playerCounter->delCounter(); } - playerCounter = new PlayerCounter(state, owner, this); + + playerCounter = new PlayerCounter(owner, _counterId, _name, _value, this); playerCounter->setPos(boundingRect().width() - playerCounter->boundingRect().width(), boundingRect().height() - playerCounter->boundingRect().height()); connect(playerCounter, &PlayerCounter::destroyed, this, &PlayerTarget::counterDeleted); + return playerCounter; } diff --git a/cockatrice/src/game_graphics/player/player_target.h b/cockatrice/src/game/player/player_target.h similarity index 69% rename from cockatrice/src/game_graphics/player/player_target.h rename to cockatrice/src/game/player/player_target.h index 67e155660..b60464e12 100644 --- a/cockatrice/src/game_graphics/player/player_target.h +++ b/cockatrice/src/game/player/player_target.h @@ -1,25 +1,25 @@ /** * @file player_target.h * @ingroup GameGraphicsPlayers + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef PLAYERTARGET_H #define PLAYERTARGET_H +#include "../../game_graphics/board/graphics_item_type.h" #include "../board/abstract_counter.h" #include "../board/arrow_target.h" -#include "../board/graphics_item_type.h" #include -class PlayerLogic; +class Player; class PlayerCounter : public AbstractCounter { Q_OBJECT public: - PlayerCounter(CounterState *state, PlayerLogic *player, QGraphicsItem *parent); + PlayerCounter(Player *_player, int _id, const QString &_name, int _value, QGraphicsItem *parent = nullptr); QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; }; @@ -43,12 +43,12 @@ public: return Type; } - explicit PlayerTarget(PlayerLogic *_player = nullptr, QGraphicsItem *parentItem = nullptr); + explicit PlayerTarget(Player *_player = nullptr, QGraphicsItem *parentItem = nullptr); ~PlayerTarget() override; QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; - AbstractCounter *addCounter(CounterState *state); + AbstractCounter *addCounter(int _counterId, const QString &_name, int _value); }; #endif diff --git a/cockatrice/src/game/replay.cpp b/cockatrice/src/game/replay.cpp index 69f9d8b20..6886f817a 100644 --- a/cockatrice/src/game/replay.cpp +++ b/cockatrice/src/game/replay.cpp @@ -2,9 +2,9 @@ #include "../interface/widgets/tabs/tab_game.h" -Replay::Replay(QObject *_parent, GameReplay *_replay, bool isLocalGame) : AbstractGame(_parent) +Replay::Replay(TabGame *_tab, GameReplay *_replay) : AbstractGame(_tab) { - gameState = new GameState(this, 0, -1, isLocalGame, {}, false, false, -1, false); + gameState = new GameState(this, 0, -1, tab->getTabSupervisor()->getIsLocalGame(), {}, false, false, -1, false); connect(gameMetaInfo, &GameMetaInfo::startedChanged, gameState, &GameState::onStartedChanged); playerManager = new PlayerManager(this, -1, false, true); loadReplay(_replay); diff --git a/cockatrice/src/game/replay.h b/cockatrice/src/game/replay.h index ecb3a10d0..301f47580 100644 --- a/cockatrice/src/game/replay.h +++ b/cockatrice/src/game/replay.h @@ -2,8 +2,8 @@ * @file replay.h * @ingroup GameLogic * @ingroup Replay + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_REPLAY_H #define COCKATRICE_REPLAY_H @@ -15,7 +15,7 @@ class Replay : public AbstractGame Q_OBJECT public: - explicit Replay(QObject *_parent, GameReplay *_replay, bool isLocalGame); + explicit Replay(TabGame *_tab, GameReplay *_replay); }; #endif // COCKATRICE_REPLAY_H diff --git a/cockatrice/src/game_graphics/z_value_layer_manager.h b/cockatrice/src/game/z_value_layer_manager.h similarity index 94% rename from cockatrice/src/game_graphics/z_value_layer_manager.h rename to cockatrice/src/game/z_value_layer_manager.h index d35ab5c1c..4eb864486 100644 --- a/cockatrice/src/game_graphics/z_value_layer_manager.h +++ b/cockatrice/src/game/z_value_layer_manager.h @@ -66,9 +66,12 @@ namespace ZValueLayerManager */ enum class Layer { - Zone, ///< Zone-level elements like backgrounds and containers. - Card, ///< Cards rendered in zones (uses sequential Z-values). - Overlay ///< Temporary UI elements like hovered cards and drag items. + /// Zone-level elements like backgrounds and containers + Zone, + /// Cards rendered in zones (uses sequential Z-values) + Card, + /// Temporary UI elements like hovered cards and drag items + Overlay }; /** diff --git a/cockatrice/src/game_graphics/z_values.h b/cockatrice/src/game/z_values.h similarity index 100% rename from cockatrice/src/game_graphics/z_values.h rename to cockatrice/src/game/z_values.h diff --git a/cockatrice/src/game_graphics/zones/card_zone.cpp b/cockatrice/src/game/zones/card_zone.cpp similarity index 86% rename from cockatrice/src/game_graphics/zones/card_zone.cpp rename to cockatrice/src/game/zones/card_zone.cpp index 3457b681e..0c189cd2b 100644 --- a/cockatrice/src/game_graphics/zones/card_zone.cpp +++ b/cockatrice/src/game/zones/card_zone.cpp @@ -19,22 +19,19 @@ CardZone::CardZone(CardZoneLogic *_logic, QGraphicsItem *parent) void CardZone::onCardAdded(CardItem *addedCard) { addedCard->setParentItem(this); - addedCard->setVisible(true); addedCard->update(); } void CardZone::retranslateUi() { - for (int i = 0; i < getLogic()->getCards().size(); ++i) { + for (int i = 0; i < getLogic()->getCards().size(); ++i) getLogic()->getCards()[i]->retranslateUi(); - } } void CardZone::mouseDoubleClickEvent(QGraphicsSceneMouseEvent * /*event*/) { - if (doubleClickAction) { + if (doubleClickAction) doubleClickAction->trigger(); - } } bool CardZone::showContextMenu(const QPoint &screenPos) @@ -49,14 +46,12 @@ bool CardZone::showContextMenu(const QPoint &screenPos) void CardZone::mousePressEvent(QGraphicsSceneMouseEvent *event) { if (event->button() == Qt::RightButton) { - if (showContextMenu(event->screenPos())) { + if (showContextMenu(event->screenPos())) event->accept(); - } else { + else event->ignore(); - } - } else { + } else event->ignore(); - } } QPointF CardZone::closestGridPoint(const QPointF &point) diff --git a/cockatrice/src/game_graphics/zones/card_zone.h b/cockatrice/src/game/zones/card_zone.h similarity index 73% rename from cockatrice/src/game_graphics/zones/card_zone.h rename to cockatrice/src/game/zones/card_zone.h index 4cef6ca80..6fe8157e4 100644 --- a/cockatrice/src/game_graphics/zones/card_zone.h +++ b/cockatrice/src/game/zones/card_zone.h @@ -1,15 +1,15 @@ /** * @file card_zone.h * @ingroup GameGraphicsZones - * @brief Base graphics item for zones that contain cards. + * @brief TODO: Document this. */ #ifndef CARDZONE_H #define CARDZONE_H -#include "../../game/zones/card_zone_logic.h" -#include "../board/abstract_graphics_item.h" -#include "../board/graphics_item_type.h" +#include "../../game_graphics/board/abstract_graphics_item.h" +#include "../../game_graphics/board/graphics_item_type.h" +#include "logic/card_zone_logic.h" #include #include @@ -40,13 +40,7 @@ protected: } public slots: bool showContextMenu(const QPoint &screenPos); - /** - * @brief Called when a card is added to this zone. Default: reparents card to this item. - * - * 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(CardItem *addedCard); + void onCardAdded(CardItem *addedCard); public: enum diff --git a/cockatrice/src/game_graphics/zones/hand_zone.cpp b/cockatrice/src/game/zones/hand_zone.cpp similarity index 60% rename from cockatrice/src/game_graphics/zones/hand_zone.cpp rename to cockatrice/src/game/zones/hand_zone.cpp index 5885e3630..7badfcca4 100644 --- a/cockatrice/src/game_graphics/zones/hand_zone.cpp +++ b/cockatrice/src/game/zones/hand_zone.cpp @@ -1,11 +1,11 @@ #include "hand_zone.h" #include "../../client/settings/cache_settings.h" -#include "../../game/player/player_actions.h" -#include "../../game/player/player_logic.h" #include "../../interface/theme_manager.h" #include "../board/card_drag_item.h" #include "../board/card_item.h" +#include "../player/player.h" +#include "../player/player_actions.h" #include #include @@ -27,20 +27,16 @@ void HandZone::handleDropEvent(const QList &dragItems, CardZoneLogic *startZone, const QPoint &dropPoint) { - if (startZone == nullptr || startZone->getPlayer() == nullptr || dragItems.isEmpty()) { - return; - } - QPoint point = dropPoint + scenePos().toPoint(); int x = -1; if (SettingsCache::instance().getHorizontalHand()) { - for (x = 0; x < getLogic()->getCards().size(); x++) { - if (point.x() < static_cast(getLogic()->getCards().at(x))->scenePos().x()) { + for (x = 0; x < getLogic()->getCards().size(); x++) + if (point.x() < static_cast(getLogic()->getCards().at(x))->scenePos().x()) break; - } - } } else { - x = calcDropIndexFromY(dropPoint.y()); + for (x = 0; x < getLogic()->getCards().size(); x++) + if (point.y() < static_cast(getLogic()->getCards().at(x))->scenePos().y()) + break; } Command_MoveCard cmd; @@ -51,20 +47,18 @@ void HandZone::handleDropEvent(const QList &dragItems, cmd.set_x(x); cmd.set_y(-1); - for (int i = 0; i < dragItems.size(); ++i) { + for (int i = 0; i < dragItems.size(); ++i) cmd.mutable_cards_to_move()->add_card()->set_card_id(dragItems[i]->getId()); - } getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(cmd); } QRectF HandZone::boundingRect() const { - if (SettingsCache::instance().getHorizontalHand()) { + if (SettingsCache::instance().getHorizontalHand()) return QRectF(0, 0, width, CardDimensions::HEIGHT_F + 10); - } else { - return QRectF(0, 0, CardDimensions::WIDTH_F * 1.5, zoneHeight); - } + else + return QRectF(0, 0, 100, zoneHeight); } void HandZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/) @@ -84,31 +78,35 @@ void HandZone::reorganizeCards() qreal totalWidth = leftJustified ? boundingRect().width() - (1 * xPadding) - 5 : boundingRect().width() - 2 * xPadding; - if (cardCount == 1) { - 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 = 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) { - c->setPos(xPadding + ((qreal)i) * (totalWidth - cardWidth) / (cardCount - 1), 5); - } else { - qreal xPosition = leftJustified ? xPadding + ((qreal)i) * cardWidth - : xPadding + ((qreal)i) * cardWidth + - (totalWidth - cardCount * cardWidth) / 2; - c->setPos(xPosition, 5); - } - c->setRealZValue(i); + for (int i = 0; i < cardCount; 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) + c->setPos(xPadding + ((qreal)i) * (totalWidth - cardWidth) / (cardCount - 1), 5); + else { + qreal xPosition = + leftJustified ? xPadding + ((qreal)i) * cardWidth + : xPadding + ((qreal)i) * cardWidth + (totalWidth - cardCount * cardWidth) / 2; + c->setPos(xPosition, 5); } + c->setRealZValue(i); } } else { - // No clip container: hand cards should always be visible to the player. - const auto params = buildStackParams(); - layoutCardsVertically(params); + qreal totalWidth = boundingRect().width(); + qreal cardWidth = getLogic()->getCards().at(0)->boundingRect().width(); + qreal xspace = 5; + qreal x1 = xspace; + qreal x2 = totalWidth - xspace - cardWidth; + + for (int i = 0; i < cardCount; i++) { + CardItem *card = getLogic()->getCards().at(i); + qreal x = (i % 2) ? x2 : x1; + qreal y = divideCardSpaceInZone(i, cardCount, boundingRect().height(), + getLogic()->getCards().at(0)->boundingRect().height()); + card->setPos(x, y); + card->setRealZValue(i); + } } } update(); diff --git a/cockatrice/src/game_graphics/zones/hand_zone.h b/cockatrice/src/game/zones/hand_zone.h similarity index 80% rename from cockatrice/src/game_graphics/zones/hand_zone.h rename to cockatrice/src/game/zones/hand_zone.h index c3f3f252b..25f4148bd 100644 --- a/cockatrice/src/game_graphics/zones/hand_zone.h +++ b/cockatrice/src/game/zones/hand_zone.h @@ -1,21 +1,20 @@ /** * @file hand_zone.h * @ingroup GameGraphicsZones - * @brief Graphical zone for the player's hand, supporting horizontal and vertical layouts. + * @brief TODO: Document this. */ #ifndef HANDZONE_H #define HANDZONE_H -#include "../../game/zones/hand_zone_logic.h" +#include "logic/hand_zone_logic.h" #include "select_zone.h" class HandZone : public SelectZone { Q_OBJECT private: - qreal width = 0.0; - qreal zoneHeight; + qreal width, zoneHeight; private slots: void updateBg(); public slots: diff --git a/cockatrice/src/game/zones/card_zone_algorithms.h b/cockatrice/src/game/zones/logic/card_zone_algorithms.h similarity index 100% rename from cockatrice/src/game/zones/card_zone_algorithms.h rename to cockatrice/src/game/zones/logic/card_zone_algorithms.h diff --git a/cockatrice/src/game/zones/card_zone_logic.cpp b/cockatrice/src/game/zones/logic/card_zone_logic.cpp similarity index 91% rename from cockatrice/src/game/zones/card_zone_logic.cpp rename to cockatrice/src/game/zones/logic/card_zone_logic.cpp index 7e0585f4e..e917e4ad7 100644 --- a/cockatrice/src/game/zones/card_zone_logic.cpp +++ b/cockatrice/src/game/zones/logic/card_zone_logic.cpp @@ -1,9 +1,9 @@ #include "card_zone_logic.h" -#include "../../game_graphics/board/card_item.h" -#include "../../game_graphics/zones/view_zone.h" -#include "../player/player_actions.h" -#include "../player/player_logic.h" +#include "../../board/card_item.h" +#include "../../player/player.h" +#include "../../player/player_actions.h" +#include "../view_zone.h" #include "view_zone_logic.h" #include @@ -20,7 +20,7 @@ * @param _contentsKnown whether the cards in the zone are known to the client * @param parent the parent QObject. */ -CardZoneLogic::CardZoneLogic(PlayerLogic *_player, +CardZoneLogic::CardZoneLogic(Player *_player, const QString &_name, bool _hasCardAttr, bool _isShufflable, @@ -55,9 +55,8 @@ void CardZoneLogic::addCard(CardItem *card, const bool reorganize, const int x, emit cardAdded(card); addCardImpl(card, x, y); - if (reorganize) { + if (reorganize) emit reorganizeCards(); - } emit cardCountChanged(); } @@ -67,19 +66,16 @@ CardItem *CardZoneLogic::takeCard(int position, int cardId, bool toNewZone) if (position == -1) { // position == -1 means either that the zone is indexed by card id // or that it doesn't matter which card you take. - for (int i = 0; i < cards.size(); ++i) { + for (int i = 0; i < cards.size(); ++i) if (cards[i]->getId() == cardId) { position = i; break; } - } - if (position == -1) { + if (position == -1) position = 0; - } } - if (position >= cards.size()) { + if (position >= cards.size()) return nullptr; - } for (auto *view : views) { qobject_cast(view->getLogic())->removeCard(position, toNewZone); @@ -146,9 +142,8 @@ void CardZoneLogic::moveAllToZone() cmd.set_target_zone(targetZone.toStdString()); cmd.set_x(targetX); - for (int i = 0; i < cards.size(); ++i) { + for (int i = 0; i < cards.size(); ++i) cmd.mutable_cards_to_move()->add_card()->set_card_id(cards[i]->getId()); - } player->getPlayerActions()->sendGameCommand(cmd); } @@ -180,9 +175,9 @@ void CardZoneLogic::clearContents() QString CardZoneLogic::getTranslatedName(bool theirOwn, GrammaticalCase gc) const { QString ownerName = player->getPlayerInfo()->getName(); - if (name == ZoneNames::HAND) { + if (name == ZoneNames::HAND) return (theirOwn ? tr("their hand", "nominative") : tr("%1's hand", "nominative").arg(ownerName)); - } else if (name == ZoneNames::DECK) { + else if (name == ZoneNames::DECK) switch (gc) { case CaseLookAtZone: return (theirOwn ? tr("their library", "look at zone") @@ -198,11 +193,11 @@ QString CardZoneLogic::getTranslatedName(bool theirOwn, GrammaticalCase gc) cons default: return (theirOwn ? tr("their library", "nominative") : tr("%1's library", "nominative").arg(ownerName)); } - } else if (name == ZoneNames::GRAVE) { + else if (name == ZoneNames::GRAVE) return (theirOwn ? tr("their graveyard", "nominative") : tr("%1's graveyard", "nominative").arg(ownerName)); - } else if (name == ZoneNames::EXILE) { + else if (name == ZoneNames::EXILE) return (theirOwn ? tr("their exile", "nominative") : tr("%1's exile", "nominative").arg(ownerName)); - } else if (name == ZoneNames::SIDEBOARD) { + else if (name == ZoneNames::SIDEBOARD) switch (gc) { case CaseLookAtZone: return (theirOwn ? tr("their sideboard", "look at zone") @@ -213,7 +208,7 @@ QString CardZoneLogic::getTranslatedName(bool theirOwn, GrammaticalCase gc) cons default: break; } - } else { + else { return (theirOwn ? tr("their custom zone '%1'", "nominative").arg(name) : tr("%1's custom zone '%2'", "nominative").arg(ownerName).arg(name)); } diff --git a/cockatrice/src/game/zones/card_zone_logic.h b/cockatrice/src/game/zones/logic/card_zone_logic.h similarity index 91% rename from cockatrice/src/game/zones/card_zone_logic.h rename to cockatrice/src/game/zones/logic/card_zone_logic.h index ae97719a9..1aa46effd 100644 --- a/cockatrice/src/game/zones/card_zone_logic.h +++ b/cockatrice/src/game/zones/logic/card_zone_logic.h @@ -1,21 +1,21 @@ /** * @file card_zone_logic.h * @ingroup GameLogicZones + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_CARD_ZONE_LOGIC_H #define COCKATRICE_CARD_ZONE_LOGIC_H -#include "../../client/translation.h" -#include "../board/card_list.h" +#include "../../../client/translation.h" +#include "../../board/card_list.h" #include #include inline Q_LOGGING_CATEGORY(CardZoneLogicLog, "card_zone_logic"); -class PlayerLogic; +class Player; class ZoneViewZone; class QMenu; class QAction; @@ -35,7 +35,7 @@ signals: void retranslateUi(); public: - explicit CardZoneLogic(PlayerLogic *_player, + explicit CardZoneLogic(Player *_player, const QString &_name, bool _hasCardAttr, bool _isShufflable, @@ -68,7 +68,7 @@ public: return name; } [[nodiscard]] QString getTranslatedName(bool theirOwn, GrammaticalCase gc) const; - [[nodiscard]] PlayerLogic *getPlayer() const + [[nodiscard]] Player *getPlayer() const { return player; } @@ -105,7 +105,7 @@ private slots: void refreshCardInfos(); protected: - PlayerLogic *player; + Player *player; QString name; CardList cards; QList views; diff --git a/cockatrice/src/game/zones/hand_zone_logic.cpp b/cockatrice/src/game/zones/logic/hand_zone_logic.cpp similarity index 84% rename from cockatrice/src/game/zones/hand_zone_logic.cpp rename to cockatrice/src/game/zones/logic/hand_zone_logic.cpp index 3bdd15902..efa85d649 100644 --- a/cockatrice/src/game/zones/hand_zone_logic.cpp +++ b/cockatrice/src/game/zones/logic/hand_zone_logic.cpp @@ -1,9 +1,9 @@ #include "hand_zone_logic.h" -#include "../../game_graphics/board/card_item.h" +#include "../../board/card_item.h" #include "card_zone_algorithms.h" -HandZoneLogic::HandZoneLogic(PlayerLogic *_player, +HandZoneLogic::HandZoneLogic(Player *_player, const QString &_name, bool _hasCardAttr, bool _isShufflable, diff --git a/cockatrice/src/game/zones/hand_zone_logic.h b/cockatrice/src/game/zones/logic/hand_zone_logic.h similarity index 88% rename from cockatrice/src/game/zones/hand_zone_logic.h rename to cockatrice/src/game/zones/logic/hand_zone_logic.h index 400506248..8f34cc851 100644 --- a/cockatrice/src/game/zones/hand_zone_logic.h +++ b/cockatrice/src/game/zones/logic/hand_zone_logic.h @@ -1,8 +1,8 @@ /** * @file hand_zone_logic.h * @ingroup GameLogicZones + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_HAND_ZONE_LOGIC_H #define COCKATRICE_HAND_ZONE_LOGIC_H @@ -12,7 +12,7 @@ class HandZoneLogic : public CardZoneLogic { Q_OBJECT public: - HandZoneLogic(PlayerLogic *_player, + HandZoneLogic(Player *_player, const QString &_name, bool _hasCardAttr, bool _isShufflable, diff --git a/cockatrice/src/game/zones/pile_zone_logic.cpp b/cockatrice/src/game/zones/logic/pile_zone_logic.cpp similarity index 86% rename from cockatrice/src/game/zones/pile_zone_logic.cpp rename to cockatrice/src/game/zones/logic/pile_zone_logic.cpp index 0f374fb84..c5ffd5fd5 100644 --- a/cockatrice/src/game/zones/pile_zone_logic.cpp +++ b/cockatrice/src/game/zones/logic/pile_zone_logic.cpp @@ -1,8 +1,8 @@ #include "pile_zone_logic.h" -#include "../../game_graphics/board/card_item.h" +#include "../../board/card_item.h" -PileZoneLogic::PileZoneLogic(PlayerLogic *_player, +PileZoneLogic::PileZoneLogic(Player *_player, const QString &_name, bool _hasCardAttr, bool _isShufflable, @@ -25,9 +25,8 @@ void PileZoneLogic::addCardImpl(CardItem *card, int x, int /*y*/) card->setCardRef({}); card->setId(-1); // If we obscure a previously revealed card, its name has to be forgotten - if (cards.size() > x + 1) { + if (cards.size() > x + 1) cards.at(x + 1)->setCardRef({}); - } } card->setVisible(false); card->resetState(); diff --git a/cockatrice/src/game/zones/pile_zone_logic.h b/cockatrice/src/game/zones/logic/pile_zone_logic.h similarity index 89% rename from cockatrice/src/game/zones/pile_zone_logic.h rename to cockatrice/src/game/zones/logic/pile_zone_logic.h index 522d99b89..498d0d4a2 100644 --- a/cockatrice/src/game/zones/pile_zone_logic.h +++ b/cockatrice/src/game/zones/logic/pile_zone_logic.h @@ -1,8 +1,8 @@ /** * @file pile_zone_logic.h * @ingroup GameLogicZones + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_PILE_ZONE_LOGIC_H #define COCKATRICE_PILE_ZONE_LOGIC_H @@ -17,7 +17,7 @@ signals: void callUpdate(); public: - PileZoneLogic(PlayerLogic *_player, + PileZoneLogic(Player *_player, const QString &_name, bool _hasCardAttr, bool _isShufflable, diff --git a/cockatrice/src/game/zones/stack_zone_logic.cpp b/cockatrice/src/game/zones/logic/stack_zone_logic.cpp similarity index 84% rename from cockatrice/src/game/zones/stack_zone_logic.cpp rename to cockatrice/src/game/zones/logic/stack_zone_logic.cpp index 341d4b0e4..6f3cb6e99 100644 --- a/cockatrice/src/game/zones/stack_zone_logic.cpp +++ b/cockatrice/src/game/zones/logic/stack_zone_logic.cpp @@ -1,9 +1,9 @@ #include "stack_zone_logic.h" -#include "../../game_graphics/board/card_item.h" +#include "../../board/card_item.h" #include "card_zone_algorithms.h" -StackZoneLogic::StackZoneLogic(PlayerLogic *_player, +StackZoneLogic::StackZoneLogic(Player *_player, const QString &_name, bool _hasCardAttr, bool _isShufflable, diff --git a/cockatrice/src/game/zones/stack_zone_logic.h b/cockatrice/src/game/zones/logic/stack_zone_logic.h similarity index 88% rename from cockatrice/src/game/zones/stack_zone_logic.h rename to cockatrice/src/game/zones/logic/stack_zone_logic.h index cce4bd0fa..81b9d6969 100644 --- a/cockatrice/src/game/zones/stack_zone_logic.h +++ b/cockatrice/src/game/zones/logic/stack_zone_logic.h @@ -1,8 +1,8 @@ /** * @file stack_zone_logic.h * @ingroup GameLogicZones + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_STACK_ZONE_LOGIC_H #define COCKATRICE_STACK_ZONE_LOGIC_H @@ -12,7 +12,7 @@ class StackZoneLogic : public CardZoneLogic { Q_OBJECT public: - StackZoneLogic(PlayerLogic *_player, + StackZoneLogic(Player *_player, const QString &_name, bool _hasCardAttr, bool _isShufflable, diff --git a/cockatrice/src/game/zones/table_zone_logic.cpp b/cockatrice/src/game/zones/logic/table_zone_logic.cpp similarity index 88% rename from cockatrice/src/game/zones/table_zone_logic.cpp rename to cockatrice/src/game/zones/logic/table_zone_logic.cpp index a4f033819..42caf2ec8 100644 --- a/cockatrice/src/game/zones/table_zone_logic.cpp +++ b/cockatrice/src/game/zones/logic/table_zone_logic.cpp @@ -1,8 +1,8 @@ #include "table_zone_logic.h" -#include "../../game_graphics/board/card_item.h" +#include "../../board/card_item.h" -TableZoneLogic::TableZoneLogic(PlayerLogic *_player, +TableZoneLogic::TableZoneLogic(Player *_player, const QString &_name, bool _hasCardAttr, bool _isShufflable, @@ -29,8 +29,7 @@ CardItem *TableZoneLogic::takeCard(int position, int cardId, bool toNewZone) { CardItem *result = CardZoneLogic::takeCard(position, cardId); - if (toNewZone) { + if (toNewZone) emit contentSizeChanged(); - } return result; } \ No newline at end of file diff --git a/cockatrice/src/game/zones/table_zone_logic.h b/cockatrice/src/game/zones/logic/table_zone_logic.h similarity index 93% rename from cockatrice/src/game/zones/table_zone_logic.h rename to cockatrice/src/game/zones/logic/table_zone_logic.h index 6d8d64a20..e173bc637 100644 --- a/cockatrice/src/game/zones/table_zone_logic.h +++ b/cockatrice/src/game/zones/logic/table_zone_logic.h @@ -1,8 +1,8 @@ /** * @file table_zone_logic.h * @ingroup GameLogicZones + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_TABLE_ZONE_LOGIC_H #define COCKATRICE_TABLE_ZONE_LOGIC_H @@ -16,7 +16,7 @@ signals: void toggleTapped(); public: - TableZoneLogic(PlayerLogic *_player, + TableZoneLogic(Player *_player, const QString &_name, bool _hasCardAttr, bool _isShufflable, diff --git a/cockatrice/src/game/zones/view_zone_logic.cpp b/cockatrice/src/game/zones/logic/view_zone_logic.cpp similarity index 97% rename from cockatrice/src/game/zones/view_zone_logic.cpp rename to cockatrice/src/game/zones/logic/view_zone_logic.cpp index 8782a1762..5a4db3163 100644 --- a/cockatrice/src/game/zones/view_zone_logic.cpp +++ b/cockatrice/src/game/zones/logic/view_zone_logic.cpp @@ -1,7 +1,7 @@ #include "view_zone_logic.h" -#include "../../client/settings/cache_settings.h" -#include "../../game_graphics/board/card_item.h" +#include "../../../client/settings/cache_settings.h" +#include "../../board/card_item.h" /** * @param _player the player that the cards are revealed to. @@ -9,7 +9,7 @@ * @param _revealZone if false, the cards will be face down. * @param _writeableRevealZone whether the player can interact with the revealed cards. */ -ZoneViewZoneLogic::ZoneViewZoneLogic(PlayerLogic *_player, +ZoneViewZoneLogic::ZoneViewZoneLogic(Player *_player, CardZoneLogic *_origZone, int _numberCards, bool _revealZone, diff --git a/cockatrice/src/game/zones/view_zone_logic.h b/cockatrice/src/game/zones/logic/view_zone_logic.h similarity index 95% rename from cockatrice/src/game/zones/view_zone_logic.h rename to cockatrice/src/game/zones/logic/view_zone_logic.h index 04ed20e45..6bd5ecc8d 100644 --- a/cockatrice/src/game/zones/view_zone_logic.h +++ b/cockatrice/src/game/zones/logic/view_zone_logic.h @@ -1,8 +1,8 @@ /** * @file view_zone_logic.h * @ingroup GameLogicZones + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_VIEW_ZONE_LOGIC_H #define COCKATRICE_VIEW_ZONE_LOGIC_H @@ -30,7 +30,7 @@ public: REMOVE_CARD }; - ZoneViewZoneLogic(PlayerLogic *_player, + ZoneViewZoneLogic(Player *_player, CardZoneLogic *_origZone, int _numberCards, bool _revealZone, diff --git a/cockatrice/src/game_graphics/zones/pile_zone.cpp b/cockatrice/src/game/zones/pile_zone.cpp similarity index 91% rename from cockatrice/src/game_graphics/zones/pile_zone.cpp rename to cockatrice/src/game/zones/pile_zone.cpp index 7bb0e695a..d85b5f4e2 100644 --- a/cockatrice/src/game_graphics/zones/pile_zone.cpp +++ b/cockatrice/src/game/zones/pile_zone.cpp @@ -1,10 +1,10 @@ #include "pile_zone.h" -#include "../../game/player/player_actions.h" -#include "../../game/player/player_logic.h" -#include "../../game/zones/pile_zone_logic.h" #include "../board/card_drag_item.h" #include "../board/card_item.h" +#include "../player/player.h" +#include "../player/player_actions.h" +#include "logic/pile_zone_logic.h" #include "view_zone.h" #include @@ -48,10 +48,9 @@ void PileZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*optio { painter->drawPath(shape()); - if (!getLogic()->getCards().isEmpty()) { + 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); @@ -88,28 +87,24 @@ void PileZone::reorganizeCards() void PileZone::mousePressEvent(QGraphicsSceneMouseEvent *event) { CardZone::mousePressEvent(event); - if (event->isAccepted()) { + if (event->isAccepted()) return; - } if (event->button() == Qt::LeftButton) { setCursor(Qt::ClosedHandCursor); event->accept(); - } else { + } else event->ignore(); - } } void PileZone::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { if ((event->screenPos() - event->buttonDownScreenPos(Qt::LeftButton)).manhattanLength() < - QApplication::startDragDistance()) { + QApplication::startDragDistance()) return; - } - if (getLogic()->getCards().isEmpty()) { + if (getLogic()->getCards().isEmpty()) return; - } bool forceFaceDown = event->modifiers().testFlag(Qt::ShiftModifier); bool bottomCard = event->modifiers().testFlag(Qt::ControlModifier); @@ -128,8 +123,7 @@ void PileZone::mouseReleaseEvent(QGraphicsSceneMouseEvent * /*event*/) void PileZone::hoverEnterEvent(QGraphicsSceneHoverEvent *event) { - if (!getLogic()->getCards().isEmpty()) { + 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/zones/pile_zone.h similarity index 93% rename from cockatrice/src/game_graphics/zones/pile_zone.h rename to cockatrice/src/game/zones/pile_zone.h index 099bc6f60..5bfc50880 100644 --- a/cockatrice/src/game_graphics/zones/pile_zone.h +++ b/cockatrice/src/game/zones/pile_zone.h @@ -1,14 +1,14 @@ /** * @file pile_zone.h * @ingroup GameGraphicsZones + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef PILEZONE_H #define PILEZONE_H -#include "../../game/zones/pile_zone_logic.h" #include "card_zone.h" +#include "logic/pile_zone_logic.h" /** * A CardZone where the cards are in a single pile instead of being laid out. diff --git a/cockatrice/src/game/zones/select_zone.cpp b/cockatrice/src/game/zones/select_zone.cpp new file mode 100644 index 000000000..9bf5f9faf --- /dev/null +++ b/cockatrice/src/game/zones/select_zone.cpp @@ -0,0 +1,97 @@ +#include "select_zone.h" + +#include "../../client/settings/cache_settings.h" +#include "../board/card_item.h" +#include "../game_scene.h" + +#include +#include + +qreal divideCardSpaceInZone(qreal index, int cardCount, qreal totalHeight, qreal cardHeight, bool reverse) +{ + qreal cardMinOverlap = cardHeight * SettingsCache::instance().getStackCardOverlapPercent() / 100; + qreal desiredHeight = cardHeight * cardCount - cardMinOverlap * (cardCount - 1); + qreal y; + if (desiredHeight > totalHeight) { + if (reverse) { + y = index / ((totalHeight - cardHeight) / (cardCount - 1)); + } else { + y = index * (totalHeight - cardHeight) / (cardCount - 1); + } + } else { + qreal start = (totalHeight - desiredHeight) / 2; + if (reverse) { + if (index <= start) { + return 0; + } + y = (index - start) / (cardHeight - cardMinOverlap); + } else { + y = index * (cardHeight - cardMinOverlap) + start; + } + } + return y; +} + +SelectZone::SelectZone(CardZoneLogic *_logic, QGraphicsItem *parent) : CardZone(_logic, parent) +{ +} + +void SelectZone::mouseMoveEvent(QGraphicsSceneMouseEvent *event) +{ + if (event->buttons().testFlag(Qt::LeftButton)) { + QPointF pos = event->pos(); + if (pos.x() < 0) + pos.setX(0); + QRectF br = boundingRect(); + if (pos.x() > br.width()) + pos.setX(br.width()); + if (pos.y() < 0) + pos.setY(0); + if (pos.y() > br.height()) + pos.setY(br.height()); + + QRectF selectionRect = QRectF(selectionOrigin, pos).normalized(); + for (auto card : getLogic()->getCards()) { + if (card->getAttachedTo() && card->getAttachedTo()->getZone() != getLogic()) { + continue; + } + + bool inRect = selectionRect.intersects(card->mapRectToParent(card->boundingRect())); + if (inRect && !cardsInSelectionRect.contains(card)) { + // selection has just expanded to cover the card + cardsInSelectionRect.insert(card); + card->setSelected(!card->isSelected()); + } else if (!inRect && cardsInSelectionRect.contains(card)) { + // selection has just shrunk to no longer cover the card + cardsInSelectionRect.remove(card); + card->setSelected(!card->isSelected()); + } + } + static_cast(scene())->resizeRubberBand( + deviceTransform(static_cast(scene())->getViewportTransform()).map(pos), + cardsInSelectionRect.size()); + event->accept(); + } +} + +void SelectZone::mousePressEvent(QGraphicsSceneMouseEvent *event) +{ + if (event->button() == Qt::LeftButton) { + if (!event->modifiers().testFlag(Qt::ControlModifier)) { + scene()->clearSelection(); + } + + selectionOrigin = event->pos(); + static_cast(scene())->startRubberBand(event->scenePos()); + event->accept(); + } else + CardZone::mousePressEvent(event); +} + +void SelectZone::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +{ + selectionOrigin = QPoint(); + cardsInSelectionRect.clear(); + static_cast(scene())->stopRubberBand(); + event->accept(); +} diff --git a/cockatrice/src/game/zones/select_zone.h b/cockatrice/src/game/zones/select_zone.h new file mode 100644 index 000000000..d6fd3e10e --- /dev/null +++ b/cockatrice/src/game/zones/select_zone.h @@ -0,0 +1,35 @@ +/** + * @file select_zone.h + * @ingroup GameGraphicsZones + * @brief TODO: Document this. + */ + +#ifndef SELECTZONE_H +#define SELECTZONE_H + +#include "card_zone.h" + +#include + +/** + * A CardZone where the cards are laid out, with each card directly interactable by clicking. + */ +class SelectZone : public CardZone +{ + Q_OBJECT +private: + QPointF selectionOrigin; + QSet cardsInSelectionRect; + +protected: + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + +public: + SelectZone(CardZoneLogic *logic, QGraphicsItem *parent = nullptr); +}; + +qreal divideCardSpaceInZone(qreal index, int cardCount, qreal totalHeight, qreal cardHeight, bool reverse = false); + +#endif diff --git a/cockatrice/src/game_graphics/zones/stack_zone.cpp b/cockatrice/src/game/zones/stack_zone.cpp similarity index 50% rename from cockatrice/src/game_graphics/zones/stack_zone.cpp rename to cockatrice/src/game/zones/stack_zone.cpp index 184f96d62..a9d649a4a 100644 --- a/cockatrice/src/game_graphics/zones/stack_zone.cpp +++ b/cockatrice/src/game/zones/stack_zone.cpp @@ -1,12 +1,13 @@ #include "stack_zone.h" -#include "../../game/player/player_actions.h" -#include "../../game/player/player_logic.h" -#include "../../game/zones/stack_zone_logic.h" +#include "../../client/settings/cache_settings.h" #include "../../interface/theme_manager.h" +#include "../board/arrow_item.h" #include "../board/card_drag_item.h" #include "../board/card_item.h" -#include "../card_dimensions.h" +#include "../player/player.h" +#include "../player/player_actions.h" +#include "logic/stack_zone_logic.h" #include #include @@ -26,7 +27,7 @@ void StackZone::updateBg() QRectF StackZone::boundingRect() const { - return {0, 0, CardDimensions::WIDTH_F * 1.5, zoneHeight}; + return {0, 0, 100, zoneHeight}; } void StackZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/) @@ -39,35 +40,45 @@ void StackZone::handleDropEvent(const QList &dragItems, CardZoneLogic *startZone, const QPoint &dropPoint) { - if (startZone == nullptr || startZone->getPlayer() == nullptr || dragItems.isEmpty()) { + if (startZone == nullptr || startZone->getPlayer() == nullptr) { return; } - const auto &cards = getLogic()->getCards(); - int index; - if (startZone == getLogic()) { - // Reordering within the zone: use drop position - index = calcDropIndexFromY(dropPoint.y(), MIN_CARD_VISIBLE); - // Same-zone no-op: don't move a card onto itself - if (!cards.isEmpty() && cards.at(index)->getId() == dragItems.at(0)->getId()) { - return; - } - } else { - // Coming from another zone: append at end (top of stack, rendered on top) - index = static_cast(cards.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()); + + int index = 0; + + if (!getLogic()->getCards().isEmpty()) { + const auto cardCount = static_cast(getLogic()->getCards().size()); + const auto &card = getLogic()->getCards().at(0); + + index = qRound(divideCardSpaceInZone(dropPoint.y(), cardCount, boundingRect().height(), + card->boundingRect().height(), true)); + + // divideCardSpaceInZone is not guaranteed to return a valid index + // currently, so clamp it to avoid crashes. + index = qBound(0, index, cardCount - 1); + + if (startZone == getLogic()) { + const auto &dragItem = dragItems.at(0); + const auto &card = getLogic()->getCards().at(index); + + if (card->getId() == dragItem->getId()) { + return; + } + } + } + cmd.set_x(index); cmd.set_y(0); - for (const CardDragItem *item : dragItems) { + for (CardDragItem *item : dragItems) { if (item) { - auto *cardToMove = cmd.mutable_cards_to_move()->add_card(); + auto cardToMove = cmd.mutable_cards_to_move()->add_card(); cardToMove->set_card_id(item->getId()); if (item->isForceFaceDown()) { cardToMove->set_face_down(true); @@ -78,22 +89,24 @@ void StackZone::handleDropEvent(const QList &dragItems, getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(cmd); } -void StackZone::setHeight(qreal newHeight) -{ - if (qFuzzyCompare(1.0 + zoneHeight, 1.0 + newHeight)) { - return; - } - prepareGeometryChange(); - zoneHeight = newHeight; - reorganizeCards(); - update(); -} - void StackZone::reorganizeCards() { if (!getLogic()->getCards().isEmpty()) { - const auto params = buildStackParams(MIN_CARD_VISIBLE); - layoutCardsVertically(params); + const auto cardCount = static_cast(getLogic()->getCards().size()); + qreal totalWidth = boundingRect().width(); + qreal cardWidth = getLogic()->getCards().at(0)->boundingRect().width(); + qreal xspace = 5; + qreal x1 = xspace; + qreal x2 = totalWidth - xspace - cardWidth; + + for (int i = 0; i < cardCount; i++) { + CardItem *card = getLogic()->getCards().at(i); + qreal x = (i % 2) ? x2 : x1; + qreal y = divideCardSpaceInZone(i, cardCount, boundingRect().height(), + getLogic()->getCards().at(0)->boundingRect().height()); + card->setPos(x, y); + card->setRealZValue(i); + } } update(); } diff --git a/cockatrice/src/game_graphics/zones/stack_zone.h b/cockatrice/src/game/zones/stack_zone.h similarity index 71% rename from cockatrice/src/game_graphics/zones/stack_zone.h rename to cockatrice/src/game/zones/stack_zone.h index 147c3e2fc..7c98f5128 100644 --- a/cockatrice/src/game_graphics/zones/stack_zone.h +++ b/cockatrice/src/game/zones/stack_zone.h @@ -1,13 +1,13 @@ /** * @file stack_zone.h * @ingroup GameGraphicsZones - * @brief Graphical zone for the stack, displaying cards in a vertical pile. + * @brief TODO: Document this. */ #ifndef STACKZONE_H #define STACKZONE_H -#include "../../game/zones/stack_zone_logic.h" +#include "logic/stack_zone_logic.h" #include "select_zone.h" class StackZone : public SelectZone @@ -20,8 +20,6 @@ private slots: public: StackZone(StackZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent); - /** @brief Resizes the stack zone height, e.g. when sharing vertical space with the command zone. */ - void setHeight(qreal newHeight); void handleDropEvent(const QList &dragItems, CardZoneLogic *startZone, const QPoint &dropPoint) override; QRectF boundingRect() const override; diff --git a/cockatrice/src/game_graphics/zones/table_zone.cpp b/cockatrice/src/game/zones/table_zone.cpp similarity index 90% rename from cockatrice/src/game_graphics/zones/table_zone.cpp rename to cockatrice/src/game/zones/table_zone.cpp index e886f62e9..2a382fafe 100644 --- a/cockatrice/src/game_graphics/zones/table_zone.cpp +++ b/cockatrice/src/game/zones/table_zone.cpp @@ -1,14 +1,14 @@ #include "table_zone.h" #include "../../client/settings/cache_settings.h" -#include "../../game/player/player_actions.h" -#include "../../game/player/player_logic.h" -#include "../../game/zones/table_zone_logic.h" #include "../../interface/theme_manager.h" #include "../board/arrow_item.h" #include "../board/card_drag_item.h" #include "../board/card_item.h" +#include "../player/player.h" +#include "../player/player_actions.h" #include "../z_values.h" +#include "logic/table_zone_logic.h" #include #include @@ -22,8 +22,7 @@ const QColor TableZone::FADE_MASK = QColor(0, 0, 0, 80); const QColor TableZone::GRADIENT_COLOR = QColor(255, 255, 255, 150); const QColor TableZone::GRADIENT_COLORLESS = QColor(255, 255, 255, 0); -TableZone::TableZone(TableZoneLogic *_logic, bool _mirrored, QGraphicsItem *parent) - : SelectZone(_logic, parent), active(false), mirrored(_mirrored) +TableZone::TableZone(TableZoneLogic *_logic, QGraphicsItem *parent) : SelectZone(_logic, parent), active(false) { connect(_logic, &TableZoneLogic::contentSizeChanged, this, &TableZone::resizeToContents); connect(_logic, &TableZoneLogic::toggleTapped, this, &TableZone::toggleTapped); @@ -51,16 +50,12 @@ QRectF TableZone::boundingRect() const return QRectF(0, 0, width, height); } -void TableZone::setMirrored(bool isMirrored) -{ - mirrored = isMirrored; - update(); -} - bool TableZone::isInverted() const { - return ((mirrored && !SettingsCache::instance().getInvertVerticalCoordinate()) || - (!mirrored && SettingsCache::instance().getInvertVerticalCoordinate())); + return ((getLogic()->getPlayer()->getGraphicsItem()->getMirrored() && + !SettingsCache::instance().getInvertVerticalCoordinate()) || + (!getLogic()->getPlayer()->getGraphicsItem()->getMirrored() && + SettingsCache::instance().getInvertVerticalCoordinate())); } void TableZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/) @@ -113,9 +108,8 @@ void TableZone::paintLandDivider(QPainter *painter) // Place the line 2 grid heights down then back it off just enough to allow // some space between a 3-card stack and the land area. qreal separatorY = MARGIN_TOP + 2 * (CardDimensions::HEIGHT + PADDING_Y) - STACKED_CARD_OFFSET_Y / 2; - if (isInverted()) { + if (isInverted()) separatorY = height - separatorY; - } painter->setPen(QColor(255, 255, 255, 40)); painter->drawLine(QPointF(0, separatorY), QPointF(width, separatorY)); } @@ -163,9 +157,8 @@ void TableZone::reorganizeCards() for (int i = 0; i < getLogic()->getCards().size(); ++i) { QPoint gridPoint = getLogic()->getCards()[i]->getGridPos(); - if (gridPoint.x() == -1) { + if (gridPoint.x() == -1) continue; - } QPointF mapPoint = mapFromGrid(gridPoint); qreal x = mapPoint.x(); @@ -174,9 +167,8 @@ void TableZone::reorganizeCards() int numberAttachedCards = getLogic()->getCards()[i]->getAttachedCards().size(); qreal actualX = x + numberAttachedCards * STACKED_CARD_OFFSET_X; qreal actualY = y; - if (numberAttachedCards) { + if (numberAttachedCards) actualY += 15; - } getLogic()->getCards()[i]->setPos(actualX, actualY); getLogic()->getCards()[i]->setRealZValue(ZValues::tableCardZValue(actualX, actualY)); @@ -235,19 +227,16 @@ void TableZone::resizeToContents() int xMax = 0; // Find rightmost card position, which includes the left margin amount. - for (int i = 0; i < getLogic()->getCards().size(); ++i) { - if (getLogic()->getCards()[i]->pos().x() > xMax) { + for (int i = 0; i < getLogic()->getCards().size(); ++i) + if (getLogic()->getCards()[i]->pos().x() > xMax) xMax = (int)getLogic()->getCards()[i]->pos().x(); - } - } // Minimum width is the rightmost card position plus enough room for // another card with padding, then margin. currentMinimumWidth = xMax + (2 * CardDimensions::WIDTH) + PADDING_X + MARGIN_RIGHT; - if (currentMinimumWidth < MIN_WIDTH) { + if (currentMinimumWidth < MIN_WIDTH) currentMinimumWidth = MIN_WIDTH; - } if (currentMinimumWidth != width) { prepareGeometryChange(); @@ -258,11 +247,9 @@ void TableZone::resizeToContents() CardItem *TableZone::getCardFromGrid(const QPoint &gridPoint) const { - for (int i = 0; i < getLogic()->getCards().size(); i++) { - if (getLogic()->getCards().at(i)->getGridPoint() == gridPoint) { + for (int i = 0; i < getLogic()->getCards().size(); i++) + if (getLogic()->getCards().at(i)->getGridPoint() == gridPoint) return getLogic()->getCards().at(i); - } - } return 0; } @@ -279,9 +266,8 @@ void TableZone::computeCardStackWidths() QMap cardStackCount; for (int i = 0; i < getLogic()->getCards().size(); ++i) { const QPoint &gridPoint = getLogic()->getCards()[i]->getGridPos(); - if (gridPoint.x() == -1) { + if (gridPoint.x() == -1) continue; - } const int key = getCardStackMapKey(gridPoint.x() / 3, gridPoint.y()); cardStackCount.insert(key, cardStackCount.value(key, 0) + 1); @@ -291,18 +277,16 @@ void TableZone::computeCardStackWidths() cardStackWidth.clear(); for (int i = 0; i < getLogic()->getCards().size(); ++i) { const QPoint &gridPoint = getLogic()->getCards()[i]->getGridPos(); - if (gridPoint.x() == -1) { + if (gridPoint.x() == -1) continue; - } const int key = getCardStackMapKey(gridPoint.x() / 3, gridPoint.y()); const int stackCount = cardStackCount.value(key, 0); - if (stackCount == 1) { + if (stackCount == 1) cardStackWidth.insert(key, CardDimensions::WIDTH + getLogic()->getCards()[i]->getAttachedCards().size() * STACKED_CARD_OFFSET_X); - } else { + else cardStackWidth.insert(key, CardDimensions::WIDTH + (stackCount - 1) * STACKED_CARD_OFFSET_X); - } } } @@ -319,17 +303,15 @@ QPointF TableZone::mapFromGrid(QPoint gridPoint) const x += cardStackWidth.value(key, CardDimensions::WIDTH) + PADDING_X; } - if (isInverted()) { + if (isInverted()) gridPoint.setY(TABLEROWS - 1 - gridPoint.y()); - } // Start with margin plus stacked card offset y = MARGIN_TOP + (gridPoint.x() % 3) * STACKED_CARD_OFFSET_Y; // Add in card size and padding for each row - for (int i = 0; i < gridPoint.y(); ++i) { + for (int i = 0; i < gridPoint.y(); ++i) y += CardDimensions::HEIGHT + PADDING_Y; - } return QPointF(x, y); } @@ -348,9 +330,8 @@ QPoint TableZone::mapToGrid(const QPointF &mapPoint) const gridPointY = clampValidTableRow(gridPointY); - if (isInverted()) { + if (isInverted()) gridPointY = TABLEROWS - 1 - gridPointY; - } // Calculating the x-coordinate of the grid space requires adding up the // widths of each card stack along the row. @@ -386,23 +367,19 @@ QPointF TableZone::closestGridPoint(const QPointF &point) { QPoint gridPoint = mapToGrid(point); gridPoint.setX((gridPoint.x() / 3) * 3); - if (getCardFromGrid(gridPoint)) { + if (getCardFromGrid(gridPoint)) gridPoint.setX(gridPoint.x() + 1); - } - if (getCardFromGrid(gridPoint)) { + if (getCardFromGrid(gridPoint)) gridPoint.setX(gridPoint.x() + 1); - } return mapFromGrid(gridPoint); } int TableZone::clampValidTableRow(const int row) { - if (row < 0) { + if (row < 0) return 0; - } - if (row >= TABLEROWS) { + if (row >= TABLEROWS) return TABLEROWS - 1; - } return row; } diff --git a/cockatrice/src/game_graphics/zones/table_zone.h b/cockatrice/src/game/zones/table_zone.h similarity index 91% rename from cockatrice/src/game_graphics/zones/table_zone.h rename to cockatrice/src/game/zones/table_zone.h index 0d7e58206..7a53a9eb4 100644 --- a/cockatrice/src/game_graphics/zones/table_zone.h +++ b/cockatrice/src/game/zones/table_zone.h @@ -1,22 +1,23 @@ /** * @file table_zone.h * @ingroup GameGraphicsZones + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TABLEZONE_H #define TABLEZONE_H -#include "../../game/zones/table_zone_logic.h" #include "../board/abstract_card_item.h" +#include "logic/table_zone_logic.h" #include "select_zone.h" -/** - * @brief TableZone is the grid based rect where CardItems may be placed. - * +/* + * TableZone is the grid based rect where CardItems may be placed. * It is the main play zone and can be customized with background images. + * + * TODO: Refactor methods to make more readable, extract some logic to + * private methods (Im looking at you TableZone::reorganizeCards()) */ -//! \todo Refactor methods to make more readable, extract logic to private methods (especially reorganizeCards()). class TableZone : public SelectZone { Q_OBJECT @@ -82,7 +83,6 @@ private: If this TableZone is currently active */ bool active = false; - bool mirrored = false; [[nodiscard]] bool isInverted() const; @@ -97,7 +97,6 @@ public slots: Reorganizes CardItems in the TableZone */ void reorganizeCards() override; - void setMirrored(bool isMirrored); public: /** @@ -106,7 +105,7 @@ public: @param _p the Player @param parent defaults to null */ - explicit TableZone(TableZoneLogic *_logic, bool mirrored, QGraphicsItem *parent = nullptr); + explicit TableZone(TableZoneLogic *_logic, QGraphicsItem *parent = nullptr); /** @return a QRectF of the TableZone bounding box. diff --git a/cockatrice/src/game_graphics/zones/view_zone.cpp b/cockatrice/src/game/zones/view_zone.cpp similarity index 97% rename from cockatrice/src/game_graphics/zones/view_zone.cpp rename to cockatrice/src/game/zones/view_zone.cpp index baf7b8b30..d2fd1e971 100644 --- a/cockatrice/src/game_graphics/zones/view_zone.cpp +++ b/cockatrice/src/game/zones/view_zone.cpp @@ -1,10 +1,10 @@ #include "view_zone.h" -#include "../../game/player/player_actions.h" -#include "../../game/player/player_logic.h" -#include "../../game/zones/view_zone_logic.h" #include "../board/card_drag_item.h" #include "../board/card_item.h" +#include "../player/player.h" +#include "../player/player_actions.h" +#include "logic/view_zone_logic.h" #include #include @@ -203,9 +203,9 @@ ZoneViewZone::GridSize ZoneViewZone::positionCardsForDisplay(CardList &cards, Ca QString columnProp = extractor(c); if (i) { // if not the first card - if (columnProp == lastColumnProp) { + if (columnProp == lastColumnProp) row++; // add below current card - } else { // if no match then move card to next column + else { // if no match then move card to next column col++; row = 0; } @@ -233,9 +233,8 @@ ZoneViewZone::GridSize ZoneViewZone::positionCardsForDisplay(CardList &cards, Ca cols = qCeil((double)cardCount / minRows); } - if (cols < 2) { + if (cols < 2) cols = 2; - } qCDebug(ViewZoneLog) << "reorganizeCards: rows=" << rows << "cols=" << cols; diff --git a/cockatrice/src/game_graphics/zones/view_zone.h b/cockatrice/src/game/zones/view_zone.h similarity index 97% rename from cockatrice/src/game_graphics/zones/view_zone.h rename to cockatrice/src/game/zones/view_zone.h index 9dfa00ce2..81279c72e 100644 --- a/cockatrice/src/game_graphics/zones/view_zone.h +++ b/cockatrice/src/game/zones/view_zone.h @@ -1,13 +1,13 @@ /** * @file view_zone.h * @ingroup GameGraphicsZones + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef ZONEVIEWERZONE_H #define ZONEVIEWERZONE_H -#include "../../game/zones/view_zone_logic.h" +#include "logic/view_zone_logic.h" #include "select_zone.h" #include diff --git a/cockatrice/src/game_graphics/zones/view_zone_widget.cpp b/cockatrice/src/game/zones/view_zone_widget.cpp similarity index 96% rename from cockatrice/src/game_graphics/zones/view_zone_widget.cpp rename to cockatrice/src/game/zones/view_zone_widget.cpp index 14537a826..23d7d6a19 100644 --- a/cockatrice/src/game_graphics/zones/view_zone_widget.cpp +++ b/cockatrice/src/game/zones/view_zone_widget.cpp @@ -2,11 +2,11 @@ #include "../../client/settings/cache_settings.h" #include "../../filters/syntax_help.h" -#include "../../game/player/player_actions.h" -#include "../../game/player/player_logic.h" #include "../../interface/pixel_map_generator.h" #include "../board/card_item.h" #include "../game_scene.h" +#include "../player/player.h" +#include "../player/player_actions.h" #include "../z_values.h" #include "view_zone.h" @@ -37,7 +37,7 @@ constexpr qreal kMinVisibleWidth = 100.0; * @param _revealZone if false, the cards will be face down. * @param _writeableRevealZone whether the player can interact with the revealed cards. */ -ZoneViewWidget::ZoneViewWidget(PlayerLogic *_player, +ZoneViewWidget::ZoneViewWidget(Player *_player, CardZoneLogic *_origZone, int numberCards, bool _revealZone, @@ -75,11 +75,6 @@ ZoneViewWidget::ZoneViewWidget(PlayerLogic *_player, searchEditProxy->setZValue(ZValues::DRAG_ITEM); vbox->addItem(searchEditProxy); - // hide search bar if chat autofocus setting is enabled, since typing into it will no longer work anyway - searchEditProxy->setVisible(!SettingsCache::instance().getKeepGameChatFocus()); - connect(&SettingsCache::instance(), &SettingsCache::keepGameChatFocusChanged, searchEditProxy, - [searchEditProxy](bool keepFocus) { searchEditProxy->setVisible(!keepFocus); }); - // top row QGraphicsLinearLayout *hTopRow = new QGraphicsLinearLayout(Qt::Horizontal); @@ -257,9 +252,8 @@ void ZoneViewWidget::retranslateUi() void ZoneViewWidget::stopWindowDrag() { - if (!draggingWindow) { + if (!draggingWindow) return; - } draggingWindow = false; ungrabMouse(); @@ -318,15 +312,13 @@ QGraphicsView *ZoneViewWidget::findDragView(QWidget *eventWidget) const { QWidget *current = eventWidget; while (current) { - if (auto *view = qobject_cast(current)) { + if (auto *view = qobject_cast(current)) return view; - } current = current->parentWidget(); } - if (scene() && !scene()->views().isEmpty()) { + if (scene() && !scene()->views().isEmpty()) return scene()->views().constFirst(); - } return nullptr; } @@ -354,9 +346,8 @@ bool ZoneViewWidget::windowFrameEvent(QEvent *event) } auto *me = dynamic_cast(event); - if (!me) { + if (!me) return QGraphicsWidget::windowFrameEvent(event); - } switch (event->type()) { case QEvent::GraphicsSceneMousePress: @@ -515,9 +506,8 @@ void ZoneViewWidget::resizeToZoneContents(bool forceInitialHeight) zone->setGeometry(QRectF(0, -scrollBar->value(), zoneContainer->size().width(), totalZoneHeight)); - if (layout()) { + if (layout()) layout()->invalidate(); - } } void ZoneViewWidget::handleScrollBarChange(int value) @@ -531,9 +521,8 @@ void ZoneViewWidget::closeEvent(QCloseEvent *event) disconnect(zone, &ZoneViewZone::closed, this, 0); // manually call zone->close in order to remove it from the origZones views zone->close(); - if (shuffleCheckBox.isChecked()) { + if (shuffleCheckBox.isChecked()) player->getPlayerActions()->sendGameCommand(Command_Shuffle()); - } zoneDeleted(); event->accept(); } @@ -547,9 +536,8 @@ void ZoneViewWidget::zoneDeleted() void ZoneViewWidget::initStyleOption(QStyleOption *option) const { QStyleOptionTitleBar *titleBar = qstyleoption_cast(option); - if (titleBar) { + if (titleBar) titleBar->icon = QPixmap("theme:cockatrice"); - } } /** diff --git a/cockatrice/src/game_graphics/zones/view_zone_widget.h b/cockatrice/src/game/zones/view_zone_widget.h similarity index 95% rename from cockatrice/src/game_graphics/zones/view_zone_widget.h rename to cockatrice/src/game/zones/view_zone_widget.h index de5ad28d5..1246192b8 100644 --- a/cockatrice/src/game_graphics/zones/view_zone_widget.h +++ b/cockatrice/src/game/zones/view_zone_widget.h @@ -1,12 +1,12 @@ /** * @file view_zone_widget.h * @ingroup GameGraphicsZones + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef ZONEVIEWWIDGET_H #define ZONEVIEWWIDGET_H -#include "../../game/zones/card_zone_logic.h" +#include "logic/card_zone_logic.h" #include #include @@ -20,7 +20,7 @@ class QLabel; class QPushButton; class CardZone; class ZoneViewZone; -class PlayerLogic; +class Player; class CardDatabase; class QScrollBar; class GameScene; @@ -65,7 +65,7 @@ private: bool canBeShuffled; int extraHeight; - PlayerLogic *player; + Player *player; bool draggingWindow = false; QPoint dragStartScreenPos; @@ -108,7 +108,7 @@ private slots: void expandWindow(); public: - ZoneViewWidget(PlayerLogic *_player, + ZoneViewWidget(Player *_player, CardZoneLogic *_origZone, int numberCards = 0, bool _revealZone = false, @@ -119,7 +119,7 @@ public: { return zone; } - PlayerLogic *getPlayer() const + Player *getPlayer() const { return player; } diff --git a/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp b/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp index 8da8ab708..05f4a41ab 100644 --- a/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp +++ b/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp @@ -19,29 +19,27 @@ void AbstractGraphicsItem::paintNumberEllipse(int number, QFontMetrics fm(font); double w = 1.3 * fm.horizontalAdvance(numStr); double h = fm.height() * 1.3; - if (w < h) { + if (w < h) w = h; - } painter->setPen(QColor(255, 255, 255, 0)); painter->setBrush(QBrush(QColor(color))); QRectF textRect; - if (position == -1) { + if (position == -1) textRect = QRectF((boundingRect().width() - w) / 2.0, (boundingRect().height() - h) / 2.0, w, h); - } else { + else { qreal xOffset = 10; qreal yOffset = 20; qreal spacing = 2; - if (position < 2) { + if (position < 2) textRect = QRectF(count == 1 ? ((boundingRect().width() - w) / 2.0) : (position % 2 == 0 ? xOffset : (boundingRect().width() - xOffset - w)), yOffset, w, h); - } else { + else textRect = QRectF(count == 3 ? ((boundingRect().width() - w) / 2.0) : (position % 2 == 0 ? xOffset : (boundingRect().width() - xOffset - w)), yOffset + (spacing + h) * (position / 2), w, h); - } } painter->drawEllipse(textRect); diff --git a/cockatrice/src/game_graphics/board/abstract_graphics_item.h b/cockatrice/src/game_graphics/board/abstract_graphics_item.h index 287c2c0b3..93b9bff1b 100644 --- a/cockatrice/src/game_graphics/board/abstract_graphics_item.h +++ b/cockatrice/src/game_graphics/board/abstract_graphics_item.h @@ -1,8 +1,8 @@ /** * @file abstract_graphics_item.h * @ingroup GameGraphics + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef ABSTRACTGRAPHICSITEM_H #define ABSTRACTGRAPHICSITEM_H diff --git a/cockatrice/src/game_graphics/board/arrow_target.cpp b/cockatrice/src/game_graphics/board/arrow_target.cpp deleted file mode 100644 index 79b21d921..000000000 --- a/cockatrice/src/game_graphics/board/arrow_target.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "arrow_target.h" - -#include "../../game/player/player_logic.h" -#include "arrow_item.h" - -ArrowTarget::ArrowTarget(PlayerLogic *_owner, QGraphicsItem *parent) : AbstractGraphicsItem(parent), owner(_owner) -{ - setFlag(ItemSendsScenePositionChanges); -} - -void ArrowTarget::setBeingPointedAt(bool _beingPointedAt) -{ - beingPointedAt = _beingPointedAt; - update(); -} - -QVariant ArrowTarget::itemChange(GraphicsItemChange change, const QVariant &value) -{ - if (change == ItemScenePositionHasChanged) { - emit scenePositionChanged(); - } - return AbstractGraphicsItem::itemChange(change, value); -} \ No newline at end of file diff --git a/cockatrice/src/game_graphics/board/arrow_target.h b/cockatrice/src/game_graphics/board/arrow_target.h deleted file mode 100644 index bf89c5456..000000000 --- a/cockatrice/src/game_graphics/board/arrow_target.h +++ /dev/null @@ -1,47 +0,0 @@ -/** - * @file arrow_target.h - * @ingroup GameGraphics - */ -//! \todo Document this file. - -#ifndef ARROWTARGET_H -#define ARROWTARGET_H - -#include "abstract_graphics_item.h" - -#include - -class PlayerLogic; -class ArrowItem; - -class ArrowTarget : public AbstractGraphicsItem -{ - Q_OBJECT -protected: - PlayerLogic *owner; - -private: - bool beingPointedAt = false; - -signals: - void scenePositionChanged(); - -public: - explicit ArrowTarget(PlayerLogic *_owner, QGraphicsItem *parent = nullptr); - ~ArrowTarget() override = default; - - [[nodiscard]] PlayerLogic *getOwner() const - { - return owner; - } - - void setBeingPointedAt(bool _beingPointedAt); - [[nodiscard]] bool getBeingPointedAt() const - { - return beingPointedAt; - } - -protected: - QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; -}; -#endif diff --git a/cockatrice/src/game_graphics/board/graphics_item_type.h b/cockatrice/src/game_graphics/board/graphics_item_type.h index 7eac132b0..c48ae4ed6 100644 --- a/cockatrice/src/game_graphics/board/graphics_item_type.h +++ b/cockatrice/src/game_graphics/board/graphics_item_type.h @@ -1,8 +1,8 @@ /** * @file graphics_item_type.h * @ingroup GameGraphics + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_GRAPHICS_ITEM_TYPE_H #define COCKATRICE_GRAPHICS_ITEM_TYPE_H diff --git a/cockatrice/src/game_graphics/log/message_log_widget.h b/cockatrice/src/game_graphics/log/message_log_widget.h deleted file mode 100644 index a145d358d..000000000 --- a/cockatrice/src/game_graphics/log/message_log_widget.h +++ /dev/null @@ -1,109 +0,0 @@ -/** - * @file message_log_widget.h - * @ingroup GameWidgets - */ -//! \todo Document this file. - -#ifndef MESSAGELOGWIDGET_H -#define MESSAGELOGWIDGET_H - -#include "../../game/zones/card_zone_logic.h" -#include "../../interface/widgets/server/chat_view/chat_view.h" - -class AbstractGame; -class CardItem; -class GameEventContext; -class PlayerLogic; -class PlayerEventHandler; - -class MessageLogWidget : public ChatView -{ - Q_OBJECT -private: - enum MessageContext - { - MessageContext_None, - MessageContext_MoveCard, - MessageContext_Mulligan - }; - - MessageContext currentContext; - QString messagePrefix, messageSuffix; - - static QPair getFromStr(CardZoneLogic *zone, QString cardName, int position, bool ownerChange); - -public: - void connectToPlayerEventHandler(PlayerEventHandler *player); - MessageLogWidget(TabSupervisor *_tabSupervisor, AbstractGame *_game, QWidget *parent = nullptr); - -public slots: - void containerProcessingDone(); - void containerProcessingStarted(const GameEventContext &context); - void logAlwaysRevealTopCard(PlayerLogic *player, CardZoneLogic *zone, bool reveal); - void logAlwaysLookAtTopCard(PlayerLogic *player, CardZoneLogic *zone, bool reveal); - void logAttachCard(PlayerLogic *player, QString cardName, PlayerLogic *targetPlayer, QString targetCardName); - void logConcede(int playerId); - void logUnconcede(int playerId); - void logConnectionStateChanged(PlayerLogic *player, bool connectionState); - void logCreateArrow(PlayerLogic *player, - PlayerLogic *startPlayer, - QString startCard, - PlayerLogic *targetPlayer, - QString targetCard, - bool playerTarget); - void logCreateToken(PlayerLogic *player, QString cardName, QString pt, bool faceDown); - void logDeckSelect(PlayerLogic *player, QString deckHash, int sideboardSize); - void logDestroyCard(PlayerLogic *player, QString cardName); - void logDrawCards(PlayerLogic *player, int number, bool deckIsEmpty); - void logDumpZone(PlayerLogic *player, CardZoneLogic *zone, int numberCards, bool isReversed = false); - void logFlipCard(PlayerLogic *player, QString cardName, bool faceDown); - void logGameClosed(); - void logGameStart(); - void logGameFlooded(); - void logJoin(PlayerLogic *player); - void logJoinSpectator(QString name); - void logKicked(); - void logLeave(PlayerLogic *player, QString reason); - void logLeaveSpectator(QString name, QString reason); - void logNotReadyStart(PlayerLogic *player); - void logMoveCard(PlayerLogic *player, - CardItem *card, - CardZoneLogic *startZone, - int oldX, - CardZoneLogic *targetZone, - int newX); - void logMulligan(PlayerLogic *player, int number); - void logReplayStarted(int gameId); - void logReadyStart(PlayerLogic *player); - void logRevealCards(PlayerLogic *player, - CardZoneLogic *zone, - int cardId, - QString cardName, - PlayerLogic *otherPlayer, - bool faceDown, - int amount, - bool isLentToAnotherPlayer); - void logReverseTurn(PlayerLogic *player, bool reversed); - 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, 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, CardItem *card, bool doesntUntap); - void logSetPT(PlayerLogic *player, CardItem *card, QString newPT); - void logSetSideboardLock(PlayerLogic *player, bool locked); - 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); - void logUndoDraw(PlayerLogic *player, QString cardName); - void logUndoDrawFailed(PlayerLogic *player); - void setContextJudgeName(QString player); - void appendHtmlServerMessage(const QString &html, - bool optionalIsBold = false, - QString optionalFontColor = QString()) override; -}; - -#endif diff --git a/cockatrice/src/game_graphics/player/menu/player_menu.cpp b/cockatrice/src/game_graphics/player/menu/player_menu.cpp deleted file mode 100644 index 17b791222..000000000 --- a/cockatrice/src/game_graphics/player/menu/player_menu.cpp +++ /dev/null @@ -1,140 +0,0 @@ -#include "player_menu.h" - -#include "../../../game_graphics/zones/hand_zone.h" -#include "../../../game_graphics/zones/pile_zone.h" -#include "../../../game_graphics/zones/table_zone.h" -#include "../../../interface/widgets/tabs/tab_game.h" -#include "../../board/card_item.h" -#include "../player_graphics_item.h" -#include "card_menu.h" -#include "hand_menu.h" - -#include - -PlayerMenu::PlayerMenu(PlayerGraphicsItem *_player) : QObject(_player), player(_player) -{ - connect(player->getLogic(), &PlayerLogic::requestCardMenuUpdate, this, &PlayerMenu::updateCardMenu); - connect(this, &PlayerMenu::cardInfoRequested, player, &PlayerGraphicsItem::cardInfoRequested); - - playerMenu = new TearOffMenu(); - - if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) { - handMenu = addManagedMenu(player, playerMenu); - libraryMenu = addManagedMenu(player, playerMenu); - } else { - handMenu = nullptr; - libraryMenu = nullptr; - } - - graveMenu = addManagedMenu(player, playerMenu); - rfgMenu = addManagedMenu(player, playerMenu); - - if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) { - sideboardMenu = addManagedMenu(player, playerMenu); - customZonesMenu = addManagedMenu(player); - playerMenu->addSeparator(); - - countersMenu = playerMenu->addMenu(QString()); - - utilityMenu = createManagedComponent(player, playerMenu); - } else { - sideboardMenu = nullptr; - customZonesMenu = nullptr; - countersMenu = nullptr; - utilityMenu = nullptr; - } - - if (player->getLogic()->getPlayerInfo()->getLocal()) { - sayMenu = addManagedMenu(player); - } else { - sayMenu = nullptr; - } - - connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this, - &PlayerMenu::refreshShortcuts); - refreshShortcuts(); - - retranslateUi(); -} - -void PlayerMenu::setMenusForGraphicItems() -{ - player->getTableZoneGraphicsItem()->setMenu(playerMenu); - player->getGraveyardZoneGraphicsItem()->setMenu(graveMenu, graveMenu->aViewGraveyard); - player->getRfgZoneGraphicsItem()->setMenu(rfgMenu, rfgMenu->aViewRfg); - if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) { - player->getHandZoneGraphicsItem()->setMenu(handMenu); - player->getDeckZoneGraphicsItem()->setMenu(libraryMenu, libraryMenu->aDrawCard); - player->getSideboardZoneGraphicsItem()->setMenu(sideboardMenu); - } -} - -QMenu *PlayerMenu::updateCardMenu(const CardItem *card) -{ - if (!card) { - emit cardMenuUpdated(nullptr); - return nullptr; - } - - // 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()) || - player->getLogic()->getGame()->getActiveCard() != card) { - return nullptr; - } - - CardMenu *menu = new CardMenu(player, card, shortcutsActive); - connect(menu, &CardMenu::cardInfoRequested, this, &PlayerMenu::cardInfoRequested); - emit cardMenuUpdated(menu); - - return menu; -} - -void PlayerMenu::retranslateUi() -{ - playerMenu->setTitle(tr("Player \"%1\"").arg(player->getLogic()->getPlayerInfo()->getName())); - - for (auto *component : managedComponents) { - component->retranslateUi(); - } - - if (countersMenu) { - countersMenu->setTitle(tr("&Counters")); - } - - emit retranslateRequested(); -} - -void PlayerMenu::refreshShortcuts() -{ - if (shortcutsActive) { - // Judges get access to every player's menus but only want shortcuts to be set for their own. - if (player->getLogic()->getPlayerInfo()->getLocalOrJudge() && - !player->getLogic()->getPlayerInfo()->getLocal()) { - setShortcutsInactive(); - } else { - setShortcutsActive(); - } - } else { - setShortcutsInactive(); - } -} - -void PlayerMenu::setShortcutsActive() -{ - shortcutsActive = true; - for (auto *c : managedComponents) { - c->setShortcutsActive(); - } - emit shortcutsActivated(); -} - -void PlayerMenu::setShortcutsInactive() -{ - shortcutsActive = false; - for (auto *c : managedComponents) { - c->setShortcutsInactive(); - } - emit shortcutsDeactivated(); -} \ No newline at end of file diff --git a/cockatrice/src/game_graphics/player/player_dialogs.cpp b/cockatrice/src/game_graphics/player/player_dialogs.cpp deleted file mode 100644 index 95c225812..000000000 --- a/cockatrice/src/game_graphics/player/player_dialogs.cpp +++ /dev/null @@ -1,299 +0,0 @@ -#include "player_dialogs.h" - -#include "../../client/settings/card_counter_settings.h" -#include "../../interface/widgets/utility/get_text_with_max.h" -#include "../board/card_item.h" -#include "../dialogs/dlg_roll_dice.h" -#include "../player/player_graphics_item.h" - -#include -#include -#include - -PlayerDialogs::PlayerDialogs(PlayerGraphicsItem *_player, PlayerActions *_playerActions) - : QObject(_player), player(_player), playerActions(_playerActions) -{ - connect(playerActions, &PlayerActions::requestViewTopCardsDialog, this, - &PlayerDialogs::onViewTopCardsDialogRequested); - - connect(playerActions, &PlayerActions::requestViewBottomCardsDialog, this, - &PlayerDialogs::onViewBottomCardsDialogRequested); - - connect(playerActions, &PlayerActions::requestShuffleTopDialog, this, &PlayerDialogs::onShuffleTopDialogRequested); - - connect(playerActions, &PlayerActions::requestShuffleBottomDialog, this, - &PlayerDialogs::onShuffleBottomDialogRequested); - - connect(playerActions, &PlayerActions::requestMulliganDialog, this, &PlayerDialogs::onMulliganDialogRequested); - - connect(playerActions, &PlayerActions::requestDrawCardsDialog, this, &PlayerDialogs::onDrawCardsDialogRequested); - - connect(playerActions, &PlayerActions::requestMoveTopCardsToDialog, this, - &PlayerDialogs::onMoveTopCardsToDialogRequested); - - connect(playerActions, &PlayerActions::requestMoveTopCardsUntilDialog, this, - &PlayerDialogs::onMoveTopCardsUntilDialogRequested); - - connect(playerActions, &PlayerActions::requestMoveBottomCardsToDialog, this, - &PlayerDialogs::onMoveBottomCardsToDialogRequested); - - connect(playerActions, &PlayerActions::requestDrawBottomCardsDialog, this, - &PlayerDialogs::onDrawBottomCardsDialogRequested); - - connect(playerActions, &PlayerActions::requestRollDieDialog, this, &PlayerDialogs::onRollDieDialogRequested); - - connect(playerActions, &PlayerActions::requestCreateTokenDialog, this, - &PlayerDialogs::onCreateTokenDialogRequested); - - connect(playerActions, &PlayerActions::requestCreateRelatedFromRelationDialog, this, - &PlayerDialogs::onCreateRelatedFromRelationDialogRequested); - - connect(playerActions, &PlayerActions::requestMoveCardXCardsFromTopDialog, this, - &PlayerDialogs::onMoveCardXCardsFromTopDialogRequested); - - connect(playerActions, &PlayerActions::requestSetPTDialog, this, &PlayerDialogs::onSetPTDialogRequested); - - connect(playerActions, &PlayerActions::requestSetAnnotationDialog, this, - &PlayerDialogs::onSetAnnotationDialogRequested); - - connect(playerActions, &PlayerActions::requestSetCardCounterDialog, this, - &PlayerDialogs::onSetCardCounterDialogRequested); -} - -void PlayerDialogs::onViewTopCardsDialogRequested(int defaultNumberTopCards, int deckSize) -{ - bool ok; - int number = QInputDialog::getInt(dialogParent(), tr("View top cards of library"), - tr("Number of cards: (max. %1)").arg(deckSize), defaultNumberTopCards, 1, - deckSize, 1, &ok); - if (ok) { - playerActions->actViewTopCards(number); - } -} - -void PlayerDialogs::onViewBottomCardsDialogRequested(int defaultNumberBottomCards, int deckSize) -{ - bool ok; - int number = QInputDialog::getInt(dialogParent(), tr("View bottom cards of library"), - tr("Number of cards: (max. %1)").arg(deckSize), defaultNumberBottomCards, 1, - deckSize, 1, &ok); - if (ok) { - playerActions->actViewBottomCards(number); - } -} - -void PlayerDialogs::onShuffleTopDialogRequested(int defaultNumberTopCards, int maxCards) -{ - bool ok; - int number = QInputDialog::getInt(dialogParent(), tr("Shuffle top cards of library"), - tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberTopCards, 1, - maxCards, 1, &ok); - if (ok) { - playerActions->actShuffleTop(number); - } -} - -void PlayerDialogs::onShuffleBottomDialogRequested(int defaultNumberBottomCards, int maxCards) -{ - bool ok; - int number = QInputDialog::getInt(dialogParent(), tr("Shuffle bottom cards of library"), - tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberBottomCards, 1, - maxCards, 1, &ok); - if (ok) { - playerActions->actShuffleBottom(number); - } -} - -void PlayerDialogs::onMulliganDialogRequested(int startSize, int handSize, int deckSize) -{ - bool ok; - int number = QInputDialog::getInt(dialogParent(), tr("Draw hand"), - tr("Number of cards: (max. %1)").arg(deckSize) + '\n' + - tr("0 and lower are in comparison to current hand size"), - startSize, -handSize, deckSize, 1, &ok); - - if (ok) { - playerActions->actMulligan(number); - } -} - -void PlayerDialogs::onDrawCardsDialogRequested(int defaultNumberTopCards, int deckSize) -{ - bool ok; - int number = QInputDialog::getInt(dialogParent(), tr("Draw cards"), tr("Number of cards: (max. %1)").arg(deckSize), - defaultNumberTopCards, 1, deckSize, 1, &ok); - - if (ok) { - playerActions->actDrawCards(number); - } -} - -void PlayerDialogs::onMoveTopCardsToDialogRequested(int defaultNumberTopCards, - int maxCards, - const QString &targetZone, - const QString &zoneDisplayName, - bool faceDown) -{ - bool ok; - int number = QInputDialog::getInt(dialogParent(), tr("Move top cards to %1").arg(zoneDisplayName), - tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberTopCards, 1, - maxCards, 1, &ok); - if (ok) { - playerActions->moveTopCardsTo(number, targetZone, faceDown); - } -} - -void PlayerDialogs::onMoveTopCardsUntilDialogRequested(MoveTopCardsUntilOptions options) -{ - DlgMoveTopCardsUntil dlg(dialogParent(), options); - if (!dlg.exec()) { - return; - } - playerActions->moveTopCardsUntil(dlg.getExpr(), dlg.getOptions()); -} - -void PlayerDialogs::onMoveBottomCardsToDialogRequested(int defaultNumberBottomCards, - int maxCards, - const QString &targetZone, - const QString &zoneDisplayName, - bool faceDown) -{ - bool ok; - int number = QInputDialog::getInt(dialogParent(), tr("Move bottom cards to %1").arg(zoneDisplayName), - tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberBottomCards, 1, - maxCards, 1, &ok); - if (ok) { - playerActions->moveBottomCardsTo(number, targetZone, faceDown); - } -} - -void PlayerDialogs::onDrawBottomCardsDialogRequested(int defaultNumberBottomCards, int maxCards) -{ - bool ok; - int number = - QInputDialog::getInt(dialogParent(), tr("Draw bottom cards"), tr("Number of cards: (max. %1)").arg(maxCards), - defaultNumberBottomCards, 1, maxCards, 1, &ok); - if (ok) { - playerActions->actDrawBottomCards(number); - } -} - -void PlayerDialogs::onRollDieDialogRequested() -{ - DlgRollDice dlg(dialogParent()); - if (!dlg.exec()) { - return; - } - playerActions->actRollDie(dlg.getDieSideCount(), dlg.getDiceToRollCount()); -} - -void PlayerDialogs::onCreateRelatedFromRelationDialogRequested(const CardItem *sourceCard, - const CardRelation *cardRelation) -{ - if (sourceCard == nullptr || cardRelation == nullptr) { - playerActions->setLastRelatedCreationSucceeded(false); - return; - } - - int variableCount = cardRelation->getDefaultCount(); - - if (cardRelation->getIsVariable()) { - bool ok; - - emit requestDialogSemaphore(true); - - variableCount = QInputDialog::getInt(dialogParent(), tr("Create tokens"), tr("Number:"), - cardRelation->getDefaultCount(), 1, MAX_TOKENS_PER_DIALOG, 1, &ok); - - emit requestDialogSemaphore(false); - - if (!ok) { - playerActions->setLastRelatedCreationSucceeded(false); // cancelled - return; - } - } - - const bool succeeded = playerActions->createRelatedFromRelation(sourceCard, cardRelation, variableCount); - - playerActions->setLastRelatedCreationSucceeded(succeeded); - - if (succeeded) { - playerActions->onRelatedCardCreated(sourceCard, cardRelation); // only on confirmed success - } -} - -void PlayerDialogs::onCreateTokenDialogRequested(const QStringList &predefinedTokens) -{ - DlgCreateToken dlg(predefinedTokens, dialogParent()); - if (!dlg.exec()) { - return; - } - - playerActions->actCreateToken(dlg.getTokenInfo()); -} - -void PlayerDialogs::onMoveCardXCardsFromTopDialogRequested(int defaultNumberTopCardsToPlaceBelow, int deckSize) -{ - bool ok; - int number = - QInputDialog::getInt(dialogParent(), tr("Place card X cards from top of library"), - tr("Which position should this card be placed:") + "\n" + tr("(max. %1)").arg(deckSize), - defaultNumberTopCardsToPlaceBelow, 1, deckSize, 1, &ok); - number -= 1; // indexes start at 0 - - if (ok) { - playerActions->actMoveCardXCardsFromTop(player->getGameScene()->selectedCards(), number); - } -} - -void PlayerDialogs::onSetPTDialogRequested(const QString &oldPT) -{ - bool ok; - auto cards = player->getGameScene()->selectedCards(); - emit requestDialogSemaphore(true); - QString pt = getTextWithMax(dialogParent(), tr("Change power/toughness"), tr("Change stats to:"), QLineEdit::Normal, - oldPT, &ok); - emit requestDialogSemaphore(false); - - if (!ok || player->getLogic()->clearCardsToDelete()) { - return; - } - - playerActions->actSetPT(cards, pt); -} - -void PlayerDialogs::onSetAnnotationDialogRequested(const QString &oldAnnotation) -{ - auto cards = player->getGameScene()->selectedCards(); - emit requestDialogSemaphore(true); - AnnotationDialog *dialog = new AnnotationDialog(dialogParent()); - dialog->setOptions(QInputDialog::UsePlainTextEditForTextInput); - dialog->setWindowTitle(tr("Set annotation")); - dialog->setLabelText(tr("Please enter the new annotation:")); - dialog->setTextValue(oldAnnotation); - bool ok = dialog->exec(); - emit requestDialogSemaphore(false); - if (!ok || player->getLogic()->clearCardsToDelete()) { - return; - } - QString annotation = dialog->textValue().left(MAX_NAME_LENGTH); - playerActions->actSetAnnotation(cards, annotation); -} - -void PlayerDialogs::onSetCardCounterDialogRequested(int counterId, const QString &oldValueForDlg) -{ - auto cards = player->getGameScene()->selectedCards(); - emit requestDialogSemaphore(true); - - auto &cardCounterSettings = SettingsCache::instance().cardCounters(); - QString counterName = cardCounterSettings.displayName(counterId); - - AbstractCounterDialog dialog(counterName, oldValueForDlg, dialogParent()); - int ok = dialog.exec(); - - emit requestDialogSemaphore(false); - if (!ok || player->getLogic()->clearCardsToDelete()) { - return; - } - playerActions->actSetCardCounter(cards, counterId, dialog.textValue()); -} \ No newline at end of file diff --git a/cockatrice/src/game_graphics/player/player_dialogs.h b/cockatrice/src/game_graphics/player/player_dialogs.h deleted file mode 100644 index f87704f2d..000000000 --- a/cockatrice/src/game_graphics/player/player_dialogs.h +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef COCKATRICE_PLAYER_DIALOGS_H -#define COCKATRICE_PLAYER_DIALOGS_H -#include "../../game/player/player_actions.h" -#include "player_graphics_item.h" - -#include -#include - -class PlayerGraphicsItem; -class PlayerDialogs : public QObject -{ - - Q_OBJECT - -public: - explicit PlayerDialogs(PlayerGraphicsItem *player, PlayerActions *playerActions); - -signals: - void requestDialogSemaphore(bool active); - -public slots: - void onViewTopCardsDialogRequested(int defaultNumberTopCards, int deckSize); - void onViewBottomCardsDialogRequested(int defaultNumberBottomCards, int deckSize); - void onShuffleTopDialogRequested(int defaultNumberTopCards, int maxCards); - void onShuffleBottomDialogRequested(int defaultNumberBottomCards, int maxCards); - void onMulliganDialogRequested(int startSize, int handSize, int deckSize); - void onDrawCardsDialogRequested(int defaultNumberTopCards, int deckSize); - void onMoveTopCardsToDialogRequested(int defaultNumberTopCards, - int maxCards, - const QString &targetZone, - const QString &zoneDisplayName, - bool faceDown); - void onMoveTopCardsUntilDialogRequested(MoveTopCardsUntilOptions options); - void onMoveBottomCardsToDialogRequested(int defaultNumberBottomCards, - int maxCards, - const QString &targetZone, - const QString &zoneDisplayName, - bool faceDown); - void onDrawBottomCardsDialogRequested(int defaultNumberBottomCards, int maxCards); - void onRollDieDialogRequested(); - 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); - -private: - PlayerGraphicsItem *player; - PlayerActions *playerActions; - - QWidget *dialogParent() const - { - if (auto *s = player->scene()) { - if (auto *v = s->views().value(0)) { - return v->window(); - } - } - return nullptr; - } -}; - -#endif // COCKATRICE_PLAYER_DIALOGS_H diff --git a/cockatrice/src/game_graphics/tally/subtype_tally.cpp b/cockatrice/src/game_graphics/tally/subtype_tally.cpp deleted file mode 100644 index 804443b15..000000000 --- a/cockatrice/src/game_graphics/tally/subtype_tally.cpp +++ /dev/null @@ -1,77 +0,0 @@ -#include "subtype_tally.h" - -#include "../board/card_item.h" - -#include -#include - -namespace -{ - -/** @brief Extracts subtypes from a single card face's type line. */ -QStringList extractSubtypesFromFace(const QString &faceType) -{ - // Card type format: "Creature — Goblin Warrior" or "Legendary Enchantment — Saga" - QStringList parts = faceType.split(QStringLiteral(" — ")); - if (parts.size() > 1) { - return parts[1].split(QStringLiteral(" "), Qt::SkipEmptyParts); - } - return {}; -} - -/** @brief A single subtype (e.g., "Goblin", "Warrior") with its occurrence count. */ -struct SubtypeEntry -{ - QString name; - int count; -}; - -} // anonymous namespace - -namespace SubtypeTally -{ - -QList countSubtypes(const QList &cards) -{ - QMap subtypeCounts; - - for (CardItem *card : cards) { - if (card->getFaceDown() || card->getCard().isEmpty()) { - continue; - } - - QString cardType = card->getCardInfo().getCardType(); - // Handle double-faced cards: "Creature — Human // Creature — Werewolf" - QStringList cardFaces = cardType.split(QStringLiteral(" // ")); - - for (const QString &face : cardFaces) { - QStringList subtypes = extractSubtypesFromFace(face); - for (const QString &subtype : subtypes) { - subtypeCounts[subtype]++; - } - } - } - - QList entries; - for (auto it = subtypeCounts.constBegin(); it != subtypeCounts.constEnd(); ++it) { - entries.append({it.key(), it.value()}); - } - - // Sort by count ascending, then alphabetically (lowest counts at bottom of display) - std::sort(entries.begin(), entries.end(), [](const SubtypeEntry &a, const SubtypeEntry &b) { - if (a.count != b.count) { - return a.count < b.count; - } - return a.name < b.name; - }); - - // convert entries into TallyRows - QList rows; - rows.reserve(entries.size()); // for backwards compatibility with Qt5 - std::transform(entries.begin(), entries.end(), std::back_inserter(rows), - [](const SubtypeEntry &e) { return TallyRow{e.name, QString::number(e.count)}; }); - - return rows; -} - -} // namespace SubtypeTally diff --git a/cockatrice/src/game_graphics/tally/subtype_tally.h b/cockatrice/src/game_graphics/tally/subtype_tally.h deleted file mode 100644 index 9926528e0..000000000 --- a/cockatrice/src/game_graphics/tally/subtype_tally.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef COCKATRICE_SUBTYPE_TALLY_H -#define COCKATRICE_SUBTYPE_TALLY_H - -#include "tally.h" - -#include -#include - -class CardItem; - -/** - * @brief Extracts and tallies subtypes from selected cards. - */ -namespace SubtypeTally -{ -/** - * @brief Parses card type lines and counts each subtype occurrence. - * - * Skips face-down cards and cards without type info. - * @param cards The list of selected card items to analyze. - * @return Entries sorted by count ascending, then alphabetically. - */ -QList countSubtypes(const QList &cards); -} // namespace SubtypeTally - -#endif diff --git a/cockatrice/src/game_graphics/tally/tally.cpp b/cockatrice/src/game_graphics/tally/tally.cpp deleted file mode 100644 index 521417ae6..000000000 --- a/cockatrice/src/game_graphics/tally/tally.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "tally.h" - -#include "subtype_tally.h" - -QList Tally::compute(const QList &cards, const TallyType type) -{ - switch (type) { - case TallyType::None: - return {}; - case TallyType::Subtypes: - return SubtypeTally::countSubtypes(cards); - } - return {}; -} diff --git a/cockatrice/src/game_graphics/tally/tally.h b/cockatrice/src/game_graphics/tally/tally.h deleted file mode 100644 index 1ccb7939f..000000000 --- a/cockatrice/src/game_graphics/tally/tally.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef COCKATRICE_TALLY_H -#define COCKATRICE_TALLY_H -#include - -class CardItem; - -/** @brief A single row of the tally output. */ -struct TallyRow -{ - QString name; ///< The row name (displayed on the left) - QString value; ///< Value for the row (displayed on the right) - - bool operator==(const TallyRow &) const = default; -}; - -/** - * The tally type - */ -enum class TallyType -{ - None, - Subtypes, -}; - -namespace Tally -{ - -/** - * @brief Analyzes the selected cards according to the tally type and builds the resulting tally rows. - * This forwards the cards to the code for that tally type. - * - * @param cards The list of selected card items to analyze. - * @param type The type of tally to do - * @return Rows sorted in top-to-bottom display order - */ -QList compute(const QList &cards, TallyType type); - -} // namespace Tally - -#endif // COCKATRICE_TALLY_H diff --git a/cockatrice/src/game_graphics/zones/select_zone.cpp b/cockatrice/src/game_graphics/zones/select_zone.cpp deleted file mode 100644 index f2e720686..000000000 --- a/cockatrice/src/game_graphics/zones/select_zone.cpp +++ /dev/null @@ -1,288 +0,0 @@ -#include "select_zone.h" - -#include "../../client/settings/cache_settings.h" -#include "../board/card_item.h" -#include "../game_scene.h" - -#include -#include -#include - -static qreal stackingOffset(qreal cardHeight) -{ - const qreal overlapPercent = SettingsCache::instance().getStackCardOverlapPercent(); - return cardHeight * (100.0 - overlapPercent) / 100.0; -} - -SelectZone::ZoneLayout SelectZone::computeZoneLayout(const StackLayoutParams ¶ms) -{ - if (params.cardCount <= 0) { - return {0.0, 0.0}; - } - qreal effectiveOffset = params.desiredOffset; - if (params.cardCount > 1) { - qreal fitOffset; - if (params.totalHeight < params.cardHeight && params.minOffset > 0.0) { - // Zone is shorter than a card (e.g. minimized). Compress offsets so - // every card has at least minOffset pixels of its top visible. - fitOffset = (params.totalHeight - params.minOffset) / (params.cardCount - 1); - effectiveOffset = qMax(0.0, qMin(params.desiredOffset, fitOffset)); - } else { - qreal reservedForBottomCard; - if (params.allowBottomOverflow) { - // Allow the bottom card to partially overflow in tight zones, scaling the - // overflow allowance by sqrt(cardCount-1) so offsets decrease smoothly - // as cards are added rather than dropping by 1/(n-1) each time. - // The 0.75 ratio was tuned experimentally to balance card visibility vs. overflow. - constexpr qreal bottomCardZoneRatio = 0.75; - const qreal adjustedRatio = bottomCardZoneRatio / qSqrt(static_cast(params.cardCount - 1)); - reservedForBottomCard = qMin(params.cardHeight, params.totalHeight * adjustedRatio); - } else { - // No overflow: reserve full card height for the bottom card - reservedForBottomCard = params.cardHeight; - } - fitOffset = (params.totalHeight - reservedForBottomCard) / (params.cardCount - 1); - - if (!params.allowBottomOverflow) { - // Constrain offset so all card tops remain within zone bounds. - // With start=0, last card top at (cardCount-1) * effectiveOffset must be < totalHeight. - qreal maxOffsetForTops = params.totalHeight / (params.cardCount - 1); - fitOffset = qMin(fitOffset, maxOffsetForTops); - } - - // Apply minOffset only if it fits; otherwise compress further to keep all card tops visible. - effectiveOffset = qMin(params.desiredOffset, fitOffset); - if (fitOffset >= params.minOffset) { - effectiveOffset = qMax(params.minOffset, effectiveOffset); - } - } - } - qreal stackHeight = (params.cardCount - 1) * effectiveOffset + params.cardHeight; - qreal start = (stackHeight <= params.totalHeight) ? (params.totalHeight - stackHeight) / 2.0 : 0.0; - return {effectiveOffset, start}; -} - -SelectZone *SelectZone::findOwningSelectZone(const QGraphicsItem *card) -{ - QGraphicsItem *parent = card ? card->parentItem() : nullptr; - if (!parent) { - return nullptr; - } - // Card may be direct child of zone (escaped for hover) or child of clip container. - if (auto *zone = dynamic_cast(parent)) { - return zone; - } - if (auto *zone = dynamic_cast(parent->parentItem())) { - return zone; - } - return nullptr; -} - -SelectZone::StackLayoutParams SelectZone::buildStackParams(qreal minOffset) const -{ - const auto &cards = getLogic()->getCards(); - if (cards.isEmpty()) { - return {0, boundingRect().height(), 0.0, 0.0, minOffset}; - } - const auto cardCount = static_cast(cards.size()); - const qreal cardHeight = cards.at(0)->boundingRect().height(); - const qreal offset = stackingOffset(cardHeight); - return {cardCount, boundingRect().height(), cardHeight, offset, minOffset}; -} - -int SelectZone::calcDropIndexFromY(qreal dropY, qreal minOffset) const -{ - const auto &cards = getLogic()->getCards(); - if (cards.isEmpty()) { - return 0; - } - const auto params = buildStackParams(minOffset); - auto [effectiveOffset, start] = computeZoneLayout(params); - if (effectiveOffset <= 0.0) { - return 0; - } - return qBound(0, qRound((dropY - start) / effectiveOffset), params.cardCount - 1); -} - -void SelectZone::restoreStaleEscapedCards() -{ - if (!cardClipContainer) { - return; - } - 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. - if (card && card->parentItem() == this && !card->getIsHovered()) { - card->setParentItem(cardClipContainer); - } - } -} - -void SelectZone::layoutCardsVertically(const StackLayoutParams ¶ms) -{ - const auto &cards = getLogic()->getCards(); - if (cards.isEmpty() || params.cardCount <= 0) { - return; - } - if (params.cardCount > cards.size()) { - return; - } - - constexpr qreal xspace = 5; - const qreal cardWidth = cards.at(0)->boundingRect().width(); - const qreal totalWidth = boundingRect().width(); - const qreal x1 = xspace; - const qreal x2 = totalWidth - xspace - cardWidth; - const qreal xCentered = (totalWidth - cardWidth) / 2.0; - - auto [effectiveOffset, start] = computeZoneLayout(params); - for (int i = 0; i < params.cardCount; i++) { - CardItem *card = cards.at(i); - qreal y = start + i * effectiveOffset; - // Center single card; alternate left/right for multiple cards - qreal x = (params.cardCount == 1) ? xCentered : ((i % 2) ? x2 : x1); - card->setPos(x, y); - card->setRealZValue(i); - } -} - -SelectZone::SelectZone(CardZoneLogic *_logic, QGraphicsItem *parent) : CardZone(_logic, parent) -{ -} - -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 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); - } - } - } -} - -void SelectZone::onCardAdded(CardItem *addedCard) -{ - if (cardClipContainer && addedCard) { - addedCard->setParentItem(cardClipContainer); - addedCard->setVisible(true); - addedCard->update(); - } else { - CardZone::onCardAdded(addedCard); - } -} - -void SelectZone::setupClipContainer(std::optional zValue) -{ - if (cardClipContainer) { - return; - } - - setFlag(QGraphicsItem::ItemClipsChildrenToShape, false); - - cardClipContainer = new QGraphicsRectItem(this); // Owned by Qt parent-child tree; deleted with this zone. - cardClipContainer->setFlag(QGraphicsItem::ItemClipsChildrenToShape, true); - cardClipContainer->setPen(Qt::NoPen); - cardClipContainer->setBrush(Qt::NoBrush); - cardClipContainer->setRect(boundingRect()); - if (zValue.has_value()) { - cardClipContainer->setZValue(*zValue); - } -} - -void SelectZone::escapeClipForHover(QGraphicsItem *card) -{ - // Reparent from clip container to zone so the hover-scaled card is visible - // beyond clip bounds. Coordinates are identical because the clip container - // is at (0,0) with no transform relative to this zone. - if (cardClipContainer && card && card->parentItem() == cardClipContainer) { - card->setParentItem(this); - cardClipContainer->update(); - } -} - -void SelectZone::restoreClipAfterHover(QGraphicsItem *card) -{ - // Restore card to clip container. If card's parent is not this zone, - // a zone transition already reparented it via onCardAdded — skip. - if (cardClipContainer && card && card->parentItem() == this) { - card->setParentItem(cardClipContainer); - } -} - -void SelectZone::updateClipRect() -{ - if (cardClipContainer) { - cardClipContainer->setRect(boundingRect()); - } -} - -void SelectZone::mouseMoveEvent(QGraphicsSceneMouseEvent *event) -{ - if (event->buttons().testFlag(Qt::LeftButton)) { - QPointF pos = event->pos(); - if (pos.x() < 0) { - pos.setX(0); - } - QRectF br = boundingRect(); - if (pos.x() > br.width()) { - pos.setX(br.width()); - } - if (pos.y() < 0) { - pos.setY(0); - } - if (pos.y() > br.height()) { - pos.setY(br.height()); - } - - QRectF selectionRect = QRectF(selectionOrigin, pos).normalized(); - for (auto card : getLogic()->getCards()) { - if (card->getAttachedTo() && card->getAttachedTo()->getZone() != getLogic()) { - continue; - } - - bool inRect = selectionRect.intersects(card->mapRectToItem(this, card->boundingRect())); - if (inRect && !cardsInSelectionRect.contains(card)) { - // selection has just expanded to cover the card - cardsInSelectionRect.insert(card); - card->setSelected(!card->isSelected()); - } else if (!inRect && cardsInSelectionRect.contains(card)) { - // selection has just shrunk to no longer cover the card - cardsInSelectionRect.remove(card); - card->setSelected(!card->isSelected()); - } - } - static_cast(scene())->resizeRubberBand( - deviceTransform(static_cast(scene())->getViewportTransform()).map(pos), - cardsInSelectionRect.size()); - event->accept(); - } -} - -void SelectZone::mousePressEvent(QGraphicsSceneMouseEvent *event) -{ - if (event->button() == Qt::LeftButton) { - if (!event->modifiers().testFlag(Qt::ControlModifier)) { - scene()->clearSelection(); - } - - selectionOrigin = event->pos(); - static_cast(scene())->startRubberBand(event->scenePos()); - event->accept(); - } else { - CardZone::mousePressEvent(event); - } -} - -void SelectZone::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) -{ - selectionOrigin = QPoint(); - cardsInSelectionRect.clear(); - static_cast(scene())->stopRubberBand(); - event->accept(); -} diff --git a/cockatrice/src/game_graphics/zones/select_zone.h b/cockatrice/src/game_graphics/zones/select_zone.h deleted file mode 100644 index 7408f29b6..000000000 --- a/cockatrice/src/game_graphics/zones/select_zone.h +++ /dev/null @@ -1,148 +0,0 @@ -/** - * @file select_zone.h - * @ingroup GameGraphicsZones - * @brief Base class for zones where cards are laid out and individually interactable. - */ - -#ifndef SELECTZONE_H -#define SELECTZONE_H - -#include "card_zone.h" - -#include -#include - -class QGraphicsRectItem; - -/** - * A CardZone where the cards are laid out, with each card directly interactable by clicking. - */ -class SelectZone : public CardZone -{ - Q_OBJECT -public: - /** - * @brief Finds the SelectZone that owns a card, regardless of whether the card is parented - * to the zone directly or to its clip container. Returns nullptr if not in a SelectZone. - */ - static SelectZone *findOwningSelectZone(const QGraphicsItem *card); - - SelectZone(CardZoneLogic *logic, QGraphicsItem *parent = nullptr); - ~SelectZone() 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 - * bounds. Safe no-op if no clip container exists. Coordinates are preserved (clip container is at (0,0) with no - * transform). - */ - void escapeClipForHover(QGraphicsItem *card); - /** - * @brief Restores a hover-escaped card back to the clip container. Guards against zone transitions that already - * reparented the card. - */ - void restoreClipAfterHover(QGraphicsItem *card); - -private: - QPointF selectionOrigin; - QSet cardsInSelectionRect; - /** - * @brief Invisible clipping parent for cards; owned by Qt parent-child tree (parented to this zone). - * Created by setupClipContainer(); null when no clip container is active. - */ - QGraphicsRectItem *cardClipContainer = nullptr; - -protected: - // -- Layout computation -- - - /** @brief Parameters describing a vertical card stack's geometry. */ - struct StackLayoutParams - { - int cardCount; ///< Number of cards in the stack - qreal totalHeight; ///< Available height for the stack (zone height) - qreal cardHeight; ///< Height of a single card - qreal desiredOffset; ///< Preferred vertical offset between card tops - qreal minOffset = 0.0; ///< Minimum offset to preserve (0 allows full compression) - /** - * @brief When false (default), reserves full cardHeight for the bottom card, ensuring - * all cards remain within zone bounds. When true, allows the bottom card to - * partially overflow using sqrt-scaled allowance. Use with setupClipContainer() - * for zones too short to fit a full card. - */ - bool allowBottomOverflow = false; - }; - - /** @brief Result of computing a vertical stack layout. */ - struct ZoneLayout - { - qreal effectiveOffset; ///< Actual offset between card tops (may be compressed) - qreal start; ///< Y coordinate of the first card's top edge - }; - - /** @brief Minimum visible pixels of each card's top edge when stacking compresses offsets in tight zones. */ - static constexpr qreal MIN_CARD_VISIBLE = 10.0; - - /** - * @brief Computes layout for a vertical card stack (effective offset and start position). - * - * Three regimes: - * 1. Minimized zone (totalHeight < card height with minOffset > 0): offsets compress - * so each card retains at least minOffset visible pixels of its top edge. - * 2. Normal zone with allowBottomOverflow=false (default): the bottom card is - * guaranteed to fit within the zone boundary. Offsets compress as needed. - * 3. Normal zone with allowBottomOverflow=true: the bottom card may partially - * overflow. The overflow allowance is scaled by sqrt(cardCount-1) so that - * adding one card shifts existing cards smoothly. - * - * When the stack fits with room to spare, it is centered vertically. - */ - static ZoneLayout computeZoneLayout(const StackLayoutParams ¶ms); - - /** @brief Builds StackLayoutParams from the current card list and zone geometry. */ - StackLayoutParams buildStackParams(qreal minOffset = 0.0) const; - - /** - * @brief Computes the card index at a given y-coordinate within the zone's vertical layout. - * Returns 0 if the zone has no cards or the offset is zero. - */ - int calcDropIndexFromY(qreal dropY, qreal minOffset = 0.0) const; - - /** - * @brief Positions cards vertically with alternating left/right x-offsets. - * - * Cards alternate between left and right margins (5px padding from zone edges): - * even-indexed cards at left, odd-indexed at right. - * Cards are assigned ascending z-values. - * - * @param params Stack layout geometry parameters (use allowBottomOverflow to control overflow) - */ - void layoutCardsVertically(const StackLayoutParams ¶ms); - - // -- Clip container -- - // The clip container mechanism is available for future zones that need visual clipping - // (e.g., zones too short to fit a full card). To enable: call setupClipContainer() in the - // zone's constructor, and set allowBottomOverflow=true in layout params. - - /** - * @brief Restores any cards that were hover-escaped but whose hover state was not properly cleaned up. - * Call at the start of reorganizeCards() in zones that use a clip container. - */ - void restoreStaleEscapedCards(); - - /** - * @brief Creates a clip container child item that clips card overflow to zone bounds. - * Cards entering this zone are reparented to this container by the onCardAdded override. - * Disables zone-level child clipping; clipping is delegated to the container. - * @param zValue Optional z-value for the clip container (e.g. ZValues::CARD_BASE) - */ - void setupClipContainer(std::optional zValue = std::nullopt); - - /** @brief Updates the clip container rect to match this zone's current boundingRect(). */ - void updateClipRect(); - - void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; - void mousePressEvent(QGraphicsSceneMouseEvent *event) override; - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; -}; - -#endif 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 bd427a6c8..dbd51b973 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp @@ -150,10 +150,9 @@ void CardPictureLoader::getPixmap(QPixmap &pixmap, const ExactCard &card, QSize void CardPictureLoader::imageLoaded(const ExactCard &card, const QImage &image) { - QPixmap finalPixmap; - if (image.isNull()) { qCDebug(CardPictureLoaderLog) << "Caching NULL pixmap for" << card.getName(); + QPixmapCache::insert(card.getPixmapCacheKey(), QPixmap()); } else { if (card.getInfo().getUiAttributes().upsideDownArt) { #if (QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)) @@ -161,19 +160,12 @@ void CardPictureLoader::imageLoaded(const ExactCard &card, const QImage &image) #else QImage mirrorImage = image.mirrored(true, true); #endif - finalPixmap = QPixmap::fromImage(mirrorImage); + QPixmapCache::insert(card.getPixmapCacheKey(), QPixmap::fromImage(mirrorImage)); } else { - finalPixmap = QPixmap::fromImage(image); + QPixmapCache::insert(card.getPixmapCacheKey(), QPixmap::fromImage(image)); } } - QPixmapCache::insert(card.getPixmapCacheKey(), finalPixmap); - - if (SettingsCache::instance().getCardPictureLoaderCacheMethod() == - CardPictureLoaderCacheMethod::CacheMethod::FILESYSTEM_CACHE) { - saveCardImageToLocalStorage(card, finalPixmap); - } - // imageLoaded should only be reached if the exactCard isn't already in cache. // (plus there's a deduplication mechanism in CardPictureLoaderWorker) // It should be safe to connect the CardInfo here without worrying about redundant connections. @@ -183,88 +175,6 @@ void CardPictureLoader::imageLoaded(const ExactCard &card, const QImage &image) card.emitPixmapUpdated(); } -void CardPictureLoader::saveCardImageToLocalStorage(const ExactCard &card, const QPixmap &pixmap) -{ - if (pixmap.isNull() || !card) { - return; - } - - const QString picsRoot = SettingsCache::instance().getPicsPath(); - CardPictureLoaderLocalSchemes::NamingScheme scheme = - SettingsCache::instance().getLocalCardImageStorageNamingScheme(); - - QString pattern; - - for (const auto &s : CardPictureLoaderLocalSchemes::exportSchemes()) { - if (s.id == scheme) { - pattern = s.pattern; - break; - } - } - - if (picsRoot.isEmpty() || pattern.isEmpty()) { - return; - } - - // Base directory: /downloadedPics - QDir baseDir(picsRoot); - if (!baseDir.exists("downloadedPics")) { - baseDir.mkpath("downloadedPics"); - } - baseDir.cd("downloadedPics"); - - // Collect card metadata - const QString cardName = card.getInfo().getCorrectedName(); - - QString setName; - QString collectorNumber; - QString uuid; - - PrintingInfo printing = card.getPrinting(); - if (printing.getSet()) { - setName = printing.getSet()->getCorrectedShortName(); - collectorNumber = printing.getProperty("num"); - uuid = printing.getUuid(); - } - - // Build path from scheme - QString relativePath = - CardPictureLoaderLocalSchemes::expandPattern(pattern, cardName, setName, collectorNumber, uuid); - - if (relativePath.isEmpty()) { - return; - } - - // append extension - relativePath += ".png"; - - // Normalize slashes - relativePath = QDir::cleanPath(relativePath); - - QFileInfo outInfo(baseDir.filePath(relativePath)); - - // Do not overwrite existing files - if (outInfo.exists()) { - return; - } - - QDir outDir = outInfo.dir(); - - // Ensure directory exists - if (!outDir.exists()) { - if (!baseDir.mkpath(outDir.path())) { - qCWarning(CardPictureLoaderLog) << "Failed to create directory for downloaded card image:" << outDir.path(); - return; - } - } - - // Save image - QImage image = pixmap.toImage(); - if (!image.save(outInfo.absoluteFilePath(), "PNG")) { - qCWarning(CardPictureLoaderLog) << "Failed to save card image to" << outInfo.absoluteFilePath(); - } -} - void CardPictureLoader::clearPixmapCache() { QPixmapCache::clear(); @@ -320,9 +230,8 @@ bool CardPictureLoader::hasCustomArt() QFileInfo dir(it.next()); #endif - if (it.fileName() == "downloadedPics") { + if (it.fileName() == "downloadedPics") continue; - } QDirIterator subIt(it.filePath(), QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); if (subIt.hasNext()) { 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 0c114ae92..4000fd99a 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.h +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.h @@ -117,7 +117,6 @@ public slots: * @param image Loaded QImage. */ void imageLoaded(const ExactCard &card, const QImage &image); - void saveCardImageToLocalStorage(const ExactCard &card, const QPixmap &pixmap); private slots: /** diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_cache_method.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_cache_method.h deleted file mode 100644 index 54977e249..000000000 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_cache_method.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef COCKATRICE_CARD_PICTURE_LOADER_CACHE_METHOD_H -#define COCKATRICE_CARD_PICTURE_LOADER_CACHE_METHOD_H -#include -#include -#include - -namespace CardPictureLoaderCacheMethod -{ -enum class CacheMethod -{ - NETWORK_CACHE, - FILESYSTEM_CACHE -}; - -struct CacheMethodInfo -{ - CacheMethod id; - QString displayName; -}; - -static inline const QList methods() -{ - static QList all = { - {CacheMethod::NETWORK_CACHE, QCoreApplication::translate("CardPictureLoaderCacheMethod", "Network Cache")}, - {CacheMethod::FILESYSTEM_CACHE, QCoreApplication::translate("CardPictureLoaderCacheMethod", "Filesystem")}, - }; - return all; -} -} // namespace CardPictureLoaderCacheMethod - -#endif // COCKATRICE_CARD_PICTURE_LOADER_CACHE_METHOD_H diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp index bb10d1c42..dd00e6e1d 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp @@ -1,7 +1,6 @@ #include "card_picture_loader_local.h" #include "../../client/settings/cache_settings.h" -#include "card_picture_loader_local_schemes.h" #include "card_picture_to_load.h" #include @@ -78,8 +77,26 @@ QImage CardPictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName, imgReader.setDecideFormatFromContent(true); // Most-to-least specific, these will fall through in order. - QStringList nameVariants = - CardPictureLoaderLocalSchemes::generateImportVariants(correctedCardName, setName, collectorNumber, providerId); + QStringList nameVariants; + + // cardName_providerId + if (!providerId.isEmpty()) { + nameVariants << QString("%1-%2").arg(correctedCardName, providerId) + << QString("%1_%2").arg(correctedCardName, providerId); + } + // cardName_setName_collectorNumber & setName-collectorNumber-cardName + if (!setName.isEmpty() && !collectorNumber.isEmpty()) { + nameVariants << QString("%1_%2_%3").arg(correctedCardName, setName, collectorNumber) + << QString("%1-%2-%3").arg(setName, collectorNumber, correctedCardName); + } + // cardName_setName + if (!setName.isEmpty()) { + nameVariants << QString("%1_%2").arg(correctedCardName, setName) + << QString("%1-%2").arg(setName, correctedCardName); + } + + // cardName + nameVariants << correctedCardName; for (const QString &nameVariant : nameVariants) { if (nameVariant.isEmpty()) { diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local_schemes.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local_schemes.h deleted file mode 100644 index d51d646e6..000000000 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local_schemes.h +++ /dev/null @@ -1,116 +0,0 @@ -#ifndef COCKATRICE_CARD_PICTURE_LOADER_LOCAL_SCHEMES_H -#define COCKATRICE_CARD_PICTURE_LOADER_LOCAL_SCHEMES_H - -#include -#include -#include -#include - -namespace CardPictureLoaderLocalSchemes -{ - -enum class NamingScheme -{ - NameOnly, - Name_Set, - Name_Set_Collector, - Set_Collector_Name, - Name_ProviderId, - Set_Folder_Name_ProviderId, - Set_Folder_Name_Set_Collector -}; - -struct NamingSchemeInfo -{ - NamingScheme id; - QString displayName; - QString pattern; -}; - -inline const QList &importSchemes() -{ - static QList list = { - {NamingScheme::Name_ProviderId, "Card Name + Provider ID", "{name}_{providerId}"}, - {NamingScheme::Name_Set_Collector, "Card Name + Set + Collector", "{name}_{set}_{collector}"}, - {NamingScheme::Set_Collector_Name, "Set + Collector + Card Name", "{set}_{collector}_{name}"}, - {NamingScheme::Name_Set, "Card Name + Set", "{name}_{set}"}, - {NamingScheme::NameOnly, "Card Name", "{name}"}, - }; - return list; -} - -inline const QList &exportSchemes() -{ - static QList list = { - {NamingScheme::Set_Folder_Name_ProviderId, "Set Folder / Name + Provider ID", "{set}/{name}_{providerId}"}, - {NamingScheme::Set_Folder_Name_Set_Collector, "Set Folder / Name + Set Name + Collector", - "{set}/{name}_{set}_{collector}"}, - {NamingScheme::Name_ProviderId, "Card Name + Provider ID", "{name}_{providerId}"}, - {NamingScheme::Name_Set_Collector, "Card Name + Set + Collector", "{name}_{set}_{collector}"}, - {NamingScheme::Set_Collector_Name, "Set + Collector + Card Name", "{set}_{collector}_{name}"}, - }; - return list; -} - -inline QString expandPattern(const QString &pattern, - const QString &name, - const QString &set, - const QString &collector, - const QString &providerId) -{ - QString result = pattern; - - auto replaceIfPresent = [&](const QString &token, const QString &value) -> bool { - if (!result.contains(token)) { - return true; - } - - if (value.isEmpty()) { - return false; - } - - result.replace(token, value); - return true; - }; - - if (!replaceIfPresent("{name}", name)) { - return {}; - } - if (!replaceIfPresent("{set}", set)) { - return {}; - } - if (!replaceIfPresent("{collector}", collector)) { - return {}; - } - if (!replaceIfPresent("{providerId}", providerId)) { - return {}; - } - - return result; -} - -inline QStringList -generateImportVariants(const QString &name, const QString &set, const QString &collector, const QString &providerId) -{ - QStringList variants; - const QStringList separators = {"_", "-"}; - - for (const auto &scheme : importSchemes()) { - for (const QString &sep : separators) { - - QString pattern = scheme.pattern; - pattern.replace("_", sep); - - QString v = expandPattern(pattern, name, set, collector, providerId); - if (!v.isEmpty()) { - variants << v; - } - } - } - - return variants; -} - -} // namespace CardPictureLoaderLocalSchemes - -#endif // COCKATRICE_CARD_PICTURE_LOADER_LOCAL_SCHEMES_H \ No newline at end of file diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp index 2f51ba986..a246d74f2 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp @@ -26,15 +26,10 @@ CardPictureLoaderWorker::CardPictureLoaderWorker() cache->setCacheDirectory(SettingsCache::instance().getNetworkCachePath()); cache->setMaximumCacheSize(1024L * 1024L * static_cast(SettingsCache::instance().getNetworkCacheSizeInMB())); - - connect(&SettingsCache::instance(), &SettingsCache::networkCacheSizeChanged, cache, [this](int newSizeInMB) { - if (cache) { - cache->setMaximumCacheSize(1024L * 1024L * static_cast(newSizeInMB)); - } - }); - + // Note: the settings is in MB, but QNetworkDiskCache uses bytes + connect(&SettingsCache::instance(), &SettingsCache::networkCacheSizeChanged, this, + [this](int newSizeInMB) { cache->setMaximumCacheSize(1024L * 1024L * static_cast(newSizeInMB)); }); networkManager->setCache(cache); - // Use a ManualRedirectPolicy since we keep track of redirects in picDownloadFinished // We can't use NoLessSafeRedirectPolicy because it is not applied with AlwaysCache networkManager->setRedirectPolicy(QNetworkRequest::ManualRedirectPolicy); @@ -70,19 +65,14 @@ void CardPictureLoaderWorker::queueRequest(const QUrl &url, CardPictureLoaderWor QUrl cachedRedirect = getCachedRedirect(url); if (!cachedRedirect.isEmpty()) { queueRequest(cachedRedirect, worker); - return; - } - if (SettingsCache::instance().getCardPictureLoaderCacheMethod() == - CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE && - cache->metaData(url).isValid()) { - // If we hit a cached url, we get to make the request for free, since it won't contribute towards the - // rate-limit + } else if (cache->metaData(url).isValid()) { + // If we hit a cached url, we get to make the request for free, since it won't contribute towards the rate-limit makeRequest(url, worker); - return; + } else { + requestLoadQueue.append(qMakePair(url, worker)); + emit imageRequestQueued(url, worker->cardToDownload.getCard(), worker->cardToDownload.getSetName()); + processQueuedRequests(); } - requestLoadQueue.append(qMakePair(url, worker)); - emit imageRequestQueued(url, worker->cardToDownload.getCard(), worker->cardToDownload.getSetName()); - processQueuedRequests(); } QNetworkReply *CardPictureLoaderWorker::makeRequest(const QUrl &url, CardPictureLoaderWorkerWork *worker) @@ -97,12 +87,9 @@ QNetworkReply *CardPictureLoaderWorker::makeRequest(const QUrl &url, CardPicture QNetworkRequest req(url); req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING)); req.setRawHeader("Accept", "image/avif,image/webp,image/apng,image/,/*;q=0.8"); - - bool useNetworkCache = !picDownload && SettingsCache::instance().getCardPictureLoaderCacheMethod() == - CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE; - - req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, - useNetworkCache ? QNetworkRequest::AlwaysCache : QNetworkRequest::AlwaysNetwork); + if (!picDownload) { + req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysCache); + } QNetworkReply *reply = networkManager->get(req); diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp index 63846e5fd..d72226aab 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp @@ -53,19 +53,18 @@ QList CardPictureToLoad::extractSetsSorted(const ExactCard &card) * PrintingInfo for the set is returned. * * This method only exists to maintain existing behavior. + * TODO: check if going through all sets is still necessary after the ExactCard refactor. * * @param card The card to look in * @param setName The set's short name * @return A PrintingInfo, or a default-constructed PrintingInfo if the set name is not in the CardInfo. */ -//! \todo Check if going through all sets is still necessary after the ExactCard refactor. static PrintingInfo findPrintingForSet(const ExactCard &card, const QString &setName) { SetToPrintingsMap setsToPrintings = card.getInfo().getSets(); - if (!setsToPrintings.contains(setName)) { + if (!setsToPrintings.contains(setName)) return PrintingInfo(); - } for (const auto &printing : setsToPrintings[setName]) { if (printing.getUuid() == card.getPrinting().getUuid()) { diff --git a/cockatrice/src/interface/deck_loader/deck_loader.cpp b/cockatrice/src/interface/deck_loader/deck_loader.cpp index 39a0c1071..d71dca24a 100644 --- a/cockatrice/src/interface/deck_loader/deck_loader.cpp +++ b/cockatrice/src/interface/deck_loader/deck_loader.cpp @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -130,10 +129,7 @@ std::optional DeckLoader::loadFromRemote(const QString &nativeString std::optional DeckLoader::saveToFile(const DeckList &deck, const QString &fileName, DeckFileFormat::Format fmt) { - // Use QSaveFile so that a failed write (e.g. a full disk) leaves the existing deck untouched - // instead of truncating it to a 0-byte file. The target is only replaced once every byte has - // been flushed successfully in commit(). - QSaveFile file(fileName); + QFile file(fileName); if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { qCWarning(DeckLoaderLog) << "Could not create or open file:" << fileName; return std::nullopt; @@ -149,19 +145,15 @@ DeckLoader::saveToFile(const DeckList &deck, const QString &fileName, DeckFileFo break; } + file.flush(); + file.close(); + + qCInfo(DeckLoaderLog) << "Saved deck to " << fileName << "with format" << fmt << "-" << success; + if (!success) { - file.cancelWriting(); - qCWarning(DeckLoaderLog) << "Failed to serialize deck for file:" << fileName; return std::nullopt; } - if (!file.commit()) { - qCWarning(DeckLoaderLog) << "Failed to save deck to " << fileName << ":" << file.errorString(); - return std::nullopt; - } - - qCInfo(DeckLoaderLog) << "Saved deck to " << fileName << "with format" << fmt; - LoadedDeck::LoadInfo lastLoadInfo = {fileName, fmt}; return lastLoadInfo; } @@ -189,11 +181,6 @@ bool DeckLoader::saveToNewFile(LoadedDeck &deck, const QString &fileName, DeckFi */ bool DeckLoader::updateLastLoadedTimestamp(LoadedDeck &deck) { - // text format doesn't support lastLoadedTimestamp, so there's no point in proceeding - if (deck.lastLoadInfo.fileFormat != DeckFileFormat::Cockatrice) { - return false; - } - QString fileName = deck.lastLoadInfo.fileName; QFileInfo fileInfo(fileName); @@ -204,44 +191,45 @@ bool DeckLoader::updateLastLoadedTimestamp(LoadedDeck &deck) QDateTime originalTimestamp = fileInfo.lastModified(); - // Use QSaveFile so that a failed write (e.g. a full disk) cannot truncate an existing deck to a - // 0-byte file while merely bumping its timestamp. - QSaveFile file(fileName); + // Open the file for writing + QFile file(fileName); if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { qCWarning(DeckLoaderLog) << "Failed to open file for writing:" << fileName; return false; } + bool result = false; + // Perform file modifications - deck.deckList.setLastLoadedTimestamp(QDateTime::currentDateTime().toString()); - - if (!deck.deckList.saveToFile_Native(&file)) { - file.cancelWriting(); - qCWarning(DeckLoaderLog) << "Failed to serialize deck for file:" << fileName; - return false; + switch (deck.lastLoadInfo.fileFormat) { + case DeckFileFormat::PlainText: + result = deck.deckList.saveToFile_Plain(&file); + break; + case DeckFileFormat::Cockatrice: + deck.deckList.setLastLoadedTimestamp(QDateTime::currentDateTime().toString()); + result = deck.deckList.saveToFile_Native(&file); + break; } - if (!file.commit()) { - qCWarning(DeckLoaderLog) << "Failed to update timestamp for file:" << fileName << ":" << file.errorString(); - return false; + file.close(); // Close the file to ensure changes are flushed + + if (result) { + // Re-open the file and set the original timestamp + if (!file.open(QIODevice::ReadWrite)) { + qCWarning(DeckLoaderLog) << "Failed to re-open file to set timestamp:" << fileName; + return false; + } + + if (!file.setFileTime(originalTimestamp, QFileDevice::FileModificationTime)) { + qCWarning(DeckLoaderLog) << "Failed to set modification time for file:" << fileName; + file.close(); + return false; + } + + file.close(); } - // Re-open the file and restore the original timestamp, so that updating the lastLoadedTimestamp - // does not change the file's modification time. - QFile timestampFile(fileName); - if (!timestampFile.open(QIODevice::ReadWrite)) { - qCWarning(DeckLoaderLog) << "Failed to re-open file to set timestamp:" << fileName; - return false; - } - - if (!timestampFile.setFileTime(originalTimestamp, QFileDevice::FileModificationTime)) { - qCWarning(DeckLoaderLog) << "Failed to set modification time for file:" << fileName; - timestampFile.close(); - return false; - } - - timestampFile.close(); - return true; + return result; } static QString getDomainForWebsite(DeckLoader::DecklistWebsite website) @@ -441,7 +429,8 @@ void DeckLoader::saveToStream_DeckZoneCards(QTextStream &out, } if (addSetNameAndNumber) { if (!card->getCardSetShortName().isNull() && !card->getCardSetShortName().isEmpty()) { - out << " " << "(" << card->getCardSetShortName() << ")"; + out << " " + << "(" << card->getCardSetShortName() << ")"; } if (!card->getCardCollectorNumber().isNull()) { out << " " << card->getCardCollectorNumber(); @@ -458,54 +447,51 @@ bool DeckLoader::convertToCockatriceFormat(LoadedDeck &deck) return false; } - // Determine the format before touching any file, so an already-converted or - // unsupported deck never truncates or deletes anything. - switch (DeckFileFormat::getFormatFromName(fileName)) { - case DeckFileFormat::PlainText: - break; - case DeckFileFormat::Cockatrice: - qCInfo(DeckLoaderLog) << "File is already in Cockatrice format. No conversion needed."; - return true; - default: - qCWarning(DeckLoaderLog) << "Unsupported file format for conversion:" << fileName; - return false; - } - // Change the file extension to .cod QFileInfo fileInfo(fileName); QString newFileName = QDir::toNativeSeparators(fileInfo.path() + "/" + fileInfo.completeBaseName() + ".cod"); - // Use QSaveFile so a failed write (e.g. a full disk) cannot leave a 0-byte .cod - // behind and then delete the original deck. - QSaveFile file(newFileName); + // Open the new file for writing + QFile file(newFileName); if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { qCWarning(DeckLoaderLog) << "Failed to open file for writing:" << newFileName; return false; } - if (!deck.deckList.saveToFile_Native(&file)) { - file.cancelWriting(); - qCWarning(DeckLoaderLog) << "Failed to serialize deck for file:" << newFileName; - return false; + bool result = false; + + // Perform file modifications based on the detected format + switch (DeckFileFormat::getFormatFromName(fileName)) { + case DeckFileFormat::PlainText: + // Save in Cockatrice's native format + result = deck.deckList.saveToFile_Native(&file); + break; + case DeckFileFormat::Cockatrice: + qCInfo(DeckLoaderLog) << "File is already in Cockatrice format. No conversion needed."; + result = true; + break; + default: + qCWarning(DeckLoaderLog) << "Unsupported file format for conversion:" << fileName; + result = false; + break; } - if (!file.commit()) { - qCWarning(DeckLoaderLog) << "Failed to convert deck to " << newFileName << ":" << file.errorString(); - return false; + file.close(); + + // Delete the old file if conversion was successful + if (result) { + if (!QFile::remove(fileName)) { + qCWarning(DeckLoaderLog) << "Failed to delete original file:" << fileName; + } else { + qCInfo(DeckLoaderLog) << "Original file deleted successfully:" << fileName; + } + deck.lastLoadInfo = { + .fileName = newFileName, + .fileFormat = DeckFileFormat::Cockatrice, + }; } - // Conversion succeeded: delete the original file. - if (!QFile::remove(fileName)) { - qCWarning(DeckLoaderLog) << "Failed to delete original file:" << fileName; - } else { - qCInfo(DeckLoaderLog) << "Original file deleted successfully:" << fileName; - } - deck.lastLoadInfo = { - .fileName = newFileName, - .fileFormat = DeckFileFormat::Cockatrice, - }; - - return true; + return result; } void DeckLoader::printDeckListNode(QTextCursor *cursor, const InnerDecklistNode *node) diff --git a/cockatrice/src/interface/deck_loader/deck_loader.h b/cockatrice/src/interface/deck_loader/deck_loader.h index ac23e1ee0..c707c33dc 100644 --- a/cockatrice/src/interface/deck_loader/deck_loader.h +++ b/cockatrice/src/interface/deck_loader/deck_loader.h @@ -1,8 +1,8 @@ /** * @file deck_loader.h * @ingroup ImportExport + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DECK_LOADER_H #define DECK_LOADER_H diff --git a/cockatrice/src/interface/key_signals.cpp b/cockatrice/src/interface/key_signals.cpp index a78997cc2..b4a38fad5 100644 --- a/cockatrice/src/interface/key_signals.cpp +++ b/cockatrice/src/interface/key_signals.cpp @@ -6,33 +6,29 @@ bool KeySignals::eventFilter(QObject * /*object*/, QEvent *event) { QKeyEvent *kevent; - if (event->type() != QEvent::KeyPress) { + if (event->type() != QEvent::KeyPress) return false; - } kevent = static_cast(event); switch (kevent->key()) { case Qt::Key_Return: case Qt::Key_Enter: - if (kevent->modifiers().testFlag(Qt::AltModifier) && kevent->modifiers().testFlag(Qt::ControlModifier)) { + if (kevent->modifiers().testFlag(Qt::AltModifier) && kevent->modifiers().testFlag(Qt::ControlModifier)) emit onCtrlAltEnter(); - } else if (kevent->modifiers() & Qt::ControlModifier) { + else if (kevent->modifiers() & Qt::ControlModifier) emit onCtrlEnter(); - } else { + else emit onEnter(); - } break; case Qt::Key_Right: - if (kevent->modifiers() & Qt::ShiftModifier) { + if (kevent->modifiers() & Qt::ShiftModifier) emit onShiftRight(); - } break; case Qt::Key_Left: - if (kevent->modifiers() & Qt::ShiftModifier) { + if (kevent->modifiers() & Qt::ShiftModifier) emit onShiftLeft(); - } break; case Qt::Key_Delete: @@ -41,39 +37,33 @@ bool KeySignals::eventFilter(QObject * /*object*/, QEvent *event) break; case Qt::Key_Minus: - if (kevent->modifiers().testFlag(Qt::AltModifier) && kevent->modifiers().testFlag(Qt::ControlModifier)) { + if (kevent->modifiers().testFlag(Qt::AltModifier) && kevent->modifiers().testFlag(Qt::ControlModifier)) emit onCtrlAltMinus(); - } break; case Qt::Key_Equal: - if (kevent->modifiers().testFlag(Qt::AltModifier) && kevent->modifiers().testFlag(Qt::ControlModifier)) { + if (kevent->modifiers().testFlag(Qt::AltModifier) && kevent->modifiers().testFlag(Qt::ControlModifier)) emit onCtrlAltEqual(); - } break; case Qt::Key_BracketLeft: - if (kevent->modifiers().testFlag(Qt::AltModifier) && kevent->modifiers().testFlag(Qt::ControlModifier)) { + if (kevent->modifiers().testFlag(Qt::AltModifier) && kevent->modifiers().testFlag(Qt::ControlModifier)) emit onCtrlAltLBracket(); - } break; case Qt::Key_BracketRight: - if (kevent->modifiers().testFlag(Qt::AltModifier) && kevent->modifiers().testFlag(Qt::ControlModifier)) { + if (kevent->modifiers().testFlag(Qt::AltModifier) && kevent->modifiers().testFlag(Qt::ControlModifier)) emit onCtrlAltRBracket(); - } break; case Qt::Key_S: - if (kevent->modifiers() & Qt::ShiftModifier) { + if (kevent->modifiers() & Qt::ShiftModifier) emit onShiftS(); - } break; case Qt::Key_C: - if (kevent->modifiers() & Qt::ControlModifier) { + if (kevent->modifiers() & Qt::ControlModifier) emit onCtrlC(); - } break; default: diff --git a/cockatrice/src/interface/key_signals.h b/cockatrice/src/interface/key_signals.h index 30dcee0ba..3404dca9e 100644 --- a/cockatrice/src/interface/key_signals.h +++ b/cockatrice/src/interface/key_signals.h @@ -2,8 +2,8 @@ * @file key_signals.h * @ingroup Core * @ingroup UI + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef KEYSIGNALS_H #define KEYSIGNALS_H diff --git a/cockatrice/src/interface/layouts/flow_layout.cpp b/cockatrice/src/interface/layouts/flow_layout.cpp index 0d03b7789..f7ebbfb79 100644 --- a/cockatrice/src/interface/layouts/flow_layout.cpp +++ b/cockatrice/src/interface/layouts/flow_layout.cpp @@ -1,16 +1,7 @@ /** * @file flow_layout.cpp - * @brief Implementation of FlowLayout — a QLayout that wraps child widgets into rows - * (Qt::Horizontal flow) or columns (Qt::Vertical flow). - * - * Design contract (following Qt layout conventions): - * - setGeometry() places children inside the given rect. Nothing else. - * - sizeHint() reports the unconstrained preferred size (all items in one line). - * - minimumSize() reports the minimum size (largest single item). - * - heightForWidth() reports the height needed for a given width (horizontal flow only). - * - * The layout never calls setFixedSize() or adjustSize() on its parent widget; - * that is the responsibility of the parent widget / scroll area. + * @brief Implementation of the FlowLayout class, a custom layout for dynamically organizing widgets + * in rows within the constraints of available width or parent scroll areas. */ #include "flow_layout.h" @@ -21,18 +12,27 @@ #include #include #include -#include +/** + * @brief Constructs a FlowLayout instance with the specified parent widget, margin, and spacing values. + * @param parent The parent widget for this layout. + * @param margin The layout margin. + * @param hSpacing The horizontal spacing between items. + * @param vSpacing The vertical spacing between items. + */ FlowLayout::FlowLayout(QWidget *parent, - const Qt::Orientation flowDirection, + const Qt::Orientation _flowDirection, const int margin, const int hSpacing, const int vSpacing) - : QLayout(parent), flowDirection(flowDirection), horizontalMargin(hSpacing), verticalMargin(vSpacing) + : QLayout(parent), flowDirection(_flowDirection), horizontalMargin(hSpacing), verticalMargin(vSpacing) { setContentsMargins(margin, margin, margin, margin); } +/** + * @brief Destructor for FlowLayout, which cleans up all items in the layout. + */ FlowLayout::~FlowLayout() { QLayoutItem *item; @@ -42,353 +42,499 @@ FlowLayout::~FlowLayout() } /** - * @brief Reports which axis the layout can expand along. - * - * A horizontally-flowing layout expands horizontally (and wraps vertically, - * but that is governed by heightForWidth, not by this flag). - * A vertically-flowing layout expands vertically. + * @brief Indicates the layout's support for expansion in both horizontal and vertical directions. + * @return The orientations (Qt::Horizontal | Qt::Vertical) this layout can expand to fill. */ Qt::Orientations FlowLayout::expandingDirections() const { - return (flowDirection == Qt::Horizontal) ? Qt::Horizontal : Qt::Vertical; + return Qt::Horizontal | Qt::Vertical; } /** - * @brief Height-for-width is only meaningful for horizontal (wrapping) flow. + * @brief Indicates that this layout's height depends on its width. + * @return True, as the layout adjusts its height to fit the specified width. */ bool FlowLayout::hasHeightForWidth() const { - return flowDirection == Qt::Horizontal; + return true; } /** - * @brief Returns the height required to display all items within @p width. - * - * Only valid for horizontal flow; returns -1 otherwise so Qt ignores it. - * Spacing is counted once between adjacent items, never before the first - * or after the last. + * @brief Calculates the required height to display all items within the specified width. + * @param width The available width for arranging items. + * @return The total height needed to fit all items in rows constrained by the specified width. */ int FlowLayout::heightForWidth(const int width) const { - if (flowDirection != Qt::Horizontal) { - return -1; - } + if (flowDirection == Qt::Vertical) { + int height = 0; + int rowWidth = 0; + int rowHeight = 0; - int totalHeight = 0; - int rowUsedWidth = 0; - int rowHeight = 0; + for (const QLayoutItem *item : items) { + if (item == nullptr || item->isEmpty()) { + continue; + } - for (const QLayoutItem *item : items) { - if (!item || item->isEmpty()) { - continue; + int itemWidth = item->sizeHint().width() + horizontalSpacing(); + if (rowWidth + itemWidth > width) { + height += rowHeight + verticalSpacing(); + rowWidth = itemWidth; + rowHeight = item->sizeHint().height(); + } else { + rowWidth += itemWidth; + rowHeight = qMax(rowHeight, item->sizeHint().height()); + } } + height += rowHeight; // Add height of the last row + return height; + } else { + int width = 0; + int colWidth = 0; + int colHeight = 0; - const QSize itemSize = item->sizeHint(); - // Spacing is only inserted between items, not before the first. - const int spaceX = (rowUsedWidth > 0) ? horizontalSpacing() : 0; + for (const QLayoutItem *item : items) { + if (item == nullptr || item->isEmpty()) { + continue; + } - if (rowUsedWidth > 0 && rowUsedWidth + spaceX + itemSize.width() > width) { - // This item overflows the current row — commit the row and start a new one. - totalHeight += rowHeight + verticalSpacing(); - rowUsedWidth = itemSize.width(); - rowHeight = itemSize.height(); - } else { - rowUsedWidth += spaceX + itemSize.width(); - rowHeight = qMax(rowHeight, itemSize.height()); + int itemHeight = item->sizeHint().height(); + if (colHeight + itemHeight > width) { + width += colWidth; + colHeight = itemHeight; + colWidth = item->sizeHint().width(); + } else { + colHeight += itemHeight; + colWidth = qMax(colWidth, item->sizeHint().width()); + } } + width += colWidth; // Add width of the last column + return width; } - - return totalHeight + rowHeight; // Include the final (possibly only) row. } /** - * @brief Places all children within @p rect. - * - * This is the only method that may move/resize children. It does NOT resize - * the parent widget; that would break Qt's layout protocol. + * @brief Arranges layout items in rows within the specified rectangle bounds. + * @param rect The area within which to position layout items. */ void FlowLayout::setGeometry(const QRect &rect) { - QLayout::setGeometry(rect); + QLayout::setGeometry(rect); // Sets the geometry of the layout based on the given rectangle. if (flowDirection == Qt::Horizontal) { - layoutAllRows(rect.x(), rect.y(), rect.width()); + // If we have a parent scroll area, we're clamped to that, else we use our own rectangle. + const int availableWidth = getParentScrollAreaWidth() == 0 ? rect.width() : getParentScrollAreaWidth(); + + const int totalHeight = layoutAllRows(rect.x(), rect.y(), availableWidth); + + if (QWidget *parentWidgetPtr = parentWidget()) { + parentWidgetPtr->setFixedSize(availableWidth, totalHeight); + } } else { - layoutAllColumns(rect.x(), rect.y(), rect.height()); + const int availableHeight = qMax(rect.height(), getParentScrollAreaHeight()); + + const int totalWidth = layoutAllColumns(rect.x(), rect.y(), availableHeight); + + if (QWidget *parentWidgetPtr = parentWidget()) { + parentWidgetPtr->setFixedSize(totalWidth, availableHeight); + } } } -QSize FlowLayout::sizeHint() const -{ - return (flowDirection == Qt::Horizontal) ? calculateSizeHintHorizontal() : calculateSizeHintVertical(); -} - -QSize FlowLayout::minimumSize() const -{ - return (flowDirection == Qt::Horizontal) ? calculateMinimumSizeHorizontal() : calculateMinimumSizeVertical(); -} - -// ─── Row layout (horizontal flow) ──────────────────────────────────────────── - /** - * @brief Places all items into wrapping rows within @p availableWidth. - * @return The y-coordinate of the bottom edge of the last row. + * @brief Lays out items into rows according to the available width, starting from a given origin. + * Each row is arranged within `availableWidth`, wrapping to a new row as necessary. + * @param originX The x-coordinate for the layout start position. + * @param originY The y-coordinate for the layout start position. + * @param availableWidth The width within which each row is constrained. + * @return The total height after arranging all rows. */ int FlowLayout::layoutAllRows(const int originX, const int originY, const int availableWidth) { - QVector rowItems; - int rowUsedWidth = 0; // Width consumed by items already in the current row. - int currentY = originY; - int rowHeight = 0; + QVector rowItems; // Holds items for the current row + int currentXPosition = originX; // Tracks the x-coordinate while placing items + int currentYPosition = originY; // Tracks the y-coordinate, moving down after each row + + int rowHeight = 0; // Tracks the maximum height of items in the current row for (QLayoutItem *item : items) { - if (!item || item->isEmpty()) { + if (item == nullptr || item->isEmpty()) { continue; } - const QSize itemSize = item->sizeHint(); - // No leading space for the first item in a row. - const int spaceX = rowItems.isEmpty() ? 0 : horizontalSpacing(); + QSize itemSize = item->sizeHint(); // The suggested size for the current item + int itemWidth = itemSize.width() + horizontalSpacing(); // Item width plus spacing - if (!rowItems.isEmpty() && rowUsedWidth + spaceX + itemSize.width() > availableWidth) { - // Current item does not fit — flush the current row, begin a new one. - layoutSingleRow(rowItems, originX, currentY, availableWidth); - rowItems.clear(); - currentY += rowHeight + verticalSpacing(); - rowUsedWidth = 0; - rowHeight = 0; + // Check if the current item fits in the remaining width of the current row + if (currentXPosition + itemWidth > availableWidth) { + // If not, layout the current row and start a new row + layoutSingleRow(rowItems, originX, currentYPosition); + rowItems.clear(); // Reset the list for the new row + currentXPosition = originX; // Reset x-position to the row's start + currentYPosition += rowHeight + verticalSpacing(); // Move y-position down to the next row + rowHeight = 0; // Reset row height for the new row } // Add the item to the current row rowItems.append(item); - // `rowItems.size() > 1` is equivalent to "this is not the first item in the row" - // because we just appended above. - rowUsedWidth += (rowItems.size() > 1 ? horizontalSpacing() : 0) + itemSize.width(); - rowHeight = qMax(rowHeight, itemSize.height()); + rowHeight = qMax(rowHeight, itemSize.height()); // Update the row's height to the tallest item + currentXPosition += itemWidth + horizontalSpacing(); // Move x-position for the next item } - layoutSingleRow(rowItems, originX, currentY, availableWidth); // Flush the final row. - return currentY + rowHeight; + // Layout the final row if there are any remaining items + layoutSingleRow(rowItems, originX, currentYPosition); + + // Return the total height used, including the last row's height + return currentYPosition + rowHeight; } /** - * @brief Sets the geometry for every item in @p rowItems, starting at (@p x, @p y). - * - * Items whose horizontal size policy includes the Expand or MinimumExpanding flag - * share the leftover row width proportionally (like QHBoxLayout stretch), so that - * e.g. a QLineEdit can fill remaining space while fixed-size buttons stay compact. - * - * Items without an expanding policy are placed at their sizeHint, clamped to maximumSize. + * @brief Arranges a single row of items within specified x and y starting positions. + * @param rowItems A list of items to be arranged in the row. + * @param x The starting x-coordinate for the row. + * @param y The starting y-coordinate for the row. */ -void FlowLayout::layoutSingleRow(const QVector &rowItems, int x, const int y, const int availableWidth) +void FlowLayout::layoutSingleRow(const QVector &rowItems, int x, const int y) { - if (rowItems.isEmpty()) { - return; - } - - // ── Pass 1: measure fixed width and count expanding items ──────────────── - int fixedWidth = 0; - int expandingCount = 0; - int spacingTotal = (rowItems.size() - 1) * horizontalSpacing(); - for (QLayoutItem *item : rowItems) { - if (!item || item->isEmpty()) { + if (item == nullptr || item->isEmpty()) { continue; } - QWidget *widget = item->widget(); - const QSizePolicy::Policy hPolicy = widget ? widget->sizePolicy().horizontalPolicy() : QSizePolicy::Fixed; - - if (hPolicy & QSizePolicy::ExpandFlag) { - ++expandingCount; - } else { - const int maxW = widget ? widget->maximumWidth() : QWIDGETSIZE_MAX; - fixedWidth += qMin(item->sizeHint().width(), maxW); - } - } - - // Extra pixels to share among expanding items (never negative). - const int extra = qMax(0, availableWidth - spacingTotal - fixedWidth); - const int expandingShare = (expandingCount > 0) ? extra / expandingCount : 0; - - // ── Pass 2: place items ────────────────────────────────────────────────── - for (QLayoutItem *item : rowItems) { - if (!item || item->isEmpty()) { - continue; - } - - QWidget *widget = item->widget(); - if (!widget) { - continue; - } - - const QSizePolicy::Policy hPolicy = widget->sizePolicy().horizontalPolicy(); - const QSize maxSize = widget->maximumSize(); - const bool expands = hPolicy & QSizePolicy::ExpandFlag; - - const int itemWidth = - expands ? qMin(expandingShare, maxSize.width()) : qMin(item->sizeHint().width(), maxSize.width()); - const int itemHeight = qMin(item->sizeHint().height(), maxSize.height()); - + // Get the maximum allowed size for the item + QSize itemMaxSize = item->widget()->maximumSize(); + // Constrain the item's width and height to its size hint or maximum size + const int itemWidth = qMin(item->sizeHint().width(), itemMaxSize.width()); + const int itemHeight = qMin(item->sizeHint().height(), itemMaxSize.height()); + // Set the item's geometry based on the computed size and position item->setGeometry(QRect(QPoint(x, y), QSize(itemWidth, itemHeight))); + // Move the x-position to the right, leaving space for horizontal spacing x += itemWidth + horizontalSpacing(); } } -// ─── Column layout (vertical flow) ─────────────────────────────────────────── - /** - * @brief Places all items into wrapping columns within @p availableHeight. - * @return The x-coordinate of the right edge of the last column. + * @brief Lays out items into columns according to the available height, starting from a given origin. + * Each column is arranged within `availableHeight`, wrapping to a new column as necessary. + * @param originX The x-coordinate for the layout start position. + * @param originY The y-coordinate for the layout start position. + * @param availableHeight The height within which each column is constrained. + * @return The total width after arranging all columns. */ int FlowLayout::layoutAllColumns(const int originX, const int originY, const int availableHeight) { - QVector colItems; - int colUsedHeight = 0; // Height consumed by items already in the current column. - int currentX = originX; - int colWidth = 0; + QVector colItems; // Holds items for the current column + int currentXPosition = originX; // Tracks the x-coordinate while placing items + int currentYPosition = originY; // Tracks the y-coordinate, resetting for each new column + + int colWidth = 0; // Tracks the maximum width of items in the current column for (QLayoutItem *item : items) { - if (!item || item->isEmpty()) { + if (item == nullptr || item->isEmpty()) { continue; } - const QSize itemSize = item->sizeHint(); - // No leading space for the first item in a column. - const int spaceY = colItems.isEmpty() ? 0 : verticalSpacing(); + QSize itemSize = item->sizeHint(); // The suggested size for the current item - if (!colItems.isEmpty() && colUsedHeight + spaceY + itemSize.height() > availableHeight) { - // Current item does not fit — flush the current column, begin a new one. - layoutSingleColumn(colItems, currentX, originY); - colItems.clear(); - currentX += colWidth + horizontalSpacing(); - colUsedHeight = 0; - colWidth = 0; + // Check if the current item fits in the remaining height of the current column + if (currentYPosition + itemSize.height() > availableHeight) { + // If not, layout the current column and start a new column + layoutSingleColumn(colItems, currentXPosition, originY); + colItems.clear(); // Reset the list for the new column + currentYPosition = originY; // Reset y-position to the column's start + currentXPosition += colWidth; // Move x-position to the next column + colWidth = 0; // Reset column width for the new column } + // Add the item to the current column colItems.append(item); - colUsedHeight += (colItems.size() > 1 ? verticalSpacing() : 0) + itemSize.height(); - colWidth = qMax(colWidth, itemSize.width()); + colWidth = qMax(colWidth, itemSize.width()); // Update the column's width to the widest item + currentYPosition += itemSize.height(); // Move y-position for the next item } - layoutSingleColumn(colItems, currentX, originY); // Flush the final column. - return currentX + colWidth; + // Layout the final column if there are any remaining items + layoutSingleColumn(colItems, currentXPosition, originY); + + // Return the total width used, including the last column's width + return currentXPosition + colWidth; } /** - * @brief Sets the geometry for every item in @p colItems, starting at (@p x, @p y). - * - * Each item is placed at its sizeHint, clamped to its maximumSize. + * @brief Arranges a single column of items within specified x and y starting positions. + * @param colItems A list of items to be arranged in the column. + * @param x The starting x-coordinate for the column. + * @param y The starting y-coordinate for the column. */ void FlowLayout::layoutSingleColumn(const QVector &colItems, const int x, int y) { for (QLayoutItem *item : colItems) { - if (!item || item->isEmpty()) { - qCDebug(FlowLayoutLog) << "Skipping null or empty item in column."; + if (item == nullptr) { + qCDebug(FlowLayoutLog) << "Item is null."; continue; } + if (item->isEmpty()) { + qCDebug(FlowLayoutLog) << "Skipping empty item."; + continue; + } + + // Debugging: Print the item's widget class name and size hint QWidget *widget = item->widget(); - if (!widget) { - qCDebug(FlowLayoutLog) << "Item has no widget; skipping."; - continue; + if (widget) { + qCDebug(FlowLayoutLog) << "Widget class:" << widget->metaObject()->className(); + qCDebug(FlowLayoutLog) << "Widget size hint:" << widget->sizeHint(); + qCDebug(FlowLayoutLog) << "Widget maximum size:" << widget->maximumSize(); + qCDebug(FlowLayoutLog) << "Widget minimum size:" << widget->minimumSize(); + + // Debugging: Print child widgets + const QObjectList &children = widget->children(); + qCDebug(FlowLayoutLog) << "Child widgets:"; + for (QObject *child : children) { + if (QWidget *childWidget = qobject_cast(child)) { + qCDebug(FlowLayoutLog) << " - Child widget class:" << childWidget->metaObject()->className(); + qCDebug(FlowLayoutLog) << " Size hint:" << childWidget->sizeHint(); + qCDebug(FlowLayoutLog) << " Maximum size:" << childWidget->maximumSize(); + } + } + } else { + qCDebug(FlowLayoutLog) << "Item does not have a widget."; } - qCDebug(FlowLayoutLog) << "Widget:" << widget->metaObject()->className() << "sizeHint:" << widget->sizeHint() - << "maximumSize:" << widget->maximumSize() << "minimumSize:" << widget->minimumSize(); - - const QSize maxSize = widget->maximumSize(); - const int itemWidth = qMin(item->sizeHint().width(), maxSize.width()); - const int itemHeight = qMin(item->sizeHint().height(), maxSize.height()); - - qCDebug(FlowLayoutLog) << "Placing at x=" << x << "y=" << y << "w=" << itemWidth << "h=" << itemHeight; + // Get the maximum allowed size for the item + QSize itemMaxSize = widget->maximumSize(); + // Constrain the item's width and height to its size hint or maximum size + const int itemWidth = qMin(item->sizeHint().width(), itemMaxSize.width()); + const int itemHeight = qMin(item->sizeHint().height(), itemMaxSize.height()); + // Debugging: Print the computed geometry + qCDebug(FlowLayoutLog) << "Computed geometry: x=" << x << ", y=" << y << ", width=" << itemWidth + << ", height=" << itemHeight; // Set the item's geometry based on the computed size and position item->setGeometry(QRect(QPoint(x, y), QSize(itemWidth, itemHeight))); - y += itemHeight + verticalSpacing(); + + // Move the y-position down by the item's height to place the next item below + y += itemHeight; } } /** - * @brief Preferred size for horizontal flow: all items in a single row (unconstrained). - * - * The actual displayed height is determined by heightForWidth() once Qt knows the - * real available width. + * @brief Calculates the preferred size of the layout based on the flow direction. + * @return A QSize representing the ideal dimensions of the layout. + */ +QSize FlowLayout::sizeHint() const +{ + if (flowDirection == Qt::Horizontal) { + return calculateSizeHintHorizontal(); + } else { + return calculateSizeHintVertical(); + } +} + +/** + * @brief Calculates the minimum size required by the layout based on the flow direction. + * @return A QSize representing the minimum required dimensions. + */ +QSize FlowLayout::minimumSize() const +{ + if (flowDirection == Qt::Horizontal) { + return calculateMinimumSizeHorizontal(); + } else { + return calculateMinimumSizeVertical(); + } +} + +/** + * @brief Calculates the size hint for horizontal flow direction. + * @return A QSize representing the preferred dimensions. */ QSize FlowLayout::calculateSizeHintHorizontal() const { - int totalWidth = 0; - int maxHeight = 0; + int maxWidth = 0; // Tracks the maximum width needed + int totalHeight = 0; // Tracks the total height across all rows + int rowHeight = 0; // Tracks the height of the current row + int currentWidth = 0; // Tracks the current row's width - for (const QLayoutItem *item : items) { - if (!item || item->isEmpty()) { - continue; - } - const QSize s = item->sizeHint(); - if (totalWidth > 0) { - totalWidth += horizontalSpacing(); - } - totalWidth += s.width(); - maxHeight = qMax(maxHeight, s.height()); - } - return QSize(totalWidth, maxHeight); -} + const int availableWidth = getParentScrollAreaWidth() == 0 ? parentWidget()->width() : getParentScrollAreaWidth(); -/** - * @brief Minimum size for horizontal flow: the largest single item. - * - * This guarantees we can always display at least one item per row. - */ -QSize FlowLayout::calculateMinimumSizeHorizontal() const -{ - QSize size(0, 0); - for (const QLayoutItem *item : items) { - if (!item || item->isEmpty()) { - qCDebug(FlowLayoutLog) << "Skipping empty item."; - continue; - } - size = size.expandedTo(item->minimumSize()); - } - return size; -} - -/** - * @brief Preferred size for vertical flow: all items in a single column (unconstrained). - */ -QSize FlowLayout::calculateSizeHintVertical() const -{ - int maxWidth = 0; - int totalHeight = 0; + qCDebug(FlowLayoutLog) << "Calculating horizontal size hint. Available width:" << availableWidth; for (const QLayoutItem *item : items) { if (!item || item->isEmpty()) { qCDebug(FlowLayoutLog) << "Skipping empty item."; continue; } - const QSize s = item->sizeHint(); - if (totalHeight > 0) { - totalHeight += verticalSpacing(); + + QSize itemSize = item->sizeHint(); + int itemWidth = itemSize.width() + horizontalSpacing(); + qCDebug(FlowLayoutLog) << "Processing item. Size:" << itemSize << "Width with spacing:" << itemWidth; + + if (currentWidth + itemWidth > availableWidth) { + qCDebug(FlowLayoutLog) << "Row overflow. Current width:" << currentWidth << "Row height:" << rowHeight; + maxWidth = qMax(maxWidth, currentWidth); + totalHeight += rowHeight + verticalSpacing(); + qCDebug(FlowLayoutLog) << "Updated total height:" << totalHeight << "Max width so far:" << maxWidth; + + currentWidth = 0; + rowHeight = 0; } - totalHeight += s.height(); - maxWidth = qMax(maxWidth, s.width()); + + currentWidth += itemWidth; + rowHeight = qMax(rowHeight, itemSize.height()); + qCDebug(FlowLayoutLog) << "Updated current width:" << currentWidth << "Updated row height:" << rowHeight; } + + // Account for the final row + maxWidth = qMax(maxWidth, currentWidth); + totalHeight += rowHeight; + qCDebug(FlowLayoutLog) << "Final total height:" << totalHeight << "Final max width:" << maxWidth; + return QSize(maxWidth, totalHeight); } /** - * @brief Minimum size for vertical flow: the largest single item. + * @brief Calculates the minimum size for horizontal flow direction. + * @return A QSize representing the minimum required dimensions. */ -QSize FlowLayout::calculateMinimumSizeVertical() const +QSize FlowLayout::calculateMinimumSizeHorizontal() const { - QSize size(0, 0); + int maxWidth = 0; // Tracks the maximum width of a row + int totalHeight = 0; // Tracks the total height across all rows + int rowHeight = 0; // Tracks the height of the current row + int currentWidth = 0; // Tracks the current row's width + + const int availableWidth = getParentScrollAreaWidth() == 0 ? parentWidget()->width() : getParentScrollAreaWidth(); + + qCDebug(FlowLayoutLog) << "Calculating horizontal minimum size. Available width:" << availableWidth; + for (const QLayoutItem *item : items) { if (!item || item->isEmpty()) { qCDebug(FlowLayoutLog) << "Skipping empty item."; continue; } - size = size.expandedTo(item->minimumSize()); + + QSize itemMinSize = item->minimumSize(); + int itemWidth = itemMinSize.width() + horizontalSpacing(); + qCDebug(FlowLayoutLog) << "Processing item. Minimum size:" << itemMinSize << "Width with spacing:" << itemWidth; + + if (currentWidth + itemWidth > availableWidth) { + qCDebug(FlowLayoutLog) << "Row overflow. Current width:" << currentWidth << "Row height:" << rowHeight; + maxWidth = qMax(maxWidth, currentWidth); + totalHeight += rowHeight + verticalSpacing(); + qCDebug(FlowLayoutLog) << "Updated total height:" << totalHeight << "Max width so far:" << maxWidth; + + currentWidth = 0; + rowHeight = 0; + } + + currentWidth += itemWidth; + rowHeight = qMax(rowHeight, itemMinSize.height()); + qCDebug(FlowLayoutLog) << "Updated current width:" << currentWidth << "Updated row height:" << rowHeight; } - return size; + + // Account for the final row + maxWidth = qMax(maxWidth, currentWidth); + totalHeight += rowHeight; + qCDebug(FlowLayoutLog) << "Final total height:" << totalHeight << "Final max width:" << maxWidth; + + return QSize(maxWidth, totalHeight); +} + +/** + * @brief Calculates the size hint for vertical flow direction. + * @return A QSize representing the preferred dimensions. + */ +QSize FlowLayout::calculateSizeHintVertical() const +{ + int totalWidth = 0; + int maxHeight = 0; + int colWidth = 0; + int currentHeight = 0; + + const int availableHeight = qMax(parentWidget()->height(), getParentScrollAreaHeight()); + + qCDebug(FlowLayoutLog) << "Calculating vertical size hint. Available height:" << availableHeight; + + for (const QLayoutItem *item : items) { + if (!item || item->isEmpty()) { + qCDebug(FlowLayoutLog) << "Skipping empty item."; + continue; + } + + QSize itemSize = item->sizeHint(); + qCDebug(FlowLayoutLog) << "Processing item. Size:" << itemSize; + + if (currentHeight + itemSize.height() > availableHeight) { + qCDebug(FlowLayoutLog) << "Column overflow. Current height:" << currentHeight + << "Column width:" << colWidth; + totalWidth += colWidth + horizontalSpacing(); + maxHeight = qMax(maxHeight, currentHeight); + qCDebug(FlowLayoutLog) << "Updated total width:" << totalWidth << "Max height so far:" << maxHeight; + + currentHeight = 0; + colWidth = 0; + } + + currentHeight += itemSize.height() + verticalSpacing(); + colWidth = qMax(colWidth, itemSize.width()); + qCDebug(FlowLayoutLog) << "Updated current height:" << currentHeight << "Updated column width:" << colWidth; + } + + // Account for the final column + totalWidth += colWidth; + maxHeight = qMax(maxHeight, currentHeight); + qCDebug(FlowLayoutLog) << "Final total width:" << totalWidth << "Final max height:" << maxHeight; + + return QSize(totalWidth, maxHeight); +} + +/** + * @brief Calculates the minimum size for vertical flow direction. + * @return A QSize representing the minimum required dimensions. + */ +QSize FlowLayout::calculateMinimumSizeVertical() const +{ + int totalWidth = 0; // Tracks the total width across all columns + int maxHeight = 0; // Tracks the maximum height of a column + int colWidth = 0; // Tracks the width of the current column + int currentHeight = 0; // Tracks the current column's height + + const int availableHeight = qMax(parentWidget()->height(), getParentScrollAreaHeight()); + + qCDebug(FlowLayoutLog) << "Calculating vertical minimum size. Available height:" << availableHeight; + + for (const QLayoutItem *item : items) { + if (!item || item->isEmpty()) { + qCDebug(FlowLayoutLog) << "Skipping empty item."; + continue; + } + + QSize itemMinSize = item->minimumSize(); + int itemHeight = itemMinSize.height() + verticalSpacing(); + qCDebug(FlowLayoutLog) << "Processing item. Minimum size:" << itemMinSize + << "Height with spacing:" << itemHeight; + + if (currentHeight + itemHeight > availableHeight) { + qCDebug(FlowLayoutLog) << "Column overflow. Current height:" << currentHeight + << "Column width:" << colWidth; + totalWidth += colWidth + horizontalSpacing(); + maxHeight = qMax(maxHeight, currentHeight); + qCDebug(FlowLayoutLog) << "Updated total width:" << totalWidth << "Max height so far:" << maxHeight; + + currentHeight = 0; + colWidth = 0; + } + + currentHeight += itemHeight; + colWidth = qMax(colWidth, itemMinSize.width()); + qCDebug(FlowLayoutLog) << "Updated current height:" << currentHeight << "Updated column width:" << colWidth; + } + + // Account for the final column + totalWidth += colWidth; + maxHeight = qMax(maxHeight, currentHeight); + qCDebug(FlowLayoutLog) << "Final total width:" << totalWidth << "Final max height:" << maxHeight; + + return QSize(totalWidth, maxHeight); } /** @@ -397,7 +543,7 @@ QSize FlowLayout::calculateMinimumSizeVertical() const */ void FlowLayout::addItem(QLayoutItem *item) { - if (item) { + if (item != nullptr) { items.append(item); } } @@ -405,8 +551,11 @@ void FlowLayout::addItem(QLayoutItem *item) void FlowLayout::insertWidgetAtIndex(QWidget *toInsert, int index) { addChildWidget(toInsert); - const int bounded = qBound(0, index, static_cast(items.size())); - items.insert(bounded, new QWidgetItem(toInsert)); + + // We don't want to fail on an index that violates the bounds, so we just clamp it. + int boundedIndex = qBound(0, index, qMax(0, static_cast(items.size()))); + items.insert(boundedIndex, new QWidgetItem(toInsert)); + invalidate(); } @@ -464,13 +613,52 @@ int FlowLayout::verticalSpacing() const */ int FlowLayout::smartSpacing(const QStyle::PixelMetric pm) const { - QObject *p = parent(); - if (!p) { + QObject *parent = this->parent(); + + if (!parent) { return -1; } - if (p->isWidgetType()) { - const auto *pw = static_cast(p); + + if (parent->isWidgetType()) { + const auto *pw = dynamic_cast(parent); return pw->style()->pixelMetric(pm, nullptr, pw); } - return static_cast(p)->spacing(); -} \ No newline at end of file + + return dynamic_cast(parent)->spacing(); +} + +/** + * @brief Gets the width of the parent scroll area, if any. + * @return The width of the scroll area's viewport, or 0 if not found. + */ +int FlowLayout::getParentScrollAreaWidth() const +{ + QWidget *parent = parentWidget(); + + while (parent) { + if (const auto *scrollArea = qobject_cast(parent)) { + return scrollArea->viewport()->width(); + } + parent = parent->parentWidget(); + } + + return 0; +} + +/** + * @brief Gets the height of the parent scroll area, if any. + * @return The height of the scroll area's viewport, or 0 if not found. + */ +int FlowLayout::getParentScrollAreaHeight() const +{ + QWidget *parent = parentWidget(); + + while (parent) { + if (const auto *scrollArea = qobject_cast(parent)) { + return scrollArea->viewport()->height(); + } + parent = parent->parentWidget(); + } + + return 0; +} diff --git a/cockatrice/src/interface/layouts/flow_layout.h b/cockatrice/src/interface/layouts/flow_layout.h index 9adcd8bb5..cf109d260 100644 --- a/cockatrice/src/interface/layouts/flow_layout.h +++ b/cockatrice/src/interface/layouts/flow_layout.h @@ -1,10 +1,8 @@ /** * @file flow_layout.h * @ingroup UI - * @brief A QLayout subclass that arranges child widgets in wrapping rows (horizontal flow) - * or wrapping columns (vertical flow). + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef FLOW_LAYOUT_H #define FLOW_LAYOUT_H @@ -12,8 +10,8 @@ #include #include #include -#include #include +#include inline Q_LOGGING_CATEGORY(FlowLayoutLog, "flow_layout", QtInfoMsg); @@ -21,55 +19,42 @@ class FlowLayout : public QLayout { public: explicit FlowLayout(QWidget *parent = nullptr); - FlowLayout(QWidget *parent, Qt::Orientation flowDirection, int margin = 0, int hSpacing = 0, int vSpacing = 0); + FlowLayout(QWidget *parent, Qt::Orientation _flowDirection, int margin = 0, int hSpacing = 0, int vSpacing = 0); ~FlowLayout() override; - void insertWidgetAtIndex(QWidget *toInsert, int index); - // QLayout interface + [[nodiscard]] QSize calculateMinimumSizeHorizontal() const; + [[nodiscard]] QSize calculateSizeHintVertical() const; + [[nodiscard]] QSize calculateMinimumSizeVertical() const; void addItem(QLayoutItem *item) override; [[nodiscard]] int count() const override; [[nodiscard]] QLayoutItem *itemAt(int index) const override; QLayoutItem *takeAt(int index) override; - void setGeometry(const QRect &rect) override; + [[nodiscard]] int horizontalSpacing() const; - // Size negotiation [[nodiscard]] Qt::Orientations expandingDirections() const override; [[nodiscard]] bool hasHeightForWidth() const override; [[nodiscard]] int heightForWidth(int width) const override; - [[nodiscard]] QSize sizeHint() const override; - [[nodiscard]] QSize minimumSize() const override; - - // Spacing helpers - void setHorizontalMargin(int margin) - { - horizontalMargin = margin; - } - [[nodiscard]] int horizontalSpacing() const; - void setVerticalMargin(int margin) - { - verticalMargin = margin; - } [[nodiscard]] int verticalSpacing() const; + [[nodiscard]] int doLayout(const QRect &rect, bool testOnly) const; [[nodiscard]] int smartSpacing(QStyle::PixelMetric pm) const; + [[nodiscard]] int getParentScrollAreaWidth() const; + [[nodiscard]] int getParentScrollAreaHeight() const; - // Layout passes (virtual so subclasses can override placement logic) + void setGeometry(const QRect &rect) override; virtual int layoutAllRows(int originX, int originY, int availableWidth); - virtual void layoutSingleRow(const QVector &rowItems, int x, int y, int availableWidth); + virtual void layoutSingleRow(const QVector &rowItems, int x, int y); int layoutAllColumns(int originX, int originY, int availableHeight); void layoutSingleColumn(const QVector &colItems, int x, int y); + [[nodiscard]] QSize sizeHint() const override; + [[nodiscard]] QSize minimumSize() const override; + [[nodiscard]] QSize calculateSizeHintHorizontal() const; protected: - // Size-hint helpers split by direction - [[nodiscard]] QSize calculateSizeHintHorizontal() const; - [[nodiscard]] QSize calculateMinimumSizeHorizontal() const; - [[nodiscard]] QSize calculateSizeHintVertical() const; - [[nodiscard]] QSize calculateMinimumSizeVertical() const; - - QList items; + QList items; // List to store layout items Qt::Orientation flowDirection; - int horizontalMargin; ///< Horizontal spacing between items (-1 = use style default) - int verticalMargin; ///< Vertical spacing between items (-1 = use style default) + int horizontalMargin; + int verticalMargin; }; #endif // FLOW_LAYOUT_H \ No newline at end of file diff --git a/cockatrice/src/interface/layouts/overlap_layout.cpp b/cockatrice/src/interface/layouts/overlap_layout.cpp index a4c13518a..9bf5e8468 100644 --- a/cockatrice/src/interface/layouts/overlap_layout.cpp +++ b/cockatrice/src/interface/layouts/overlap_layout.cpp @@ -223,7 +223,7 @@ void OverlapLayout::setGeometry(const QRect &rect) const int yPos = rect.top() + currentRow * (maxItemHeight - overlapOffsetHeight); item->setGeometry(QRect(xPos, yPos, maxItemWidth, maxItemHeight)); - //! \todo Figure this out properly or maybe adjust size hint to account for this. + // TODO: Figure this out properly or maybe adjust size hint to account for this? // Update row and column indices based on the layout direction. if (overlapDirection == Qt::Horizontal) { currentColumn++; diff --git a/cockatrice/src/interface/layouts/overlap_layout.h b/cockatrice/src/interface/layouts/overlap_layout.h index c1b6a8e51..5844fca41 100644 --- a/cockatrice/src/interface/layouts/overlap_layout.h +++ b/cockatrice/src/interface/layouts/overlap_layout.h @@ -1,8 +1,8 @@ /** * @file overlap_layout.h * @ingroup UI + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef OVERLAP_LAYOUT_H #define OVERLAP_LAYOUT_H diff --git a/cockatrice/src/interface/logger.cpp b/cockatrice/src/interface/logger.cpp index 3e00a0b24..d6df065e8 100644 --- a/cockatrice/src/interface/logger.cpp +++ b/cockatrice/src/interface/logger.cpp @@ -66,9 +66,8 @@ void Logger::openLogfileSession() void Logger::closeLogfileSession() { - if (!logToFileEnabled) { + if (!logToFileEnabled) return; - } logToFileEnabled = false; fileStream << "Log session closed at " << QDateTime::currentDateTime().toString() << Qt::endl; diff --git a/cockatrice/src/interface/logger.h b/cockatrice/src/interface/logger.h index fc6dd70be..59244e226 100644 --- a/cockatrice/src/interface/logger.h +++ b/cockatrice/src/interface/logger.h @@ -1,8 +1,8 @@ /** * @file logger.h * @ingroup Core + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef LOGGER_H #define LOGGER_H diff --git a/cockatrice/src/interface/palette_editor/color_button.cpp b/cockatrice/src/interface/palette_editor/color_button.cpp deleted file mode 100644 index e1a490d20..000000000 --- a/cockatrice/src/interface/palette_editor/color_button.cpp +++ /dev/null @@ -1,72 +0,0 @@ -#include "color_button.h" - -#include -#include - -ColorButton::ColorButton(QWidget *parent) : QToolButton(parent) -{ - setFixedSize(52, 24); - setCursor(Qt::PointingHandCursor); - setToolTip(tr("Click to pick a color")); - connect(this, &QToolButton::clicked, this, &ColorButton::pickColor); -} - -void ColorButton::setColor(const QColor &c) -{ - if (color == c) { - return; - } - color = c; - updateSwatch(); - emit colorChanged(c); -} - -void ColorButton::pickColor() -{ - QColor chosen = QColorDialog::getColor(color, this, tr("Pick colour"), QColorDialog::ShowAlphaChannel); - if (chosen.isValid()) { - setColor(chosen); - } -} - -void ColorButton::updateSwatch() -{ - QPixmap pixmap(size() * devicePixelRatioF()); - pixmap.setDevicePixelRatio(devicePixelRatioF()); - pixmap.fill(Qt::transparent); - QPainter painter(&pixmap); - painter.setRenderHint(QPainter::Antialiasing); - - // Checkerboard for alpha - const int cellSize = 4; - for (int y = 0; y < height(); y += cellSize) { - for (int x = 0; x < width(); x += cellSize) { - painter.fillRect(x, y, cellSize, cellSize, - ((x / cellSize + y / cellSize) % 2) ? QColor(180, 180, 180) : Qt::white); - } - } - - // Color fill - painter.setPen(Qt::NoPen); - painter.setBrush(color); - painter.drawRoundedRect(QRectF(0.5, 0.5, width() - 1, height() - 1), 3, 3); - - // Border - QColor border = palette().color(QPalette::Shadow); - border.setAlpha(180); - painter.setPen(QPen(border, 1)); - painter.setBrush(Qt::NoBrush); - painter.drawRoundedRect(QRectF(0.5, 0.5, width() - 1, height() - 1), 3, 3); - - // 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)); - QFont f = font(); - f.setPixelSize(8); - painter.setFont(f); - painter.drawText(rect(), Qt::AlignCenter, color.name().toUpper()); - - setIcon(QIcon(pixmap)); - setIconSize(size()); - setText({}); -} \ No newline at end of file diff --git a/cockatrice/src/interface/palette_editor/color_button.h b/cockatrice/src/interface/palette_editor/color_button.h deleted file mode 100644 index 4b139ef68..000000000 --- a/cockatrice/src/interface/palette_editor/color_button.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef COCKATRICE_COLOR_BUTTON_H -#define COCKATRICE_COLOR_BUTTON_H - -#include -#include - -class ColorButton : public QToolButton -{ - Q_OBJECT -public: - explicit ColorButton(QWidget *parent = nullptr); - - QColor getColor() const - { - return color; - } - void setColor(const QColor &c); - -signals: - void colorChanged(const QColor &color); - -private slots: - void pickColor(); - -private: - void updateSwatch(); - QColor color; -}; - -#endif // COCKATRICE_COLOR_BUTTON_H \ No newline at end of file diff --git a/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp b/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp deleted file mode 100644 index 1b9be1dd4..000000000 --- a/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp +++ /dev/null @@ -1,326 +0,0 @@ -#include "palette_editor_dialog.h" - -#include "../theme_manager.h" -#include "palette_generator.h" -#include "palette_grid_widget.h" -#include "quick_setup_panel.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -PaletteEditorDialog::PaletteEditorDialog(const QString &_themeDirPath, const QString &_themeName, QWidget *parent) - : QDialog(parent), themeDirPath(_themeDirPath), themeName(_themeName) -{ - setMinimumSize(740, 220); - setupUi(); - - // Load both scheme configs upfront so switching is instant - loadSchemes(); - - loadedScheme = themeManager->isDarkMode(themeDirPath) ? "Dark" : "Light"; - - schemeComboBox->blockSignals(true); - schemeComboBox->setCurrentText(loadedScheme); - schemeComboBox->blockSignals(false); - - paletteGrid->loadPalette(workingConfig[loadedScheme]); - seedAccentFromScheme(loadedScheme); - - retranslateUi(); -} - -void PaletteEditorDialog::setupUi() -{ - auto *root = new QVBoxLayout(this); - root->setSpacing(0); - root->setContentsMargins(0, 0, 0, 0); - - // Header - header = new QWidget; - header->setAutoFillBackground(true); - { - QPalette hp = header->palette(); - hp.setColor(QPalette::Window, qApp->palette().color(QPalette::Window).darker(108)); - header->setPalette(hp); - } - auto *headerLayout = new QHBoxLayout(header); - headerLayout->setContentsMargins(12, 8, 12, 8); - - titleLabel = new QLabel(this); - titleLabel->setTextFormat(Qt::RichText); - - editingLabel = new QLabel(this); - - schemeComboBox = new QComboBox; - schemeComboBox->addItems({"Light", "Dark"}); - schemeComboBox->setFixedWidth(90); - - headerLayout->addWidget(titleLabel); - headerLayout->addStretch(); - headerLayout->addWidget(editingLabel); - headerLayout->addWidget(schemeComboBox); - root->addWidget(header); - - auto makeSeparator = [&]() { - auto *sep = new QFrame; - sep->setFrameShape(QFrame::HLine); - sep->setFrameShadow(QFrame::Plain); - sep->setFixedHeight(1); - return sep; - }; - - root->addWidget(makeSeparator()); - - // Quick Setup panel - quickSetupPanel = new QuickSetupPanel; - quickSetupPanel->setAutoFillBackground(true); - - QPalette sp = quickSetupPanel->palette(); - sp.setColor(QPalette::Window, qApp->palette().color(QPalette::Window).darker(102)); - quickSetupPanel->setPalette(sp); - - root->addWidget(quickSetupPanel); - root->addWidget(makeSeparator()); - - // Toggle button — acts as a section header for the advanced area - paletteGridToggleButton = new QPushButton(this); - paletteGridToggleButton->setCheckable(true); - paletteGridToggleButton->setChecked(false); - paletteGridToggleButton->setFlat(true); - paletteGridToggleButton->setStyleSheet("QPushButton { text-align: left; padding: 5px 12px; font-weight: bold; }" - "QPushButton:checked { }"); - root->addWidget(paletteGridToggleButton); - - // Separator + grid start hidden; revealed by the toggle - paletteGridSeparator = makeSeparator(); - paletteGridSeparator->setVisible(false); - root->addWidget(paletteGridSeparator); - - paletteGrid = new PaletteGridWidget; - paletteGrid->setVisible(false); - root->addWidget(paletteGrid, 1); - - // Footer - root->addWidget(makeSeparator()); - footer = new QWidget; - footer->setAutoFillBackground(true); - { - QPalette fp = footer->palette(); - fp.setColor(QPalette::Window, qApp->palette().color(QPalette::Window).darker(104)); - footer->setPalette(fp); - } - auto *footerLayout = new QHBoxLayout(footer); - footerLayout->setContentsMargins(12, 8, 12, 8); - - revertButton = new QPushButton(this); - - buttonBox = new QDialogButtonBox; - resetBtn = buttonBox->addButton(tr("Reset"), QDialogButtonBox::ResetRole); - applyBtn = buttonBox->addButton(tr("Apply"), QDialogButtonBox::ApplyRole); - saveBtn = buttonBox->addButton(tr("Save && Apply"), QDialogButtonBox::AcceptRole); - closeBtn = buttonBox->addButton(QDialogButtonBox::Close); - - footerLayout->addWidget(revertButton); - footerLayout->addStretch(); - footerLayout->addWidget(buttonBox); - root->addWidget(footer); - - // Connections - connect(schemeComboBox, &QComboBox::currentTextChanged, this, &PaletteEditorDialog::onSchemeChanged); - connect(quickSetupPanel, &QuickSetupPanel::generateRequested, this, &PaletteEditorDialog::onGenerateFromAccent); - connect(revertButton, &QPushButton::clicked, this, &PaletteEditorDialog::onRevertToDefault); - connect(resetBtn, &QPushButton::clicked, this, &PaletteEditorDialog::onReset); - connect(applyBtn, &QPushButton::clicked, this, &PaletteEditorDialog::onApply); - connect(saveBtn, &QPushButton::clicked, this, &PaletteEditorDialog::onSave); - connect(closeBtn, &QPushButton::clicked, this, &QDialog::reject); - - connect(paletteGridToggleButton, &QPushButton::toggled, this, [this](bool open) { - paletteGridToggleButton->setText(open ? tr("▼ Edit Palette") : tr("▶ Edit Palette")); - paletteGridSeparator->setVisible(open); - paletteGrid->setVisible(open); - - if (open) { - setMinimumHeight(680); - resize(width(), 680); - } else { - setMinimumHeight(220); - adjustSize(); // shrinks to fit just the visible content - } - }); -} - -void PaletteEditorDialog::retranslateUi() -{ - setWindowTitle(tr("Palette Editor — %1").arg(themeName)); - titleLabel->setText(tr("Palette Editor  ·  %1").arg(themeName)); - - // Revert button only makes sense when the theme ships default palette files - const bool hasDefault = PaletteConfig::fromDefault(themeDirPath, "Light").hasPalette() || - PaletteConfig::fromDefault(themeDirPath, "Dark").hasPalette(); - revertButton->setEnabled(hasDefault); - if (!hasDefault) { - revertButton->setToolTip(tr("This theme ships no default palette files")); - } else { - revertButton->setToolTip(tr("Replace current colours with the theme author's defaults")); - } - - schemeComboBox->setToolTip(tr("Switch between the light and dark palette files")); - editingLabel->setText(tr("Editing:")); - paletteGridToggleButton->setText(tr("▶ Edit Palette")); - paletteGridToggleButton->setToolTip(tr("Show or hide the per-role colour grid for manual tweaks")); - revertButton->setText(tr("↺ Revert to theme default")); - - resetBtn->setText(tr("Reset")); - applyBtn->setText(tr("Apply")); - saveBtn->setText(tr("Save && Apply")); - resetBtn->setToolTip(tr("Discard unsaved edits and restore the last saved palette")); - applyBtn->setToolTip(tr("Preview this palette without saving to disk")); - saveBtn->setToolTip(tr("Write palette-%1.toml and reload the theme").arg(loadedScheme.toLower())); - - if (themeDirPath.isEmpty()) { - saveBtn->setEnabled(false); - saveBtn->setToolTip(tr("Cannot save: this theme has no directory on disk")); - } -} - -void PaletteEditorDialog::loadSchemes() -{ - const QStringList schemes = {"Light", "Dark"}; - for (const QString &scheme : schemes) { - PaletteConfig cfg = PaletteConfig::fromScheme(themeDirPath, scheme); - - if (!cfg.hasPalette()) { - cfg = PaletteConfig::fromDefault(themeDirPath, scheme); - } - - if (!cfg.hasPalette()) { - const QPalette appPal = qApp->palette(); - for (auto group : {QPalette::Active, QPalette::Disabled, QPalette::Inactive}) { - for (int i = 0; i < QPalette::NColorRoles; ++i) { - auto role = static_cast(i); - if (role != QPalette::NoRole) { - cfg.colors[group][role] = appPal.color(group, role); - } - } - } - } - savedConfig[scheme] = cfg; - workingConfig[scheme] = cfg; - } -} - -void PaletteEditorDialog::seedAccentFromScheme(const QString &scheme) -{ - QColor seed = workingConfig.value(scheme).colors.value(QPalette::Active).value(QPalette::Highlight); - if (seed.isValid()) { - quickSetupPanel->setAccentColor(seed); - } -} - -void PaletteEditorDialog::onSchemeChanged(const QString &scheme) -{ - // Snapshot unsaved edits for the scheme we're leaving - if (!loadedScheme.isEmpty()) { - workingConfig[loadedScheme] = paletteGrid->currentPaletteConfig(); - } - - loadedScheme = scheme; - paletteGrid->loadPalette(workingConfig.value(scheme)); - seedAccentFromScheme(scheme); - onApply(); -} - -void PaletteEditorDialog::onGenerateFromAccent(const QColor &accent, int intensity) -{ - PaletteConfig cfg = PaletteGenerator::fromAccent(accent, intensity, loadedScheme); - workingConfig[loadedScheme] = cfg; - paletteGrid->loadPalette(cfg); -} - -void PaletteEditorDialog::onApply() -{ - themeManager->previewPalette(paletteGrid->currentPaletteConfig(), loadedScheme); -} - -void PaletteEditorDialog::onSave() -{ - if (loadedScheme.isEmpty()) { - return; - } - - PaletteConfig cfg = paletteGrid->currentPaletteConfig(); - - if (!ThemeManager::savePaletteConfig(themeDirPath, loadedScheme, cfg)) { - QMessageBox::warning(this, tr("Save failed"), - tr("Could not write %1 to:\n%2").arg(PaletteConfig::fileName(loadedScheme), themeDirPath)); - return; - } - - ThemeConfig globalCfg = ThemeConfig::fromThemeDir(themeDirPath); - globalCfg.colorScheme = loadedScheme; - globalCfg.save(themeDirPath); - - savedConfig[loadedScheme] = cfg; - workingConfig[loadedScheme] = cfg; - themeManager->reloadCurrentTheme(); - accept(); -} - -void PaletteEditorDialog::onReset() -{ - workingConfig[loadedScheme] = savedConfig[loadedScheme]; - paletteGrid->loadPalette(savedConfig[loadedScheme]); -} - -void PaletteEditorDialog::onRevertToDefault() -{ - PaletteConfig def = PaletteConfig::fromDefault(themeDirPath, loadedScheme); - if (!def.hasPalette()) { - QMessageBox::information(this, tr("No default found"), - tr("No default palette file found for the \"%1\" scheme.").arg(loadedScheme)); - return; - } - workingConfig[loadedScheme] = def; - paletteGrid->loadPalette(def); -} - -void PaletteEditorDialog::changeEvent(QEvent *e) -{ - if (e->type() == QEvent::PaletteChange) { - QTimer::singleShot(0, this, &PaletteEditorDialog::refreshChromePalettes); - } - - QDialog::changeEvent(e); -} - -void PaletteEditorDialog::refreshChromePalettes() -{ - const QPalette base = qApp->palette(); - - if (header) { - QPalette hp = header->palette(); - hp.setColor(QPalette::Window, base.color(QPalette::Window).darker(108)); - header->setPalette(hp); - header->update(); - } - if (footer) { - QPalette fp = footer->palette(); - fp.setColor(QPalette::Window, base.color(QPalette::Window).darker(104)); - footer->setPalette(fp); - footer->update(); - } - if (quickSetupPanel) { - QPalette sp = quickSetupPanel->palette(); - sp.setColor(QPalette::Window, base.color(QPalette::Window).darker(102)); - quickSetupPanel->setPalette(sp); - quickSetupPanel->update(); - } -} diff --git a/cockatrice/src/interface/palette_editor/palette_editor_dialog.h b/cockatrice/src/interface/palette_editor/palette_editor_dialog.h deleted file mode 100644 index cec4c1700..000000000 --- a/cockatrice/src/interface/palette_editor/palette_editor_dialog.h +++ /dev/null @@ -1,68 +0,0 @@ -#ifndef COCKATRICE_PALETTE_EDITOR_DIALOG_H -#define COCKATRICE_PALETTE_EDITOR_DIALOG_H - -#include "../theme_config.h" - -#include -#include -#include - -class QLabel; -class QComboBox; -class QDialogButtonBox; -class QPushButton; -class PaletteGridWidget; -class QuickSetupPanel; - -class PaletteEditorDialog : public QDialog -{ - Q_OBJECT -public: - explicit PaletteEditorDialog(const QString &themeDirPath, const QString &themeName, QWidget *parent = nullptr); - void loadSchemes(); - -private slots: - void onSave(); - void onApply(); - void onReset(); - void onRevertToDefault(); - void onSchemeChanged(const QString &scheme); - void onGenerateFromAccent(const QColor &accent, int intensity); - -private: - void setupUi(); - void retranslateUi(); - void refreshChromePalettes(); - void loadScheme(const QString &scheme); // snapshot current, switch, load - void seedAccentFromScheme(const QString &scheme); - - // Sub-widgets - QWidget *header; - QLabel *titleLabel; - QLabel *editingLabel; - QuickSetupPanel *quickSetupPanel = nullptr; - PaletteGridWidget *paletteGrid = nullptr; - QPushButton *paletteGridToggleButton = nullptr; - QFrame *paletteGridSeparator = nullptr; - QWidget *footer; - QComboBox *schemeComboBox = nullptr; - QDialogButtonBox *buttonBox = nullptr; - QPushButton *resetBtn = nullptr; - QPushButton *applyBtn = nullptr; - QPushButton *saveBtn = nullptr; - QPushButton *closeBtn = nullptr; - QPushButton *revertButton = nullptr; - - // State - QString themeDirPath; - QString themeName; - QString loadedScheme; - - QMap workingConfig; - QMap savedConfig; - -protected: - void changeEvent(QEvent *e) override; -}; - -#endif // COCKATRICE_PALETTE_EDITOR_DIALOG_H \ No newline at end of file diff --git a/cockatrice/src/interface/palette_editor/palette_generator.cpp b/cockatrice/src/interface/palette_editor/palette_generator.cpp deleted file mode 100644 index d30dd14f1..000000000 --- a/cockatrice/src/interface/palette_editor/palette_generator.cpp +++ /dev/null @@ -1,200 +0,0 @@ -#include "palette_generator.h" - -#include - -// ════════════════════════════════════════════════════════════════════════════ -// PaletteGenerator::fromAccent -// -// Three intensity bands: -// 0–30 Subtle — Highlight / links / BrightText take on the hue; -// backgrounds stay neutral grey. -// 30–70 Accented — Button, ToolTipBase, AlternateBase, shading tint in; -// backgrounds get a faint hue wash. -// 70–100 Chromatic— Window and Base pick up real saturation; the whole -// application reads as that colour, text stays readable. -// -// Key principles: -// • Quadratic saturation curve: low end feels truly subtle, top is vivid. -// • Each role has its own saturation ceiling; buttons always pop above window. -// • Base stays near-white / near-black regardless of intensity for legibility. -// • Button text contrast is computed from the real button color, not assumed. -// • Tooltip blends from classic yellow to hue-tinted above intensity ~25. -// • 3D shading ladder (Light→Shadow) carries the same hue for coherence. -// • Disabled: text → mid-gray, backgrounds → match Window. -// • Inactive Highlight fades to a near-bg tone so it doesn't compete. -// ════════════════════════════════════════════════════════════════════════════ - -namespace PaletteGenerator -{ - -PaletteConfig fromAccent(const QColor &accent, int intensity, const QString &scheme) -{ - PaletteConfig cfg; - const bool dark = scheme.compare("Dark", Qt::CaseInsensitive) == 0; - const double t = intensity / 100.0; // 0.0 – 1.0 - - int h = accent.hslHue(); - const bool achromatic = (h < 0); - if (achromatic) { - h = 0; - } - - // Saturation budgets - // Quadratic ease-in means the subtle end is genuinely subtle and the - // full end is bold without being garish. - auto sat = [&](double maxSat) -> int { - if (achromatic) { - return 0; - } - return qRound(maxSat * t * t); - }; - - const int satWindow = sat(dark ? 80.0 : 90.0); - const int satBase = sat(dark ? 25.0 : 20.0); // text areas stay near-white/black - const int satAlt = sat(dark ? 90.0 : 100.0); - const int satButton = sat(dark ? 120.0 : 130.0); // buttons pop above the bg - const int satTooltip = sat(dark ? 90.0 : 80.0); - const int satHighlight = achromatic ? 0 : qRound(accent.hslSaturation() * (0.45 + 0.55 * t)); - const int satShadeHi = sat(dark ? 60.0 : 50.0); // Light / Midlight - const int satShadeLo = sat(dark ? 90.0 : 70.0); // Mid / Dark - - // Per-role lightness - // Nudge lightness slightly as saturation rises to compensate for the - // Helmholtz-Kohlrausch effect (saturated colors look lighter/heavier). - const int winL = dark ? (28 + qRound(t * 8)) : (242 - qRound(t * 6)); - const int baseL = dark ? (43 + qRound(t * 6)) : 252; - const int altL = dark ? (36 + qRound(t * 9)) : (234 - qRound(t * 5)); - const int btnL = dark ? (56 + qRound(t * 10)) : (230 - qRound(t * 10)); - const int tipL = dark ? (52 + qRound(t * 8)) : (248 - qRound(t * 6)); - - // Highlight color - QColor hl; - if (achromatic) { - hl = dark ? QColor(105, 105, 105) : QColor(95, 95, 95); - } else if (dark) { - int L = qBound(105, accent.lightness() + qRound(45.0 * (1.0 - t)), 215); - hl = QColor::fromHsl(h, qMin(255, satHighlight), L); - } else { - int L = qBound(50, accent.lightness() - qRound(25.0 * t), 180); - hl = QColor::fromHsl(h, qMin(255, satHighlight), L); - } - const double hlLuma = 0.299 * hl.red() + 0.587 * hl.green() + 0.114 * hl.blue(); - const QColor hlText = (hlLuma > 135) ? Qt::black : Qt::white; - - // Local helpers - using CR = QPalette::ColorRole; - using CG = QPalette::ColorGroup; - - auto hsl = [&](int lightness, int s) -> QColor { - return QColor::fromHsl(h, qBound(0, s, 255), qBound(0, lightness, 255)); - }; - - auto textOn = [](const QColor &bg) -> QColor { - double luma = 0.299 * bg.red() + 0.587 * bg.green() + 0.114 * bg.blue(); - return (luma > 135) ? Qt::black : Qt::white; - }; - - auto set3 = [&](CR role, QColor active, QColor disabled, QColor inactive) { - cfg.colors[CG::Active][role] = active; - cfg.colors[CG::Disabled][role] = disabled; - cfg.colors[CG::Inactive][role] = inactive; - }; - - auto setAll = [&](CR role, QColor c) { set3(role, c, c, c); }; - - // Tooltip: blend classic yellow → hue-tinted above t≈0.20 - QColor bg_tip; - if (achromatic || t < 0.20) { - bg_tip = QColor(255, 255, 220); - } else { - QColor tinted = hsl(tipL, satTooltip); - double blend = qMin(1.0, (t - 0.20) / 0.55); - QColor yellow(255, 255, 220); - bg_tip = QColor(qRound(yellow.red() * (1.0 - blend) + tinted.red() * blend), - qRound(yellow.green() * (1.0 - blend) + tinted.green() * blend), - qRound(yellow.blue() * (1.0 - blend) + tinted.blue() * blend)); - } - - // Backgrounds - const QColor bg_win = hsl(winL, satWindow); - const QColor bg_base = hsl(baseL, satBase); - const QColor bg_alt = hsl(altL, satAlt); - const QColor bg_btn = hsl(btnL, satButton); - - set3(CR::Window, bg_win, bg_win, bg_win); - set3(CR::Base, bg_base, bg_win, bg_base); - set3(CR::AlternateBase, bg_alt, bg_alt, bg_alt); - set3(CR::Button, bg_btn, bg_win, bg_btn); - set3(CR::ToolTipBase, bg_tip, bg_tip, bg_tip); - - // Foreground text - const QColor winText = dark ? Qt::white : Qt::black; - const QColor disText = dark ? QColor(157, 157, 157) : QColor(120, 120, 120); - const QColor disBtnText = dark ? QColor(120, 120, 120) : QColor(150, 150, 150); - - set3(CR::WindowText, winText, disText, winText); - set3(CR::Text, winText, disText, winText); - set3(CR::ButtonText, textOn(bg_btn), disBtnText, textOn(bg_btn)); - setAll(CR::ToolTipText, textOn(bg_tip)); - - const QColor phAlpha = dark ? QColor(255, 255, 255, 110) : QColor(0, 0, 0, 110); - const QColor phDis = dark ? QColor(255, 255, 255, 70) : QColor(0, 0, 0, 70); - set3(CR::PlaceholderText, phAlpha, phDis, phAlpha); - - // Highlight / selection - const QColor inactiveHl = hsl(winL + (dark ? 14 : -10), satWindow); - cfg.colors[CG::Active][CR::Highlight] = hl; - cfg.colors[CG::Disabled][CR::Highlight] = inactiveHl; - cfg.colors[CG::Inactive][CR::Highlight] = inactiveHl; - cfg.colors[CG::Active][CR::HighlightedText] = hlText; - cfg.colors[CG::Disabled][CR::HighlightedText] = disText; - cfg.colors[CG::Inactive][CR::HighlightedText] = dark ? Qt::white : Qt::black; - - // BrightText - QColor bright; - if (achromatic) { - bright = dark ? Qt::white : Qt::black; - } else if (dark) { - bright = QColor::fromHsl(h, qMin(255, satHighlight + 25), qMin(235, hl.lightness() + 50)); - } else { - bright = Qt::white; - } - setAll(CR::BrightText, bright); - - // Links - QColor link, linkV; - if (achromatic) { - link = dark ? QColor(100, 200, 255) : QColor(0, 0, 210); - linkV = dark ? QColor(200, 100, 255) : QColor(128, 0, 180); - } else if (dark) { - link = QColor::fromHsl(h, qMin(255, satHighlight), qMin(230, hl.lightness() + 75)); - linkV = QColor::fromHsl((h + 30) % 360, qMin(255, satHighlight), qMin(215, hl.lightness() + 55)); - } else { - link = QColor::fromHsl(h, qMin(255, satHighlight), qMax(40, hl.lightness() - 75)); - linkV = QColor::fromHsl((h + 30) % 360, qMin(255, satHighlight), qMax(30, hl.lightness() - 95)); - } - set3(CR::Link, link, dark ? QColor(48, 140, 198) : QColor(0, 0, 255), link); - set3(CR::LinkVisited, linkV, dark ? QColor(180, 80, 255) : QColor(255, 0, 255), linkV); - - // 3D / frame shading - if (dark) { - setAll(CR::Light, hsl(115, qMin(255, satShadeHi))); - setAll(CR::Midlight, hsl(82, qMin(255, satShadeHi))); - setAll(CR::Mid, hsl(37, satShadeLo)); - setAll(CR::Dark, hsl(22, satShadeLo)); - setAll(CR::Shadow, Qt::black); - } else { - setAll(CR::Light, Qt::white); - setAll(CR::Midlight, hsl(226, qMin(255, satShadeHi))); - setAll(CR::Mid, hsl(158, satShadeLo)); - setAll(CR::Dark, hsl(148, satShadeLo)); - // Shadow stays neutral — tinting it makes the UI look bruised - cfg.colors[CG::Active][CR::Shadow] = QColor(105, 105, 105); - cfg.colors[CG::Disabled][CR::Shadow] = Qt::black; - cfg.colors[CG::Inactive][CR::Shadow] = QColor(105, 105, 105); - } - - return cfg; -} - -} // namespace PaletteGenerator \ No newline at end of file diff --git a/cockatrice/src/interface/palette_editor/palette_generator.h b/cockatrice/src/interface/palette_editor/palette_generator.h deleted file mode 100644 index 0cec9b5c3..000000000 --- a/cockatrice/src/interface/palette_editor/palette_generator.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef COCKATRICE_PALETTE_GENERATOR_H -#define COCKATRICE_PALETTE_GENERATOR_H - -#include "../theme_config.h" - -#include -#include - -// All QPalette roles are derived from a single accent color and an -// intensity value (0-100). See the .cpp for the full band breakdown. -namespace PaletteGenerator -{ -PaletteConfig fromAccent(const QColor &accent, int intensity, const QString &scheme); -} // namespace PaletteGenerator - -#endif // COCKATRICE_PALETTE_GENERATOR_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 deleted file mode 100644 index e4ac5a16f..000000000 --- a/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp +++ /dev/null @@ -1,179 +0,0 @@ -#include "palette_grid_widget.h" - -#include -#include -#include -#include -#include -#include -#include - -static QList allRoles() -{ - QList roles; - for (int i = 0; i < QPalette::NColorRoles; ++i) { - auto r = static_cast(i); - if (r != QPalette::NoRole) { - roles << r; - } - } - return roles; -} - -static const QList ALL_GROUPS = {QPalette::Active, QPalette::Disabled, QPalette::Inactive}; - -static const QMap ROLE_DESCRIPTIONS = { - {QPalette::Window, QT_TR_NOOP("Main window / dialog background")}, - {QPalette::WindowText, QT_TR_NOOP("Text drawn on Window")}, - {QPalette::Base, QT_TR_NOOP("Background for text input widgets")}, - {QPalette::Text, QT_TR_NOOP("Text in input widgets")}, - {QPalette::Button, QT_TR_NOOP("Button background")}, - {QPalette::ButtonText, QT_TR_NOOP("Button label text")}, - {QPalette::BrightText, QT_TR_NOOP("High-contrast text (e.g. checked items)")}, - {QPalette::Highlight, QT_TR_NOOP("Selection / focus highlight")}, - {QPalette::HighlightedText, QT_TR_NOOP("Text on top of Highlight")}, - {QPalette::Link, QT_TR_NOOP("Unvisited hyperlink")}, - {QPalette::LinkVisited, QT_TR_NOOP("Visited hyperlink")}, - {QPalette::AlternateBase, QT_TR_NOOP("Alternating row background in views")}, - {QPalette::ToolTipBase, QT_TR_NOOP("Tooltip background")}, - {QPalette::ToolTipText, QT_TR_NOOP("Tooltip text")}, - {QPalette::PlaceholderText, QT_TR_NOOP("Placeholder / hint text in inputs")}, - {QPalette::Light, QT_TR_NOOP("Lighter than Button (3-D highlight)")}, - {QPalette::Midlight, QT_TR_NOOP("Between Button and Light")}, - {QPalette::Mid, QT_TR_NOOP("Between Button and Dark")}, - {QPalette::Dark, QT_TR_NOOP("Darker than Button (3-D shadow)")}, - {QPalette::Shadow, QT_TR_NOOP("Very dark shadow colour")}, -}; - -PaletteGridWidget::PaletteGridWidget(QWidget *parent) : QWidget(parent) -{ - scroll = new QScrollArea(this); - scroll->setWidgetResizable(true); - scroll->setFrameShape(QFrame::NoFrame); - - gridHost = new QWidget; - buildGrid(gridHost); - refreshChromePalettes(); - scroll->setWidget(gridHost); - - layout = new QVBoxLayout(this); - layout->setContentsMargins(0, 0, 0, 0); - layout->addWidget(scroll); -} - -void PaletteGridWidget::buildGrid(QWidget *host) -{ - QMetaEnum roleEnum = QMetaEnum::fromType(); - - auto *grid = new QGridLayout(host); - grid->setSpacing(3); - grid->setContentsMargins(12, 8, 12, 8); - grid->setColumnStretch(0, 1); - grid->setColumnStretch(1, 0); - grid->setColumnStretch(2, 0); - grid->setColumnStretch(3, 0); - - // Column headers - const QStringList groupHeaders = {tr("Active"), tr("Disabled"), tr("Inactive")}; - const QStringList groupTips = { - tr("Normal interactive state"), - tr("Widget is disabled / not interactive"), - tr("Window is in background / unfocused"), - }; - for (int col = 0; col < 3; ++col) { - auto *label = new QLabel(groupHeaders[col], host); - label->setAlignment(Qt::AlignCenter); - label->setToolTip(groupTips[col]); - QFont f = label->font(); - f.setBold(true); - label->setFont(f); - label->setAutoFillBackground(true); - label->setContentsMargins(4, 4, 4, 4); - grid->addWidget(label, 0, col + 1); - headerLabels.push_back(label); - } - - // Role rows - const auto roles = allRoles(); - for (int row = 0; row < roles.size(); ++row) { - auto role = roles[row]; - const char *name = roleEnum.valueToKey(role); - - // Alternating row shade - if (row % 2 == 0) { - for (int col = 0; col < 4; ++col) { - auto *shade = new QWidget(host); - shade->setAutoFillBackground(true); - grid->addWidget(shade, row + 1, col); - rowShadeWidgets.push_back(shade); - } - } - - auto *label = new QLabel(QString(name), host); - label->setToolTip(ROLE_DESCRIPTIONS.value(role, {})); - label->setContentsMargins(4, 2, 8, 2); - grid->addWidget(label, row + 1, 0); - - for (int col = 0; col < 3; ++col) { - auto group = ALL_GROUPS[col]; - auto *btn = new ColorButton(host); - colorButtons[group][role] = btn; - grid->addWidget(btn, row + 1, col + 1, Qt::AlignHCenter | Qt::AlignVCenter); - } - } -} - -void PaletteGridWidget::changeEvent(QEvent *e) -{ - if (e->type() == QEvent::PaletteChange) { - QTimer::singleShot(0, this, &PaletteGridWidget::refreshChromePalettes); - } - - QWidget::changeEvent(e); -} - -void PaletteGridWidget::refreshChromePalettes() -{ - const QPalette base = qApp->palette(); - const QColor alt = base.color(QPalette::AlternateBase); - - // Header labels - for (auto *label : headerLabels) { - QPalette lp = label->palette(); - lp.setColor(QPalette::Window, alt); - label->setPalette(lp); - label->update(); - } - - // Alternating row backgrounds - for (auto *shade : rowShadeWidgets) { - QPalette sp = shade->palette(); - sp.setColor(QPalette::Window, alt); - shade->setPalette(sp); - shade->update(); - } -} - -void PaletteGridWidget::loadPalette(const PaletteConfig &cfg) -{ - for (auto group : ALL_GROUPS) { - for (auto role : allRoles()) { - QColor color = cfg.colors.value(group).value(role); - if (!color.isValid()) { - color = qApp->palette().color(group, role); - } - colorButtons[group][role]->setColor(color); - } - } -} - -PaletteConfig PaletteGridWidget::currentPaletteConfig() const -{ - PaletteConfig cfg; - for (auto group : ALL_GROUPS) { - for (auto role : allRoles()) { - cfg.colors[group][role] = colorButtons[group][role]->getColor(); - } - } - return cfg; -} \ No newline at end of file diff --git a/cockatrice/src/interface/palette_editor/palette_grid_widget.h b/cockatrice/src/interface/palette_editor/palette_grid_widget.h deleted file mode 100644 index 1d85f1ac8..000000000 --- a/cockatrice/src/interface/palette_editor/palette_grid_widget.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef COCKATRICE_PALETTE_GRID_WIDGET_H -#define COCKATRICE_PALETTE_GRID_WIDGET_H - -#include "../theme_config.h" -#include "color_button.h" - -#include -#include -#include -#include - -class QLabel; -class QScrollArea; -// Scrollable grid of ColorButtons — one per (ColorGroup × ColorRole) cell. -// Owns the load/read round-trip for PaletteConfig but has no file I/O itself. -class PaletteGridWidget : public QWidget -{ - Q_OBJECT -public: - explicit PaletteGridWidget(QWidget *parent = nullptr); - - void loadPalette(const PaletteConfig &cfg); - PaletteConfig currentPaletteConfig() const; - -private: - void buildGrid(QWidget *host); - void changeEvent(QEvent *e); - void refreshChromePalettes(); - - QMap> colorButtons; - QScrollArea *scroll; - QWidget *gridHost; - QVBoxLayout *layout; - QVector headerLabels; - QVector rowShadeWidgets; -}; - -#endif // COCKATRICE_PALETTE_GRID_WIDGET_H \ No newline at end of file diff --git a/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp b/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp deleted file mode 100644 index fe3af9b52..000000000 --- a/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp +++ /dev/null @@ -1,99 +0,0 @@ -#include "quick_setup_panel.h" - -#include -#include -#include -#include -#include - -QuickSetupPanel::QuickSetupPanel(QWidget *parent) : QWidget(parent) -{ - layout = new QHBoxLayout(this); - layout->setContentsMargins(12, 8, 12, 8); - layout->setSpacing(10); - - heading = new QLabel(this); - heading->setTextFormat(Qt::RichText); - - accentLabel = new QLabel(this); - accentButton = new ColorButton(this); - accentButton->setColor(QColor(20, 140, 60)); - - intensityLabel = new QLabel(this); - - labelLow = new QLabel(this); - labelHigh = new QLabel(this); - 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); - labelHigh->setPalette(dimmed); - - intensitySlider = new QSlider(Qt::Horizontal, this); - intensitySlider->setRange(0, 100); - intensitySlider->setValue(70); - intensitySlider->setFixedWidth(160); - - intensityPercentageLabel = new QLabel(this); - intensityPercentageLabel->setFixedWidth(34); - intensityPercentageLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - - generateButton = new QPushButton(this); - - layout->addWidget(heading); - layout->addSpacing(6); - layout->addWidget(accentLabel); - layout->addWidget(accentButton); - layout->addSpacing(12); - layout->addWidget(intensityLabel); - layout->addWidget(labelLow); - layout->addWidget(intensitySlider); - layout->addWidget(labelHigh); - layout->addWidget(intensityPercentageLabel); - layout->addStretch(); - layout->addWidget(generateButton); - - connect(intensitySlider, &QSlider::valueChanged, this, - [this](int v) { intensityPercentageLabel->setText(tr("%1%").arg(v)); }); - connect(generateButton, &QPushButton::clicked, this, - [this] { emit generateRequested(accentButton->getColor(), intensitySlider->value()); }); - retranslateUi(); -} - -void QuickSetupPanel::retranslateUi() -{ - heading->setText(tr("Quick Setup")); - heading->setToolTip(tr("Generate all palette roles automatically from a single accent colour")); - accentLabel->setText(tr("Accent:")); - accentButton->setToolTip(tr("Primary hue. Used directly for highlights and links.\n" - "At high intensity it also tints buttons and backgrounds.")); - intensityLabel->setText(tr("Intensity:")); - labelLow->setText(tr("Subtle")); - labelHigh->setText(tr("Full colour")); - intensitySlider->setToolTip(tr("0–30 Subtle tint — only highlights and links change hue\n" - "30–70 Accented — buttons, tooltips, and borders join in\n" - "70–100 Full colour — backgrounds, everything")); - intensityPercentageLabel->setText(tr("70%")); - - generateButton->setText(tr("Generate ↓")); - generateButton->setToolTip(tr("Derive all palette roles from the accent colour above.\n" - "Fine-tune individual colours in the grid afterwards.")); -} - -QColor QuickSetupPanel::accentColor() const -{ - return accentButton->getColor(); -} - -int QuickSetupPanel::intensity() const -{ - return intensitySlider->value(); -} - -void QuickSetupPanel::setAccentColor(const QColor &c) -{ - accentButton->setColor(c); -} \ No newline at end of file diff --git a/cockatrice/src/interface/palette_editor/quick_setup_panel.h b/cockatrice/src/interface/palette_editor/quick_setup_panel.h deleted file mode 100644 index dddd0aaa3..000000000 --- a/cockatrice/src/interface/palette_editor/quick_setup_panel.h +++ /dev/null @@ -1,94 +0,0 @@ -#ifndef COCKATRICE_QUICK_SETUP_PANEL_H -#define COCKATRICE_QUICK_SETUP_PANEL_H - -#include "color_button.h" - -#include - -class QPushButton; -class QHBoxLayout; -class QLabel; -class QSlider; - -/** - * @class QuickSetupPanel - * @brief Provides a compact "Quick Setup" interface for generating theme palettes. - * - * The panel contains: - * - an accent color picker, - * - an intensity slider, - * - and a generate button. - * - * When the user clicks the generate button, the panel emits - * generateRequested() with the currently selected accent color - * and intensity value. - * - * Typically used together with PaletteGenerator::fromAccent() - * to quickly generate color schemes from a chosen accent color. - */ -class QuickSetupPanel : public QWidget -{ - Q_OBJECT - -public: - /** - * @brief Constructs the quick setup panel. - * - * @param parent Optional parent widget. - */ - explicit QuickSetupPanel(QWidget *parent = nullptr); - - /** - * @brief Retranslates all user-visible strings. - * - * Intended to be called when the application language changes. - */ - void retranslateUi(); - - /** - * @brief Returns the currently selected accent color. - * - * @return The selected accent color. - */ - QColor accentColor() const; - - /** - * @brief Returns the current intensity slider value. - * - * @return The selected intensity value. - */ - int intensity() const; - - /** - * @brief Updates the displayed accent color. - * - * Used by the parent dialog when switching schemes to keep - * the color swatch synchronized with the active palette. - * - * @param c The new accent color. - */ - void setAccentColor(const QColor &c); - -signals: - /** - * @brief Emitted when the user requests palette generation. - * - * @param accent The selected accent color. - * @param intensity The selected intensity value. - */ - void generateRequested(QColor accent, int intensity); - -private: - QHBoxLayout *layout; - QLabel *heading; - QLabel *accentLabel; - ColorButton *accentButton; - QLabel *intensityLabel; - QLabel *labelLow; - QLabel *labelHigh; - QSlider *intensitySlider; - QLabel *intensityPercentageLabel; - QPushButton *generateButton; -}; - -#endif // COCKATRICE_QUICK_SETUP_PANEL_H \ No newline at end of file diff --git a/cockatrice/src/interface/pixel_map_generator.cpp b/cockatrice/src/interface/pixel_map_generator.cpp index d3b0252a6..382fff317 100644 --- a/cockatrice/src/interface/pixel_map_generator.cpp +++ b/cockatrice/src/interface/pixel_map_generator.cpp @@ -77,9 +77,8 @@ QMap PhasePixmapGenerator::pmCache; QPixmap PhasePixmapGenerator::generatePixmap(int height, QString name) { QString key = name + QString::number(height); - if (pmCache.contains(key)) { + if (pmCache.contains(key)) return pmCache.value(key); - } QPixmap pixmap = tryLoadImage("theme:phases/" + name, QSize(height, height)); @@ -96,22 +95,19 @@ QPixmap CounterPixmapGenerator::generatePixmap(int height, QString name, bool hi name = "general"; } - if (highlight) { + if (highlight) name.append("_highlight"); - } QString key = name + QString::number(height); - if (pmCache.contains(key)) { + if (pmCache.contains(key)) return pmCache.value(key); - } QPixmap pixmap = tryLoadImage("theme:counters/" + name, QSize(height, height)); // fall back to colorless counter if the name can't be found if (pixmap.isNull()) { name = "general"; - if (highlight) { + if (highlight) name.append("_highlight"); - } pixmap = tryLoadImage("theme:counters/" + name, QSize(height, height)); } @@ -122,19 +118,17 @@ QPixmap CounterPixmapGenerator::generatePixmap(int height, QString name, bool hi QPixmap PingPixmapGenerator::generatePixmap(int size, int value, int max) { int key = size * 1000000 + max * 1000 + value; - if (pmCache.contains(key)) { + if (pmCache.contains(key)) return pmCache.value(key); - } QPixmap pixmap(size, size); pixmap.fill(Qt::transparent); QPainter painter(&pixmap); QColor color; - if ((max == -1) || (value == -1)) { + if ((max == -1) || (value == -1)) color = Qt::black; - } else { + else color.setHsv(120 * (1.0 - ((double)value / max)), 255, 255); - } QRadialGradient g(QPointF((double)pixmap.width() / 2, (double)pixmap.height() / 2), qMin(pixmap.width(), pixmap.height()) / 2.0); @@ -151,13 +145,11 @@ QMap PingPixmapGenerator::pmCache; QPixmap CountryPixmapGenerator::generatePixmap(int height, const QString &countryCode) { - if (countryCode.size() != 2) { + if (countryCode.size() != 2) return QPixmap(); - } QString key = countryCode + QString::number(height); - if (pmCache.contains(key)) { + if (pmCache.contains(key)) return pmCache.value(key); - } int width = height * 2; QPixmap pixmap = tryLoadImage("theme:countries/" + countryCode.toLower(), QSize(width, height), true); @@ -360,9 +352,8 @@ QPixmap LockPixmapGenerator::generatePixmap(int height) { int key = height; - if (pmCache.contains(key)) { + if (pmCache.contains(key)) return pmCache.value(key); - } QPixmap pixmap = tryLoadImage("theme:icons/lock", QSize(height, height), true); pmCache.insert(key, pixmap); @@ -374,9 +365,8 @@ QMap LockPixmapGenerator::pmCache; QPixmap DropdownIconPixmapGenerator::generatePixmap(int height, bool expanded) { QString key = QString::number(expanded) + ":" + QString::number(height); - if (pmCache.contains(key)) { + if (pmCache.contains(key)) return pmCache.value(key); - } QString name = expanded ? "dropdown_expanded" : "dropdown_collapsed"; QPixmap pixmap = tryLoadImage("theme:icons/" + name, QSize(height, height), true); diff --git a/cockatrice/src/interface/pixel_map_generator.h b/cockatrice/src/interface/pixel_map_generator.h index 22f44d8db..36d1e45f3 100644 --- a/cockatrice/src/interface/pixel_map_generator.h +++ b/cockatrice/src/interface/pixel_map_generator.h @@ -1,8 +1,8 @@ /** * @file pixel_map_generator.h * @ingroup UI + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef PIXMAPGENERATOR_H #define PIXMAPGENERATOR_H diff --git a/cockatrice/src/interface/theme_config.cpp b/cockatrice/src/interface/theme_config.cpp deleted file mode 100644 index b79c91265..000000000 --- a/cockatrice/src/interface/theme_config.cpp +++ /dev/null @@ -1,267 +0,0 @@ -#include "theme_config.h" - -#include -#include -#include -#include - -bool ThemeConfig::isEmpty() const -{ - return colorScheme.isEmpty() && styleName.isEmpty(); -} - -QString ThemeConfig::toIni() const -{ - QString out; - out += "[Appearance]\n"; - out += QString("ColorScheme = %1\n").arg(colorScheme.isEmpty() ? "System" : colorScheme); - out += "\n[Style]\n"; - out += QString("Name = %1\n").arg(styleName.isEmpty() ? "Default" : styleName); - return out; -} - -ThemeConfig ThemeConfig::fromThemeDir(const QString &themeDirPath) -{ - ThemeConfig cfg; - - if (themeDirPath.isEmpty()) { - return cfg; - } - - QFile f(QDir(themeDirPath).absoluteFilePath("theme.cfg")); - if (!f.open(QIODevice::ReadOnly | QIODevice::Text)) { - return cfg; - } - - 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; - } - - int eq = line.indexOf('='); - if (eq < 0) { - continue; - } - - QString key = line.left(eq).trimmed(); - QString value = line.mid(eq + 1).trimmed(); - - if (currentSection.compare("Appearance", Qt::CaseInsensitive) == 0) { - if (key.compare("ColorScheme", Qt::CaseInsensitive) == 0) { - cfg.colorScheme = value; - } - } else if (currentSection.compare("Style", Qt::CaseInsensitive) == 0) { - if (key.compare("Name", Qt::CaseInsensitive) == 0) { - cfg.styleName = value; - } - } - } - - return cfg; -} - -bool ThemeConfig::save(const QString &themeDirPath) const -{ - if (themeDirPath.isEmpty()) { - return false; - } - - QDir dir(themeDirPath); - - if (!dir.exists()) { - dir.mkpath("."); - } - - QFile f(dir.absoluteFilePath("theme.cfg")); - if (!f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) { - return false; - } - - QTextStream out(&f); - out << toIni(); - - return true; -} - -bool PaletteConfig::hasPalette() const -{ - return !colors.isEmpty(); -} - -QString PaletteConfig::toToml() const -{ - QMetaEnum roleEnum = QMetaEnum::fromType(); - - QString out; - - static const QList> groups = { - {QPalette::Active, "Palette"}, - {QPalette::Disabled, "Palette.Disabled"}, - {QPalette::Inactive, "Palette.Inactive"}, - }; - - for (const auto &[group, sectionName] : groups) { - if (!colors.contains(group)) { - continue; - } - - out += QString("[%1]\n").arg(sectionName); - - const auto &roleMap = colors[group]; - - for (auto it = roleMap.cbegin(); it != roleMap.cend(); ++it) { - const char *roleName = roleEnum.valueToKey(it.key()); - - if (!roleName) { - continue; - } - - out += QString("%1 = %2\n").arg(QString(roleName), -20).arg(it.value().name(QColor::HexArgb)); - } - - out += "\n"; - } - - return out; -} - -QString PaletteConfig::fileName(const QString &colorScheme) -{ - return colorScheme.compare("Dark", Qt::CaseInsensitive) == 0 ? "palette-dark.toml" : "palette-light.toml"; -} - -PaletteConfig PaletteConfig::fromFile(const QString &filePath) -{ - PaletteConfig cfg; - - QFile f(filePath); - - if (!f.open(QIODevice::ReadOnly | QIODevice::Text)) { - return cfg; - } - - QMetaEnum roleEnum = QMetaEnum::fromType(); - - QString currentSection; - QPalette::ColorGroup currentGroup = QPalette::Active; - - 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(); - - if (currentSection.startsWith("Palette", Qt::CaseInsensitive)) { - int dot = currentSection.indexOf('.'); - - QString groupStr = (dot >= 0) ? currentSection.mid(dot + 1) : "Active"; - - if (groupStr.compare("Disabled", Qt::CaseInsensitive) == 0) { - currentGroup = QPalette::Disabled; - } else if (groupStr.compare("Inactive", Qt::CaseInsensitive) == 0) { - currentGroup = QPalette::Inactive; - } else { - currentGroup = QPalette::Active; - } - } - - 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 - 1].isSpace()) { - value = value.left(i).trimmed(); - break; - } - } - - if (!currentSection.startsWith("Palette", Qt::CaseInsensitive)) { - continue; - } - - if (key.startsWith("QPalette::")) { - key = key.mid(10); - } - - int roleInt = roleEnum.keyToValue(key.toUtf8().constData()); - - if (roleInt < 0) { - continue; - } - - QColor color(value); - - if (color.isValid()) { - cfg.colors[currentGroup][static_cast(roleInt)] = color; - } - } - - return cfg; -} - -PaletteConfig PaletteConfig::fromScheme(const QString &themeDirPath, const QString &colorScheme) -{ - if (themeDirPath.isEmpty()) { - return {}; - } - - return fromFile(QDir(themeDirPath).absoluteFilePath(fileName(colorScheme))); -} - -PaletteConfig PaletteConfig::fromDefault(const QString &themeDirPath, const QString &colorScheme) -{ - if (themeDirPath.isEmpty()) { - return {}; - } - - QDir dir(themeDirPath); - - bool wantDark = colorScheme.compare("Dark", Qt::CaseInsensitive) == 0; - - PaletteConfig cfg = - fromFile(dir.absoluteFilePath(wantDark ? "palette-default-dark.toml" : "palette-default-light.toml")); - - if (!cfg.hasPalette()) { - cfg = fromFile(dir.absoluteFilePath(wantDark ? "palette-default-light.toml" : "palette-default-dark.toml")); - } - - return cfg; -} - -QPalette PaletteConfig::apply(QPalette base) const -{ - for (auto git = colors.cbegin(); git != colors.cend(); ++git) { - for (auto rit = git.value().cbegin(); rit != git.value().cend(); ++rit) { - base.setColor(git.key(), rit.key(), rit.value()); - } - } - - return base; -} \ No newline at end of file diff --git a/cockatrice/src/interface/theme_config.h b/cockatrice/src/interface/theme_config.h deleted file mode 100644 index 07bf55b7a..000000000 --- a/cockatrice/src/interface/theme_config.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef COCKATRICE_THEME_CONFIG_H -#define COCKATRICE_THEME_CONFIG_H - -#include -#include -#include -#include - -struct ThemeConfig -{ - QString colorScheme; - QString styleName; - - bool isEmpty() const; - QString toIni() const; - - static ThemeConfig fromThemeDir(const QString &themeDirPath); - bool save(const QString &themeDirPath) const; -}; - -struct PaletteConfig -{ - QMap> colors; - - bool hasPalette() const; - QString toToml() const; - - static QString fileName(const QString &colorScheme); - - static PaletteConfig fromFile(const QString &filePath); - static PaletteConfig fromScheme(const QString &themeDirPath, const QString &colorScheme); - static PaletteConfig fromDefault(const QString &themeDirPath, const QString &colorScheme); - - QPalette apply(QPalette base) const; -}; - -#endif // COCKATRICE_THEME_CONFIG_H \ No newline at end of file diff --git a/cockatrice/src/interface/theme_manager.cpp b/cockatrice/src/interface/theme_manager.cpp index 7dc757062..c7f259ec0 100644 --- a/cockatrice/src/interface/theme_manager.cpp +++ b/cockatrice/src/interface/theme_manager.cpp @@ -19,7 +19,9 @@ #include #define NONE_THEME_NAME "Default" -#define FUSION_THEME_NAME "Fusion" +#define FUSION_THEME_NAME "Fusion (System Default)" +#define FUSION_THEME_NAME_LIGHT "Fusion (Light)" +#define FUSION_THEME_NAME_DARK "Fusion (Dark)" #define STYLE_CSS_NAME "style.css" #define HANDZONE_BG_NAME "handzone" #define PLAYERZONE_BG_NAME "playerzone" @@ -49,9 +51,8 @@ struct PaletteColorInfo // Iterate through all color roles (excluding NoRole and NColorRoles) for (int r = 0; r < QPalette::NColorRoles; ++r) { auto role = static_cast(r); - if (role == QPalette::NoRole) { + if (role == QPalette::NoRole) continue; - } PaletteColorInfo info; info.group = group; @@ -77,9 +78,8 @@ struct PaletteColorInfo for (int r = 0; r < QPalette::NColorRoles; ++r) { auto role = static_cast(r); - if (role == QPalette::NoRole) { + if (role == QPalette::NoRole) continue; - } QColor color = palette.color(group, role); qInfo().nospace() << qPrintable(QString("%1").arg(roleEnum.valueToKey(role), -20)) << " : " @@ -92,7 +92,7 @@ struct PaletteColorInfo ThemeManager::ThemeManager(QObject *parent) : QObject(parent) { defaultStyleName = qApp->style()->objectName(); - //! \todo Workaround for windows11 style being broken. + // FIXME workaround for windows11 style being broken if (defaultStyleName == "windows11") { defaultStyleName = "windowsvista"; } @@ -113,28 +113,37 @@ void ThemeManager::ensureThemeDirectoryExists() } } -bool ThemeManager::isDarkMode(const QString &themeDirPath) +bool ThemeManager::isDarkMode() { - ThemeConfig themeConfig = ThemeConfig::fromThemeDir(themeDirPath); - if (themeConfig.colorScheme.compare("Dark", Qt::CaseInsensitive) == 0) { - return true; - } else if (themeConfig.colorScheme.compare("Light", Qt::CaseInsensitive) == 0) { + auto themeName = SettingsCache::instance().getThemeName(); + // Explicit Dark Mode + if (themeName == FUSION_THEME_NAME_LIGHT || themeName.endsWith("(Light)")) { return false; - } else { -#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) - bool osDark = (QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark); -#else - bool osDark = false; -#endif - return osDark; } + // Explicit Light Mode + if (themeName == FUSION_THEME_NAME_DARK || themeName.endsWith("(Dark)")) { + return true; + } + + // Auto detection on compatible Qt versions +#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)) + if (QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark && + (themeName == NONE_THEME_NAME || themeName == FUSION_THEME_NAME || themeName.endsWith("(System Default)"))) { + return true; + } else { + return false; + } +#endif + // Default to light mode + return false; } bool ThemeManager::isBuiltInTheme() { const auto themeName = SettingsCache::instance().getThemeName(); - return themeName == NONE_THEME_NAME || themeName == FUSION_THEME_NAME; + return themeName == NONE_THEME_NAME || themeName == FUSION_THEME_NAME || themeName == FUSION_THEME_NAME_LIGHT || + themeName == FUSION_THEME_NAME_DARK; } QStringMap &ThemeManager::getAvailableThemes() @@ -142,13 +151,15 @@ QStringMap &ThemeManager::getAvailableThemes() QDir dir; availableThemes.clear(); + // add default value + availableThemes.insert(NONE_THEME_NAME, QString()); + // load themes from user profile dir dir.setPath(SettingsCache::instance().getThemesPath()); - // add default value - availableThemes.insert(NONE_THEME_NAME, dir.absoluteFilePath("Default")); - - availableThemes.insert(FUSION_THEME_NAME, dir.absoluteFilePath("Fusion")); + availableThemes.insert(FUSION_THEME_NAME, dir.filePath("Fusion (System Default)")); + availableThemes.insert(FUSION_THEME_NAME_LIGHT, dir.filePath("Fusion (Light)")); + availableThemes.insert(FUSION_THEME_NAME_DARK, dir.filePath("Fusion (Dark)")); for (QString themeName : dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name)) { if (!availableThemes.contains(themeName)) { @@ -204,115 +215,192 @@ QBrush ThemeManager::loadExtraBrush(QString fileName, QBrush &fallbackBrush) return brush; } -ThemeConfig ThemeManager::loadGlobalConfig(const QString &themeDirPath) +static inline QPalette createDarkGreenFusionPalette() { - return ThemeConfig::fromThemeDir(themeDirPath); -} + QPalette p = QStyleFactory::create("Fusion")->standardPalette(); -bool ThemeManager::saveGlobalConfig(const QString &themeDirPath, const ThemeConfig &cfg) -{ - return cfg.save(themeDirPath); -} + // ---------- Core backgrounds ---------- + p.setColor(QPalette::Window, QColor(30, 30, 30)); // #ff1e1e1e + p.setColor(QPalette::Base, QColor(45, 45, 45)); // #ff2d2d2d + p.setColor(QPalette::AlternateBase, QColor(53, 53, 53)); // #ff353535 + p.setColor(QPalette::Button, QColor(60, 60, 60)); // #ff3c3c3c + p.setColor(QPalette::ToolTipBase, QColor(60, 60, 60)); // #ff3c3c3c -PaletteConfig ThemeManager::loadPaletteConfig(const QString &themeDirPath, const QString &colorScheme) -{ - if (themeDirPath.isEmpty()) { - return {}; - } - return PaletteConfig::fromScheme(themeDirPath, colorScheme); -} + // ---------- Core text ---------- + p.setColor(QPalette::WindowText, Qt::white); // #ffffffff + p.setColor(QPalette::Text, Qt::white); // #ffffffff + p.setColor(QPalette::ButtonText, Qt::white); // #ffffffff + p.setColor(QPalette::ToolTipText, QColor(212, 212, 212)); // #ffd4d4d4 + p.setColor(QPalette::PlaceholderText, QColor(255, 255, 255, 128)); // #80ffffff -bool ThemeManager::savePaletteConfig(const QString &themeDirPath, const QString &colorScheme, const PaletteConfig &cfg) -{ - if (themeDirPath.isEmpty()) { - return false; - } + // ---------- Selection / focus ---------- + const QColor highlight(20, 140, 60); // #ff148c3c + p.setColor(QPalette::Highlight, highlight); + p.setColor(QPalette::HighlightedText, Qt::white); // #ffffffff - QDir dir(themeDirPath); - if (!dir.exists()) { - dir.mkpath("."); - } + // ---------- Links ---------- + p.setColor(QPalette::Link, QColor(0, 246, 82)); // #ff00f652 + p.setColor(QPalette::LinkVisited, QColor(0, 211, 70)); // #ff00d346 - QFile f(dir.absoluteFilePath(PaletteConfig::fileName(colorScheme))); - if (!f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) { - return false; - } - - QTextStream(&f) << cfg.toToml(); - return true; -} - -void ThemeManager::setColorScheme(const QString &scheme) -{ - const QString dirPath = getAvailableThemes().value(SettingsCache::instance().getThemeName()); - ThemeConfig cfg = ThemeConfig::fromThemeDir(dirPath); - - cfg.colorScheme = scheme; - - cfg.save(dirPath); - reloadCurrentTheme(); -} - -void ThemeManager::reloadCurrentTheme() -{ - themeChangedSlot(); -} - -void ThemeManager::previewPalette(const PaletteConfig &cfg, const QString &scheme) -{ - const QString themeName = SettingsCache::instance().getThemeName(); - const QString dirPath = getAvailableThemes().value(themeName); - const ThemeConfig themeCfg = ThemeConfig::fromThemeDir(dirPath); - applyStyleAndPalette(themeName, themeCfg, cfg, scheme); -} - -void ThemeManager::applyStyleAndPalette(const QString &themeName, - const ThemeConfig &themeCfg, - const PaletteConfig &palCfg, - const QString &activeScheme) -{ -#if (QT_VERSION < QT_VERSION_CHECK(6, 5, 0)) - Q_UNUSED(activeScheme) + // ---------- Accent (Qt 6) ---------- +#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) + p.setColor(QPalette::Accent, QColor(0, 211, 70)); // #ff00d346 #endif - QString styleName = themeCfg.styleName; - if (styleName.isEmpty() || styleName.compare("Default", Qt::CaseInsensitive) == 0) { - if (themeName == FUSION_THEME_NAME) { - styleName = "Fusion"; - } else { - styleName = defaultStyleName; - } - } - QStyle *style = QStyleFactory::create(styleName); - if (!style) { - style = QStyleFactory::create(defaultStyleName); - } + // ---------- Bright text ---------- + p.setColor(QPalette::BrightText, QColor(0, 246, 82)); // #ff00f652 - // Base palette - QPalette base; - if (styleName.compare("Fusion", Qt::CaseInsensitive) == 0) { - base = style->standardPalette(); -#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)) - if (activeScheme == "Dark") { - base.setColor(QPalette::AlternateBase, QColor(53, 53, 53)); - } + // ---------- 3D / frame shading ---------- + p.setColor(QPalette::Light, QColor(120, 120, 120)); // #ff787878 + p.setColor(QPalette::Midlight, QColor(90, 90, 90)); // #ff5a5a5a + p.setColor(QPalette::Mid, QColor(40, 40, 40)); // #ff282828 + p.setColor(QPalette::Dark, QColor(30, 30, 30)); // #ff1e1e1e + p.setColor(QPalette::Shadow, Qt::black); // #ff000000 + + // ---------- Disabled state ---------- + const QColor disabledText(157, 157, 157); // #ff9d9d9d + p.setColor(QPalette::Disabled, QPalette::WindowText, disabledText); + p.setColor(QPalette::Disabled, QPalette::Text, disabledText); + p.setColor(QPalette::Disabled, QPalette::ButtonText, disabledText); + p.setColor(QPalette::Disabled, QPalette::Base, QColor(30, 30, 30)); + p.setColor(QPalette::Disabled, QPalette::Window, QColor(30, 30, 30)); + p.setColor(QPalette::Disabled, QPalette::Link, QColor(48, 140, 198)); // #ff308cc6 + p.setColor(QPalette::Disabled, QPalette::LinkVisited, QColor(255, 0, 255)); // #ffff00ff + p.setColor(QPalette::Disabled, QPalette::ToolTipBase, QColor(255, 255, 220)); + p.setColor(QPalette::Disabled, QPalette::ToolTipText, Qt::black); + +#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) + p.setColor(QPalette::Disabled, QPalette::Accent, disabledText); #endif + + // ---------- Inactive state ---------- + p.setColor(QPalette::Inactive, QPalette::Highlight, QColor(30, 30, 30)); + p.setColor(QPalette::Inactive, QPalette::HighlightedText, Qt::white); + +#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) + p.setColor(QPalette::Inactive, QPalette::Accent, QColor(30, 30, 30)); +#endif + + return p; +} + +static inline QPalette createLightGreenFusionPalette() +{ + QPalette p = QStyleFactory::create("Fusion")->standardPalette(); + + // ---------- Core backgrounds ---------- + p.setColor(QPalette::Window, QColor(240, 240, 240)); // #fff0f0f0 + p.setColor(QPalette::Base, Qt::white); // #ffffffff + p.setColor(QPalette::AlternateBase, QColor(233, 231, 227)); // #ffe9e7e3 + p.setColor(QPalette::Button, QColor(240, 240, 240)); // #fff0f0f0 + p.setColor(QPalette::ToolTipBase, QColor(255, 255, 220)); // #ffffffdc + + // ---------- Core text ---------- + p.setColor(QPalette::WindowText, Qt::black); // #ff000000 + p.setColor(QPalette::Text, Qt::black); // #ff000000 + p.setColor(QPalette::ButtonText, Qt::black); // #ff000000 + p.setColor(QPalette::ToolTipText, Qt::black); // #ff000000 + p.setColor(QPalette::PlaceholderText, QColor(0, 0, 0, 128)); // #80000000 + + // ---------- Selection / focus ---------- + const QColor highlight(20, 140, 60); // #ff148c3c + p.setColor(QPalette::Highlight, highlight); + p.setColor(QPalette::HighlightedText, Qt::white); // #ffffffff + + // ---------- Links ---------- + p.setColor(QPalette::Link, QColor(13, 95, 40)); // #ff0d5f28 + p.setColor(QPalette::LinkVisited, QColor(8, 64, 27)); // #ff08401b + + // ---------- Accent (Qt 6) ---------- +#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) + p.setColor(QPalette::Accent, QColor(16, 117, 50)); // #ff107532 +#endif + + // ---------- Bright text ---------- + p.setColor(QPalette::BrightText, Qt::white); // #ffffffff + + // ---------- 3D / frame shading ---------- + p.setColor(QPalette::Light, Qt::white); // #ffffffff + p.setColor(QPalette::Midlight, QColor(227, 227, 227)); // #ffe3e3e3 + p.setColor(QPalette::Mid, QColor(160, 160, 160)); // #ffa0a0a0 + p.setColor(QPalette::Dark, QColor(160, 160, 160)); // #ffa0a0a0 + p.setColor(QPalette::Shadow, QColor(105, 105, 105)); // #ff696969 + + // ---------- Disabled state ---------- + const QColor disabledText(120, 120, 120); // #ff787878 + p.setColor(QPalette::Disabled, QPalette::WindowText, disabledText); + p.setColor(QPalette::Disabled, QPalette::Text, disabledText); + p.setColor(QPalette::Disabled, QPalette::ButtonText, disabledText); + p.setColor(QPalette::Disabled, QPalette::Base, QColor(240, 240, 240)); + p.setColor(QPalette::Disabled, QPalette::Window, QColor(240, 240, 240)); + p.setColor(QPalette::Disabled, QPalette::Midlight, QColor(247, 247, 247)); + p.setColor(QPalette::Disabled, QPalette::AlternateBase, QColor(247, 247, 247)); + p.setColor(QPalette::Disabled, QPalette::Shadow, Qt::black); + p.setColor(QPalette::Disabled, QPalette::Link, QColor(0, 0, 255)); + p.setColor(QPalette::Disabled, QPalette::LinkVisited, QColor(255, 0, 255)); + +#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) + p.setColor(QPalette::Disabled, QPalette::Accent, disabledText); +#endif + + // ---------- Inactive state ---------- + p.setColor(QPalette::Inactive, QPalette::Highlight, QColor(240, 240, 240)); + p.setColor(QPalette::Inactive, QPalette::HighlightedText, Qt::black); + +#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) + p.setColor(QPalette::Inactive, QPalette::Accent, QColor(240, 240, 240)); +#endif + + return p; +} + +void ThemeManager::themeChangedSlot() +{ + QString themeName = SettingsCache::instance().getThemeName(); + qCInfo(ThemeManagerLog) << "Theme changed:" << themeName; + + QString dirPath = getAvailableThemes().value(themeName); + QDir dir = dirPath; + + // css + if (!dirPath.isEmpty() && dir.exists(STYLE_CSS_NAME)) { + qApp->setStyleSheet("file:///" + dir.absoluteFilePath(STYLE_CSS_NAME)); } else { - base = qApp->palette(); + qApp->setStyleSheet(""); } - // Overlay custom palette colours - if (palCfg.hasPalette()) { - base = palCfg.apply(base); + QStyle *newStyle = nullptr; + QPalette newPalette; + + if (themeName == FUSION_THEME_NAME) { + newStyle = QStyleFactory::create("Fusion"); + +#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)) + // Start from Fusion's own palette so dark mode is handled correctly, + // then apply any tweaks on top of it. + newPalette = newStyle->standardPalette(); + if (QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark) { + newPalette.setColor(QPalette::AlternateBase, QColor(53, 53, 53)); + } +#else + newPalette = qApp->palette(); +#endif + } else if (themeName == FUSION_THEME_NAME_LIGHT) { + newStyle = QStyleFactory::create("Fusion"); + newPalette = createLightGreenFusionPalette(); + } else if (themeName == FUSION_THEME_NAME_DARK) { + newStyle = QStyleFactory::create("Fusion"); + newPalette = createDarkGreenFusionPalette(); + } else { + newStyle = QStyleFactory::create(defaultStyleName); + // Use the style's default palette. + newPalette = newStyle->standardPalette(); } - // Palette BEFORE style — setStyle() triggers a synchronous repolish of all - // widgets immediately. If the palette isn't set yet at that point, every - // widget gets polished against the stale colours, requiring a second apply - // to fully resolve. Setting palette first means setStyle's repolish cascade - // already sees the correct colours. - qApp->setPalette(base); - qApp->setStyle(style); + // Apply palette FIRST. + qApp->setPalette(newPalette); + // Then apply style. + qApp->setStyle(newStyle); // Force every widget to re-polish and repaint immediately rather than // waiting for natural expose events, which produces a patchwork of old @@ -322,57 +410,34 @@ void ThemeManager::applyStyleAndPalette(const QString &themeName, // palette (WA_SetPalette not set). Calling it unconditionally would clobber // intentional per-widget palette customisations across the whole app. for (QWidget *widget : qApp->allWidgets()) { - style->unpolish(widget); - style->polish(widget); - widget->update(); + if (widget->isVisible()) { + newStyle->unpolish(widget); + newStyle->polish(widget); + + widget->update(); + } } -} -void ThemeManager::themeChangedSlot() -{ - QString themeName = SettingsCache::instance().getThemeName(); - QString dirPath = getAvailableThemes().value(themeName); - currentThemePath = dirPath; - QDir dir(dirPath); - - // CSS - if (!dirPath.isEmpty() && dir.exists(STYLE_CSS_NAME)) { - qApp->setStyleSheet("file:///" + dir.absoluteFilePath(STYLE_CSS_NAME)); + if (dirPath.isEmpty()) { + // set default values + QDir::setSearchPaths("theme", DEFAULT_RESOURCE_PATHS); + brushes[Role::Hand] = HANDZONE_BG_DEFAULT; + brushes[Role::Table] = TABLEZONE_BG_DEFAULT; + brushes[Role::Player] = PLAYERZONE_BG_DEFAULT; + brushes[Role::Stack] = STACKZONE_BG_DEFAULT; } else { - qApp->setStyleSheet(""); + // resources + QStringList resources; + resources << dir.absolutePath() << DEFAULT_RESOURCE_PATHS; + QDir::setSearchPaths("theme", resources); + + // zones bg + dir.cd("zones"); + brushes[Role::Hand] = loadBrush(HANDZONE_BG_NAME, HANDZONE_BG_DEFAULT); + brushes[Role::Table] = loadBrush(TABLEZONE_BG_NAME, TABLEZONE_BG_DEFAULT); + brushes[Role::Player] = loadBrush(PLAYERZONE_BG_NAME, PLAYERZONE_BG_DEFAULT); + brushes[Role::Stack] = loadBrush(STACKZONE_BG_NAME, STACKZONE_BG_DEFAULT); } - - // load theme.cfg for style + scheme preference - ThemeConfig themeCfg = ThemeConfig::fromThemeDir(dirPath); - - // Resolve active scheme: - // theme.cfg says Dark/Light → use that - // theme.cfg says System or is absent → follow the OS - QString activeScheme = isDarkMode(dirPath) ? "Dark" : "Light"; - - // ── Load palette: custom first, then theme default ──────────────────── - PaletteConfig palette = PaletteConfig::fromScheme(dirPath, activeScheme); - if (!palette.hasPalette()) { - palette = PaletteConfig::fromDefault(dirPath, activeScheme); - } - - applyStyleAndPalette(themeName, themeCfg, palette, activeScheme); - - QStringList resources; - if (!dirPath.isEmpty()) { - resources << dir.absolutePath(); - } - resources << DEFAULT_RESOURCE_PATHS; - - QDir::setSearchPaths("theme", resources); - - brushes[Role::Hand] = loadBrush(HANDZONE_BG_NAME, HANDZONE_BG_DEFAULT); - - brushes[Role::Table] = loadBrush(TABLEZONE_BG_NAME, TABLEZONE_BG_DEFAULT); - - brushes[Role::Player] = loadBrush(PLAYERZONE_BG_NAME, PLAYERZONE_BG_DEFAULT); - - brushes[Role::Stack] = loadBrush(STACKZONE_BG_NAME, STACKZONE_BG_DEFAULT); for (auto &brushCache : brushesCache) { brushCache.clear(); } @@ -399,7 +464,6 @@ static QString roleBgName(ThemeManager::Role role) default: Q_ASSERT(false); - return {}; } } diff --git a/cockatrice/src/interface/theme_manager.h b/cockatrice/src/interface/theme_manager.h index b9e764d08..416923128 100644 --- a/cockatrice/src/interface/theme_manager.h +++ b/cockatrice/src/interface/theme_manager.h @@ -1,14 +1,12 @@ /** * @file theme_manager.h * @ingroup CoreSettings + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef THEMEMANAGER_H #define THEMEMANAGER_H -#include "theme_config.h" - #include #include #include @@ -43,7 +41,6 @@ public: private: QString defaultStyleName; - QString currentThemePath; std::array brushes; QStringMap availableThemes; /* @@ -55,31 +52,11 @@ protected: void ensureThemeDirectoryExists(); QBrush loadBrush(QString fileName, QColor fallbackColor); QBrush loadExtraBrush(QString fileName, QBrush &fallbackBrush); - void applyStyleAndPalette(const QString &themeName, - const ThemeConfig &themeCfg, - const PaletteConfig &palCfg, - const QString &activeScheme); public: bool isBuiltInTheme(); - bool isDarkMode(const QString &themeDirPath); + bool isDarkMode(); QStringMap &getAvailableThemes(); - // Returns the path to the currently active theme directory (empty = default) - QString getCurrentThemePath() const - { - return currentThemePath; - } - // Load the global theme settings (style + color scheme preference) - static ThemeConfig loadGlobalConfig(const QString &themeDirPath); - static bool saveGlobalConfig(const QString &themeDirPath, const ThemeConfig &cfg); - - // 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); - void setColorScheme(const QString &scheme); - - void reloadCurrentTheme(); - void previewPalette(const PaletteConfig &cfg, const QString &scheme); QBrush &getBgBrush(Role zone); QBrush getExtraBgBrush(Role zone, int zoneId = 0); diff --git a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h index f776d4c77..6512ba890 100644 --- a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h +++ b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h @@ -1,8 +1,8 @@ /** * @file color_identity_widget.h * @ingroup CardExtraInfoWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COLOR_IDENTITY_WIDGET_H #define COLOR_IDENTITY_WIDGET_H diff --git a/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h index b2f6b62c0..26a186c59 100644 --- a/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h +++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h @@ -1,8 +1,8 @@ /** * @file mana_cost_widget.h * @ingroup CardExtraInfoWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef MANA_COST_WIDGET_H #define MANA_COST_WIDGET_H diff --git a/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.h b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.h index 0f2d7acd1..8d2c6813f 100644 --- a/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.h +++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.h @@ -1,8 +1,8 @@ /** * @file mana_symbol_widget.h * @ingroup CardExtraInfoWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef MANA_SYMBOL_WIDGET_H #define MANA_SYMBOL_WIDGET_H diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp index 3f36e559c..fa304816f 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp @@ -58,6 +58,16 @@ void CardGroupDisplayWidget::mousePressEvent(QMouseEvent *event) } } +void CardGroupDisplayWidget::onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card) +{ + emit cardClicked(event, card); +} + +void CardGroupDisplayWidget::onHover(const ExactCard &card) +{ + emit cardHovered(card); +} + void CardGroupDisplayWidget::onSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected) { auto proxyModel = qobject_cast(selectionModel->model()); @@ -85,9 +95,8 @@ void CardGroupDisplayWidget::onSelectionChanged(const QItemSelection &selected, for (auto &range : deselected) { for (int row = range.top(); row <= range.bottom(); ++row) { QModelIndex idx = range.model()->index(row, 0, range.parent()); - if (proxyModel) { + if (proxyModel) idx = proxyModel->mapToSource(idx); - } auto it = indexToWidgetMap.find(QPersistentModelIndex(idx)); if (it != indexToWidgetMap.end()) { @@ -144,8 +153,8 @@ QWidget *CardGroupDisplayWidget::constructWidgetForIndex(QPersistentModelIndex i widget->setScaleFactor(cardSizeWidget->getSlider()->value()); widget->setCard(CardDatabaseManager::query()->getCard({cardName, cardProviderId})); - connect(widget, &CardInfoPictureWithTextOverlayWidget::cardClicked, this, &CardGroupDisplayWidget::cardClicked); - connect(widget, &CardInfoPictureWithTextOverlayWidget::hoveredOnCard, this, &CardGroupDisplayWidget::cardHovered); + connect(widget, &CardInfoPictureWithTextOverlayWidget::imageClicked, this, &CardGroupDisplayWidget::onClick); + connect(widget, &CardInfoPictureWithTextOverlayWidget::hoveredOnCard, this, &CardGroupDisplayWidget::onHover); connect(cardSizeWidget->getSlider(), &QSlider::valueChanged, widget, &CardInfoPictureWidget::setScaleFactor); indexToWidgetMap[index].append(widget); diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h index 2308ccf8d..0f1209b29 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h @@ -1,8 +1,8 @@ /** * @file card_group_display_widget.h * @ingroup DeckEditorCardGroupWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARD_GROUP_DISPLAY_WIDGET_H #define CARD_GROUP_DISPLAY_WIDGET_H @@ -48,6 +48,8 @@ public: public slots: void mousePressEvent(QMouseEvent *event) override; + void onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card); + void onHover(const ExactCard &card); virtual QWidget *constructWidgetForIndex(QPersistentModelIndex index); virtual void updateCardDisplays(); virtual void onCardAddition(const QModelIndex &parent, int first, int last); @@ -57,7 +59,7 @@ public slots: void resizeEvent(QResizeEvent *event) override; signals: - void cardClicked(QMouseEvent *event, const ExactCard &card); + void cardClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card); void cardHovered(const ExactCard &card); void cleanupRequested(CardGroupDisplayWidget *cardGroupDisplayWidget); diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h index 0772c1ab4..e07152b34 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h @@ -1,8 +1,8 @@ /** * @file flat_card_group_display_widget.h * @ingroup DeckEditorCardGroupWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef FLAT_CARD_GROUP_DISPLAY_WIDGET_H #define FLAT_CARD_GROUP_DISPLAY_WIDGET_H diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h index 5b4b80d6b..288e46129 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h @@ -1,8 +1,8 @@ /** * @file overlapped_card_group_display_widget.h * @ingroup DeckEditorCardGroupWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef OVERLAPPED_CARD_GROUP_DISPLAY_WIDGET_H #define OVERLAPPED_CARD_GROUP_DISPLAY_WIDGET_H diff --git a/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp index 577dafe0a..4930fbbfd 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp @@ -1,6 +1,6 @@ #include "card_info_display_widget.h" -#include "../../../game_graphics/board/card_item.h" +#include "../../../game/board/card_item.h" #include "card_info_picture_widget.h" #include "card_info_text_widget.h" @@ -43,13 +43,11 @@ CardInfoDisplayWidget::CardInfoDisplayWidget(const CardRef &cardRef, QWidget *pa void CardInfoDisplayWidget::setCard(const ExactCard &card) { - if (exactCard) { + if (exactCard) disconnect(exactCard.getCardPtr().data(), nullptr, this, nullptr); - } exactCard = card; - if (exactCard) { + if (exactCard) connect(exactCard.getCardPtr().data(), &QObject::destroyed, this, &CardInfoDisplayWidget::clear); - } text->setCard(exactCard); pic->setCard(exactCard); diff --git a/cockatrice/src/interface/widgets/cards/card_info_display_widget.h b/cockatrice/src/interface/widgets/cards/card_info_display_widget.h index f8f33f3d4..d44c4c205 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.h @@ -1,8 +1,8 @@ /** * @file card_info_display_widget.h * @ingroup CardWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARDINFOWIDGET_H #define CARDINFOWIDGET_H diff --git a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp index 2e7c62461..21bee8f54 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp @@ -1,7 +1,7 @@ #include "card_info_frame_widget.h" #include "../../../client/settings/cache_settings.h" -#include "../../../game_graphics/board/card_item.h" +#include "../../../game/board/card_item.h" #include "card_info_display_widget.h" #include "card_info_picture_widget.h" #include "card_info_text_widget.h" diff --git a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h index e766fac7a..11b991e87 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h @@ -1,8 +1,8 @@ /** * @file card_info_frame_widget.h * @ingroup CardWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARDFRAME_H #define CARDFRAME_H diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.h index ce22a1a44..0185f758c 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.h @@ -1,8 +1,8 @@ /** * @file card_info_picture_art_crop_widget.h * @ingroup CardWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARD_INFO_PICTURE_ART_CROP_WIDGET_H #define CARD_INFO_PICTURE_ART_CROP_WIDGET_H diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h index a158ac6cf..10eb32940 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h @@ -2,8 +2,8 @@ * @file card_info_picture_enlarged_widget.h * @ingroup CardWigets * @ingroup DeckEditorWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARD_PICTURE_ENLARGED_WIDGET_H #define CARD_PICTURE_ENLARGED_WIDGET_H 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 3bfd9ce7d..555d69381 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp @@ -1,7 +1,7 @@ #include "card_info_picture_widget.h" #include "../../../client/settings/cache_settings.h" -#include "../../../game_graphics/board/card_item.h" +#include "../../../game/board/card_item.h" #include "../../../interface/card_picture_loader/card_picture_loader.h" #include "../../../interface/widgets/tabs/tab_supervisor.h" #include "../../window_main.h" @@ -345,7 +345,7 @@ void CardInfoPictureWidget::mousePressEvent(QMouseEvent *event) createRightClickMenu()->popup(QCursor::pos()); } - emit cardClicked(event, exactCard); + emit cardClicked(event); } void CardInfoPictureWidget::hideEvent(QHideEvent *event) @@ -431,13 +431,13 @@ QMenu *CardInfoPictureWidget::createAddToOpenDeckMenu() QAction *addCard = addCardMenu->addAction(tr("Mainboard")); connect(addCard, &QAction::triggered, this, [this, deckEditorTab] { deckEditorTab->updateCard(exactCard); - deckEditorTab->addCard(exactCard, DECK_ZONE_MAIN); + deckEditorTab->actAddCard(exactCard); }); QAction *addCardSideboard = addCardMenu->addAction(tr("Sideboard")); connect(addCardSideboard, &QAction::triggered, this, [this, deckEditorTab] { deckEditorTab->updateCard(exactCard); - deckEditorTab->addCard(exactCard, DECK_ZONE_SIDE); + deckEditorTab->actAddCardToSideboard(exactCard); }); } 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 1f065eed9..5eb2d88d9 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h @@ -1,8 +1,8 @@ /** * @file card_info_picture_widget.h * @ingroup CardWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARD_INFO_PICTURE_H #define CARD_INFO_PICTURE_H @@ -43,7 +43,7 @@ signals: void hoveredOnCard(const ExactCard &hoveredCard); void cardScaleFactorChanged(int _scale); void cardChanged(const ExactCard &card); - void cardClicked(QMouseEvent *event, const ExactCard &card); + void cardClicked(QMouseEvent *event); protected: void resizeEvent(QResizeEvent *event) override; 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 c5cb59b3b..2f0aeccfd 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 @@ -93,7 +93,7 @@ void CardInfoPictureWithTextOverlayWidget::setHighlighted(bool _highlighted) void CardInfoPictureWithTextOverlayWidget::mousePressEvent(QMouseEvent *event) { - emit cardClicked(event, getCard()); + emit imageClicked(event, this); } /** 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 ba978498d..eed827292 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 @@ -2,8 +2,8 @@ * @file card_info_picture_with_text_overlay_widget.h * @ingroup CardWidgets * @ingroup DeckStorageWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARD_PICTURE_WITH_TEXT_OVERLAY_H #define CARD_PICTURE_WITH_TEXT_OVERLAY_H @@ -35,6 +35,8 @@ public: void setHighlighted(bool _highlighted); [[nodiscard]] QSize sizeHint() const override; +signals: + void imageClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance); protected: void paintEvent(QPaintEvent *event) override; diff --git a/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp index c6af5320b..f5f343807 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp @@ -1,6 +1,6 @@ #include "card_info_text_widget.h" -#include "../../../game_graphics/board/card_item.h" +#include "../../../game/board/card_item.h" #include #include @@ -73,9 +73,8 @@ void CardInfoTextWidget::setCard(const ExactCard &exactCard) QStringList cardProps = card->getProperties(); for (const QString &key : cardProps) { - if (key.contains("-")) { + if (key.contains("-")) continue; - } QString keyText = Mtg::getNicePropertyName(key).toHtmlEscaped() + ":"; text += QString("%1%2").arg(keyText, card->getProperty(key).toHtmlEscaped()); diff --git a/cockatrice/src/interface/widgets/cards/card_info_text_widget.h b/cockatrice/src/interface/widgets/cards/card_info_text_widget.h index a9c29da37..95b588882 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.h @@ -1,8 +1,8 @@ /** * @file card_info_text_widget.h * @ingroup CardWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARDINFOTEXT_H #define CARDINFOTEXT_H diff --git a/cockatrice/src/interface/widgets/cards/card_size_widget.h b/cockatrice/src/interface/widgets/cards/card_size_widget.h index 9f4c165fd..638c263ea 100644 --- a/cockatrice/src/interface/widgets/cards/card_size_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_size_widget.h @@ -3,8 +3,8 @@ * @ingroup CardWidgets * @ingroup DeckEditorWidgets * @ingroup DeckStorageWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARD_SIZE_WIDGET_H #define CARD_SIZE_WIDGET_H 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 eaf3a67b0..a8a97a4ca 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 @@ -51,7 +51,7 @@ DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent, // User Interaction // ===================================================================================================================== -void DeckCardZoneDisplayWidget::onClick(QMouseEvent *event, const ExactCard &card) +void DeckCardZoneDisplayWidget::onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card) { emit cardClicked(event, card, zoneName); } diff --git a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h index b426fca30..dc0f3d734 100644 --- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h +++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h @@ -1,8 +1,8 @@ /** * @file deck_card_zone_display_widget.h * @ingroup DeckEditorWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DECK_CARD_ZONE_DISPLAY_WIDGET_H #define DECK_CARD_ZONE_DISPLAY_WIDGET_H @@ -42,7 +42,7 @@ public: void addCardsToOverlapWidget(); public slots: - void onClick(QMouseEvent *event, const ExactCard &card); + void onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card); void onHover(const ExactCard &card); void cleanupInvalidCardGroup(CardGroupDisplayWidget *displayWidget); void constructAppropriateWidget(QPersistentModelIndex index); @@ -55,7 +55,7 @@ public slots: void onCategoryRemoval(const QModelIndex &parent, int first, int last); signals: - void cardClicked(QMouseEvent *event, const ExactCard &card, const QString &zoneName); + void cardClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card, QString zoneName); void cardHovered(const ExactCard &card); void activeSortCriteriaChanged(QStringList activeSortCriteria); void requestCleanup(DeckCardZoneDisplayWidget *displayWidget); diff --git a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h index 154e938aa..acb67a49a 100644 --- a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h +++ b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h @@ -2,8 +2,8 @@ * @file deck_preview_card_picture_widget.h * @ingroup CardWidgets * @ingroup Lobby + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DECK_PREVIEW_CARD_PICTURE_WIDGET_H #define DECK_PREVIEW_CARD_PICTURE_WIDGET_H diff --git a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp index e807e9d47..7af641689 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp @@ -17,9 +17,8 @@ AbstractAnalyticsPanelWidget * AnalyticsPanelWidgetFactory::create(const QString &type, QWidget *parent, DeckListStatisticsAnalyzer *analyzer) const { auto it = widgets.find(type); - if (it == widgets.end()) { + if (it == widgets.end()) return nullptr; - } auto w = it->creator(parent, analyzer); diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp index 0107294c7..4931aeaa4 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp @@ -20,11 +20,12 @@ DrawProbabilityWidget::DrawProbabilityWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer) : AbstractAnalyticsPanelWidget(parent, analyzer) { - controls = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff); - controls->setSpacing(4, 4); + controls = new QWidget(this); + controlLayout = new QHBoxLayout(controls); + controlLayout->setContentsMargins(11, 0, 11, 0); labelPrefix = new QLabel(this); - controls->addWidget(labelPrefix); + controlLayout->addWidget(labelPrefix); criteriaCombo = new QComboBox(this); // Give these things item-data so we can translate the actual user-facing strings @@ -32,32 +33,33 @@ DrawProbabilityWidget::DrawProbabilityWidget(QWidget *parent, DeckListStatistics criteriaCombo->addItem(QString(), "type"); criteriaCombo->addItem(QString(), "subtype"); criteriaCombo->addItem(QString(), "cmc"); - controls->addWidget(criteriaCombo); + controlLayout->addWidget(criteriaCombo); exactnessCombo = new QComboBox(this); exactnessCombo->addItem(QString(), true); // At least exactnessCombo->addItem(QString(), false); // Exactly - controls->addWidget(exactnessCombo); + controlLayout->addWidget(exactnessCombo); quantitySpin = new QSpinBox(this); quantitySpin->setRange(1, 60); - controls->addWidget(quantitySpin); + controlLayout->addWidget(quantitySpin); labelMiddle = new QLabel(this); - controls->addWidget(labelMiddle); + controlLayout->addWidget(labelMiddle); drawnSpin = new QSpinBox(this); drawnSpin->setRange(1, 60); drawnSpin->setValue(7); - controls->addWidget(drawnSpin); + controlLayout->addWidget(drawnSpin); labelSuffix = new QLabel(this); - controls->addWidget(labelSuffix); + controlLayout->addWidget(labelSuffix); labelPrefix->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); labelMiddle->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); labelSuffix->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + controlLayout->addStretch(1); layout->addWidget(controls); // Table diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h index 9f7b971b1..80015999f 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h @@ -1,8 +1,6 @@ #ifndef COCKATRICE_DRAW_PROBABILITY_WIDGET_H #define COCKATRICE_DRAW_PROBABILITY_WIDGET_H -#include "../../../../layouts/flow_layout.h" -#include "../../../general/layout_containers/flow_widget.h" #include "../../abstract_analytics_panel_widget.h" #include "../../deck_list_statistics_analyzer.h" #include "draw_probability_config.h" @@ -33,7 +31,8 @@ private slots: private: DrawProbabilityConfig config; - FlowWidget *controls; + QWidget *controls; + QHBoxLayout *controlLayout; QLabel *labelPrefix; QLabel *labelMiddle; QLabel *labelSuffix; diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp index 83e35d57d..3317486ea 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp @@ -28,9 +28,8 @@ ManaBaseConfigDialog::ManaBaseConfigDialog(DeckListStatisticsAnalyzer *analyzer, // select initial filters for (int i = 0; i < filterList->count(); ++i) { - if (config.filters.contains(filterList->item(i)->text())) { + if (config.filters.contains(filterList->item(i)->text())) filterList->item(i)->setSelected(true); - } } buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h index 85b2a13b3..39380c07e 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h @@ -1,8 +1,8 @@ /** * @file mana_base_widget.h * @ingroup DeckEditorAnalyticsWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef MANA_BASE_WIDGET_H #define MANA_BASE_WIDGET_H diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp index 9e9ae98a6..38199656c 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp @@ -69,9 +69,8 @@ void ManaCurveConfigDialog::setFromConfig(const ManaCurveConfig &cfg) { groupBy->setCurrentText(cfg.groupBy); // restore filters - for (int i = 0; i < filterList->count(); ++i) { + for (int i = 0; i < filterList->count(); ++i) filterList->item(i)->setSelected(cfg.filters.contains(filterList->item(i)->text())); - } showMain->setChecked(cfg.showMain); showCatRows->setChecked(cfg.showCategoryRows); @@ -82,9 +81,8 @@ void ManaCurveConfigDialog::accept() cfg.groupBy = groupBy->currentText(); cfg.filters.clear(); - for (auto *item : filterList->selectedItems()) { + for (auto *item : filterList->selectedItems()) cfg.filters << item->text(); - } cfg.showMain = showMain->isChecked(); cfg.showCategoryRows = showCatRows->isChecked(); diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp index c04767015..f059ff873 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp @@ -51,17 +51,15 @@ void ManaCurveTotalWidget::updateDisplay(const QString &categoryName, for (auto it = cmcIt->cbegin(); it != cmcIt->cend(); ++it) { const QString &category = it.key(); - if (!config.filters.isEmpty() && !config.filters.contains(category)) { + if (!config.filters.isEmpty() && !config.filters.contains(category)) continue; - } const int value = it.value(); QStringList cards; const auto catIt = cardsMap.constFind(category); - if (catIt != cardsMap.cend()) { + if (catIt != cardsMap.cend()) cards = catIt->value(cmc); - } segments.push_back({category, value, cards, GameSpecificColors::MTG::colorHelper(category)}); } diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp index b182bf954..e09ecfe87 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp @@ -69,18 +69,16 @@ static void buildMapsByCategory(const QHash> &categoryC const QString &category = catIt.key(); const auto &countsByCmc = catIt.value(); - for (auto it = countsByCmc.cbegin(); it != countsByCmc.cend(); ++it) { + for (auto it = countsByCmc.cbegin(); it != countsByCmc.cend(); ++it) outCmcMap[it.key()][category] = it.value(); - } } for (auto catIt = categoryCards.cbegin(); catIt != categoryCards.cend(); ++catIt) { const QString &category = catIt.key(); const auto &cardsByCmc = catIt.value(); - for (auto it = cardsByCmc.cbegin(); it != cardsByCmc.cend(); ++it) { + for (auto it = cardsByCmc.cbegin(); it != cardsByCmc.cend(); ++it) outCardsMap[category][it.key()] = it.value(); - } } } @@ -90,9 +88,8 @@ static void findGlobalCmcRange(const QHash> &categoryCo maxCmc = 0; for (const auto &countsByCmc : categoryCounts) { - for (auto it = countsByCmc.cbegin(); it != countsByCmc.cend(); ++it) { + for (auto it = countsByCmc.cbegin(); it != countsByCmc.cend(); ++it) maxCmc = qMax(maxCmc, it.key()); - } } } diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h index d3e56d44c..da59da9a8 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h @@ -1,8 +1,8 @@ /** * @file mana_curve_widget.h * @ingroup DeckEditorAnalyticsWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef MANA_CURVE_WIDGET_H #define MANA_CURVE_WIDGET_H @@ -37,7 +37,7 @@ public: { config = ManaCurveConfig::fromJson(o); updateDisplay(); - } + }; QJsonObject extractConfigFromDialog(QDialog *dlg) const override; diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp index b01c33ba5..80fd03928 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp @@ -26,9 +26,8 @@ ManaDevotionConfigDialog::ManaDevotionConfigDialog(DeckListStatisticsAnalyzer *a // select initial filters for (int i = 0; i < filterList->count(); ++i) { - if (config.filters.contains(filterList->item(i)->text())) { + if (config.filters.contains(filterList->item(i)->text())) filterList->item(i)->setSelected(true); - } } buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h index af0215305..833f12938 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h @@ -1,8 +1,8 @@ /** * @file mana_devotion_widget.h * @ingroup DeckEditorAnalyticsWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef MANA_DEVOTION_WIDGET_H #define MANA_DEVOTION_WIDGET_H diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp index 01af9329c..f70f32d5b 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp @@ -24,9 +24,8 @@ ManaDistributionConfig ManaDistributionConfig::fromJson(const QJsonObject &o) if (o.contains("filters")) { config.filters.clear(); - for (auto v : o["filters"].toArray()) { + for (auto v : o["filters"].toArray()) config.filters << v.toString(); - } } if (o.contains("showColorRows")) { diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp index 325c70028..7fe4d94e4 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp @@ -62,9 +62,8 @@ void ManaDistributionConfigDialog::setFromConfig(const ManaDistributionConfig &c displayType->setCurrentText(cfg.displayType); - for (int i = 0; i < filterList->count(); ++i) { + for (int i = 0; i < filterList->count(); ++i) filterList->item(i)->setSelected(cfg.filters.contains(filterList->item(i)->text())); - } showColorRows->setChecked(cfg.showColorRows); } @@ -75,9 +74,8 @@ void ManaDistributionConfigDialog::accept() // Filters cfg.filters.clear(); - for (auto *item : filterList->selectedItems()) { + for (auto *item : filterList->selectedItems()) cfg.filters << item->text(); - } cfg.showColorRows = showColorRows->isChecked(); diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp index 76552ea2f..147675e21 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp @@ -23,8 +23,8 @@ DeckAnalyticsWidget::DeckAnalyticsWidget(QWidget *parent, DeckListStatisticsAnal layout = new QVBoxLayout(this); // Controls - controlContainer = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff); - controlContainer->setSpacing(4, 4); + controlContainer = new QWidget(this); + controlLayout = new QHBoxLayout(controlContainer); addButton = new QPushButton(this); removeButton = new QPushButton(this); saveButton = new QPushButton(this); @@ -32,11 +32,11 @@ DeckAnalyticsWidget::DeckAnalyticsWidget(QWidget *parent, DeckListStatisticsAnal includeSideboardCheckBox = new QCheckBox(this); includeSideboardCheckBox->setChecked(false); - controlContainer->addWidget(addButton); - controlContainer->addWidget(removeButton); - controlContainer->addWidget(saveButton); - controlContainer->addWidget(loadButton); - controlContainer->addWidget(includeSideboardCheckBox); + controlLayout->addWidget(addButton); + controlLayout->addWidget(removeButton); + controlLayout->addWidget(saveButton); + controlLayout->addWidget(loadButton); + controlLayout->addWidget(includeSideboardCheckBox); layout->addWidget(controlContainer); diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h index 3c73deca2..09618c3f8 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h @@ -7,7 +7,6 @@ #ifndef DECK_ANALYTICS_WIDGET_H #define DECK_ANALYTICS_WIDGET_H -#include "../general/layout_containers/flow_widget.h" #include "abstract_analytics_panel_widget.h" #include "deck_list_statistics_analyzer.h" #include "resizable_panel.h" @@ -52,7 +51,8 @@ private: void addPanelInstance(const QString &typeId, AbstractAnalyticsPanelWidget *panel, const QJsonObject &cfg = {}); QVBoxLayout *layout; - FlowWidget *controlContainer; + QWidget *controlContainer; + QHBoxLayout *controlLayout; QPushButton *addButton; QPushButton *removeButton; diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp b/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp index add13ff21..073b6d25c 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp @@ -191,12 +191,10 @@ double DeckListStatisticsAnalyzer::hypergeometric(int N, int K, int n, int k) } auto choose = [](int n, int r) -> double { - if (r > n) { + if (r > n) return 0.0; - } - if (r == 0 || r == n) { + if (r == 0 || r == n) return 1.0; - } double res = 1.0; for (int i = 1; i <= r; ++i) { res *= (n - r + i); diff --git a/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp b/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp deleted file mode 100644 index a1c29e241..000000000 --- a/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp +++ /dev/null @@ -1,167 +0,0 @@ -#include "card_database_view.h" - -#include "../../../client/settings/cache_settings.h" -#include "card_database_display_model.h" -#include "card_database_model.h" - -#include -#include -#include -#include -#include -#include -#include - -static bool canBeCommander(const CardInfo &cardInfo) -{ - return (cardInfo.getCardType().contains("Legendary", Qt::CaseInsensitive) && - cardInfo.getCardType().contains("Creature", Qt::CaseInsensitive)) || - cardInfo.getText().contains("can be your commander", Qt::CaseInsensitive); -} - -CardDatabaseView::CardDatabaseView(QWidget *parent, CardDatabaseDisplayModel *model) - : QTreeView(parent), databaseDisplayModel(model) -{ - // set up object - setUniformRowHeights(true); - setRootIsDecorated(false); - setAlternatingRowColors(true); - setSortingEnabled(true); - sortByColumn(0, Qt::AscendingOrder); - QTreeView::setModel(databaseDisplayModel); - setContextMenuPolicy(Qt::CustomContextMenu); - - connect(databaseDisplayModel, &CardDatabaseDisplayModel::modelDirty, this, - &CardDatabaseView::resetSelectionIfEmpty); - - connect(this, &QTreeView::customContextMenuRequested, this, &CardDatabaseView::openCustomMenu); - connect(selectionModel(), &QItemSelectionModel::currentRowChanged, this, &CardDatabaseView::updateCard); - connect(this, &QTreeView::doubleClicked, this, &CardDatabaseView::actDoubleClick); - - // layout settings - QByteArray dbHeaderState = SettingsCache::instance().layouts().getDeckEditorDbHeaderState(); - if (dbHeaderState.isNull()) { - // first run - setColumnWidth(0, 200); - } else { - header()->restoreState(dbHeaderState); - } - connect(header(), &QHeaderView::geometriesChanged, this, &CardDatabaseView::saveDbHeaderState); - - // create key filters - searchKeySignals.setObjectName("searchKeySignals"); - connect(&searchKeySignals, &KeySignals::onEnter, this, [this] { addCard(DECK_ZONE_MAIN); }); - connect(&searchKeySignals, &KeySignals::onCtrlAltEqual, this, [this] { addCard(DECK_ZONE_MAIN); }); - connect(&searchKeySignals, &KeySignals::onCtrlAltRBracket, this, [this] { addCard(DECK_ZONE_SIDE); }); - connect(&searchKeySignals, &KeySignals::onCtrlAltMinus, this, [this] { decrementCard(DECK_ZONE_MAIN); }); - connect(&searchKeySignals, &KeySignals::onCtrlAltLBracket, this, [this] { decrementCard(DECK_ZONE_SIDE); }); - connect(&searchKeySignals, &KeySignals::onCtrlAltEnter, this, [this] { addCard(DECK_ZONE_SIDE); }); - connect(&searchKeySignals, &KeySignals::onCtrlEnter, this, [this] { addCard(DECK_ZONE_SIDE); }); - connect(&searchKeySignals, &KeySignals::onCtrlC, this, &CardDatabaseView::copyDatabaseCellContents); -} - -QString CardDatabaseView::currentCardName() const -{ - const QModelIndex currentIndex = selectionModel()->currentIndex(); - if (!currentIndex.isValid()) { - return {}; - } - - return currentIndex.siblingAtColumn(CardDatabaseModel::NameColumn).data().toString(); -} - -void CardDatabaseView::actDoubleClick() -{ - if (QApplication::keyboardModifiers() & Qt::ControlModifier) { - addCard(DECK_ZONE_SIDE); - } else { - addCard(DECK_ZONE_MAIN); - } -} - -void CardDatabaseView::addCard(const QString &zoneName) -{ - emit cardAdded(currentCardName(), zoneName); -} - -void CardDatabaseView::decrementCard(const QString &zoneName) -{ - emit cardDecremented(currentCardName(), zoneName); -} - -void CardDatabaseView::updateCard(const QModelIndex ¤t, const QModelIndex & /*previous*/) -{ - if (!current.isValid()) { - return; - } - - const QString cardName = current.siblingAtColumn(CardDatabaseModel::NameColumn).data().toString(); - - if (!current.model()->hasChildren(current.siblingAtColumn(CardDatabaseModel::NameColumn))) { - emit cardChanged(cardName); - } -} - -void CardDatabaseView::resetSelectionIfEmpty() -{ - QModelIndexList sel = selectionModel()->selectedRows(); - if (sel.isEmpty() && databaseDisplayModel->rowCount() > 0) { - selectionModel()->setCurrentIndex(databaseDisplayModel->index(0, 0), - QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); - } -} - -void CardDatabaseView::copyDatabaseCellContents() const -{ - auto _data = selectionModel()->currentIndex().data(); - QApplication::clipboard()->setText(_data.toString()); -} - -void CardDatabaseView::saveDbHeaderState() -{ - SettingsCache::instance().layouts().setDeckEditorDbHeaderState(header()->saveState()); -} - -void CardDatabaseView::openCustomMenu(QPoint point) -{ - CardInfoPtr card = CardDatabaseManager::query()->getCardInfo(currentCardName()); - - if (!card) { - return; - } - - QMenu menu; - // add to deck and sideboard options - QAction *addToDeck = menu.addAction(tr("Add to Deck")); - QAction *addToSideboard = menu.addAction(tr("Add to Sideboard")); - QAction *selectPrinting = menu.addAction(tr("Select Printing")); - - connect(addToDeck, &QAction::triggered, this, [this, card] { emit cardAdded(card->getName(), DECK_ZONE_MAIN); }); - connect(addToSideboard, &QAction::triggered, this, - [this, card] { emit cardAdded(card->getName(), DECK_ZONE_SIDE); }); - connect(selectPrinting, &QAction::triggered, this, &CardDatabaseView::selectPrintingClicked); - - if (canBeCommander(*card)) { - QAction *edhRecCommander = menu.addAction(tr("Show on EDHRec (Commander)")); - connect(edhRecCommander, &QAction::triggered, this, [this, card] { emit edhrecClicked(card, true); }); - } - QAction *edhRecCard = menu.addAction(tr("Show on EDHRec (Card)")); - connect(edhRecCard, &QAction::triggered, this, [this, card] { emit edhrecClicked(card, false); }); - - // filling out the related cards submenu - auto *relatedMenu = new QMenu(tr("Show Related cards")); - menu.addMenu(relatedMenu); - auto relatedCards = card->getAllRelatedCards(); - if (relatedCards.isEmpty()) { - relatedMenu->setDisabled(true); - } else { - for (const CardRelation *rel : relatedCards) { - const QString &relatedCardName = rel->getName(); - QAction *relatedCard = relatedMenu->addAction(relatedCardName); - connect(relatedCard, &QAction::triggered, this, - [this, relatedCardName] { emit relatedCardClicked(relatedCardName); }); - } - } - - menu.exec(mapToGlobal(point)); -} diff --git a/cockatrice/src/interface/widgets/deck_editor/card_database_view.h b/cockatrice/src/interface/widgets/deck_editor/card_database_view.h deleted file mode 100644 index 175ec12b9..000000000 --- a/cockatrice/src/interface/widgets/deck_editor/card_database_view.h +++ /dev/null @@ -1,59 +0,0 @@ -#ifndef COCKATRICE_CARD_DATABASE_VIEW_H -#define COCKATRICE_CARD_DATABASE_VIEW_H - -#include "../../key_signals.h" - -#include -#include - -class CardDatabaseModel; -class CardDatabaseDisplayModel; - -/** - * @brief The card database table. - */ -class CardDatabaseView : public QTreeView -{ - Q_OBJECT - - KeySignals searchKeySignals; - CardDatabaseDisplayModel *databaseDisplayModel; - -public: - explicit CardDatabaseView(QWidget *parent, CardDatabaseDisplayModel *model); - - QString currentCardName() const; - - /** - * @brief Get the KeySignals that are connected to this view. - * You can install the KeySignals as an eventFilter to capture keyboard shortcuts for adding and decrementing cards. - */ - KeySignals *getKeySignals() - { - return &searchKeySignals; - } - -signals: - void cardChanged(const QString &cardName); - - void cardAdded(const QString &cardName, const QString &zoneName); - void cardDecremented(const QString &cardName, const QString &zoneName); - - void edhrecClicked(const CardInfoPtr &cardInfo, bool isCommander); - void selectPrintingClicked(); - void relatedCardClicked(const QString &relatedCard); - -private slots: - void actDoubleClick(); - - void addCard(const QString &zoneName); - void decrementCard(const QString &zoneName); - void updateCard(const QModelIndex ¤t, const QModelIndex &); - - void resetSelectionIfEmpty(); - void copyDatabaseCellContents() const; - void saveDbHeaderState(); - void openCustomMenu(QPoint point); -}; - -#endif // COCKATRICE_CARD_DATABASE_VIEW_H diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp index 2a491de4f..bacebe385 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp @@ -13,7 +13,7 @@ DeckEditorCardDatabaseDockWidget::DeckEditorCardDatabaseDockWidget(AbstractTabDe void DeckEditorCardDatabaseDockWidget::createDatabaseDisplayDock(AbstractTabDeckEditor *deckEditor) { - databaseDisplayWidget = new DeckEditorDatabaseDisplayWidget(this, deckEditor->databaseModel); + databaseDisplayWidget = new DeckEditorDatabaseDisplayWidget(this, deckEditor); auto *frame = new QVBoxLayout; frame->setObjectName("databaseDisplayFrame"); @@ -29,16 +29,19 @@ void DeckEditorCardDatabaseDockWidget::createDatabaseDisplayDock(AbstractTabDeck // connect signals connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::cardChanged, deckEditor, &AbstractTabDeckEditor::updateCard); - connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::cardAdded, deckEditor, - &AbstractTabDeckEditor::addCard); - connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::cardDecremented, deckEditor, - &AbstractTabDeckEditor::decrementCard); - connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::edhrecRequested, deckEditor, - &AbstractTabDeckEditor::openEdhrecTab); - connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::printingSelectorRequested, deckEditor, - &AbstractTabDeckEditor::showPrintingSelector); - connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::cardInfoRequested, deckEditor, - &AbstractTabDeckEditor::updateCardInfo); + connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::addCardToMainDeck, deckEditor, + &AbstractTabDeckEditor::actAddCard); + connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::addCardToSideboard, deckEditor, + &AbstractTabDeckEditor::actAddCardToSideboard); + connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::decrementCardFromMainDeck, deckEditor, + &AbstractTabDeckEditor::actDecrementCard); + connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::decrementCardFromSideboard, deckEditor, + &AbstractTabDeckEditor::actDecrementCardFromSideboard); +} + +CardDatabase *DeckEditorCardDatabaseDockWidget::getDatabase() const +{ + return databaseDisplayWidget->databaseModel->getDatabase(); } void DeckEditorCardDatabaseDockWidget::retranslateUi() @@ -55,3 +58,7 @@ void DeckEditorCardDatabaseDockWidget::clearAllDatabaseFilters() { databaseDisplayWidget->clearAllDatabaseFilters(); } +void DeckEditorCardDatabaseDockWidget::highlightAllSearchEdit() +{ + databaseDisplayWidget->searchEdit->setSelection(0, databaseDisplayWidget->searchEdit->text().length()); +} diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h index 6af2e4432..6ad442075 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h @@ -17,11 +17,13 @@ public: DeckEditorDatabaseDisplayWidget *databaseDisplayWidget; + CardDatabase *getDatabase() const; void setFilterTree(FilterTree *filterTree); public slots: void retranslateUi(); void clearAllDatabaseFilters(); + void highlightAllSearchEdit(); private: void createDatabaseDisplayDock(AbstractTabDeckEditor *deckEditor); 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 9da821813..c625ff1d9 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 @@ -5,17 +5,24 @@ #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include "../../../interface/widgets/tabs/tab_supervisor.h" #include "../../pixel_map_generator.h" -#include "card_database_view.h" #include #include +#include #include #include #include #include -DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent, CardDatabaseModel *databaseModel) - : QWidget(parent) +static bool canBeCommander(const CardInfo &cardInfo) +{ + return (cardInfo.getCardType().contains("Legendary", Qt::CaseInsensitive) && + cardInfo.getCardType().contains("Creature", Qt::CaseInsensitive)) || + cardInfo.getText().contains("can be your commander", Qt::CaseInsensitive); +} + +DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent, AbstractTabDeckEditor *deckEditor) + : QWidget(parent), deckEditor(deckEditor) { setObjectName("databaseDisplayWidget"); @@ -29,34 +36,62 @@ DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent searchEdit->setClearButtonEnabled(true); searchEdit->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition); auto help = searchEdit->addAction(QPixmap("theme:icons/info"), QLineEdit::TrailingPosition); + searchEdit->installEventFilter(&searchKeySignals); setFocusProxy(searchEdit); setFocusPolicy(Qt::ClickFocus); + searchKeySignals.setObjectName("searchKeySignals"); + connect(searchEdit, &SearchLineEdit::textChanged, this, &DeckEditorDatabaseDisplayWidget::updateSearch); + connect(&searchKeySignals, &KeySignals::onEnter, this, &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck); + connect(&searchKeySignals, &KeySignals::onCtrlAltEqual, this, + &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck); + connect(&searchKeySignals, &KeySignals::onCtrlAltRBracket, this, + &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard); + connect(&searchKeySignals, &KeySignals::onCtrlAltMinus, this, + &DeckEditorDatabaseDisplayWidget::actDecrementCardFromMainDeck); + connect(&searchKeySignals, &KeySignals::onCtrlAltLBracket, this, + &DeckEditorDatabaseDisplayWidget::actDecrementCardFromSideboard); + connect(&searchKeySignals, &KeySignals::onCtrlAltEnter, this, + &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard); + connect(&searchKeySignals, &KeySignals::onCtrlEnter, this, &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard); + connect(&searchKeySignals, &KeySignals::onCtrlC, this, &DeckEditorDatabaseDisplayWidget::copyDatabaseCellContents); connect(help, &QAction::triggered, this, [this] { createSearchSyntaxHelpWindow(searchEdit); }); + databaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), true, this); + databaseModel->setObjectName("databaseModel"); databaseDisplayModel = new CardDatabaseDisplayModel(this); databaseDisplayModel->setObjectName("databaseDisplayModel"); databaseDisplayModel->setSourceModel(databaseModel); databaseDisplayModel->setFilterKeyColumn(0); - databaseView = new CardDatabaseView(this, databaseDisplayModel); + databaseView = new QTreeView(this); databaseView->setObjectName("databaseView"); databaseView->setFocusProxy(searchEdit); + databaseView->setUniformRowHeights(true); + databaseView->setRootIsDecorated(false); + databaseView->setAlternatingRowColors(true); + databaseView->setSortingEnabled(true); + databaseView->sortByColumn(0, Qt::AscendingOrder); + databaseView->setModel(databaseDisplayModel); + databaseView->setContextMenuPolicy(Qt::CustomContextMenu); + connect(databaseView, &QTreeView::customContextMenuRequested, this, + &DeckEditorDatabaseDisplayWidget::databaseCustomMenu); + connect(databaseView->selectionModel(), &QItemSelectionModel::currentRowChanged, this, + &DeckEditorDatabaseDisplayWidget::updateCard); + connect(databaseView, &QTreeView::doubleClicked, this, &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck); + + QByteArray dbHeaderState = SettingsCache::instance().layouts().getDeckEditorDbHeaderState(); + if (dbHeaderState.isNull()) { + // first run + databaseView->setColumnWidth(0, 200); + } else { + databaseView->header()->restoreState(dbHeaderState); + } + connect(databaseView->header(), &QHeaderView::geometriesChanged, this, + &DeckEditorDatabaseDisplayWidget::saveDbHeaderState); searchEdit->setTreeView(databaseView); - searchEdit->installEventFilter(databaseView->getKeySignals()); - - connect(searchEdit, &SearchLineEdit::textChanged, databaseDisplayModel, &CardDatabaseDisplayModel::setStringFilter); - connect(databaseView, &CardDatabaseView::cardAdded, this, &DeckEditorDatabaseDisplayWidget::addCard); - connect(databaseView, &CardDatabaseView::cardDecremented, this, &DeckEditorDatabaseDisplayWidget::decrementCard); - connect(databaseView, &CardDatabaseView::cardChanged, this, &DeckEditorDatabaseDisplayWidget::updateCard); - - connect(databaseView, &CardDatabaseView::edhrecClicked, this, &DeckEditorDatabaseDisplayWidget::edhrecRequested); - connect(databaseView, &CardDatabaseView::selectPrintingClicked, this, - &DeckEditorDatabaseDisplayWidget::printingSelectorRequested); - connect(databaseView, &CardDatabaseView::relatedCardClicked, this, - &DeckEditorDatabaseDisplayWidget::onRelatedCardClicked); aAddCard = new QAction(QString(), this); aAddCard->setIcon(QPixmap("theme:icons/arrow_right_green")); @@ -82,39 +117,118 @@ DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent retranslateUi(); } +void DeckEditorDatabaseDisplayWidget::updateSearch(const QString &search) +{ + databaseDisplayModel->setStringFilter(search); + QModelIndexList sel = databaseView->selectionModel()->selectedRows(); + if (sel.isEmpty() && databaseDisplayModel->rowCount()) + databaseView->selectionModel()->setCurrentIndex(databaseDisplayModel->index(0, 0), + QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); +} + void DeckEditorDatabaseDisplayWidget::clearAllDatabaseFilters() { databaseDisplayModel->clearFilterAll(); searchEdit->setText(""); } +void DeckEditorDatabaseDisplayWidget::updateCard(const QModelIndex ¤t, const QModelIndex & /*previous*/) +{ + if (!current.isValid()) { + return; + } + + const QString cardName = current.siblingAtColumn(CardDatabaseModel::NameColumn).data().toString(); + + if (!current.model()->hasChildren(current.siblingAtColumn(CardDatabaseModel::NameColumn))) { + emit cardChanged(CardDatabaseManager::query()->getPreferredCard(cardName)); + } +} + void DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck() { - addCard(databaseView->currentCardName(), DECK_ZONE_MAIN); + emit addCardToMainDeck(currentCard()); } void DeckEditorDatabaseDisplayWidget::actAddCardToSideboard() { - addCard(databaseView->currentCardName(), DECK_ZONE_SIDE); + emit addCardToSideboard(currentCard()); } -void DeckEditorDatabaseDisplayWidget::addCard(const QString &cardName, const QString &zoneName) +void DeckEditorDatabaseDisplayWidget::actDecrementCardFromMainDeck() { - highlightAllSearchEdit(); - ExactCard exactCard = CardDatabaseManager::query()->getPreferredCard(cardName); - emit cardAdded(exactCard, zoneName); + emit decrementCardFromMainDeck(currentCard()); } -void DeckEditorDatabaseDisplayWidget::decrementCard(const QString &cardName, const QString &zoneName) +void DeckEditorDatabaseDisplayWidget::actDecrementCardFromSideboard() { - ExactCard exactCard = CardDatabaseManager::query()->getPreferredCard(cardName); - emit cardDecremented(exactCard, zoneName); + emit decrementCardFromSideboard(currentCard()); } -void DeckEditorDatabaseDisplayWidget::updateCard(const QString &cardName) +ExactCard DeckEditorDatabaseDisplayWidget::currentCard() const { - ExactCard exactCard = CardDatabaseManager::query()->getPreferredCard(cardName); - emit cardChanged(exactCard); + const QModelIndex currentIndex = databaseView->selectionModel()->currentIndex(); + if (!currentIndex.isValid()) { + return {}; + } + + const QString cardName = currentIndex.siblingAtColumn(CardDatabaseModel::NameColumn).data().toString(); + + return CardDatabaseManager::query()->getPreferredCard(cardName); +} + +void DeckEditorDatabaseDisplayWidget::databaseCustomMenu(QPoint point) +{ + QMenu menu; + ExactCard card = currentCard(); + + if (card) { + // add to deck and sideboard options + QAction *addToDeck, *addToSideboard, *selectPrinting, *edhRecCommander, *edhRecCard; + addToDeck = menu.addAction(tr("Add to Deck")); + addToSideboard = menu.addAction(tr("Add to Sideboard")); + selectPrinting = menu.addAction(tr("Select Printing")); + connect(selectPrinting, &QAction::triggered, this, [this, card] { deckEditor->showPrintingSelector(); }); + if (canBeCommander(card.getInfo())) { + edhRecCommander = menu.addAction(tr("Show on EDHRec (Commander)")); + connect(edhRecCommander, &QAction::triggered, this, + [this, card] { deckEditor->getTabSupervisor()->addEdhrecTab(card.getCardPtr(), true); }); + } + edhRecCard = menu.addAction(tr("Show on EDHRec (Card)")); + + connect(addToDeck, &QAction::triggered, this, &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck); + connect(addToSideboard, &QAction::triggered, this, &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard); + connect(edhRecCard, &QAction::triggered, this, + [this, card] { deckEditor->getTabSupervisor()->addEdhrecTab(card.getCardPtr()); }); + + // filling out the related cards submenu + auto *relatedMenu = new QMenu(tr("Show Related cards")); + menu.addMenu(relatedMenu); + auto relatedCards = card.getInfo().getAllRelatedCards(); + if (relatedCards.isEmpty()) { + relatedMenu->setDisabled(true); + } else { + for (const CardRelation *rel : relatedCards) { + const QString &relatedCardName = rel->getName(); + QAction *relatedCard = relatedMenu->addAction(relatedCardName); + connect( + relatedCard, &QAction::triggered, deckEditor->cardInfoDockWidget->cardInfo, + [this, relatedCardName] { deckEditor->cardInfoDockWidget->cardInfo->setCard(relatedCardName); }); + } + } + menu.exec(databaseView->mapToGlobal(point)); + } +} + +void DeckEditorDatabaseDisplayWidget::copyDatabaseCellContents() +{ + auto _data = databaseView->selectionModel()->currentIndex().data(); + QApplication::clipboard()->setText(_data.toString()); +} + +void DeckEditorDatabaseDisplayWidget::saveDbHeaderState() +{ + SettingsCache::instance().layouts().setDeckEditorDbHeaderState(databaseView->header()->saveState()); } void DeckEditorDatabaseDisplayWidget::setFilterTree(FilterTree *filterTree) @@ -126,15 +240,4 @@ void DeckEditorDatabaseDisplayWidget::retranslateUi() { aAddCard->setText(tr("Add card to &maindeck")); aAddCardToSideboard->setText(tr("Add card to &sideboard")); -} - -void DeckEditorDatabaseDisplayWidget::highlightAllSearchEdit() -{ - searchEdit->setSelection(0, searchEdit->text().length()); -} - -void DeckEditorDatabaseDisplayWidget::onRelatedCardClicked(const QString &relatedCard) -{ - ExactCard exactCard = CardDatabaseManager::query()->guessCard({relatedCard}); - emit cardInfoRequested(exactCard); } \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h index 5de4d211d..16ae6e255 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h @@ -9,6 +9,7 @@ #define DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" +#include "../../key_signals.h" #include "../utility/custom_line_edit.h" #include @@ -16,56 +17,54 @@ #include #include -class CardDatabaseView; class AbstractTabDeckEditor; - class DeckEditorDatabaseDisplayWidget : public QWidget { Q_OBJECT public: - explicit DeckEditorDatabaseDisplayWidget(QWidget *parent, CardDatabaseModel *databaseModel); + explicit DeckEditorDatabaseDisplayWidget(QWidget *parent, AbstractTabDeckEditor *deckEditor); + AbstractTabDeckEditor *deckEditor; + SearchLineEdit *searchEdit; + CardDatabaseModel *databaseModel; + CardDatabaseDisplayModel *databaseDisplayModel; - CardDatabaseView *getDatabaseView() const + QTreeView *getDatabaseView() { return databaseView; } public slots: + ExactCard currentCard() const; void setFilterTree(FilterTree *filterTree); void clearAllDatabaseFilters(); - + void updateSearch(const QString &search); + void updateCard(const QModelIndex ¤t, const QModelIndex &); void actAddCardToMainDeck(); void actAddCardToSideboard(); - - void addCard(const QString &cardName, const QString &zoneName); - void decrementCard(const QString &cardName, const QString &zoneName); - void updateCard(const QString &cardName); + void actDecrementCardFromMainDeck(); + void actDecrementCardFromSideboard(); + void databaseCustomMenu(QPoint point); + void copyDatabaseCellContents(); signals: - void cardAdded(const ExactCard &card, const QString &zoneName); - void cardDecremented(const ExactCard &card, const QString &zoneName); + void addCardToMainDeck(const ExactCard &card); + void addCardToSideboard(const ExactCard &card); + void decrementCardFromMainDeck(const ExactCard &card); + void decrementCardFromSideboard(const ExactCard &card); void cardChanged(const ExactCard &_card); - void edhrecRequested(const CardInfoPtr &cardInfo, bool isCommander); - void printingSelectorRequested(); - void cardInfoRequested(const ExactCard &card); - private: - CardDatabaseDisplayModel *databaseDisplayModel; - CardDatabaseView *databaseView; + KeySignals searchKeySignals; + QTreeView *databaseView; QHBoxLayout *searchLayout; - SearchLineEdit *searchEdit; QAction *aAddCard, *aAddCardToSideboard; QVBoxLayout *centralFrame; QWidget *centralWidget; - void highlightAllSearchEdit(); - private slots: void retranslateUi(); - - void onRelatedCardClicked(const QString &relatedCard); + void saveDbHeaderState(); }; #endif // DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H 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 f61a01168..f939ae99d 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 @@ -11,7 +11,7 @@ #include #include #include -#include +#include static int findRestoreIndex(const CardRef &wanted, const QComboBox *combo) { @@ -314,9 +314,8 @@ void DeckEditorDeckDockWidget::initializeFormats() ExactCard DeckEditorDeckDockWidget::getCurrentCard() { QModelIndex current = deckView->selectionModel()->currentIndex(); - if (!current.isValid()) { + if (!current.isValid()) return {}; - } const QString cardName = current.siblingAtColumn(DeckListModelColumns::CARD_NAME).data().toString(); const QString cardProviderID = current.siblingAtColumn(DeckListModelColumns::CARD_PROVIDER_ID).data().toString(); const QModelIndex gparent = current.parent().parent(); @@ -531,7 +530,7 @@ void DeckEditorDeckDockWidget::changeSelectedCard(int changeBy) // currentIndex will return an index for the underlying deckModel instead of the proxy. // That index will return an invalid index when indexBelow/indexAbove crosses a header node, // causing the selection to fail to move down. - //! \todo Figure out why it's happening so we can do a proper fix instead of a hacky workaround. + /// \todo Figure out why it's happening so we can do a proper fix instead of a hacky workaround if (deckViewCurrentIndex.model() == proxy->sourceModel()) { deckViewCurrentIndex = proxy->mapFromSource(deckViewCurrentIndex); } @@ -635,8 +634,8 @@ void DeckEditorDeckDockWidget::actSwapSelection() { auto selectedRows = getSelectedCardNodeSourceIndices(); - //! \todo Remove the hack and also handle reselection when all rows of a multi-selection gets deleted. - // Hack: maintains old reselection behavior when single-selection row is deleted. + // hack to maintain the old reselection behavior when currently selected row of a single-selection gets deleted + // TODO: remove the hack and also handle reselection when all rows of a multi-selection gets deleted if (selectedRows.length() == 1) { deckView->setSelectionMode(QAbstractItemView::SingleSelection); } @@ -652,12 +651,10 @@ void DeckEditorDeckDockWidget::actSwapSelection() void DeckEditorDeckDockWidget::actDecrementCard(const ExactCard &card, QString zoneName) { - if (!card) { + if (!card) return; - } - if (card.getInfo().getIsToken()) { + if (card.getInfo().getIsToken()) zoneName = DECK_ZONE_TOKENS; - } deckStateManager->decrementCard(card, zoneName); } @@ -666,8 +663,8 @@ void DeckEditorDeckDockWidget::actDecrementSelection() { auto selectedRows = getSelectedCardNodeSourceIndices(); - //! \todo Remove the hack and also handle reselection when all rows of a multi-selection gets deleted. - // Hack: maintains old reselection behavior when single-selection row is deleted. + // hack to maintain the old reselection behavior when currently selected row of a single-selection gets deleted + // TODO: remove the hack and also handle reselection when all rows of a multi-selection gets deleted if (selectedRows.length() == 1) { deckView->setSelectionMode(QAbstractItemView::SingleSelection); } @@ -683,8 +680,8 @@ void DeckEditorDeckDockWidget::actRemoveCard() { auto selectedRows = getSelectedCardNodeSourceIndices(); - //! \todo Remove the hack and also handle reselection when all rows of a multi-selection gets deleted. - // Hack: maintains old reselection behavior when single-selection row is deleted. + // hack to maintain the old reselection behavior when currently selected row of a single-selection gets deleted + // TODO: remove the hack and also handle reselection when all rows of a multi-selection gets deleted if (selectedRows.length() == 1) { deckView->setSelectionMode(QAbstractItemView::SingleSelection); } 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 6b18db82e..8a9a6cdaa 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 @@ -89,9 +89,8 @@ void DeckEditorFilterDockWidget::filterViewCustomContextMenu(const QPoint &point QModelIndex idx; idx = filterView->indexAt(point); - if (!idx.isValid()) { + if (!idx.isValid()) return; - } action = menu.addAction(QString("delete")); action->setData(point); @@ -106,9 +105,8 @@ void DeckEditorFilterDockWidget::filterRemove(const QAction *action) point = action->data().toPoint(); idx = filterView->indexAt(point); - if (!idx.isValid()) { + if (!idx.isValid()) return; - } filterModel->removeRow(idx.row(), idx.parent()); } 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 e41529b22..14c5faae7 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 @@ -8,9 +8,8 @@ QVariant DeckListStyleProxy::data(const QModelIndex &index, int role) const { QModelIndex src = mapToSource(index); - if (!src.isValid()) { + if (!src.isValid()) return {}; - } QVariant value = QIdentityProxyModel::data(index, role); 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 f8fb450ce..8da27b63c 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp @@ -192,9 +192,8 @@ QModelIndex DeckStateManager::addCard(const ExactCard &card, const QString &zone QModelIndex DeckStateManager::decrementCard(const ExactCard &card, const QString &zoneName) { - if (!card) { + if (!card) return {}; - } QString providerId = card.getPrinting().getUuid(); QString collectorNumber = card.getPrinting().getProperty("num"); @@ -242,23 +241,17 @@ static bool doSwapCard(DeckListModel *model, bool DeckStateManager::swapCardAtIndex(const QModelIndex &idx) { - if (!idx.isValid()) { + if (!idx.isValid()) return false; - } QString cardName = idx.siblingAtColumn(DeckListModelColumns::CARD_NAME).data().toString(); QString providerId = idx.siblingAtColumn(DeckListModelColumns::CARD_PROVIDER_ID).data().toString(); QModelIndex gparent = idx.parent().parent(); - if (!gparent.isValid()) { + if (!gparent.isValid()) return false; - } QString zoneName = gparent.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString(); - // tokens have no swap target - if (zoneName == DECK_ZONE_TOKENS) { - return false; - } QString otherZoneName = zoneName == DECK_ZONE_MAIN ? DECK_ZONE_SIDE : DECK_ZONE_MAIN; QString reason = tr("Moved to %1 1 × \"%2\" (%3)") // 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 10312d0a0..4f1ec7e04 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h @@ -154,11 +154,9 @@ public: */ QModelIndex modifyDeck(const QString &reason, const std::function &operation); - /** - * @name Metadata setters - * @brief These methods set the metadata. Will no-op if the new value is the same as the current value. - * Saves the operation to history if successful. - */ + /// @name Metadata setters + /// @brief These methods set the metadata. Will no-op if the new value is the same as the current value. + /// Saves the operation to history if successful. ///@{ void setName(const QString &name); void setComments(const QString &comments); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp index 2a7fc6c06..0bb0eb1c9 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent) { @@ -261,7 +261,13 @@ void DlgConnect::updateDisplayInfo(const QString &saveName) QStringList _data = uci.getServerInfo(saveName); if (_data.isEmpty()) { - _data << "" << "" << "" << "" << "" << "" << ""; + _data << "" + << "" + << "" + << "" + << "" + << "" + << ""; } bool savePasswordStatus = (_data.at(5) == "1"); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_connect.h b/cockatrice/src/interface/widgets/dialogs/dlg_connect.h index 083dad0ad..41993e068 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_connect.h @@ -1,8 +1,8 @@ /** * @file dlg_connect.h * @ingroup ConnectionDialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_CONNECT_H #define DLG_CONNECT_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h index 6642ad8c6..61eea1d6e 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h @@ -2,8 +2,8 @@ * @file dlg_convert_deck_to_cod_format.h * @ingroup LocalDeckStorageDialogs * @ingroup Lobby + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DIALOG_CONVERT_DECK_TO_COD_FORMAT_H #define DIALOG_CONVERT_DECK_TO_COD_FORMAT_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp index f892801f1..7f109f600 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include void DlgCreateGame::sharedCtor() { @@ -215,9 +215,8 @@ DlgCreateGame::DlgCreateGame(const ServerInfo_Game &gameInfo, const QMapsetChecked(gameInfo.spectators_omniscient()); QSet types; - for (int i = 0; i < gameInfo.game_types_size(); ++i) { + for (int i = 0; i < gameInfo.game_types_size(); ++i) types.insert(gameInfo.game_types(i)); - } QMapIterator gameTypeIterator(gameTypes); while (gameTypeIterator.hasNext()) { @@ -317,9 +316,9 @@ void DlgCreateGame::checkResponse(const Response &response) { buttonBox->setEnabled(true); - if (response.response_code() == Response::RespOk) { + if (response.response_code() == Response::RespOk) accept(); - } else { + else { QMessageBox::critical(this, tr("Error"), tr("Server error.")); return; } diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h index 61925286d..e28363311 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h @@ -1,8 +1,8 @@ /** * @file dlg_create_game.h * @ingroup RoomDialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_CREATEGAME_H #define DLG_CREATEGAME_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp index 2d6ee7909..349f4ca4c 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp @@ -95,9 +95,8 @@ void DlgDefaultTagsEditor::addItem() // Prevent duplicate tags for (int i = 0; i < listWidget->count(); ++i) { QWidget *widget = listWidget->itemWidget(listWidget->item(i)); - if (!widget) { + if (!widget) continue; - } QLineEdit *lineEdit = widget->findChild(); if (lineEdit && lineEdit->text() == newTag) { QMessageBox::warning(this, tr("Duplicate Tag"), tr("This tag already exists.")); @@ -139,9 +138,8 @@ void DlgDefaultTagsEditor::confirmChanges() QStringList updatedList; for (int i = 0; i < listWidget->count(); ++i) { QWidget *widget = listWidget->itemWidget(listWidget->item(i)); - if (!widget) { + if (!widget) continue; - } QLineEdit *lineEdit = widget->findChild(); if (lineEdit) { updatedList.append(lineEdit->text()); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h index e584d0731..27af74105 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h @@ -2,8 +2,8 @@ * @file dlg_default_tags_editor.h * @ingroup Dialogs * @ingroup DeckStorageWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_DEFAULT_TAGS_EDITOR_H #define DLG_DEFAULT_TAGS_EDITOR_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp index b5710b208..db5f21701 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include DlgEditAvatar::DlgEditAvatar(QWidget *parent) : QDialog(parent), image() { diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h index d635ac2a8..641b736dc 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h @@ -1,8 +1,8 @@ /** * @file dlg_edit_avatar.h * @ingroup AccountDialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_EDITAVATAR_H #define DLG_EDITAVATAR_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp index 63181b44f..e3bbc7435 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include DlgEditPassword::DlgEditPassword(QWidget *parent) : QDialog(parent) { @@ -59,7 +59,7 @@ DlgEditPassword::DlgEditPassword(QWidget *parent) : QDialog(parent) void DlgEditPassword::actOk() { - //! \todo This stuff should be using QValidators. + //! \todo this stuff should be using qvalidators if (newPasswordEdit->text().length() < 8) { QMessageBox::critical(this, tr("Error"), tr("Your password is too short.")); return; diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h index 85c72233d..ee8e45985 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h @@ -1,8 +1,8 @@ /** * @file dlg_edit_password.h * @ingroup AccountDialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_EDITPASSWORD_H #define DLG_EDITPASSWORD_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp index f249976c2..fe9cd181c 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include DlgEditTokens::DlgEditTokens(QWidget *parent) : QDialog(parent), currentCard(nullptr) { @@ -149,9 +149,8 @@ void DlgEditTokens::actAddToken() QString name; for (;;) { name = getTextWithMax(this, tr("Add token"), tr("Please enter the name of the token:")); - if (name.isEmpty()) { + if (name.isEmpty()) return; - } if (databaseModel->getDatabase()->query()->getCardInfo(name)) { QMessageBox::critical(this, tr("Error"), tr("The chosen name conflicts with an existing card or token.\nMake sure to enable " @@ -182,21 +181,18 @@ void DlgEditTokens::actRemoveToken() void DlgEditTokens::colorChanged(int colorIndex) { - if (currentCard) { + if (currentCard) currentCard->setColors(QString(colorEdit->itemData(colorIndex).toChar())); - } } void DlgEditTokens::ptChanged(const QString &_pt) { - if (currentCard) { + if (currentCard) currentCard->setPowTough(_pt); - } } void DlgEditTokens::annotationChanged(const QString &_annotation) { - if (currentCard) { + if (currentCard) currentCard->setText(_annotation); - } } diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h index 202212e98..f19646756 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h @@ -1,8 +1,8 @@ /** * @file dlg_edit_tokens.h * @ingroup GameDialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_EDIT_TOKENS_H #define DLG_EDIT_TOKENS_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp index 85b95f335..dcfbc91e9 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include DlgEditUser::DlgEditUser(QWidget *parent, QString email, QString country, QString realName) : QDialog(parent) { @@ -26,9 +26,8 @@ DlgEditUser::DlgEditUser(QWidget *parent, QString email, QString country, QStrin int i = 1; for (const QString &c : countries) { countryEdit->addItem(QPixmap("theme:countries/" + c.toLower()), c); - if (c == country) { + if (c == country) countryEdit->setCurrentIndex(i); - } ++i; } diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h index 35a8bfb46..b89a3be04 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h @@ -1,8 +1,8 @@ /** * @file dlg_edit user.h * @ingroup NetworkDialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_EDITUSER_H #define DLG_EDITUSER_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp index 8f498cc2c..1bf98822c 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp @@ -22,43 +22,41 @@ DlgFilterGames::DlgFilterGames(const QMap &_allGameTypes, {QTime(1, 0), tr("1 hour")}, {QTime(2, 0), tr("2 hours")}}) { - const GameFilterConfigs &filters = gamesProxyModel->getFilters(); - hideBuddiesOnlyGames = new QCheckBox(tr("Hide 'buddies only' games")); - hideBuddiesOnlyGames->setChecked(filters.hideBuddiesOnlyGames); + hideBuddiesOnlyGames->setChecked(gamesProxyModel->getHideBuddiesOnlyGames()); hideFullGames = new QCheckBox(tr("Hide full games")); - hideFullGames->setChecked(filters.hideFullGames); + hideFullGames->setChecked(gamesProxyModel->getHideFullGames()); hideGamesThatStarted = new QCheckBox(tr("Hide games that have started")); - hideGamesThatStarted->setChecked(filters.hideGamesThatStarted); + hideGamesThatStarted->setChecked(gamesProxyModel->getHideGamesThatStarted()); hidePasswordProtectedGames = new QCheckBox(tr("Hide password protected games")); - hidePasswordProtectedGames->setChecked(filters.hidePasswordProtectedGames); + hidePasswordProtectedGames->setChecked(gamesProxyModel->getHidePasswordProtectedGames()); hideIgnoredUserGames = new QCheckBox(tr("Hide 'ignored user' games")); - hideIgnoredUserGames->setChecked(filters.hideIgnoredUserGames); + hideIgnoredUserGames->setChecked(gamesProxyModel->getHideIgnoredUserGames()); hideNotBuddyCreatedGames = new QCheckBox(tr("Hide games not created by buddies")); - hideNotBuddyCreatedGames->setChecked(filters.hideNotBuddyCreatedGames); + hideNotBuddyCreatedGames->setChecked(gamesProxyModel->getHideNotBuddyCreatedGames()); hideOpenDecklistGames = new QCheckBox(tr("Hide games with forced open decklists")); - hideOpenDecklistGames->setChecked(filters.hideOpenDecklistGames); + hideOpenDecklistGames->setChecked(gamesProxyModel->getHideOpenDecklistGames()); maxGameAgeComboBox = new QComboBox(); maxGameAgeComboBox->setEditable(false); maxGameAgeComboBox->addItems(gameAgeMap.values()); - QTime gameAge = filters.maxGameAge; + QTime gameAge = gamesProxyModel->getMaxGameAge(); maxGameAgeComboBox->setCurrentIndex(gameAgeMap.keys().indexOf(gameAge)); // index is -1 if unknown auto *maxGameAgeLabel = new QLabel(tr("&Newer than:")); maxGameAgeLabel->setBuddy(maxGameAgeComboBox); gameNameFilterEdit = new QLineEdit; - gameNameFilterEdit->setText(filters.gameNameFilter); + gameNameFilterEdit->setText(gamesProxyModel->getGameNameFilter()); auto *gameNameFilterLabel = new QLabel(tr("Game &description:")); gameNameFilterLabel->setBuddy(gameNameFilterEdit); creatorNameFilterEdit = new QLineEdit; - creatorNameFilterEdit->setText(filters.creatorNameFilters.join(", ")); + creatorNameFilterEdit->setText(gamesProxyModel->getCreatorNameFilters().join(", ")); auto *creatorNameFilterLabel = new QLabel(tr("&Creator name:")); creatorNameFilterLabel->setBuddy(creatorNameFilterEdit); @@ -78,7 +76,7 @@ DlgFilterGames::DlgFilterGames(const QMap &_allGameTypes, gameTypesIterator.next(); auto *temp = new QCheckBox(gameTypesIterator.value()); - temp->setChecked(filters.gameTypeFilter.contains(gameTypesIterator.key())); + temp->setChecked(gamesProxyModel->getGameTypeFilter().contains(gameTypesIterator.key())); gameTypeFilterCheckBoxes.insert(gameTypesIterator.key(), temp); gameTypeFilterLayout->addWidget(temp); @@ -87,22 +85,21 @@ DlgFilterGames::DlgFilterGames(const QMap &_allGameTypes, if (!allGameTypes.isEmpty()) { gameTypeFilterGroupBox = new QGroupBox(tr("&Game types")); gameTypeFilterGroupBox->setLayout(gameTypeFilterLayout); - } else { + } else gameTypeFilterGroupBox = nullptr; - } auto *maxPlayersFilterMinLabel = new QLabel(tr("at &least:")); maxPlayersFilterMinSpinBox = new QSpinBox; maxPlayersFilterMinSpinBox->setMinimum(0); maxPlayersFilterMinSpinBox->setMaximum(99); - maxPlayersFilterMinSpinBox->setValue(filters.maxPlayersFilterMin); + maxPlayersFilterMinSpinBox->setValue(gamesProxyModel->getMaxPlayersFilterMin()); maxPlayersFilterMinLabel->setBuddy(maxPlayersFilterMinSpinBox); auto *maxPlayersFilterMaxLabel = new QLabel(tr("at &most:")); maxPlayersFilterMaxSpinBox = new QSpinBox; maxPlayersFilterMaxSpinBox->setMinimum(0); maxPlayersFilterMaxSpinBox->setMaximum(99); - maxPlayersFilterMaxSpinBox->setValue(filters.maxPlayersFilterMax); + maxPlayersFilterMaxSpinBox->setValue(gamesProxyModel->getMaxPlayersFilterMax()); maxPlayersFilterMaxLabel->setBuddy(maxPlayersFilterMaxSpinBox); auto *maxPlayersFilterLayout = new QGridLayout; @@ -127,17 +124,17 @@ DlgFilterGames::DlgFilterGames(const QMap &_allGameTypes, restrictionsGroupBox->setLayout(restrictionsLayout); showOnlyIfSpectatorsCanWatch = new QCheckBox(tr("Show games only if &spectators can watch")); - showOnlyIfSpectatorsCanWatch->setChecked(filters.showOnlyIfSpectatorsCanWatch); + showOnlyIfSpectatorsCanWatch->setChecked(gamesProxyModel->getShowOnlyIfSpectatorsCanWatch()); connect(showOnlyIfSpectatorsCanWatch, &QCheckBox::toggled, this, &DlgFilterGames::toggleSpectatorCheckboxEnabledness); showSpectatorPasswordProtected = new QCheckBox(tr("Show spectator password p&rotected games")); - showSpectatorPasswordProtected->setChecked(filters.showSpectatorPasswordProtected); + showSpectatorPasswordProtected->setChecked(gamesProxyModel->getShowSpectatorPasswordProtected()); showOnlyIfSpectatorsCanChat = new QCheckBox(tr("Show only if spectators can ch&at")); - showOnlyIfSpectatorsCanChat->setChecked(filters.showOnlyIfSpectatorsCanChat); + showOnlyIfSpectatorsCanChat->setChecked(gamesProxyModel->getShowOnlyIfSpectatorsCanChat()); showOnlyIfSpectatorsCanSeeHands = new QCheckBox(tr("Show only if spectators can see &hands")); - showOnlyIfSpectatorsCanSeeHands->setChecked(filters.showOnlyIfSpectatorsCanSeeHands); - toggleSpectatorCheckboxEnabledness(filters.showOnlyIfSpectatorsCanWatch); + showOnlyIfSpectatorsCanSeeHands->setChecked(gamesProxyModel->getShowOnlyIfSpectatorsCanSeeHands()); + toggleSpectatorCheckboxEnabledness(getShowOnlyIfSpectatorsCanWatch()); auto *spectatorsLayout = new QGridLayout; spectatorsLayout->addWidget(showOnlyIfSpectatorsCanWatch, 0, 0); @@ -183,27 +180,6 @@ DlgFilterGames::DlgFilterGames(const QMap &_allGameTypes, setFixedHeight(sizeHint().height()); } -GameFilterConfigs DlgFilterGames::getFilters() const -{ - return {hideBuddiesOnlyGames->isChecked(), - hideIgnoredUserGames->isChecked(), - hideFullGames->isChecked(), - hideGamesThatStarted->isChecked(), - hidePasswordProtectedGames->isChecked(), - hideNotBuddyCreatedGames->isChecked(), - hideOpenDecklistGames->isChecked(), - gameNameFilterEdit->text(), - getCreatorNameFilters(), - getGameTypeFilter(), - maxPlayersFilterMinSpinBox->value(), - maxPlayersFilterMaxSpinBox->value(), - getMaxGameAge(), - showOnlyIfSpectatorsCanWatch->isChecked(), - getShowSpectatorPasswordProtected(), - getShowOnlyIfSpectatorsCanChat(), - getShowOnlyIfSpectatorsCanSeeHands()}; -} - void DlgFilterGames::actOk() { accept(); @@ -216,6 +192,46 @@ void DlgFilterGames::toggleSpectatorCheckboxEnabledness(bool spectatorsEnabled) showOnlyIfSpectatorsCanSeeHands->setDisabled(!spectatorsEnabled); } +bool DlgFilterGames::getHideFullGames() const +{ + return hideFullGames->isChecked(); +} + +bool DlgFilterGames::getHideGamesThatStarted() const +{ + return hideGamesThatStarted->isChecked(); +} + +bool DlgFilterGames::getHideBuddiesOnlyGames() const +{ + return hideBuddiesOnlyGames->isChecked(); +} + +bool DlgFilterGames::getHidePasswordProtectedGames() const +{ + return hidePasswordProtectedGames->isChecked(); +} + +bool DlgFilterGames::getHideIgnoredUserGames() const +{ + return hideIgnoredUserGames->isChecked(); +} + +bool DlgFilterGames::getHideNotBuddyCreatedGames() const +{ + return hideNotBuddyCreatedGames->isChecked(); +} + +bool DlgFilterGames::getHideOpenDecklistGames() const +{ + return hideOpenDecklistGames->isChecked(); +} + +QString DlgFilterGames::getGameNameFilter() const +{ + return gameNameFilterEdit->text(); +} + QStringList DlgFilterGames::getCreatorNameFilters() const { return creatorNameFilterEdit->text().split(",", Qt::SkipEmptyParts); @@ -227,22 +243,36 @@ QSet DlgFilterGames::getGameTypeFilter() const QMapIterator i(gameTypeFilterCheckBoxes); while (i.hasNext()) { i.next(); - if (i.value()->isChecked()) { + if (i.value()->isChecked()) result.insert(i.key()); - } } return result; } +int DlgFilterGames::getMaxPlayersFilterMin() const +{ + return maxPlayersFilterMinSpinBox->value(); +} + +int DlgFilterGames::getMaxPlayersFilterMax() const +{ + return maxPlayersFilterMaxSpinBox->value(); +} + QTime DlgFilterGames::getMaxGameAge() const { int index = maxGameAgeComboBox->currentIndex(); - if (index < 0 || index >= gameAgeMap.size()) { // index is out of bounds - return gamesProxyModel->getFilters().maxGameAge; // leave the setting unchanged + if (index < 0 || index >= gameAgeMap.size()) { // index is out of bounds + return gamesProxyModel->getMaxGameAge(); // leave the setting unchanged } return gameAgeMap.keys().at(index); } +bool DlgFilterGames::getShowOnlyIfSpectatorsCanWatch() const +{ + return showOnlyIfSpectatorsCanWatch->isChecked(); +} + bool DlgFilterGames::getShowSpectatorPasswordProtected() const { return showSpectatorPasswordProtected->isEnabled() && showSpectatorPasswordProtected->isChecked(); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h index 447f9b16c..abfdab28a 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h @@ -1,8 +1,8 @@ /** * @file dlg_filter_games.h * @ingroup RoomDialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_FILTER_GAMES_H #define DLG_FILTER_GAMES_H @@ -48,14 +48,6 @@ private: const QMap &allGameTypes; const GamesProxyModel *gamesProxyModel; - const QMap gameAgeMap; - - [[nodiscard]] QStringList getCreatorNameFilters() const; - [[nodiscard]] QSet getGameTypeFilter() const; - [[nodiscard]] QTime getMaxGameAge() const; - [[nodiscard]] bool getShowSpectatorPasswordProtected() const; - [[nodiscard]] bool getShowOnlyIfSpectatorsCanChat() const; - [[nodiscard]] bool getShowOnlyIfSpectatorsCanSeeHands() const; private slots: void actOk(); @@ -66,7 +58,32 @@ public: const GamesProxyModel *_gamesProxyModel, QWidget *parent = nullptr); - [[nodiscard]] GameFilterConfigs getFilters() const; + [[nodiscard]] bool getHideFullGames() const; + [[nodiscard]] bool getHideGamesThatStarted() const; + [[nodiscard]] bool getHidePasswordProtectedGames() const; + void setShowPasswordProtectedGames(bool _passwordProtectedGamesHidden); + [[nodiscard]] bool getHideBuddiesOnlyGames() const; + void setHideBuddiesOnlyGames(bool _hideBuddiesOnlyGames); + [[nodiscard]] bool getHideOpenDecklistGames() const; + void setHideOpenDecklistGames(bool _hideOpenDecklistGames); + [[nodiscard]] bool getHideIgnoredUserGames() const; + void setHideIgnoredUserGames(bool _hideIgnoredUserGames); + [[nodiscard]] bool getHideNotBuddyCreatedGames() const; + [[nodiscard]] QString getGameNameFilter() const; + void setGameNameFilter(const QString &_gameNameFilter); + [[nodiscard]] QStringList getCreatorNameFilters() const; + void setCreatorNameFilter(const QString &_creatorNameFilter); + [[nodiscard]] QSet getGameTypeFilter() const; + void setGameTypeFilter(const QSet &_gameTypeFilter); + [[nodiscard]] int getMaxPlayersFilterMin() const; + [[nodiscard]] int getMaxPlayersFilterMax() const; + void setMaxPlayersFilter(int _maxPlayersFilterMin, int _maxPlayersFilterMax); + [[nodiscard]] QTime getMaxGameAge() const; + const QMap gameAgeMap; + [[nodiscard]] bool getShowOnlyIfSpectatorsCanWatch() const; + [[nodiscard]] bool getShowSpectatorPasswordProtected() const; + [[nodiscard]] bool getShowOnlyIfSpectatorsCanChat() const; + [[nodiscard]] bool getShowOnlyIfSpectatorsCanSeeHands() const; }; #endif diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp index 14c3cda47..24e9030e0 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h index d32e2fc3e..e8925b1d3 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h @@ -1,8 +1,8 @@ /** * @file dlg_forgot_password_challenge.h * @ingroup AccountDialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_FORGOTPASSWORDCHALLENGE_H #define DLG_FORGOTPASSWORDCHALLENGE_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp index fc934d082..c33a41bed 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include DlgForgotPasswordRequest::DlgForgotPasswordRequest(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h index 2cf352e0d..e51dad810 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h @@ -1,8 +1,8 @@ /** * @file dlg_forgot_password_request.h * @ingroup AccountDialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_FORGOTPASSWORDREQUEST_H #define DLG_FORGOTPASSWORDREQUEST_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp index d30887988..c9c41722e 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include DlgForgotPasswordReset::DlgForgotPasswordReset(QWidget *parent) : QDialog(parent) { @@ -121,7 +121,7 @@ void DlgForgotPasswordReset::actOk() return; } - //! \todo This stuff should be using QValidators. + //! \todo this stuff should be using qvalidators if (newpasswordEdit->text().length() < 8) { QMessageBox::critical(this, tr("Error"), tr("Your password is too short.")); return; diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h index 8a443b906..3d110c71d 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h @@ -1,8 +1,8 @@ /** * @file dlg_forgot_password_reset.h * @ingroup AccountDialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_FORGOTPASSWORDRESET_H #define DLG_FORGOTPASSWORDRESET_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h index 27d658902..b103f6a56 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h @@ -2,8 +2,8 @@ * @file dlg_load_deck.h * @ingroup LocalDeckStorageDialogs * @ingroup Lobby + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_LOAD_DECK_H #define DLG_LOAD_DECK_H 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 dce9d712c..0e59653ea 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 @@ -2,8 +2,8 @@ * @file dlg_load_deck_from_clipboard.h * @ingroup LocalDeckStorageDialogs * @ingroup Lobby + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_LOAD_DECK_FROM_CLIPBOARD_H #define DLG_LOAD_DECK_FROM_CLIPBOARD_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h index 2890148b9..1ac98d206 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h @@ -2,8 +2,8 @@ * @file dlg_load_deck_from_website.h * @ingroup RemoteDeckStorageDialogs * @ingroup Lobby + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_LOAD_DECK_FROM_WEBSITE_H #define DLG_LOAD_DECK_FROM_WEBSITE_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h index 9c81e9ae3..b7e0d7aa3 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h @@ -2,8 +2,8 @@ * @file dlg_load_remote_deck.h * @ingroup RemoteDeckStorageDialogs * @ingroup Lobby + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_STARTGAME_H #define DLG_STARTGAME_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp index b17a9306f..6c46c7faf 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp @@ -62,7 +62,7 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent) // search field searchField = new LineEditUnfocusable; searchField->setObjectName("searchEdit"); - searchField->setPlaceholderText(tr("Search by set name, code, type, or release date")); + searchField->setPlaceholderText(tr("Search by set name, code, or type")); searchField->addAction(QPixmap("theme:icons/search"), LineEditUnfocusable::LeadingPosition); searchField->setClearButtonEnabled(true); setFocusProxy(searchField); @@ -217,9 +217,8 @@ void WndSets::saveHeaderState() void WndSets::rebuildMainLayout(int actionToTake) { - if (mainLayout == nullptr) { + if (mainLayout == nullptr) return; - } switch (actionToTake) { case NO_SETS_SELECTED: @@ -383,14 +382,12 @@ void WndSets::actUp() std::sort(rows.begin(), rows.end(), std::less()); QSet newRows; - if (rows.empty()) { + if (rows.empty()) return; - } for (auto i : rows) { - if (i.row() <= 0) { + if (i.row() <= 0) continue; - } int oldRow = displayModel->mapToSource(i).row(); int newRow = i.row() - 1; @@ -408,14 +405,12 @@ void WndSets::actDown() std::sort(rows.begin(), rows.end(), [](const QModelIndex &a, const QModelIndex &b) { return b < a; }); QSet newRows; - if (rows.empty()) { + if (rows.empty()) return; - } for (auto i : rows) { - if (i.row() >= displayModel->rowCount() - 1) { + if (i.row() >= displayModel->rowCount() - 1) continue; - } int oldRow = displayModel->mapToSource(i).row(); int newRow = i.row() + 1; @@ -433,9 +428,8 @@ void WndSets::actTop() QSet newRows; int newRow = 0; - if (rows.empty()) { + if (rows.empty()) return; - } for (int i = 0; i < rows.length(); i++) { int oldRow = displayModel->mapToSource(rows.at(i)).row(); @@ -460,9 +454,8 @@ void WndSets::actBottom() QSet newRows; int newRow = model->rowCount() - 1; - if (rows.empty()) { + if (rows.empty()) return; - } for (int i = 0; i < rows.length(); i++) { int oldRow = displayModel->mapToSource(rows.at(i)).row(); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h index 2ed5eca0f..d9b77a76e 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h @@ -1,8 +1,8 @@ /** * @file dlg_manage_sets.h * @ingroup Dialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_MANAGE_SETS_H #define DLG_MANAGE_SETS_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp index 942782403..a3f232d9b 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent) { @@ -311,9 +311,8 @@ DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent) countryEdit->addItem(QPixmap("theme:countries/zw"), "zw"); countryEdit->setCurrentIndex(0); QStringList countries = SettingsCache::instance().getCountries(); - for (const QString &c : countries) { + for (const QString &c : countries) countryEdit->addItem(QPixmap("theme:countries/" + c.toLower()), c); - } realnameLabel = new QLabel(tr("Real name:")); realnameEdit = new QLineEdit(); @@ -357,7 +356,7 @@ DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent) void DlgRegister::actOk() { - //! \todo This stuff should be using QValidators. + //! \todo this stuff should be using qvalidators if (passwordEdit->text().length() < 8) { QMessageBox::critical(this, tr("Registration Warning"), tr("Your password is too short.")); return; diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_register.h b/cockatrice/src/interface/widgets/dialogs/dlg_register.h index abed9ff51..bebbfc500 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_register.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_register.h @@ -1,8 +1,8 @@ /** * @file dlg_register.h * @ingroup AccountDialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_REGISTER_H #define DLG_REGISTER_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp index bc846bf3d..5d9e2679c 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp @@ -237,9 +237,8 @@ QMap DlgSelectSetForCards::getSetsForCards() for (auto cardName : cardNames) { CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(cardName); - if (!infoPtr) { + if (!infoPtr) continue; - } SetToPrintingsMap setMap = infoPtr->getSets(); for (auto &setName : setMap.keys()) { @@ -360,9 +359,8 @@ QMap DlgSelectSetForCards::getCardsForSets() for (auto cardName : cardNames) { CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(cardName); - if (!infoPtr) { + if (!infoPtr) continue; - } SetToPrintingsMap setMap = infoPtr->getSets(); for (auto it = setMap.begin(); it != setMap.end(); ++it) { diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h index 92f285aa0..795366b57 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h @@ -1,8 +1,8 @@ /** * @file dlg_select_set_for_cards.h * @ingroup Dialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_SELECT_SET_FOR_CARDS_H #define DLG_SELECT_SET_FOR_CARDS_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp index ff42596ea..6238bc80b 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp @@ -1,29 +1,1760 @@ #include "dlg_settings.h" #include "../../../client/settings/cache_settings.h" +#include "../../../client/settings/shortcut_treeview.h" +#include "../client/network/update/card_spoiler/spoiler_background_updater.h" +#include "../client/network/update/client/release_channel.h" +#include "../client/sound_engine.h" +#include "../interface/card_picture_loader/card_picture_loader.h" +#include "../interface/theme_manager.h" +#include "../interface/widgets/general/background_sources.h" +#include "../interface/widgets/tabs/tab_supervisor.h" +#include "../interface/widgets/utility/custom_line_edit.h" +#include "../interface/widgets/utility/get_text_with_max.h" +#include "../interface/widgets/utility/sequence_edit.h" #include "../main.h" -#include "../settings_page/appearance_settings_page.h" -#include "../settings_page/deck_editor_settings_page.h" -#include "../settings_page/general_settings_page.h" -#include "../settings_page/messages_settings_page.h" -#include "../settings_page/shortcut_settings_page.h" -#include "../settings_page/sound_settings_page.h" -#include "../settings_page/storage_settings_page.h" -#include "../settings_page/user_interface_settings_page.h" -#include "libcockatrice/card/database/card_database_loader.h" -#include "libcockatrice/card/database/card_database_manager.h" +#include "override_printing_warning.h" +#include <../../client/settings/card_counter_settings.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 + +#define WIKI_CUSTOM_PIC_URL "https://github.com/Cockatrice/Cockatrice/wiki/Custom-Picture-Download-URLs" +#define WIKI_CUSTOM_SHORTCUTS "https://github.com/Cockatrice/Cockatrice/wiki/Custom-Keyboard-Shortcuts" +#define WIKI_TRANSLATION_FAQ "https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ" + +enum startupCardUpdateCheckBehaviorIndex +{ + startupCardUpdateCheckBehaviorIndexNone, + startupCardUpdateCheckBehaviorIndexPrompt, + startupCardUpdateCheckBehaviorIndexAlways +}; + +GeneralSettingsPage::GeneralSettingsPage() +{ + QStringList languageCodes = findQmFiles(); + for (const QString &code : languageCodes) { + QString langName = languageName(code); + languageBox.addItem(langName, code); + } + + QString setLanguage = QCoreApplication::translate("i18n", DEFAULT_LANG_NAME); + int index = languageBox.findText(setLanguage, Qt::MatchExactly); + if (index == -1) { + qWarning() << "could not find language" << setLanguage; + } else { + languageBox.setCurrentIndex(index); + } + + // updates + SettingsCache &settings = SettingsCache::instance(); + startupUpdateCheckCheckBox.setChecked(settings.getCheckUpdatesOnStartup()); + + startupCardUpdateCheckBehaviorSelector.addItem(""); // these will be set in retranslateUI + startupCardUpdateCheckBehaviorSelector.addItem(""); + startupCardUpdateCheckBehaviorSelector.addItem(""); + if (SettingsCache::instance().getStartupCardUpdateCheckPromptForUpdate()) { + startupCardUpdateCheckBehaviorSelector.setCurrentIndex(startupCardUpdateCheckBehaviorIndexPrompt); + } else if (SettingsCache::instance().getStartupCardUpdateCheckAlwaysUpdate()) { + startupCardUpdateCheckBehaviorSelector.setCurrentIndex(startupCardUpdateCheckBehaviorIndexAlways); + } else { + startupCardUpdateCheckBehaviorSelector.setCurrentIndex(startupCardUpdateCheckBehaviorIndexNone); + } + + cardUpdateCheckIntervalSpinBox.setMinimum(1); + cardUpdateCheckIntervalSpinBox.setMaximum(30); + cardUpdateCheckIntervalSpinBox.setValue(settings.getCardUpdateCheckInterval()); + updateNotificationCheckBox.setChecked(settings.getNotifyAboutUpdates()); + newVersionOracleCheckBox.setChecked(settings.getNotifyAboutNewVersion()); + + showTipsOnStartup.setChecked(settings.getShowTipsOnStartup()); + + advertiseTranslationPageLabel.setTextInteractionFlags(Qt::LinksAccessibleByMouse); + advertiseTranslationPageLabel.setOpenExternalLinks(true); + + connect(&languageBox, qOverload(&QComboBox::currentIndexChanged), this, + &GeneralSettingsPage::languageBoxChanged); + connect(&startupUpdateCheckCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, + &SettingsCache::setCheckUpdatesOnStartup); + connect(&startupCardUpdateCheckBehaviorSelector, QOverload::of(&QComboBox::currentIndexChanged), this, + [](int index) { + SettingsCache::instance().setStartupCardUpdateCheckPromptForUpdate( + index == startupCardUpdateCheckBehaviorIndexPrompt); + SettingsCache::instance().setStartupCardUpdateCheckAlwaysUpdate( + index == startupCardUpdateCheckBehaviorIndexAlways); + }); + connect(&cardUpdateCheckIntervalSpinBox, qOverload(&QSpinBox::valueChanged), &settings, + &SettingsCache::setCardUpdateCheckInterval); + connect(&updateNotificationCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setNotifyAboutUpdate); + connect(&newVersionOracleCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, + &SettingsCache::setNotifyAboutNewVersion); + connect(&showTipsOnStartup, &QCheckBox::clicked, &settings, &SettingsCache::setShowTipsOnStartup); + + auto *personalGrid = new QGridLayout; + personalGrid->addWidget(&languageLabel, 0, 0); + personalGrid->addWidget(&languageBox, 0, 1); + personalGrid->addWidget(&advertiseTranslationPageLabel, 1, 1, Qt::AlignRight); + personalGrid->addWidget(&updateReleaseChannelLabel, 2, 0); + personalGrid->addWidget(&updateReleaseChannelBox, 2, 1); + personalGrid->addWidget(&startupUpdateCheckCheckBox, 4, 0, 1, 2); + personalGrid->addWidget(&startupCardUpdateCheckBehaviorLabel, 5, 0); + personalGrid->addWidget(&startupCardUpdateCheckBehaviorSelector, 5, 1); + personalGrid->addWidget(&cardUpdateCheckIntervalLabel, 6, 0); + personalGrid->addWidget(&cardUpdateCheckIntervalSpinBox, 6, 1); + personalGrid->addWidget(&lastCardUpdateCheckDateLabel, 7, 1); + personalGrid->addWidget(&updateNotificationCheckBox, 8, 0, 1, 2); + personalGrid->addWidget(&newVersionOracleCheckBox, 9, 0, 1, 2); + personalGrid->addWidget(&showTipsOnStartup, 10, 0, 1, 2); + + personalGroupBox = new QGroupBox; + personalGroupBox->setLayout(personalGrid); + + deckPathEdit = new QLineEdit(settings.getDeckPath()); + deckPathEdit->setReadOnly(true); + auto *deckPathButton = new QPushButton("..."); + connect(deckPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::deckPathButtonClicked); + + filtersPathEdit = new QLineEdit(settings.getFiltersPath()); + filtersPathEdit->setReadOnly(true); + auto *filtersPathButton = new QPushButton("..."); + connect(filtersPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::filtersPathButtonClicked); + + replaysPathEdit = new QLineEdit(settings.getReplaysPath()); + replaysPathEdit->setReadOnly(true); + auto *replaysPathButton = new QPushButton("..."); + connect(replaysPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::replaysPathButtonClicked); + + picsPathEdit = new QLineEdit(settings.getPicsPath()); + picsPathEdit->setReadOnly(true); + auto *picsPathButton = new QPushButton("..."); + connect(picsPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::picsPathButtonClicked); + + cardDatabasePathEdit = new QLineEdit(settings.getCardDatabasePath()); + cardDatabasePathEdit->setReadOnly(true); + auto *cardDatabasePathButton = new QPushButton("..."); + connect(cardDatabasePathButton, &QPushButton::clicked, this, &GeneralSettingsPage::cardDatabasePathButtonClicked); + + customCardDatabasePathEdit = new QLineEdit(settings.getCustomCardDatabasePath()); + customCardDatabasePathEdit->setReadOnly(true); + auto *customCardDatabasePathButton = new QPushButton("..."); + connect(customCardDatabasePathButton, &QPushButton::clicked, this, + &GeneralSettingsPage::customCardDatabaseButtonClicked); + + tokenDatabasePathEdit = new QLineEdit(settings.getTokenDatabasePath()); + tokenDatabasePathEdit->setReadOnly(true); + auto *tokenDatabasePathButton = new QPushButton("..."); + connect(tokenDatabasePathButton, &QPushButton::clicked, this, &GeneralSettingsPage::tokenDatabasePathButtonClicked); + + // Required init here to avoid crashing on Portable builds + resetAllPathsButton = new QPushButton; + + bool isPortable = settings.getIsPortableBuild(); + if (isPortable) { + deckPathEdit->setEnabled(false); + filtersPathEdit->setEnabled(false); + replaysPathEdit->setEnabled(false); + picsPathEdit->setEnabled(false); + cardDatabasePathEdit->setEnabled(false); + customCardDatabasePathEdit->setEnabled(false); + tokenDatabasePathEdit->setEnabled(false); + + deckPathButton->setVisible(false); + replaysPathButton->setVisible(false); + picsPathButton->setVisible(false); + cardDatabasePathButton->setVisible(false); + customCardDatabasePathButton->setVisible(false); + tokenDatabasePathButton->setVisible(false); + } else { + connect(resetAllPathsButton, &QPushButton::clicked, this, &GeneralSettingsPage::resetAllPathsClicked); + allPathsResetLabel = new QLabel(tr("All paths have been reset")); + allPathsResetLabel->setVisible(false); + } + + auto *pathsGrid = new QGridLayout; + pathsGrid->addWidget(&deckPathLabel, 0, 0); + pathsGrid->addWidget(deckPathEdit, 0, 1); + pathsGrid->addWidget(deckPathButton, 0, 2); + pathsGrid->addWidget(&filtersPathLabel, 1, 0); + pathsGrid->addWidget(filtersPathEdit, 1, 1); + pathsGrid->addWidget(filtersPathButton, 1, 2); + pathsGrid->addWidget(&replaysPathLabel, 2, 0); + pathsGrid->addWidget(replaysPathEdit, 2, 1); + pathsGrid->addWidget(replaysPathButton, 2, 2); + pathsGrid->addWidget(&picsPathLabel, 3, 0); + pathsGrid->addWidget(picsPathEdit, 3, 1); + pathsGrid->addWidget(picsPathButton, 3, 2); + pathsGrid->addWidget(&cardDatabasePathLabel, 4, 0); + pathsGrid->addWidget(cardDatabasePathEdit, 4, 1); + pathsGrid->addWidget(cardDatabasePathButton, 4, 2); + pathsGrid->addWidget(&customCardDatabasePathLabel, 5, 0); + pathsGrid->addWidget(customCardDatabasePathEdit, 5, 1); + pathsGrid->addWidget(customCardDatabasePathButton, 5, 2); + pathsGrid->addWidget(&tokenDatabasePathLabel, 6, 0); + pathsGrid->addWidget(tokenDatabasePathEdit, 6, 1); + pathsGrid->addWidget(tokenDatabasePathButton, 6, 2); + if (!isPortable) { + pathsGrid->addWidget(resetAllPathsButton, 7, 0); + pathsGrid->addWidget(allPathsResetLabel, 7, 1); + } + pathsGroupBox = new QGroupBox; + pathsGroupBox->setLayout(pathsGrid); + + auto *mainLayout = new QVBoxLayout; + mainLayout->addWidget(personalGroupBox); + mainLayout->addWidget(pathsGroupBox); + mainLayout->addStretch(); + + GeneralSettingsPage::retranslateUi(); + + // connect the ReleaseChannel combo box only after the entries are inserted in retranslateUi + connect(&updateReleaseChannelBox, qOverload(&QComboBox::currentIndexChanged), &settings, + &SettingsCache::setUpdateReleaseChannelIndex); + updateReleaseChannelBox.setCurrentIndex(settings.getUpdateReleaseChannelIndex()); + + setLayout(mainLayout); + + connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &GeneralSettingsPage::retranslateUi); + retranslateUi(); +} + +QStringList GeneralSettingsPage::findQmFiles() +{ + QDir dir(translationPath); + QStringList fileNames = dir.entryList(QStringList(translationPrefix + "_*.qm"), QDir::Files, QDir::Name); + fileNames.replaceInStrings(QRegularExpression(translationPrefix + "_(.*)\\.qm"), "\\1"); + return fileNames; +} + +QString GeneralSettingsPage::languageName(const QString &lang) +{ + QTranslator qTranslator; + + QString appNameHint = translationPrefix + "_" + lang; + bool appTranslationLoaded = qTranslator.load(appNameHint, translationPath); + if (!appTranslationLoaded) { + qCWarning(DlgSettingsLog) << "Unable to load" << translationPrefix << "translation" << appNameHint << "at" + << translationPath; + } + + return qTranslator.translate("i18n", DEFAULT_LANG_NAME); +} + +void GeneralSettingsPage::deckPathButtonClicked() +{ + QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), deckPathEdit->text()); + if (path.isEmpty()) + return; + + deckPathEdit->setText(path); + SettingsCache::instance().setDeckPath(path); +} + +void GeneralSettingsPage::filtersPathButtonClicked() +{ + QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), filtersPathEdit->text()); + if (path.isEmpty()) + return; + + filtersPathEdit->setText(path); + SettingsCache::instance().setFiltersPath(path); +} + +void GeneralSettingsPage::replaysPathButtonClicked() +{ + QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), replaysPathEdit->text()); + if (path.isEmpty()) + return; + + replaysPathEdit->setText(path); + SettingsCache::instance().setReplaysPath(path); +} + +void GeneralSettingsPage::picsPathButtonClicked() +{ + QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), picsPathEdit->text()); + if (path.isEmpty()) + return; + + picsPathEdit->setText(path); + SettingsCache::instance().setPicsPath(path); +} + +void GeneralSettingsPage::cardDatabasePathButtonClicked() +{ + QString path = QFileDialog::getOpenFileName(this, tr("Choose path"), cardDatabasePathEdit->text()); + if (path.isEmpty()) + return; + + cardDatabasePathEdit->setText(path); + SettingsCache::instance().setCardDatabasePath(path); +} + +void GeneralSettingsPage::customCardDatabaseButtonClicked() +{ + QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), customCardDatabasePathEdit->text()); + if (path.isEmpty()) + return; + + customCardDatabasePathEdit->setText(path); + SettingsCache::instance().setCustomCardDatabasePath(path); +} + +void GeneralSettingsPage::tokenDatabasePathButtonClicked() +{ + QString path = QFileDialog::getOpenFileName(this, tr("Choose path"), tokenDatabasePathEdit->text()); + if (path.isEmpty()) + return; + + tokenDatabasePathEdit->setText(path); + SettingsCache::instance().setTokenDatabasePath(path); +} + +void GeneralSettingsPage::resetAllPathsClicked() +{ + SettingsCache &settings = SettingsCache::instance(); + settings.resetPaths(); + deckPathEdit->setText(settings.getDeckPath()); + replaysPathEdit->setText(settings.getReplaysPath()); + picsPathEdit->setText(settings.getPicsPath()); + cardDatabasePathEdit->setText(settings.getCardDatabasePath()); + customCardDatabasePathEdit->setText(settings.getCustomCardDatabasePath()); + tokenDatabasePathEdit->setText(settings.getTokenDatabasePath()); + allPathsResetLabel->setVisible(true); +} + +void GeneralSettingsPage::languageBoxChanged(int index) +{ + SettingsCache::instance().setLang(languageBox.itemData(index).toString()); +} + +void GeneralSettingsPage::retranslateUi() +{ + personalGroupBox->setTitle(tr("Personal settings")); + languageLabel.setText(tr("Language:")); + + if (SettingsCache::instance().getIsPortableBuild()) { + pathsGroupBox->setTitle(tr("Paths (editing disabled in portable mode)")); + } else { + pathsGroupBox->setTitle(tr("Paths")); + } + advertiseTranslationPageLabel.setText( + QString("%2").arg(WIKI_TRANSLATION_FAQ).arg(tr("How to help with translations"))); + deckPathLabel.setText(tr("Decks directory:")); + filtersPathLabel.setText(tr("Filters directory:")); + replaysPathLabel.setText(tr("Replays directory:")); + picsPathLabel.setText(tr("Pictures directory:")); + cardDatabasePathLabel.setText(tr("Card database:")); + customCardDatabasePathLabel.setText(tr("Custom database directory:")); + tokenDatabasePathLabel.setText(tr("Token database:")); + updateReleaseChannelLabel.setText(tr("Update channel")); + startupUpdateCheckCheckBox.setText(tr("Check for client updates on startup")); + startupCardUpdateCheckBehaviorLabel.setText(tr("Check for card database updates on startup")); + startupCardUpdateCheckBehaviorSelector.setItemText(startupCardUpdateCheckBehaviorIndexNone, tr("Don't check")); + startupCardUpdateCheckBehaviorSelector.setItemText(startupCardUpdateCheckBehaviorIndexPrompt, + tr("Prompt for update")); + startupCardUpdateCheckBehaviorSelector.setItemText(startupCardUpdateCheckBehaviorIndexAlways, + tr("Always update in the background")); + cardUpdateCheckIntervalLabel.setText(tr("Check for card database updates every")); + cardUpdateCheckIntervalSpinBox.setSuffix(tr(" days")); + updateNotificationCheckBox.setText(tr("Notify if a feature supported by the server is missing in my client")); + newVersionOracleCheckBox.setText(tr("Automatically run Oracle when running a new version of Cockatrice")); + showTipsOnStartup.setText(tr("Show tips on startup")); + resetAllPathsButton->setText(tr("Reset all paths")); + + const auto &settings = SettingsCache::instance(); + + QDate lastCheckDate = settings.getLastCardUpdateCheck(); + int daysAgo = lastCheckDate.daysTo(QDate::currentDate()); + + lastCardUpdateCheckDateLabel.setText( + tr("Last update check on %1 (%2 days ago)").arg(lastCheckDate.toString()).arg(daysAgo)); + + // We can't change the strings after they're put into the QComboBox, so this is our workaround + int oldIndex = updateReleaseChannelBox.currentIndex(); + updateReleaseChannelBox.clear(); + for (ReleaseChannel *chan : settings.getUpdateReleaseChannels()) { + updateReleaseChannelBox.addItem(tr(chan->getName().toUtf8())); + } + updateReleaseChannelBox.setCurrentIndex(oldIndex); +} + +AppearanceSettingsPage::AppearanceSettingsPage() +{ + SettingsCache &settings = SettingsCache::instance(); + + // Theme settings + QString themeName = SettingsCache::instance().getThemeName(); + + QStringList themeDirs = themeManager->getAvailableThemes().keys(); + for (int i = 0; i < themeDirs.size(); i++) { + themeBox.addItem(themeDirs[i]); + if (themeDirs[i] == themeName) + themeBox.setCurrentIndex(i); + } + + connect(&themeBox, qOverload(&QComboBox::currentIndexChanged), this, &AppearanceSettingsPage::themeBoxChanged); + connect(&openThemeButton, &QPushButton::clicked, this, &AppearanceSettingsPage::openThemeLocation); + + for (const auto &entry : BackgroundSources::all()) { + homeTabBackgroundSourceBox.addItem(QObject::tr(entry.trKey), QVariant::fromValue(entry.type)); + } + + QString homeTabBackgroundSource = SettingsCache::instance().getHomeTabBackgroundSource(); + int homeTabBackgroundSourceId = + homeTabBackgroundSourceBox.findData(BackgroundSources::fromId(homeTabBackgroundSource)); + if (homeTabBackgroundSourceId != -1) { + homeTabBackgroundSourceBox.setCurrentIndex(homeTabBackgroundSourceId); + } + + connect(&homeTabBackgroundSourceBox, QOverload::of(&QComboBox::currentIndexChanged), this, [this]() { + auto type = homeTabBackgroundSourceBox.currentData().value(); + SettingsCache::instance().setHomeTabBackgroundSource(BackgroundSources::toId(type)); + updateHomeTabSettingsVisibility(); + }); + + homeTabBackgroundShuffleFrequencySpinBox.setRange(0, 3600); + homeTabBackgroundShuffleFrequencySpinBox.setSuffix(tr(" seconds")); + homeTabBackgroundShuffleFrequencySpinBox.setValue(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency()); + connect(&homeTabBackgroundShuffleFrequencySpinBox, qOverload(&QSpinBox::valueChanged), + &SettingsCache::instance(), &SettingsCache::setHomeTabBackgroundShuffleFrequency); + + homeTabDisplayCardNameCheckBox.setChecked(settings.getHomeTabDisplayCardName()); + connect(&homeTabDisplayCardNameCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, + &SettingsCache::setHomeTabDisplayCardName); + + updateHomeTabSettingsVisibility(); + + auto *themeGrid = new QGridLayout; + themeGrid->addWidget(&themeLabel, 0, 0); + themeGrid->addWidget(&themeBox, 0, 1); + themeGrid->addWidget(&openThemeButton, 1, 1); + themeGrid->addWidget(&homeTabBackgroundSourceLabel, 2, 0); + themeGrid->addWidget(&homeTabBackgroundSourceBox, 2, 1); + themeGrid->addWidget(&homeTabBackgroundShuffleFrequencyLabel, 3, 0); + themeGrid->addWidget(&homeTabBackgroundShuffleFrequencySpinBox, 3, 1); + themeGrid->addWidget(&homeTabDisplayCardNameLabel, 4, 0); + themeGrid->addWidget(&homeTabDisplayCardNameCheckBox, 4, 1); + + themeGroupBox = new QGroupBox; + themeGroupBox->setLayout(themeGrid); + + // Menu settings + showShortcutsCheckBox.setChecked(settings.getShowShortcuts()); + connect(&showShortcutsCheckBox, &QCheckBox::QT_STATE_CHANGED, this, &AppearanceSettingsPage::showShortcutsChanged); + + showGameSelectorFilterToolbarCheckBox.setChecked(settings.getShowGameSelectorFilterToolbar()); + connect(&showGameSelectorFilterToolbarCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, + &SettingsCache::setShowGameSelectorFilterToolbar); + + auto *menuGrid = new QGridLayout; + menuGrid->addWidget(&showShortcutsCheckBox, 0, 0); + menuGrid->addWidget(&showGameSelectorFilterToolbarCheckBox, 1, 0); + + menuGroupBox = new QGroupBox; + menuGroupBox->setLayout(menuGrid); + + // Card rendering + displayCardNamesCheckBox.setChecked(settings.getDisplayCardNames()); + connect(&displayCardNamesCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setDisplayCardNames); + + autoRotateSidewaysLayoutCardsCheckBox.setChecked(settings.getAutoRotateSidewaysLayoutCards()); + connect(&autoRotateSidewaysLayoutCardsCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, + &SettingsCache::setAutoRotateSidewaysLayoutCards); + + overrideAllCardArtWithPersonalPreferenceCheckBox.setChecked(settings.getOverrideAllCardArtWithPersonalPreference()); + connect(&overrideAllCardArtWithPersonalPreferenceCheckBox, &QCheckBox::QT_STATE_CHANGED, this, + &AppearanceSettingsPage::overrideAllCardArtWithPersonalPreferenceToggled); + + bumpSetsWithCardsInDeckToTopCheckBox.setChecked(settings.getBumpSetsWithCardsInDeckToTop()); + connect(&bumpSetsWithCardsInDeckToTopCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, + &SettingsCache::setBumpSetsWithCardsInDeckToTop); + + cardScalingCheckBox.setChecked(settings.getScaleCards()); + connect(&cardScalingCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setCardScaling); + + roundCardCornersCheckBox.setChecked(settings.getRoundCardCorners()); + connect(&roundCardCornersCheckBox, &QAbstractButton::toggled, &settings, &SettingsCache::setRoundCardCorners); + + verticalCardOverlapPercentBox.setValue(settings.getStackCardOverlapPercent()); + verticalCardOverlapPercentBox.setRange(0, 80); + connect(&verticalCardOverlapPercentBox, qOverload(&QSpinBox::valueChanged), &settings, + &SettingsCache::setStackCardOverlapPercent); + + cardViewInitialRowsMaxBox.setRange(1, 999); + cardViewInitialRowsMaxBox.setValue(SettingsCache::instance().getCardViewInitialRowsMax()); + connect(&cardViewInitialRowsMaxBox, qOverload(&QSpinBox::valueChanged), this, + &AppearanceSettingsPage::cardViewInitialRowsMaxChanged); + + cardViewExpandedRowsMaxBox.setRange(1, 999); + cardViewExpandedRowsMaxBox.setValue(SettingsCache::instance().getCardViewExpandedRowsMax()); + connect(&cardViewExpandedRowsMaxBox, qOverload(&QSpinBox::valueChanged), this, + &AppearanceSettingsPage::cardViewExpandedRowsMaxChanged); + + auto *cardsGrid = new QGridLayout; + cardsGrid->addWidget(&displayCardNamesCheckBox, 0, 0, 1, 2); + cardsGrid->addWidget(&autoRotateSidewaysLayoutCardsCheckBox, 1, 0, 1, 2); + cardsGrid->addWidget(&cardScalingCheckBox, 2, 0, 1, 2); + cardsGrid->addWidget(&roundCardCornersCheckBox, 3, 0, 1, 2); + cardsGrid->addWidget(&overrideAllCardArtWithPersonalPreferenceCheckBox, 4, 0, 1, 2); + cardsGrid->addWidget(&bumpSetsWithCardsInDeckToTopCheckBox, 5, 0, 1, 2); + cardsGrid->addWidget(&verticalCardOverlapPercentLabel, 6, 0, 1, 1); + cardsGrid->addWidget(&verticalCardOverlapPercentBox, 6, 1, 1, 1); + cardsGrid->addWidget(&cardViewInitialRowsMaxLabel, 7, 0); + cardsGrid->addWidget(&cardViewInitialRowsMaxBox, 7, 1); + cardsGrid->addWidget(&cardViewExpandedRowsMaxLabel, 8, 0); + cardsGrid->addWidget(&cardViewExpandedRowsMaxBox, 8, 1); + + cardsGroupBox = new QGroupBox; + cardsGroupBox->setLayout(cardsGrid); + + // Card counter colors + + auto *cardCounterColorsLayout = new QGridLayout; + cardCounterColorsLayout->setColumnStretch(1, 1); + cardCounterColorsLayout->setColumnStretch(3, 1); + cardCounterColorsLayout->setColumnStretch(5, 1); + + auto &cardCounterSettings = SettingsCache::instance().cardCounters(); + for (int index = 0; index < 6; ++index) { + auto *pushButton = new QPushButton; + pushButton->setStyleSheet(QString("background-color: %1").arg(cardCounterSettings.color(index).name())); + + connect(&SettingsCache::instance().cardCounters(), &CardCounterSettings::colorChanged, pushButton, + [index, pushButton](int changedIndex, const QColor &color) { + if (index == changedIndex) { + pushButton->setStyleSheet(QString("background-color: %1").arg(color.name())); + } + }); + + connect(pushButton, &QPushButton::clicked, this, [index, this]() { + auto &cardCounterSettings = SettingsCache::instance().cardCounters(); + + auto newColor = QColorDialog::getColor(cardCounterSettings.color(index), this); + if (!newColor.isValid()) + return; + + cardCounterSettings.setColor(index, newColor); + }); + + auto *colorName = new QLabel; + cardCounterNames.append(colorName); + + int row = index / 3; + int column = 2 * (index % 3); + + cardCounterColorsLayout->addWidget(pushButton, row, column); + cardCounterColorsLayout->addWidget(colorName, row, column + 1); + } + + auto *cardCountersLayout = new QVBoxLayout; + cardCountersLayout->addLayout(cardCounterColorsLayout, 1); + + cardCountersGroupBox = new QGroupBox; + cardCountersGroupBox->setLayout(cardCountersLayout); + + // Hand layout + horizontalHandCheckBox.setChecked(settings.getHorizontalHand()); + connect(&horizontalHandCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setHorizontalHand); + + leftJustifiedHandCheckBox.setChecked(settings.getLeftJustified()); + connect(&leftJustifiedHandCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setLeftJustified); + + auto *handGrid = new QGridLayout; + handGrid->addWidget(&horizontalHandCheckBox, 0, 0, 1, 2); + handGrid->addWidget(&leftJustifiedHandCheckBox, 1, 0, 1, 2); + + handGroupBox = new QGroupBox; + handGroupBox->setLayout(handGrid); + + // table grid layout + invertVerticalCoordinateCheckBox.setChecked(settings.getInvertVerticalCoordinate()); + connect(&invertVerticalCoordinateCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, + &SettingsCache::setInvertVerticalCoordinate); + + minPlayersForMultiColumnLayoutEdit.setMinimum(2); + minPlayersForMultiColumnLayoutEdit.setValue(settings.getMinPlayersForMultiColumnLayout()); + connect(&minPlayersForMultiColumnLayoutEdit, qOverload(&QSpinBox::valueChanged), &settings, + &SettingsCache::setMinPlayersForMultiColumnLayout); + minPlayersForMultiColumnLayoutLabel.setBuddy(&minPlayersForMultiColumnLayoutEdit); + + connect(&maxFontSizeForCardsEdit, qOverload(&QSpinBox::valueChanged), &settings, + &SettingsCache::setMaxFontSize); + maxFontSizeForCardsEdit.setValue(settings.getMaxFontSize()); + maxFontSizeForCardsLabel.setBuddy(&maxFontSizeForCardsEdit); + maxFontSizeForCardsEdit.setMinimum(9); + maxFontSizeForCardsEdit.setMaximum(100); + + auto *tableGrid = new QGridLayout; + tableGrid->addWidget(&invertVerticalCoordinateCheckBox, 0, 0, 1, 2); + tableGrid->addWidget(&minPlayersForMultiColumnLayoutLabel, 1, 0, 1, 1); + tableGrid->addWidget(&minPlayersForMultiColumnLayoutEdit, 1, 1, 1, 1); + tableGrid->addWidget(&maxFontSizeForCardsLabel, 2, 0, 1, 1); + tableGrid->addWidget(&maxFontSizeForCardsEdit, 2, 1, 1, 1); + + tableGroupBox = new QGroupBox; + tableGroupBox->setLayout(tableGrid); + + // putting it all together + auto *mainLayout = new QVBoxLayout; + mainLayout->addWidget(themeGroupBox); + mainLayout->addWidget(menuGroupBox); + mainLayout->addWidget(cardsGroupBox); + mainLayout->addWidget(cardCountersGroupBox); + mainLayout->addWidget(handGroupBox); + mainLayout->addWidget(tableGroupBox); + mainLayout->addStretch(); + + setLayout(mainLayout); + + connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &AppearanceSettingsPage::retranslateUi); + retranslateUi(); +} + +void AppearanceSettingsPage::themeBoxChanged(int index) +{ + QStringList themeDirs = themeManager->getAvailableThemes().keys(); + if (index >= 0 && index < themeDirs.count()) + SettingsCache::instance().setThemeName(themeDirs.at(index)); +} + +void AppearanceSettingsPage::openThemeLocation() +{ + QString dir = SettingsCache::instance().getThemesPath(); + QDir dirDir = dir; + dirDir.cdUp(); + // open if dir exists, create if parent dir does exist + if (dirDir.exists() && dirDir.mkpath(dir)) { + QDesktopServices::openUrl(QUrl::fromLocalFile(dir)); + } else { + QMessageBox::critical(this, tr("Error"), tr("Could not create themes directory at '%1'.").arg(dir)); + } +} + +void AppearanceSettingsPage::updateHomeTabSettingsVisibility() +{ + bool visible = + SettingsCache::instance().getHomeTabBackgroundSource() != BackgroundSources::toId(BackgroundSources::Theme); + + homeTabBackgroundShuffleFrequencyLabel.setVisible(visible); + homeTabBackgroundShuffleFrequencySpinBox.setVisible(visible); + homeTabDisplayCardNameLabel.setVisible(visible); + homeTabDisplayCardNameCheckBox.setVisible(visible); +} + +void AppearanceSettingsPage::showShortcutsChanged(QT_STATE_CHANGED_T value) +{ + SettingsCache::instance().setShowShortcuts(value); + qApp->setAttribute(Qt::AA_DontShowShortcutsInContextMenus, value == 0); // 0 = unchecked +} + +void AppearanceSettingsPage::overrideAllCardArtWithPersonalPreferenceToggled(QT_STATE_CHANGED_T value) +{ + bool enable = static_cast(value); + + bool accepted = OverridePrintingWarning::execMessageBox(this, enable); + + if (!accepted) { + // If user cancels, revert the checkbox/state back + QTimer::singleShot(0, this, [this, enable]() { + overrideAllCardArtWithPersonalPreferenceCheckBox.blockSignals(true); + overrideAllCardArtWithPersonalPreferenceCheckBox.setChecked(!enable); + overrideAllCardArtWithPersonalPreferenceCheckBox.blockSignals(false); + }); + } +} + +/** + * Updates the settings for cardViewInitialRowsMax. + * Forces expanded rows max to always be >= initial rows max + * @param value The new value + */ +void AppearanceSettingsPage::cardViewInitialRowsMaxChanged(int value) +{ + SettingsCache::instance().setCardViewInitialRowsMax(value); + if (cardViewExpandedRowsMaxBox.value() < value) { + cardViewExpandedRowsMaxBox.setValue(value); + } +} + +/** + * Updates the settings for cardViewExpandedRowsMax. + * Forces initial rows max to always be <= expanded rows max + * @param value The new value + */ +void AppearanceSettingsPage::cardViewExpandedRowsMaxChanged(int value) +{ + SettingsCache::instance().setCardViewExpandedRowsMax(value); + if (cardViewInitialRowsMaxBox.value() > value) { + cardViewInitialRowsMaxBox.setValue(value); + } +} + +void AppearanceSettingsPage::retranslateUi() +{ + themeGroupBox->setTitle(tr("Theme settings")); + themeLabel.setText(tr("Current theme:")); + openThemeButton.setText(tr("Open themes folder")); + homeTabBackgroundSourceLabel.setText(tr("Home tab background source:")); + homeTabBackgroundShuffleFrequencyLabel.setText(tr("Home tab background shuffle frequency:")); + homeTabBackgroundShuffleFrequencySpinBox.setSpecialValueText(tr("Disabled")); + homeTabDisplayCardNameLabel.setText(tr("Display card name of background in bottom right:")); + + menuGroupBox->setTitle(tr("Menu settings")); + showShortcutsCheckBox.setText(tr("Show keyboard shortcuts in right-click menus")); + showGameSelectorFilterToolbarCheckBox.setText(tr("Show game filter toolbar above list in room tab")); + + cardsGroupBox->setTitle(tr("Card rendering")); + displayCardNamesCheckBox.setText(tr("Display card names on cards having a picture")); + autoRotateSidewaysLayoutCardsCheckBox.setText(tr("Auto-Rotate cards with sideways layout")); + overrideAllCardArtWithPersonalPreferenceCheckBox.setText( + tr("Override all card art with personal set preference (Pre-ProviderID change behavior)")); + bumpSetsWithCardsInDeckToTopCheckBox.setText( + tr("Bump sets that the deck contains cards from to the top in the printing selector")); + cardScalingCheckBox.setText(tr("Scale cards on mouse over")); + roundCardCornersCheckBox.setText(tr("Use rounded card corners")); + verticalCardOverlapPercentLabel.setText( + tr("Minimum overlap percentage of cards on the stack and in vertical hand")); + cardViewInitialRowsMaxLabel.setText(tr("Maximum initial height for card view window:")); + cardViewInitialRowsMaxBox.setSuffix(tr(" rows")); + cardViewExpandedRowsMaxLabel.setText(tr("Maximum expanded height for card view window:")); + cardViewExpandedRowsMaxBox.setSuffix(tr(" rows")); + + cardCountersGroupBox->setTitle(tr("Card counters")); + + auto &cardCounterSettings = SettingsCache::instance().cardCounters(); + for (int index = 0; index < cardCounterNames.size(); ++index) { + cardCounterNames[index]->setText(tr("Counter %1").arg(cardCounterSettings.displayName(index))); + } + + handGroupBox->setTitle(tr("Hand layout")); + horizontalHandCheckBox.setText(tr("Display hand horizontally (wastes space)")); + leftJustifiedHandCheckBox.setText(tr("Enable left justification")); + + tableGroupBox->setTitle(tr("Table grid layout")); + invertVerticalCoordinateCheckBox.setText(tr("Invert vertical coordinate")); + minPlayersForMultiColumnLayoutLabel.setText(tr("Minimum player count for multi-column layout:")); + maxFontSizeForCardsLabel.setText(tr("Maximum font size for information displayed on cards:")); +} + +enum visualDeckStoragePromptForConversionIndex +{ + visualDeckStoragePromptForConversionIndexNone, + visualDeckStoragePromptForConversionIndexPrompt, + visualDeckStoragePromptForConversionIndexAlways +}; + +UserInterfaceSettingsPage::UserInterfaceSettingsPage() +{ + // general settings and notification settings + notificationsEnabledCheckBox.setChecked(SettingsCache::instance().getNotificationsEnabled()); + connect(¬ificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setNotificationsEnabled); + connect(¬ificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, this, + &UserInterfaceSettingsPage::setNotificationEnabled); + + specNotificationsEnabledCheckBox.setChecked(SettingsCache::instance().getSpectatorNotificationsEnabled()); + specNotificationsEnabledCheckBox.setEnabled(SettingsCache::instance().getNotificationsEnabled()); + connect(&specNotificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setSpectatorNotificationsEnabled); + + buddyConnectNotificationsEnabledCheckBox.setChecked( + SettingsCache::instance().getBuddyConnectNotificationsEnabled()); + buddyConnectNotificationsEnabledCheckBox.setEnabled(SettingsCache::instance().getNotificationsEnabled()); + connect(&buddyConnectNotificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setBuddyConnectNotificationsEnabled); + + doubleClickToPlayCheckBox.setChecked(SettingsCache::instance().getDoubleClickToPlay()); + connect(&doubleClickToPlayCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setDoubleClickToPlay); + + clickPlaysAllSelectedCheckBox.setChecked(SettingsCache::instance().getClickPlaysAllSelected()); + connect(&clickPlaysAllSelectedCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setClickPlaysAllSelected); + + playToStackCheckBox.setChecked(SettingsCache::instance().getPlayToStack()); + connect(&playToStackCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setPlayToStack); + + doNotDeleteArrowsInSubPhasesCheckBox.setChecked(SettingsCache::instance().getDoNotDeleteArrowsInSubPhases()); + connect(&doNotDeleteArrowsInSubPhasesCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setDoNotDeleteArrowsInSubPhases); + + closeEmptyCardViewCheckBox.setChecked(SettingsCache::instance().getCloseEmptyCardView()); + connect(&closeEmptyCardViewCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setCloseEmptyCardView); + + focusCardViewSearchBarCheckBox.setChecked(SettingsCache::instance().getFocusCardViewSearchBar()); + connect(&focusCardViewSearchBarCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setFocusCardViewSearchBar); + + annotateTokensCheckBox.setChecked(SettingsCache::instance().getAnnotateTokens()); + connect(&annotateTokensCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setAnnotateTokens); + + showDragSelectionCountCheckBox.setChecked(SettingsCache::instance().getShowDragSelectionCount()); + connect(&showDragSelectionCountCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setShowDragSelectionCount); + + showTotalSelectionCountCheckBox.setChecked(SettingsCache::instance().getShowTotalSelectionCount()); + connect(&showTotalSelectionCountCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setShowTotalSelectionCount); + + useTearOffMenusCheckBox.setChecked(SettingsCache::instance().getUseTearOffMenus()); + connect(&useTearOffMenusCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + [](const QT_STATE_CHANGED_T state) { SettingsCache::instance().setUseTearOffMenus(state == Qt::Checked); }); + + auto *generalGrid = new QGridLayout; + generalGrid->addWidget(&doubleClickToPlayCheckBox, 0, 0); + generalGrid->addWidget(&clickPlaysAllSelectedCheckBox, 1, 0); + generalGrid->addWidget(&playToStackCheckBox, 2, 0); + generalGrid->addWidget(&doNotDeleteArrowsInSubPhasesCheckBox, 3, 0); + generalGrid->addWidget(&closeEmptyCardViewCheckBox, 4, 0); + generalGrid->addWidget(&focusCardViewSearchBarCheckBox, 5, 0); + generalGrid->addWidget(&annotateTokensCheckBox, 6, 0); + generalGrid->addWidget(&showDragSelectionCountCheckBox, 7, 0); + generalGrid->addWidget(&showTotalSelectionCountCheckBox, 8, 0); + generalGrid->addWidget(&useTearOffMenusCheckBox, 9, 0); + + generalGroupBox = new QGroupBox; + generalGroupBox->setLayout(generalGrid); + + auto *notificationsGrid = new QGridLayout; + notificationsGrid->addWidget(¬ificationsEnabledCheckBox, 0, 0); + notificationsGrid->addWidget(&specNotificationsEnabledCheckBox, 1, 0); + notificationsGrid->addWidget(&buddyConnectNotificationsEnabledCheckBox, 2, 0); + + notificationsGroupBox = new QGroupBox; + notificationsGroupBox->setLayout(notificationsGrid); + + // animation settings + tapAnimationCheckBox.setChecked(SettingsCache::instance().getTapAnimation()); + connect(&tapAnimationCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setTapAnimation); + + auto *animationGrid = new QGridLayout; + animationGrid->addWidget(&tapAnimationCheckBox, 0, 0); + + animationGroupBox = new QGroupBox; + animationGroupBox->setLayout(animationGrid); + + // deck editor settings + openDeckInNewTabCheckBox.setChecked(SettingsCache::instance().getOpenDeckInNewTab()); + connect(&openDeckInNewTabCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setOpenDeckInNewTab); + + visualDeckStorageInGameCheckBox.setChecked(SettingsCache::instance().getVisualDeckStorageInGame()); + connect(&visualDeckStorageInGameCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setVisualDeckStorageInGame); + + visualDeckStorageSelectionAnimationCheckBox.setChecked( + SettingsCache::instance().getVisualDeckStorageSelectionAnimation()); + connect(&visualDeckStorageSelectionAnimationCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setVisualDeckStorageSelectionAnimation); + + visualDeckStoragePromptForConversionSelector.addItem(""); // these will be set in retranslateUI + visualDeckStoragePromptForConversionSelector.addItem(""); + visualDeckStoragePromptForConversionSelector.addItem(""); + if (SettingsCache::instance().getVisualDeckStoragePromptForConversion()) { + visualDeckStoragePromptForConversionSelector.setCurrentIndex(visualDeckStoragePromptForConversionIndexPrompt); + } else if (SettingsCache::instance().getVisualDeckStorageAlwaysConvert()) { + visualDeckStoragePromptForConversionSelector.setCurrentIndex(visualDeckStoragePromptForConversionIndexAlways); + } else { + visualDeckStoragePromptForConversionSelector.setCurrentIndex(visualDeckStoragePromptForConversionIndexNone); + } + connect(&visualDeckStoragePromptForConversionSelector, QOverload::of(&QComboBox::currentIndexChanged), this, + [](int index) { + SettingsCache::instance().setVisualDeckStoragePromptForConversion( + index == visualDeckStoragePromptForConversionIndexPrompt); + SettingsCache::instance().setVisualDeckStorageAlwaysConvert( + index == visualDeckStoragePromptForConversionIndexAlways); + }); + + defaultDeckEditorTypeSelector.addItem(""); // these will be set in retranslateUI + defaultDeckEditorTypeSelector.addItem(""); + defaultDeckEditorTypeSelector.setCurrentIndex(SettingsCache::instance().getDefaultDeckEditorType()); + connect(&defaultDeckEditorTypeSelector, QOverload::of(&QComboBox::currentIndexChanged), + &SettingsCache::instance(), &SettingsCache::setDefaultDeckEditorType); + + auto *deckEditorGrid = new QGridLayout; + deckEditorGrid->addWidget(&openDeckInNewTabCheckBox, 0, 0); + deckEditorGrid->addWidget(&visualDeckStorageInGameCheckBox, 1, 0); + deckEditorGrid->addWidget(&visualDeckStorageSelectionAnimationCheckBox, 2, 0); + deckEditorGrid->addWidget(&visualDeckStoragePromptForConversionLabel, 3, 0); + deckEditorGrid->addWidget(&visualDeckStoragePromptForConversionSelector, 3, 1); + deckEditorGrid->addWidget(&defaultDeckEditorTypeLabel, 4, 0); + deckEditorGrid->addWidget(&defaultDeckEditorTypeSelector, 4, 1); + + deckEditorGroupBox = new QGroupBox; + deckEditorGroupBox->setLayout(deckEditorGrid); + + // replay settings + rewindBufferingMsBox.setRange(0, 9999); + rewindBufferingMsBox.setValue(SettingsCache::instance().getRewindBufferingMs()); + connect(&rewindBufferingMsBox, qOverload(&QSpinBox::valueChanged), &SettingsCache::instance(), + &SettingsCache::setRewindBufferingMs); + + auto *replayGrid = new QGridLayout; + replayGrid->addWidget(&rewindBufferingMsLabel, 0, 0, 1, 1); + replayGrid->addWidget(&rewindBufferingMsBox, 0, 1, 1, 1); + + replayGroupBox = new QGroupBox; + replayGroupBox->setLayout(replayGrid); + + // putting it all together + auto *mainLayout = new QVBoxLayout; + mainLayout->addWidget(generalGroupBox); + mainLayout->addWidget(notificationsGroupBox); + mainLayout->addWidget(animationGroupBox); + mainLayout->addWidget(deckEditorGroupBox); + mainLayout->addWidget(replayGroupBox); + mainLayout->addStretch(); + + setLayout(mainLayout); + + connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &UserInterfaceSettingsPage::retranslateUi); + retranslateUi(); +} + +void UserInterfaceSettingsPage::setNotificationEnabled(QT_STATE_CHANGED_T i) +{ + specNotificationsEnabledCheckBox.setEnabled(i != 0); + buddyConnectNotificationsEnabledCheckBox.setEnabled(i != 0); + if (i == 0) { + specNotificationsEnabledCheckBox.setChecked(false); + buddyConnectNotificationsEnabledCheckBox.setChecked(false); + } +} + +void UserInterfaceSettingsPage::retranslateUi() +{ + generalGroupBox->setTitle(tr("General interface settings")); + doubleClickToPlayCheckBox.setText(tr("&Double-click cards to play them (instead of single-click)")); + clickPlaysAllSelectedCheckBox.setText(tr("&Clicking plays all selected cards (instead of just the clicked card)")); + playToStackCheckBox.setText(tr("&Play all nonlands onto the stack (not the battlefield) by default")); + doNotDeleteArrowsInSubPhasesCheckBox.setText(tr("Do not delete &arrows inside of subphases")); + closeEmptyCardViewCheckBox.setText(tr("Close card view window when last card is removed")); + focusCardViewSearchBarCheckBox.setText(tr("Auto focus search bar when card view window is opened")); + annotateTokensCheckBox.setText(tr("Annotate card text on tokens")); + showDragSelectionCountCheckBox.setText(tr("Show selection counter during drag selection")); + showTotalSelectionCountCheckBox.setText(tr("Show total selection counter")); + useTearOffMenusCheckBox.setText(tr("Use tear-off menus, allowing right click menus to persist on screen")); + notificationsGroupBox->setTitle(tr("Notifications settings")); + notificationsEnabledCheckBox.setText(tr("Enable notifications in taskbar")); + specNotificationsEnabledCheckBox.setText(tr("Notify in the taskbar for game events while you are spectating")); + buddyConnectNotificationsEnabledCheckBox.setText(tr("Notify in the taskbar when users in your buddy list connect")); + animationGroupBox->setTitle(tr("Animation settings")); + tapAnimationCheckBox.setText(tr("&Tap/untap animation")); + deckEditorGroupBox->setTitle(tr("Deck editor/storage settings")); + openDeckInNewTabCheckBox.setText(tr("Open deck in new tab by default")); + visualDeckStorageInGameCheckBox.setText(tr("Use visual deck storage in game lobby")); + visualDeckStorageSelectionAnimationCheckBox.setText(tr("Use selection animation for Visual Deck Storage")); + visualDeckStoragePromptForConversionLabel.setText( + tr("When adding a tag in the visual deck storage to a .txt deck:")); + visualDeckStoragePromptForConversionSelector.setItemText(visualDeckStoragePromptForConversionIndexNone, + tr("do nothing")); + visualDeckStoragePromptForConversionSelector.setItemText(visualDeckStoragePromptForConversionIndexPrompt, + tr("ask to convert to .cod")); + visualDeckStoragePromptForConversionSelector.setItemText(visualDeckStoragePromptForConversionIndexAlways, + tr("always convert to .cod")); + defaultDeckEditorTypeLabel.setText(tr("Default deck editor type")); + defaultDeckEditorTypeSelector.setItemText(TabSupervisor::ClassicDeckEditor, tr("Classic Deck Editor")); + defaultDeckEditorTypeSelector.setItemText(TabSupervisor::VisualDeckEditor, tr("Visual Deck Editor")); + replayGroupBox->setTitle(tr("Replay settings")); + rewindBufferingMsLabel.setText(tr("Buffer time for backwards skip via shortcut:")); + rewindBufferingMsBox.setSuffix(" ms"); +} + +DeckEditorSettingsPage::DeckEditorSettingsPage() +{ + picDownloadCheckBox.setChecked(SettingsCache::instance().getPicDownload()); + connect(&picDownloadCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setPicDownload); + + urlLinkLabel.setTextInteractionFlags(Qt::LinksAccessibleByMouse); + urlLinkLabel.setOpenExternalLinks(true); + + connect(&clearDownloadedPicsButton, &QPushButton::clicked, this, + &DeckEditorSettingsPage::clearDownloadedPicsButtonClicked); + connect(&resetDownloadURLs, &QPushButton::clicked, this, &DeckEditorSettingsPage::resetDownloadedURLsButtonClicked); + + auto *lpGeneralGrid = new QGridLayout; + auto *lpSpoilerGrid = new QGridLayout; + + mcDownloadSpoilersCheckBox.setChecked(SettingsCache::instance().getDownloadSpoilersStatus()); + + mpSpoilerSavePathLineEdit = new QLineEdit(SettingsCache::instance().getSpoilerCardDatabasePath()); + mpSpoilerSavePathLineEdit->setReadOnly(true); + mpSpoilerPathButton = new QPushButton("..."); + connect(mpSpoilerPathButton, &QPushButton::clicked, this, &DeckEditorSettingsPage::spoilerPathButtonClicked); + + updateNowButton = new QPushButton; + updateNowButton->setFixedWidth(150); + connect(updateNowButton, &QPushButton::clicked, this, &DeckEditorSettingsPage::updateSpoilers); + + // Update the GUI depending on if the box is ticked or not + setSpoilersEnabled(mcDownloadSpoilersCheckBox.isChecked()); + + urlList = new QListWidget; + urlList->setSelectionMode(QAbstractItemView::SingleSelection); + urlList->setAlternatingRowColors(true); + urlList->setDragEnabled(true); + urlList->setDragDropMode(QAbstractItemView::InternalMove); + connect(urlList->model(), &QAbstractItemModel::rowsMoved, this, &DeckEditorSettingsPage::urlListChanged); + + urlList->addItems(SettingsCache::instance().downloads().getAllURLs()); + + aAdd = new QAction(this); + aAdd->setIcon(QPixmap("theme:icons/increment")); + connect(aAdd, &QAction::triggered, this, &DeckEditorSettingsPage::actAddURL); + + aEdit = new QAction(this); + aEdit->setIcon(QPixmap("theme:icons/pencil")); + connect(aEdit, &QAction::triggered, this, &DeckEditorSettingsPage::actEditURL); + + aRemove = new QAction(this); + aRemove->setIcon(QPixmap("theme:icons/decrement")); + connect(aRemove, &QAction::triggered, this, &DeckEditorSettingsPage::actRemoveURL); + + auto *urlToolBar = new QToolBar; + urlToolBar->setOrientation(Qt::Vertical); + urlToolBar->addAction(aAdd); + urlToolBar->addAction(aRemove); + urlToolBar->addAction(aEdit); + urlToolBar->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); + + auto *urlListLayout = new QHBoxLayout; + urlListLayout->addWidget(urlToolBar); + urlListLayout->addWidget(urlList); + + // pixmap cache + pixmapCacheEdit.setMinimum(PIXMAPCACHE_SIZE_MIN); + // 2047 is the max value to avoid overflowing of QPixmapCache::setCacheLimit(int size) + pixmapCacheEdit.setMaximum(PIXMAPCACHE_SIZE_MAX); + pixmapCacheEdit.setSingleStep(64); + pixmapCacheEdit.setValue(SettingsCache::instance().getPixmapCacheSize()); + pixmapCacheEdit.setSuffix(" MB"); + + networkCacheEdit.setMinimum(NETWORK_CACHE_SIZE_MIN); + networkCacheEdit.setMaximum(NETWORK_CACHE_SIZE_MAX); + networkCacheEdit.setSingleStep(1); + networkCacheEdit.setValue(SettingsCache::instance().getNetworkCacheSizeInMB()); + networkCacheEdit.setSuffix(" MB"); + + networkRedirectCacheTtlEdit.setMinimum(NETWORK_REDIRECT_CACHE_TTL_MIN); + networkRedirectCacheTtlEdit.setMaximum(NETWORK_REDIRECT_CACHE_TTL_MAX); + networkRedirectCacheTtlEdit.setSingleStep(1); + networkRedirectCacheTtlEdit.setValue(SettingsCache::instance().getRedirectCacheTtl()); + + auto networkCacheLayout = new QHBoxLayout; + networkCacheLayout->addStretch(); + networkCacheLayout->addWidget(&networkCacheLabel); + networkCacheLayout->addWidget(&networkCacheEdit); + + auto networkRedirectCacheLayout = new QHBoxLayout; + networkRedirectCacheLayout->addStretch(); + networkRedirectCacheLayout->addWidget(&networkRedirectCacheTtlLabel); + networkRedirectCacheLayout->addWidget(&networkRedirectCacheTtlEdit); + + auto pixmapCacheLayout = new QHBoxLayout; + pixmapCacheLayout->addStretch(); + pixmapCacheLayout->addWidget(&pixmapCacheLabel); + pixmapCacheLayout->addWidget(&pixmapCacheEdit); + + // Top Layout + lpGeneralGrid->addWidget(&picDownloadCheckBox, 0, 0); + lpGeneralGrid->addWidget(&resetDownloadURLs, 0, 1); + lpGeneralGrid->addLayout(urlListLayout, 1, 0, 1, 2); + lpGeneralGrid->addLayout(networkCacheLayout, 2, 1); + lpGeneralGrid->addLayout(networkRedirectCacheLayout, 3, 0); + lpGeneralGrid->addLayout(pixmapCacheLayout, 3, 1); + lpGeneralGrid->addWidget(&urlLinkLabel, 5, 0); + lpGeneralGrid->addWidget(&clearDownloadedPicsButton, 5, 1); + + // Spoiler Layout + lpSpoilerGrid->addWidget(&mcDownloadSpoilersCheckBox, 0, 0); + lpSpoilerGrid->addWidget(&mcSpoilerSaveLabel, 1, 0); + lpSpoilerGrid->addWidget(mpSpoilerSavePathLineEdit, 1, 1); + lpSpoilerGrid->addWidget(mpSpoilerPathButton, 1, 2); + lpSpoilerGrid->addWidget(&lastUpdatedLabel, 2, 0); + lpSpoilerGrid->addWidget(updateNowButton, 2, 1); + lpSpoilerGrid->addWidget(&infoOnSpoilersLabel, 3, 0, 1, 3, Qt::AlignTop); + + // On a change to the checkbox, hide/un-hide the other fields + connect(&mcDownloadSpoilersCheckBox, &QCheckBox::toggled, &SettingsCache::instance(), + &SettingsCache::setDownloadSpoilerStatus); + connect(&mcDownloadSpoilersCheckBox, &QCheckBox::toggled, this, &DeckEditorSettingsPage::setSpoilersEnabled); + connect(&pixmapCacheEdit, qOverload(&QSpinBox::valueChanged), &SettingsCache::instance(), + &SettingsCache::setPixmapCacheSize); + connect(&networkCacheEdit, qOverload(&QSpinBox::valueChanged), &SettingsCache::instance(), + &SettingsCache::setNetworkCacheSizeInMB); + connect(&networkRedirectCacheTtlEdit, qOverload(&QSpinBox::valueChanged), &SettingsCache::instance(), + &SettingsCache::setNetworkRedirectCacheTtl); + + mpGeneralGroupBox = new QGroupBox; + mpGeneralGroupBox->setLayout(lpGeneralGrid); + + mpSpoilerGroupBox = new QGroupBox; + mpSpoilerGroupBox->setLayout(lpSpoilerGrid); + + auto *lpMainLayout = new QVBoxLayout; + lpMainLayout->addWidget(mpGeneralGroupBox); + lpMainLayout->addWidget(mpSpoilerGroupBox); + + setLayout(lpMainLayout); + + connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &DeckEditorSettingsPage::retranslateUi); + retranslateUi(); +} + +void DeckEditorSettingsPage::resetDownloadedURLsButtonClicked() +{ + SettingsCache::instance().downloads().resetToDefaultURLs(); + urlList->clear(); + urlList->addItems(SettingsCache::instance().downloads().getAllURLs()); + QMessageBox::information(this, tr("Success"), tr("Download URLs have been reset.")); +} + +void DeckEditorSettingsPage::clearDownloadedPicsButtonClicked() +{ + CardPictureLoader::clearNetworkCache(); + + // These are not used anymore, but we don't delete them automatically, so + // we should do it here lest we leave pictures hanging around on users' + // machines. + QString picsPath = SettingsCache::instance().getPicsPath() + "/downloadedPics/"; + QStringList dirs = QDir(picsPath).entryList(QDir::AllDirs | QDir::NoDotAndDotDot); + bool outerSuccessRemove = true; + for (const auto &dir : dirs) { + QString currentPath = picsPath + dir + "/"; + QStringList files = QDir(currentPath).entryList(QDir::Files); + bool innerSuccessRemove = true; + for (int j = 0; j < files.length(); j++) { + if (!QDir(currentPath).remove(files.at(j))) { + qInfo() << "Failed to remove " + currentPath.toUtf8() + files.at(j).toUtf8(); + outerSuccessRemove = false; + innerSuccessRemove = false; + } + qInfo() << "Removed " << currentPath << files.at(j); + } + + if (innerSuccessRemove) { + bool success = QDir(picsPath).rmdir(dir); + if (!success) { + qInfo() << "Failed to remove inner directory" << picsPath; + } else { + qInfo() << "Removed" << currentPath; + } + } + } + if (outerSuccessRemove) { + QMessageBox::information(this, tr("Success"), tr("Downloaded card pictures have been reset.")); + QDir(SettingsCache::instance().getPicsPath()).rmdir("downloadedPics"); + } else { + QMessageBox::critical(this, tr("Error"), tr("One or more downloaded card pictures could not be cleared.")); + } +} + +void DeckEditorSettingsPage::actAddURL() +{ + bool ok; + QString msg = QInputDialog::getText(this, tr("Add URL"), tr("URL:"), QLineEdit::Normal, QString(), &ok); + if (ok) { + urlList->addItem(msg); + storeSettings(); + } +} + +void DeckEditorSettingsPage::actRemoveURL() +{ + if (urlList->currentItem() != nullptr) { + delete urlList->takeItem(urlList->currentRow()); + storeSettings(); + } +} + +void DeckEditorSettingsPage::actEditURL() +{ + if (urlList->currentItem()) { + QString oldText = urlList->currentItem()->text(); + bool ok; + QString msg = QInputDialog::getText(this, tr("Edit URL"), tr("URL:"), QLineEdit::Normal, oldText, &ok); + if (ok) { + urlList->currentItem()->setText(msg); + storeSettings(); + } + } +} + +void DeckEditorSettingsPage::storeSettings() +{ + qInfo() << "URL Priority Reset"; + + QStringList downloadUrls; + for (int i = 0; i < urlList->count(); i++) { + qInfo() << "Priority" << i << ":" << urlList->item(i)->text(); + downloadUrls << urlList->item(i)->text(); + } + SettingsCache::instance().downloads().setDownloadUrls(downloadUrls); +} + +void DeckEditorSettingsPage::urlListChanged(const QModelIndex &, int, int, const QModelIndex &, int) +{ + storeSettings(); +} + +void DeckEditorSettingsPage::updateSpoilers() +{ + // Disable the button so the user can only press it once at a time + updateNowButton->setDisabled(true); + updateNowButton->setText(tr("Updating...")); + + // 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->setDisabled(false); + updateNowButton->setText(tr("Update Spoilers")); +} + +QString DeckEditorSettingsPage::getLastUpdateTime() +{ + QString fileName = SettingsCache::instance().getSpoilerCardDatabasePath(); + QFileInfo fi(fileName); + QDir fileDir(fi.path()); + QFile file(fileName); + + if (file.exists()) { + return fi.lastModified().toString("MMM d, hh:mm"); + } + + return QString(); +} + +void DeckEditorSettingsPage::spoilerPathButtonClicked() +{ + QString lsPath = QFileDialog::getExistingDirectory(this, tr("Choose path"), mpSpoilerSavePathLineEdit->text()); + if (lsPath.isEmpty()) { + return; + } + + mpSpoilerSavePathLineEdit->setText(lsPath + "/spoiler.xml"); + SettingsCache::instance().setSpoilerDatabasePath(lsPath + "/spoiler.xml"); +} + +void DeckEditorSettingsPage::setSpoilersEnabled(bool anInput) +{ + msDownloadSpoilersLabel.setEnabled(anInput); + mcSpoilerSaveLabel.setEnabled(anInput); + mpSpoilerSavePathLineEdit->setEnabled(anInput); + mpSpoilerPathButton->setEnabled(anInput); + lastUpdatedLabel.setEnabled(anInput); + updateNowButton->setEnabled(anInput); + infoOnSpoilersLabel.setEnabled(anInput); + + if (!anInput) { + SpoilerBackgroundUpdater::deleteSpoilerFile(); + } +} + +void DeckEditorSettingsPage::retranslateUi() +{ + mpGeneralGroupBox->setTitle(tr("URL Download Priority")); + mpSpoilerGroupBox->setTitle(tr("Spoilers")); + 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"))); + clearDownloadedPicsButton.setText(tr("Delete Downloaded Images")); + resetDownloadURLs.setText(tr("Reset Download URLs")); + networkCacheLabel.setText(tr("Network Cache Size:")); + networkCacheEdit.setToolTip(tr("On-disk cache for downloaded pictures")); + networkRedirectCacheTtlLabel.setText(tr("Redirect Cache TTL:")); + networkRedirectCacheTtlEdit.setToolTip(tr("How long cached redirects for urls are valid for.")); + pixmapCacheLabel.setText(tr("Picture Cache Size:")); + pixmapCacheEdit.setToolTip(tr("In-memory cache for pictures not currently on screen")); + updateNowButton->setText(tr("Update Spoilers")); + aAdd->setText(tr("Add New URL")); + aEdit->setText(tr("Edit URL")); + aRemove->setText(tr("Remove URL")); + networkRedirectCacheTtlEdit.setSuffix(" " + tr("Day(s)")); +} + +MessagesSettingsPage::MessagesSettingsPage() +{ + chatMentionCheckBox.setChecked(SettingsCache::instance().getChatMention()); + connect(&chatMentionCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setChatMention); + + chatMentionCompleterCheckbox.setChecked(SettingsCache::instance().getChatMentionCompleter()); + connect(&chatMentionCompleterCheckbox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setChatMentionCompleter); + + explainMessagesLabel.setTextInteractionFlags(Qt::LinksAccessibleByMouse); + explainMessagesLabel.setOpenExternalLinks(true); + + ignoreUnregUsersMainChat.setChecked(SettingsCache::instance().getIgnoreUnregisteredUsers()); + ignoreUnregUserMessages.setChecked(SettingsCache::instance().getIgnoreUnregisteredUserMessages()); + connect(&ignoreUnregUsersMainChat, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setIgnoreUnregisteredUsers); + connect(&ignoreUnregUserMessages, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setIgnoreUnregisteredUserMessages); + + invertMentionForeground.setChecked(SettingsCache::instance().getChatMentionForeground()); + connect(&invertMentionForeground, &QCheckBox::QT_STATE_CHANGED, this, &MessagesSettingsPage::updateTextColor); + + invertHighlightForeground.setChecked(SettingsCache::instance().getChatHighlightForeground()); + connect(&invertHighlightForeground, &QCheckBox::QT_STATE_CHANGED, this, + &MessagesSettingsPage::updateTextHighlightColor); + + mentionColor = new QLineEdit(); + mentionColor->setText(SettingsCache::instance().getChatMentionColor()); + updateMentionPreview(); + connect(mentionColor, &QLineEdit::textChanged, this, &MessagesSettingsPage::updateColor); + + messagePopups.setChecked(SettingsCache::instance().getShowMessagePopup()); + connect(&messagePopups, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setShowMessagePopups); + + mentionPopups.setChecked(SettingsCache::instance().getShowMentionPopup()); + connect(&mentionPopups, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setShowMentionPopups); + + roomHistory.setChecked(SettingsCache::instance().getRoomHistory()); + connect(&roomHistory, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), &SettingsCache::setRoomHistory); + + customAlertString = new QLineEdit(); + customAlertString->setText(SettingsCache::instance().getHighlightWords()); + connect(customAlertString, &QLineEdit::textChanged, &SettingsCache::instance(), &SettingsCache::setHighlightWords); + + auto *chatGrid = new QGridLayout; + chatGrid->addWidget(&chatMentionCheckBox, 0, 0); + chatGrid->addWidget(&invertMentionForeground, 0, 1); + chatGrid->addWidget(mentionColor, 0, 2); + chatGrid->addWidget(&chatMentionCompleterCheckbox, 1, 0); + chatGrid->addWidget(&ignoreUnregUsersMainChat, 2, 0); + chatGrid->addWidget(&hexLabel, 1, 2); + chatGrid->addWidget(&ignoreUnregUserMessages, 3, 0); + chatGrid->addWidget(&messagePopups, 4, 0); + chatGrid->addWidget(&mentionPopups, 5, 0); + chatGrid->addWidget(&roomHistory, 6, 0); + chatGroupBox = new QGroupBox; + chatGroupBox->setLayout(chatGrid); + + highlightColor = new QLineEdit(); + highlightColor->setText(SettingsCache::instance().getChatHighlightColor()); + updateHighlightPreview(); + connect(highlightColor, &QLineEdit::textChanged, this, &MessagesSettingsPage::updateHighlightColor); + + auto *highlightNotice = new QGridLayout; + highlightNotice->addWidget(highlightColor, 0, 2); + highlightNotice->addWidget(&invertHighlightForeground, 0, 1); + highlightNotice->addWidget(&hexHighlightLabel, 1, 2); + highlightNotice->addWidget(customAlertString, 0, 0); + highlightNotice->addWidget(&customAlertStringLabel, 1, 0); + highlightGroupBox = new QGroupBox; + highlightGroupBox->setLayout(highlightNotice); + + messageList = new QListWidget; + + int count = SettingsCache::instance().messages().getCount(); + for (int i = 0; i < count; i++) + messageList->addItem(SettingsCache::instance().messages().getMessageAt(i)); + + aAdd = new QAction(this); + aAdd->setIcon(QPixmap("theme:icons/increment")); + connect(aAdd, &QAction::triggered, this, &MessagesSettingsPage::actAdd); + + aEdit = new QAction(this); + aEdit->setIcon(QPixmap("theme:icons/pencil")); + connect(aEdit, &QAction::triggered, this, &MessagesSettingsPage::actEdit); + + aRemove = new QAction(this); + aRemove->setIcon(QPixmap("theme:icons/decrement")); + connect(aRemove, &QAction::triggered, this, &MessagesSettingsPage::actRemove); + + auto *messageToolBar = new QToolBar; + messageToolBar->setOrientation(Qt::Vertical); + messageToolBar->addAction(aAdd); + messageToolBar->addAction(aRemove); + messageToolBar->addAction(aEdit); + messageToolBar->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); + + auto *messageListLayout = new QHBoxLayout; + messageListLayout->addWidget(messageToolBar); + messageListLayout->addWidget(messageList); + + auto *messagesLayout = new QVBoxLayout; // combines the explainer label with the actual messages widget pieces + messagesLayout->addLayout(messageListLayout); + messagesLayout->addWidget(&explainMessagesLabel); + + messageGroupBox = new QGroupBox; // draws a box around the above layout and allows it to be titled + messageGroupBox->setLayout(messagesLayout); + + auto *mainLayout = new QVBoxLayout; // combines the messages groupbox with the rest of the menu + mainLayout->addWidget(messageGroupBox); + mainLayout->addWidget(chatGroupBox); + mainLayout->addWidget(highlightGroupBox); + + setLayout(mainLayout); + + connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &MessagesSettingsPage::retranslateUi); + retranslateUi(); +} + +void MessagesSettingsPage::updateColor(const QString &value) +{ +#if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)) + QColor colorToSet = QColor::fromString("#" + value); +#else + QColor colorToSet; + colorToSet.setNamedColor("#" + value); +#endif + if (colorToSet.isValid()) { + SettingsCache::instance().setChatMentionColor(value); + updateMentionPreview(); + } +} + +void MessagesSettingsPage::updateHighlightColor(const QString &value) +{ +#if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)) + QColor colorToSet = QColor::fromString("#" + value); +#else + QColor colorToSet; + colorToSet.setNamedColor("#" + value); +#endif + if (colorToSet.isValid()) { + SettingsCache::instance().setChatHighlightColor(value); + updateHighlightPreview(); + } +} + +void MessagesSettingsPage::updateTextColor(QT_STATE_CHANGED_T value) +{ + SettingsCache::instance().setChatMentionForeground(value); + updateMentionPreview(); +} + +void MessagesSettingsPage::updateTextHighlightColor(QT_STATE_CHANGED_T value) +{ + SettingsCache::instance().setChatHighlightForeground(value); + updateHighlightPreview(); +} + +void MessagesSettingsPage::updateMentionPreview() +{ + mentionColor->setStyleSheet( + "QLineEdit{background:#" + SettingsCache::instance().getChatMentionColor() + + ";color: " + (SettingsCache::instance().getChatMentionForeground() ? "white" : "black") + ";}"); +} + +void MessagesSettingsPage::updateHighlightPreview() +{ + highlightColor->setStyleSheet( + "QLineEdit{background:#" + SettingsCache::instance().getChatHighlightColor() + + ";color: " + (SettingsCache::instance().getChatHighlightForeground() ? "white" : "black") + ";}"); +} + +void MessagesSettingsPage::storeSettings() +{ + SettingsCache::instance().messages().setCount(messageList->count()); + for (int i = 0; i < messageList->count(); i++) + SettingsCache::instance().messages().setMessageAt(i, messageList->item(i)->text()); + emit SettingsCache::instance().messages().messageMacrosChanged(); +} + +void MessagesSettingsPage::actAdd() +{ + bool ok; + QString msg = + getTextWithMax(this, tr("Add message"), tr("Message:"), QLineEdit::Normal, QString(), &ok, MAX_TEXT_LENGTH); + if (ok) { + messageList->addItem(msg); + storeSettings(); + } +} + +void MessagesSettingsPage::actEdit() +{ + if (messageList->currentItem()) { + QString oldText = messageList->currentItem()->text(); + bool ok; + QString msg = + getTextWithMax(this, tr("Edit message"), tr("Message:"), QLineEdit::Normal, oldText, &ok, MAX_TEXT_LENGTH); + if (ok) { + messageList->currentItem()->setText(msg); + storeSettings(); + } + } +} + +void MessagesSettingsPage::actRemove() +{ + if (messageList->currentItem() != nullptr) { + delete messageList->takeItem(messageList->currentRow()); + storeSettings(); + } +} + +void MessagesSettingsPage::retranslateUi() +{ + chatGroupBox->setTitle(tr("Chat settings")); + highlightGroupBox->setTitle(tr("Custom alert words")); + chatMentionCheckBox.setText(tr("Enable chat mentions")); + chatMentionCompleterCheckbox.setText(tr("Enable mention completer")); + messageGroupBox->setTitle(tr("In-game message macros")); + explainMessagesLabel.setText( + QString("%2").arg(WIKI_CUSTOM_SHORTCUTS).arg(tr("How to use in-game message macros"))); + ignoreUnregUsersMainChat.setText(tr("Ignore chat room messages sent by unregistered users")); + ignoreUnregUserMessages.setText(tr("Ignore private messages sent by unregistered users")); + invertMentionForeground.setText(tr("Invert text color")); + invertHighlightForeground.setText(tr("Invert text color")); + messagePopups.setText(tr("Enable desktop notifications for private messages")); + mentionPopups.setText(tr("Enable desktop notification for mentions")); + roomHistory.setText(tr("Enable room message history on join")); + hexLabel.setText(tr("(Color is hexadecimal)")); + hexHighlightLabel.setText(tr("(Color is hexadecimal)")); + customAlertStringLabel.setText(tr("Separate words with a space, alphanumeric characters only")); + customAlertString->setPlaceholderText(tr("Word1 Word2 Word3")); + aAdd->setText(tr("Add New Message")); + aEdit->setText(tr("Edit Message")); + aRemove->setText(tr("Remove Message")); +} + +SoundSettingsPage::SoundSettingsPage() +{ + soundEnabledCheckBox.setChecked(SettingsCache::instance().getSoundEnabled()); + connect(&soundEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), + &SettingsCache::setSoundEnabled); + + QString themeName = SettingsCache::instance().getSoundThemeName(); + + QStringList themeDirs = soundEngine->getAvailableThemes().keys(); + for (int i = 0; i < themeDirs.size(); i++) { + themeBox.addItem(themeDirs[i]); + if (themeDirs[i] == themeName) + themeBox.setCurrentIndex(i); + } + + connect(&themeBox, qOverload(&QComboBox::currentIndexChanged), this, &SoundSettingsPage::themeBoxChanged); + connect(&soundTestButton, &QPushButton::clicked, soundEngine, &SoundEngine::testSound); + + masterVolumeSlider = new QSlider(Qt::Horizontal); + masterVolumeSlider->setMinimum(0); + masterVolumeSlider->setMaximum(100); + masterVolumeSlider->setValue(SettingsCache::instance().getMasterVolume()); + masterVolumeSlider->setToolTip(QString::number(SettingsCache::instance().getMasterVolume())); + connect(&SettingsCache::instance(), &SettingsCache::masterVolumeChanged, this, + &SoundSettingsPage::masterVolumeChanged); + connect(masterVolumeSlider, &QSlider::sliderReleased, soundEngine, &SoundEngine::testSound); + connect(masterVolumeSlider, &QSlider::valueChanged, &SettingsCache::instance(), &SettingsCache::setMasterVolume); + + masterVolumeSpinBox = new QSpinBox(); + masterVolumeSpinBox->setMinimum(0); + masterVolumeSpinBox->setMaximum(100); + masterVolumeSpinBox->setValue(SettingsCache::instance().getMasterVolume()); + connect(masterVolumeSlider, &QSlider::valueChanged, masterVolumeSpinBox, &QSpinBox::setValue); + connect(masterVolumeSpinBox, qOverload(&QSpinBox::valueChanged), masterVolumeSlider, &QSlider::setValue); + + auto *soundGrid = new QGridLayout; + soundGrid->addWidget(&soundEnabledCheckBox, 0, 0, 1, 3); + soundGrid->addWidget(&masterVolumeLabel, 1, 0); + soundGrid->addWidget(masterVolumeSlider, 1, 1); + soundGrid->addWidget(masterVolumeSpinBox, 1, 2); + soundGrid->addWidget(&themeLabel, 2, 0); + soundGrid->addWidget(&themeBox, 2, 1); + soundGrid->addWidget(&soundTestButton, 3, 1); + + soundGroupBox = new QGroupBox; + soundGroupBox->setLayout(soundGrid); + + auto *mainLayout = new QVBoxLayout; + mainLayout->addWidget(soundGroupBox); + mainLayout->addStretch(); + + setLayout(mainLayout); + + connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &SoundSettingsPage::retranslateUi); + retranslateUi(); +} + +void SoundSettingsPage::themeBoxChanged(int index) +{ + QStringList themeDirs = soundEngine->getAvailableThemes().keys(); + if (index >= 0 && index < themeDirs.count()) + SettingsCache::instance().setSoundThemeName(themeDirs.at(index)); +} + +void SoundSettingsPage::masterVolumeChanged(int value) +{ + masterVolumeSlider->setToolTip(QString::number(value)); +} + +void SoundSettingsPage::retranslateUi() +{ + soundEnabledCheckBox.setText(tr("Enable &sounds")); + themeLabel.setText(tr("Current sounds theme:")); + soundTestButton.setText(tr("Test system sound engine")); + soundGroupBox->setTitle(tr("Sound settings")); + masterVolumeLabel.setText(tr("Master volume")); +} + +ShortcutSettingsPage::ShortcutSettingsPage() +{ + // search bar + searchEdit = new SearchLineEdit; + searchEdit->setObjectName("searchEdit"); + searchEdit->setClearButtonEnabled(true); + + setFocusProxy(searchEdit); + setFocusPolicy(Qt::ClickFocus); + + // table + shortcutsTable = new ShortcutTreeView(this); + + shortcutsTable->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + shortcutsTable->setEditTriggers(QAbstractItemView::NoEditTriggers); + shortcutsTable->setColumnWidth(0, width() / 3 * 2); + searchEdit->setTreeView(shortcutsTable); + + connect(searchEdit, &SearchLineEdit::textChanged, shortcutsTable, &ShortcutTreeView::updateSearchString); + + // edit widget + currentActionGroupLabel = new QLabel(this); + currentActionGroupName = new QLabel(this); + currentActionLabel = new QLabel(this); + currentActionName = new QLabel(this); + currentShortcutLabel = new QLabel(this); + editTextBox = new SequenceEdit("", this); + shortcutsTable->installEventFilter(editTextBox); + + // buttons + faqLabel = new QLabel(this); + faqLabel->setTextInteractionFlags(Qt::LinksAccessibleByMouse); + faqLabel->setOpenExternalLinks(true); + + btnResetAll = new QPushButton(this); + btnClearAll = new QPushButton(this); + + btnResetAll->setIcon(QPixmap("theme:icons/update")); + btnClearAll->setIcon(QPixmap("theme:icons/clearsearch")); + + // layout + auto *_editLayout = new QGridLayout; + _editLayout->addWidget(currentActionGroupLabel, 0, 0); + _editLayout->addWidget(currentActionGroupName, 0, 1); + _editLayout->addWidget(currentActionLabel, 1, 0); + _editLayout->addWidget(currentActionName, 1, 1); + _editLayout->addWidget(currentShortcutLabel, 2, 0); + _editLayout->addWidget(editTextBox, 2, 1); + + editShortcutGroupBox = new QGroupBox; + editShortcutGroupBox->setLayout(_editLayout); + + auto *_buttonsLayout = new QHBoxLayout; + _buttonsLayout->addWidget(faqLabel); + _buttonsLayout->addWidget(btnResetAll); + _buttonsLayout->addWidget(btnClearAll); + + auto *_mainLayout = new QVBoxLayout; + _mainLayout->addWidget(searchEdit); + _mainLayout->addWidget(shortcutsTable); + _mainLayout->addWidget(editShortcutGroupBox); + _mainLayout->addLayout(_buttonsLayout); + + setLayout(_mainLayout); + + connect(btnResetAll, &QPushButton::clicked, this, &ShortcutSettingsPage::resetShortcuts); + connect(btnClearAll, &QPushButton::clicked, this, &ShortcutSettingsPage::clearShortcuts); + + connect(shortcutsTable, &ShortcutTreeView::currentItemChanged, this, &ShortcutSettingsPage::currentItemChanged); + + connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &ShortcutSettingsPage::retranslateUi); + retranslateUi(); +} + +void ShortcutSettingsPage::currentItemChanged(const QString &key) +{ + if (key.isEmpty()) { + currentActionGroupName->setText(""); + currentActionName->setText(""); + editTextBox->setShortcutName(""); + } else { + QString group = SettingsCache::instance().shortcuts().getShortcut(key).getGroupName(); + QString action = SettingsCache::instance().shortcuts().getShortcut(key).getName(); + currentActionGroupName->setText(group); + currentActionName->setText(action); + editTextBox->setShortcutName(key); + } +} + +void ShortcutSettingsPage::resetShortcuts() +{ + if (QMessageBox::question(this, tr("Restore all default shortcuts"), + tr("Do you really want to restore all default shortcuts?")) == QMessageBox::Yes) { + SettingsCache::instance().shortcuts().resetAllShortcuts(); + } +} + +void ShortcutSettingsPage::clearShortcuts() +{ + if (QMessageBox::question(this, tr("Clear all default shortcuts"), + tr("Do you really want to clear all shortcuts?")) == QMessageBox::Yes) { + SettingsCache::instance().shortcuts().clearAllShortcuts(); + } +} + +void ShortcutSettingsPage::retranslateUi() +{ + shortcutsTable->retranslateUi(); + + currentActionGroupLabel->setText(tr("Section:")); + currentActionLabel->setText(tr("Action:")); + currentShortcutLabel->setText(tr("Shortcut:")); + editTextBox->retranslateUi(); + faqLabel->setText(QString("%2").arg(WIKI_CUSTOM_SHORTCUTS).arg(tr("How to set custom shortcuts"))); + btnResetAll->setText(tr("Restore all default shortcuts")); + btnClearAll->setText(tr("Clear all shortcuts")); + searchEdit->setPlaceholderText(tr("Search by shortcut name")); +} static QScrollArea *makeScrollable(QWidget *widget) { @@ -58,7 +1789,6 @@ DlgSettings::DlgSettings(QWidget *parent) : QDialog(parent) pagesWidget->addWidget(makeScrollable(new AppearanceSettingsPage)); pagesWidget->addWidget(makeScrollable(new UserInterfaceSettingsPage)); pagesWidget->addWidget(new DeckEditorSettingsPage); - pagesWidget->addWidget(makeScrollable(new StorageSettingsPage)); pagesWidget->addWidget(new MessagesSettingsPage); pagesWidget->addWidget(new SoundSettingsPage); pagesWidget->addWidget(new ShortcutSettingsPage); @@ -107,11 +1837,6 @@ void DlgSettings::createIcons() deckEditorButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); deckEditorButton->setIcon(QPixmap("theme:config/deckeditor")); - storageButton = new QListWidgetItem(contentsWidget); - storageButton->setTextAlignment(Qt::AlignHCenter); - storageButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - storageButton->setIcon(QPixmap("theme:config/storage")); - messagesButton = new QListWidgetItem(contentsWidget); messagesButton->setTextAlignment(Qt::AlignHCenter); messagesButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); @@ -132,9 +1857,8 @@ void DlgSettings::createIcons() void DlgSettings::changePage(QListWidgetItem *current, QListWidgetItem *previous) { - if (!current) { + if (!current) current = previous; - } pagesWidget->setCurrentIndex(contentsWidget->row(current)); } @@ -206,7 +1930,7 @@ void DlgSettings::closeEvent(QCloseEvent *event) } if (!QDir(SettingsCache::instance().getDeckPath()).exists() || SettingsCache::instance().getDeckPath().isEmpty()) { - //! \todo Prompt to create the deck directory. + //! \todo Prompt to create it if (QMessageBox::critical( this, tr("Error"), tr("The path to your deck directory is invalid. Would you like to go back and set the correct path?"), @@ -217,7 +1941,7 @@ void DlgSettings::closeEvent(QCloseEvent *event) } if (!QDir(SettingsCache::instance().getPicsPath()).exists() || SettingsCache::instance().getPicsPath().isEmpty()) { - //! \todo Prompt to create the pictures directory. + //! \todo Prompt to create it if (QMessageBox::critical(this, tr("Error"), tr("The path to your card pictures directory is invalid. Would you like to go back " "and set the correct path?"), @@ -236,7 +1960,6 @@ void DlgSettings::retranslateUi() generalButton->setText(tr("General")); appearanceButton->setText(tr("Appearance")); userInterfaceButton->setText(tr("User Interface")); - storageButton->setText(tr("Storage")); deckEditorButton->setText(tr("Card Sources")); messagesButton->setText(tr("Chat")); soundButton->setText(tr("Sound")); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.h b/cockatrice/src/interface/widgets/dialogs/dlg_settings.h index 3ffee6388..b655a30bc 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.h @@ -1,21 +1,343 @@ /** * @file dlg_settings.h * @ingroup Dialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_SETTINGS_H #define DLG_SETTINGS_H +#include #include #include +#include +#include #include +#include +#include +#include inline Q_LOGGING_CATEGORY(DlgSettingsLog, "dlg_settings"); +class ShortcutTreeView; +class SearchLineEdit; +class QTreeView; +class QStandardItemModel; +class CardDatabase; +class QCloseEvent; +class QGridLayout; +class QHBoxLayout; +class QLineEdit; class QListWidget; -class QStackedWidget; class QListWidgetItem; +class QRadioButton; +class QSlider; +class QStackedWidget; +class QVBoxLayout; +class SequenceEdit; + +class AbstractSettingsPage : public QWidget +{ +public: + virtual void retranslateUi() = 0; +}; + +class GeneralSettingsPage : public AbstractSettingsPage +{ + Q_OBJECT +public: + GeneralSettingsPage(); + void retranslateUi() override; + +private slots: + void deckPathButtonClicked(); + void filtersPathButtonClicked(); + void replaysPathButtonClicked(); + void picsPathButtonClicked(); + void cardDatabasePathButtonClicked(); + void customCardDatabaseButtonClicked(); + void tokenDatabasePathButtonClicked(); + void resetAllPathsClicked(); + void languageBoxChanged(int index); + +private: + QStringList findQmFiles(); + QString languageName(const QString &lang); + QLineEdit *deckPathEdit; + QLineEdit *filtersPathEdit; + QLineEdit *replaysPathEdit; + QLineEdit *picsPathEdit; + QLineEdit *cardDatabasePathEdit; + QLineEdit *customCardDatabasePathEdit; + QLineEdit *tokenDatabasePathEdit; + QPushButton *resetAllPathsButton; + QLabel *allPathsResetLabel; + QGroupBox *personalGroupBox; + QGroupBox *pathsGroupBox; + QComboBox languageBox; + QCheckBox startupUpdateCheckCheckBox; + QLabel startupCardUpdateCheckBehaviorLabel; + QComboBox startupCardUpdateCheckBehaviorSelector; + QLabel cardUpdateCheckIntervalLabel; + QSpinBox cardUpdateCheckIntervalSpinBox; + QLabel lastCardUpdateCheckDateLabel; + QCheckBox updateNotificationCheckBox; + QCheckBox newVersionOracleCheckBox; + QComboBox updateReleaseChannelBox; + QLabel languageLabel; + QLabel deckPathLabel; + QLabel filtersPathLabel; + QLabel replaysPathLabel; + QLabel picsPathLabel; + QLabel cardDatabasePathLabel; + QLabel customCardDatabasePathLabel; + QLabel tokenDatabasePathLabel; + QLabel updateReleaseChannelLabel; + QLabel advertiseTranslationPageLabel; + QCheckBox showTipsOnStartup; +}; + +class AppearanceSettingsPage : public AbstractSettingsPage +{ + Q_OBJECT +private slots: + void themeBoxChanged(int index); + void openThemeLocation(); + void updateHomeTabSettingsVisibility(); + void showShortcutsChanged(QT_STATE_CHANGED_T enabled); + void overrideAllCardArtWithPersonalPreferenceToggled(QT_STATE_CHANGED_T enabled); + + void cardViewInitialRowsMaxChanged(int value); + void cardViewExpandedRowsMaxChanged(int value); + +private: + QLabel themeLabel; + QComboBox themeBox; + QPushButton openThemeButton; + QLabel homeTabBackgroundSourceLabel; + QComboBox homeTabBackgroundSourceBox; + QLabel homeTabBackgroundShuffleFrequencyLabel; + QSpinBox homeTabBackgroundShuffleFrequencySpinBox; + QLabel homeTabDisplayCardNameLabel; + QCheckBox homeTabDisplayCardNameCheckBox; + QLabel minPlayersForMultiColumnLayoutLabel; + QLabel maxFontSizeForCardsLabel; + QCheckBox showShortcutsCheckBox; + QCheckBox showGameSelectorFilterToolbarCheckBox; + QCheckBox displayCardNamesCheckBox; + QCheckBox autoRotateSidewaysLayoutCardsCheckBox; + QCheckBox overrideAllCardArtWithPersonalPreferenceCheckBox; + QCheckBox bumpSetsWithCardsInDeckToTopCheckBox; + QCheckBox cardScalingCheckBox; + QCheckBox roundCardCornersCheckBox; + QLabel verticalCardOverlapPercentLabel; + QSpinBox verticalCardOverlapPercentBox; + QLabel cardViewInitialRowsMaxLabel; + QSpinBox cardViewInitialRowsMaxBox; + QLabel cardViewExpandedRowsMaxLabel; + QSpinBox cardViewExpandedRowsMaxBox; + QCheckBox horizontalHandCheckBox; + QCheckBox leftJustifiedHandCheckBox; + QCheckBox invertVerticalCoordinateCheckBox; + QGroupBox *themeGroupBox; + QGroupBox *menuGroupBox; + QGroupBox *cardsGroupBox; + QGroupBox *handGroupBox; + QGroupBox *tableGroupBox; + QGroupBox *cardCountersGroupBox; + QList cardCounterNames; + QSpinBox minPlayersForMultiColumnLayoutEdit; + QSpinBox maxFontSizeForCardsEdit; + +public: + AppearanceSettingsPage(); + void retranslateUi() override; +}; + +class UserInterfaceSettingsPage : public AbstractSettingsPage +{ + Q_OBJECT +private slots: + void setNotificationEnabled(QT_STATE_CHANGED_T); + +private: + QCheckBox notificationsEnabledCheckBox; + QCheckBox specNotificationsEnabledCheckBox; + QCheckBox buddyConnectNotificationsEnabledCheckBox; + QCheckBox doubleClickToPlayCheckBox; + QCheckBox clickPlaysAllSelectedCheckBox; + QCheckBox playToStackCheckBox; + QCheckBox doNotDeleteArrowsInSubPhasesCheckBox; + QCheckBox closeEmptyCardViewCheckBox; + QCheckBox focusCardViewSearchBarCheckBox; + QCheckBox annotateTokensCheckBox; + QCheckBox showDragSelectionCountCheckBox; + QCheckBox showTotalSelectionCountCheckBox; + QCheckBox useTearOffMenusCheckBox; + QCheckBox tapAnimationCheckBox; + QCheckBox openDeckInNewTabCheckBox; + QLabel visualDeckStoragePromptForConversionLabel; + QComboBox visualDeckStoragePromptForConversionSelector; + QCheckBox visualDeckStorageInGameCheckBox; + QCheckBox visualDeckStorageSelectionAnimationCheckBox; + QLabel defaultDeckEditorTypeLabel; + QComboBox defaultDeckEditorTypeSelector; + QLabel rewindBufferingMsLabel; + QSpinBox rewindBufferingMsBox; + QGroupBox *generalGroupBox; + QGroupBox *notificationsGroupBox; + QGroupBox *animationGroupBox; + QGroupBox *deckEditorGroupBox; + QGroupBox *replayGroupBox; + +public: + UserInterfaceSettingsPage(); + void retranslateUi() override; +}; + +class DeckEditorSettingsPage : public AbstractSettingsPage +{ + Q_OBJECT +public: + DeckEditorSettingsPage(); + void retranslateUi() override; + QString getLastUpdateTime(); + +private slots: + void storeSettings(); + void urlListChanged(const QModelIndex &, int, int, const QModelIndex &, int); + void setSpoilersEnabled(bool); + void spoilerPathButtonClicked(); + void updateSpoilers(); + void unlockSettings(); + void actAddURL(); + void actRemoveURL(); + void actEditURL(); + void clearDownloadedPicsButtonClicked(); + void resetDownloadedURLsButtonClicked(); + +private: + QPushButton clearDownloadedPicsButton; + QPushButton resetDownloadURLs; + QLabel urlLinkLabel; + QCheckBox picDownloadCheckBox; + QListWidget *urlList; + QAction *aAdd, *aEdit, *aRemove; + QCheckBox mcDownloadSpoilersCheckBox; + QLabel msDownloadSpoilersLabel; + QGroupBox *mpGeneralGroupBox; + QGroupBox *mpSpoilerGroupBox; + QLineEdit *mpSpoilerSavePathLineEdit; + QLabel mcSpoilerSaveLabel; + QLabel lastUpdatedLabel; + QLabel infoOnSpoilersLabel; + QPushButton *mpSpoilerPathButton; + QPushButton *updateNowButton; + QLabel networkCacheLabel; + QSpinBox networkCacheEdit; + QLabel networkRedirectCacheTtlLabel; + QSpinBox networkRedirectCacheTtlEdit; + QSpinBox pixmapCacheEdit; + QLabel pixmapCacheLabel; +}; + +class MessagesSettingsPage : public AbstractSettingsPage +{ + Q_OBJECT +public: + MessagesSettingsPage(); + void retranslateUi() override; + +private slots: + void actAdd(); + void actEdit(); + void actRemove(); + void updateColor(const QString &value); + void updateHighlightColor(const QString &value); + void updateTextColor(QT_STATE_CHANGED_T value); + void updateTextHighlightColor(QT_STATE_CHANGED_T value); + +private: + QListWidget *messageList; + QAction *aAdd; + QAction *aEdit; + QAction *aRemove; + QCheckBox chatMentionCheckBox; + QCheckBox chatMentionCompleterCheckbox; + QCheckBox invertMentionForeground; + QCheckBox invertHighlightForeground; + QCheckBox ignoreUnregUsersMainChat; + QCheckBox ignoreUnregUserMessages; + QCheckBox messagePopups; + QCheckBox mentionPopups; + QCheckBox roomHistory; + QGroupBox *chatGroupBox; + QGroupBox *highlightGroupBox; + QGroupBox *messageGroupBox; + QLineEdit *mentionColor; + QLineEdit *highlightColor; + QLineEdit *customAlertString; + QLabel hexLabel; + QLabel hexHighlightLabel; + QLabel customAlertStringLabel; + QLabel explainMessagesLabel; + + void storeSettings(); + void updateMentionPreview(); + void updateHighlightPreview(); +}; + +class SoundSettingsPage : public AbstractSettingsPage +{ + Q_OBJECT +public: + SoundSettingsPage(); + void retranslateUi() override; + +private: + QLabel themeLabel; + QComboBox themeBox; + QGroupBox *soundGroupBox; + QPushButton soundTestButton; + QCheckBox soundEnabledCheckBox; + QLabel masterVolumeLabel; + QSlider *masterVolumeSlider; + QSpinBox *masterVolumeSpinBox; + +private slots: + void masterVolumeChanged(int value); + void themeBoxChanged(int index); +}; + +class ShortcutSettingsPage : public AbstractSettingsPage +{ + Q_OBJECT +public: + ShortcutSettingsPage(); + void retranslateUi() override; + +private: + SearchLineEdit *searchEdit; + ShortcutTreeView *shortcutsTable; + QVBoxLayout *mainLayout; + QHBoxLayout *buttonsLayout; + QGroupBox *editShortcutGroupBox; + QGridLayout *editLayout; + QLabel *currentActionGroupLabel; + QLabel *currentActionGroupName; + QLabel *currentActionLabel; + QLabel *currentActionName; + QLabel *currentShortcutLabel; + SequenceEdit *editTextBox; + QLabel *faqLabel; + QPushButton *btnResetAll; + QPushButton *btnClearAll; + +private slots: + void resetShortcuts(); + void clearShortcuts(); + void currentItemChanged(const QString &key); +}; class DlgSettings : public QDialog { @@ -31,8 +353,8 @@ private slots: private: QListWidget *contentsWidget; QStackedWidget *pagesWidget; - QListWidgetItem *generalButton, *appearanceButton, *userInterfaceButton, *deckEditorButton, *storageButton, - *messagesButton, *soundButton, *shortcutsButton; + QListWidgetItem *generalButton, *appearanceButton, *userInterfaceButton, *deckEditorButton, *messagesButton, + *soundButton, *shortcutsButton; void createIcons(); void retranslateUi(); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h b/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h index d26610983..44fc59d58 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h @@ -1,8 +1,8 @@ /** * @file dlg_startup_card_check.h * @ingroup CardDatabaseUpdateDialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_STARTUP_CARD_CHECK_H #define DLG_STARTUP_CARD_CHECK_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h index e493481d0..3dad7c652 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h @@ -1,8 +1,8 @@ /** * @file dlg_tip_of_the_day.h * @ingroup Dialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_TIPOFDAY_H #define DLG_TIPOFDAY_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp index ee2149309..c9adeb270 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp @@ -40,7 +40,7 @@ DlgUpdate::DlgUpdate(QWidget *parent) : QDialog(parent) buttonBox->addButton(ok, QDialogButtonBox::AcceptRole); connect(gotoDownload, &QPushButton::clicked, this, &DlgUpdate::gotoDownloadPage); - //! \todo Make reinstall button actually do something when clicked. + // TODO: make reinstall button actually do something when clicked // connect(manualDownload, &QPushButton::clicked, this, &DlgUpdate::downloadUpdate); connect(stopDownload, &QPushButton::clicked, this, &DlgUpdate::cancelDownload); connect(ok, &QPushButton::clicked, this, &DlgUpdate::closeDialog); @@ -154,9 +154,8 @@ void DlgUpdate::finishedUpdateCheck(bool needToUpdate, bool isCompatible, Releas ")

" + tr("Do you want to update now?"), QMessageBox::Yes | QMessageBox::No); - if (reply == QMessageBox::Yes) { + if (reply == QMessageBox::Yes) downloadUpdate(release->getName()); - } } else { QMessageBox::information( this, tr("Update Available"), @@ -219,25 +218,10 @@ void DlgUpdate::downloadError(const QString &errorString) void DlgUpdate::downloadSuccessful(const QUrl &filepath) { setLabel(tr("Installing...")); - - QString installerPath = filepath.toLocalFile(); - - QString appDir = QDir::toNativeSeparators(QCoreApplication::applicationDirPath()); - QProcess process; - process.setProgram(installerPath); - - // NSIS needs the /D= argument to be an UNQUOTED string, even if it contains spaces. Qt likes to quote arguments if - // they contain spaces, so we use the windows exclusive QProcess::setNativeArguments in the only case where this is - // relevant, which preserves the argument unquoted. -#ifdef Q_OS_WIN - process.setNativeArguments(QString("/R /D=%1").arg(appDir)); -#else - // Linux/macOS: normal argument passing (not relevant since they update differently.) - process.setArguments({"/R", QString("/D=%1").arg(appDir)}); -#endif - // Try to open the installer. If it opens, quit Cockatrice - if (process.startDetached()) { + if (QProcess::startDetached(filepath.toLocalFile(), + QStringList() + << "/R" << QString("/D=%1").arg(QCoreApplication::applicationDirPath()))) { QMetaObject::invokeMethod(static_cast(parent()), "close", Qt::QueuedConnection); qCInfo(DlgUpdateLog) << "Opened downloaded update file successfully - closing Cockatrice"; close(); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_update.h b/cockatrice/src/interface/widgets/dialogs/dlg_update.h index 7bd0020d5..daf0b9e47 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_update.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_update.h @@ -1,8 +1,8 @@ /** * @file dlg_update.h * @ingroup ClientUpdateDialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_UPDATE_H #define DLG_UPDATE_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp index 4eb054647..3dd0fedb3 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp @@ -60,9 +60,8 @@ void DlgViewLog::actCopyToClipboard() void DlgViewLog::loadInitialLogBuffer() { QList logBuffer = Logger::getInstance().getLogBuffer(); - for (const QString &message : logBuffer) { + for (const QString &message : logBuffer) appendLogEntry(message); - } } void DlgViewLog::appendLogEntry(const QString &message) diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h index 5c7315b50..f0b900527 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h @@ -1,8 +1,8 @@ /** * @file dlg_view_log.h * @ingroup ServerLogDialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DLG_VIEWLOG_H #define DLG_VIEWLOG_H diff --git a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp index 66170792a..94996e975 100644 --- a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp +++ b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp @@ -73,9 +73,8 @@ TipsOfTheDay::~TipsOfTheDay() QVariant TipsOfTheDay::data(const QModelIndex &index, int /*role*/) const { - if (!index.isValid() || index.row() >= tipList->size() || index.column() >= TIPDDBMODEL_COLUMNS) { + if (!index.isValid() || index.row() >= tipList->size() || index.column() >= TIPDDBMODEL_COLUMNS) return QVariant(); - } TipOfTheDay tip = tipList->at(index.row()); switch (index.column()) { diff --git a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h index 9cda07e2b..d61fddab5 100644 --- a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h +++ b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h @@ -1,8 +1,8 @@ /** * @file tip_of_the_day.h * @ingroup Dialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TIP_OF_DAY_H #define TIP_OF_DAY_H diff --git a/cockatrice/src/interface/widgets/general/background_sources.h b/cockatrice/src/interface/widgets/general/background_sources.h index 423111bb6..15bf1d377 100644 --- a/cockatrice/src/interface/widgets/general/background_sources.h +++ b/cockatrice/src/interface/widgets/general/background_sources.h @@ -1,8 +1,8 @@ /** * @file background_sources.h * @ingroup UI + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_BACKGROUND_SOURCES_H #define COCKATRICE_BACKGROUND_SOURCES_H @@ -40,9 +40,8 @@ public: static QString toId(Type type) { for (const auto &e : all()) { - if (e.type == type) { + if (e.type == type) return e.id; - } } return {}; } @@ -50,9 +49,8 @@ public: static Type fromId(const QString &id) { for (const auto &e : all()) { - if (id == e.id) { + if (id == e.id) return e.type; - } } return Theme; // default } @@ -60,9 +58,8 @@ public: static QString toDisplay(Type type) { for (const auto &e : all()) { - if (e.type == type) { + if (e.type == type) return QObject::tr(e.trKey); - } } return {}; } diff --git a/cockatrice/src/interface/widgets/general/display/banner_widget.h b/cockatrice/src/interface/widgets/general/display/banner_widget.h index 77a05abb6..8a81dcfce 100644 --- a/cockatrice/src/interface/widgets/general/display/banner_widget.h +++ b/cockatrice/src/interface/widgets/general/display/banner_widget.h @@ -3,8 +3,8 @@ * @ingroup Widgets * @ingroup DeckEditorCardGroupWidgets * @ingroup DeckStorageWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef BANNER_WIDGET_H #define 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 d9e108e6a..998808307 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 @@ -52,9 +52,8 @@ void BarChartWidget::paintEvent(QPaintEvent *) int barAreaWidth = right - left; int barCount = bars.size(); - if (barCount == 0) { + if (barCount == 0) return; - } int spacing = 6; int barWidth = (barAreaWidth - (barCount - 1) * spacing) / barCount; @@ -92,9 +91,8 @@ void BarChartWidget::paintEvent(QPaintEvent *) for (int j = 0; j < bar.segments.size(); j++) { const auto &seg = bar.segments[j]; int segHeight = (seg.value * barAreaHeight / highest); - if (segHeight < 2 && seg.value > 0) { + if (segHeight < 2 && seg.value > 0) segHeight = 2; - } int topY = yCurrent - segHeight; @@ -191,9 +189,8 @@ void BarChartWidget::mouseMoveEvent(QMouseEvent *e) for (int i = 0; i < segments.size(); i++) { const auto &seg = segments[i]; int segHeight = (seg.value * barAreaHeight / highest); - if (segHeight < 2 && seg.value > 0) { + if (segHeight < 2 && seg.value > 0) segHeight = 2; - } int topY = yCurrent - segHeight; int bottomY = yCurrent; diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h index 05814f15b..67ad24995 100644 --- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h +++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h @@ -2,8 +2,8 @@ * @file bar_widget.h * @ingroup Widgets * @ingroup DeckEditorAnalyticsWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef BAR_WIDGET_H #define BAR_WIDGET_H diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp index 12ab5bb3b..ed91ba03d 100644 --- a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp +++ b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp @@ -26,19 +26,16 @@ QSize ColorBar::minimumSizeHint() const void ColorBar::paintEvent(QPaintEvent *) { - if (colors.isEmpty()) { + if (colors.isEmpty()) return; - } int total = 0; - for (const auto &pair : colors) { + for (const auto &pair : colors) total += pair.second; - } // Prevent divide-by-zero - if (total == 0) { + if (total == 0) return; - } QPainter p(this); p.setRenderHint(QPainter::Antialiasing, true); @@ -66,9 +63,8 @@ void ColorBar::paintEvent(QPaintEvent *) int segmentWidth = int(ratio * w); // Ensure the segment width is at least 1 to avoid degenerate rectangles - if (segmentWidth < 1) { + if (segmentWidth < 1) segmentWidth = 1; - } QColor base = colorFromName(key); @@ -104,9 +100,8 @@ void ColorBar::leaveEvent(QEvent *) void ColorBar::mouseMoveEvent(QMouseEvent *event) { - if (!isHovered || colors.isEmpty()) { + if (!isHovered || colors.isEmpty()) return; - } #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) int x = int(event->position().x()); @@ -117,21 +112,18 @@ void ColorBar::mouseMoveEvent(QMouseEvent *event) #endif QString text = tooltipForPosition(x); - if (!text.isEmpty()) { + if (!text.isEmpty()) QToolTip::showText(gp, text, this); - } } QString ColorBar::tooltipForPosition(int x) const { int total = 0; - for (const auto &pair : colors) { + for (const auto &pair : colors) total += pair.second; - } - if (total == 0) { + if (total == 0) return {}; - } int pos = 0; @@ -157,14 +149,12 @@ QColor ColorBar::colorFromName(const QString &name) const {"W", QColor(235, 235, 230)}, {"B", QColor(30, 30, 30)}, }; - if (map.contains(name)) { + if (map.contains(name)) return map[name]; - } QColor c(name); - if (!c.isValid()) { + if (!c.isValid()) c = Qt::gray; - } return c; } \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h index 100f95310..0ef68f578 100644 --- a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h +++ b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h @@ -99,13 +99,13 @@ protected: void mouseMoveEvent(QMouseEvent *event) override; private: - /** @brief Map of color keys to counts used for rendering. */ + /// Map of color keys to counts used for rendering. QList> colors; - /** @brief True if the mouse is currently inside the widget. */ + /// True if the mouse is currently inside the widget. bool isHovered = false; - /** @brief Minimum ratio a segment must exceed to be drawn. */ + /// Minimum ratio a segment must exceed to be drawn. double minRatioThreshold = 0.0; /** diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h b/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h index 9cd6039c8..ff7d91363 100644 --- a/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h +++ b/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h @@ -2,8 +2,8 @@ * @file percent_bar_widget.h * @ingroup Widgets * @ingroup DeckEditorAnalyticsWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef PERCENT_BAR_WIDGET_H #define PERCENT_BAR_WIDGET_H 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 9bad32bda..e027aabdd 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 @@ -44,9 +44,8 @@ void SegmentedBarWidget::paintEvent(QPaintEvent *) const auto &seg = segments[i]; int segHeight = total > 0 ? (seg.value * barHeight / total) : 0; - if (segHeight < 2) { + if (segHeight < 2) segHeight = 2; - } QRect r(barX, yCurrent - segHeight, barWidth, segHeight); bool isTop = (i == segments.size() - 1); @@ -111,9 +110,8 @@ int SegmentedBarWidget::segmentAt(int y) const int top = currentTop - segHeight; int bottom = currentTop; - if (y >= top && y <= bottom) { + if (y >= top && y <= bottom) return i; - } currentTop -= segHeight; } diff --git a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp index b129fbe18..84232b36f 100644 --- a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp +++ b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp @@ -157,9 +157,8 @@ QString ColorPie::tooltipForPoint(const QPoint &pt) const QPointF v = pt - center; double distance = std::hypot(v.x(), v.y()); - if (distance > size / 2.0) { + if (distance > size / 2.0) return {}; - } double angle = std::atan2(-v.y(), v.x()) * 180.0 / M_PI; if (angle < 0) { diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h index c9b159b02..ca3043d10 100644 --- a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h +++ b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h @@ -1,8 +1,8 @@ /** * @file dynamic_font_size_label.h * @ingroup Widgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DYNAMICFONTSIZELABEL_H #define DYNAMICFONTSIZELABEL_H diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.h b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.h index 540abfe6b..19e67fd28 100644 --- a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.h +++ b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.h @@ -1,8 +1,8 @@ /** * @file dynamic_font_size_push_button.h * @ingroup PrintingWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DYNAMICFONTSIZEPUSHBUTTON_H #define DYNAMICFONTSIZEPUSHBUTTON_H diff --git a/cockatrice/src/interface/widgets/general/display/labeled_input.h b/cockatrice/src/interface/widgets/general/display/labeled_input.h index 838dfb280..8424e09f0 100644 --- a/cockatrice/src/interface/widgets/general/display/labeled_input.h +++ b/cockatrice/src/interface/widgets/general/display/labeled_input.h @@ -1,8 +1,8 @@ /** * @file labeled_input.h * @ingroup DeckEditorCardGroupWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef LABELED_INPUT_H #define LABELED_INPUT_H diff --git a/cockatrice/src/interface/widgets/general/display/shadow_background_label.h b/cockatrice/src/interface/widgets/general/display/shadow_background_label.h index 69232691e..b2344b7d0 100644 --- a/cockatrice/src/interface/widgets/general/display/shadow_background_label.h +++ b/cockatrice/src/interface/widgets/general/display/shadow_background_label.h @@ -1,8 +1,8 @@ /** * @file shadow_background_label.h * @ingroup PrintingWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef STYLEDLABEL_H #define STYLEDLABEL_H diff --git a/cockatrice/src/interface/widgets/general/home_styled_button.h b/cockatrice/src/interface/widgets/general/home_styled_button.h index f8d97e9aa..a053993da 100644 --- a/cockatrice/src/interface/widgets/general/home_styled_button.h +++ b/cockatrice/src/interface/widgets/general/home_styled_button.h @@ -1,8 +1,8 @@ /** * @file home_styled_button.h * @ingroup Widgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef HOME_STYLED_BUTTON_H #define HOME_STYLED_BUTTON_H diff --git a/cockatrice/src/interface/widgets/general/home_widget.cpp b/cockatrice/src/interface/widgets/general/home_widget.cpp index e1687f997..a87d69119 100644 --- a/cockatrice/src/interface/widgets/general/home_widget.cpp +++ b/cockatrice/src/interface/widgets/general/home_widget.cpp @@ -139,9 +139,8 @@ void HomeWidget::updateRandomCard() } break; } - if (!newCard) { + if (!newCard) return; - } connect(newCard.getCardPtr().data(), &CardInfo::pixmapUpdated, this, &HomeWidget::updateBackgroundProperties); backgroundSourceCard->setCard(newCard); diff --git a/cockatrice/src/interface/widgets/general/home_widget.h b/cockatrice/src/interface/widgets/general/home_widget.h index 90d003aa7..b30bb5407 100644 --- a/cockatrice/src/interface/widgets/general/home_widget.h +++ b/cockatrice/src/interface/widgets/general/home_widget.h @@ -2,8 +2,8 @@ * @file home_widget.h * @ingroup Core * @ingroup Widgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef HOME_WIDGET_H #define HOME_WIDGET_H diff --git a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp index 025f457bd..75ab56b34 100644 --- a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp +++ b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp @@ -1,52 +1,42 @@ /** * @file flow_widget.cpp - * @brief Implementation of FlowWidget — a QWidget hosting a FlowLayout inside an - * optional QScrollArea. + * @brief Implementation of the FlowWidget class for organizing widgets in a flow layout within a scrollable area. */ #include "flow_widget.h" #include #include -#include -#include #include +#include +#include /** - * @brief Constructs a FlowWidget. + * @brief Constructs a FlowWidget with a scrollable layout. * - * When both scroll policies are Qt::ScrollBarAlwaysOff the scroll area is - * omitted entirely and the container is placed directly in the main layout. - * - * @param parent Parent widget. - * @param _flowDirection Qt::Horizontal for row-wrapping, Qt::Vertical for column-wrapping. - * @param horizontalPolicy Horizontal scroll-bar policy. - * @param verticalPolicy Vertical scroll-bar policy. + * @param parent The parent widget of this FlowWidget. + * @param horizontalPolicy The horizontal scroll bar policy for the scroll area. + * @param verticalPolicy The vertical scroll bar policy for the scroll area. */ FlowWidget::FlowWidget(QWidget *parent, const Qt::Orientation _flowDirection, const Qt::ScrollBarPolicy horizontalPolicy, const Qt::ScrollBarPolicy verticalPolicy) - : QWidget(parent), scrollArea(nullptr), flowDirection(_flowDirection) - + : QWidget(parent), flowDirection(_flowDirection) { - // Top-level size policy - // Horizontal flow: expand horizontally, let height be determined by wrapping. - // Vertical flow: expand vertically, let width be determined by wrapping. - if (flowDirection == Qt::Horizontal) { - setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + // Main Widget and Layout + if (_flowDirection == Qt::Horizontal) { + setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); + setMinimumWidth(0); } else { - setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); + setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding); + setMinimumHeight(0); } - mainLayout = new QHBoxLayout(this); - mainLayout->setContentsMargins(0, 0, 0, 0); setLayout(mainLayout); - const bool useScrollArea = (horizontalPolicy != Qt::ScrollBarAlwaysOff || verticalPolicy != Qt::ScrollBarAlwaysOff); - - // Scroll area (optional) - if (useScrollArea) { + if (horizontalPolicy != Qt::ScrollBarAlwaysOff || verticalPolicy != Qt::ScrollBarAlwaysOff) { + // Scroll Area, which should expand as much as possible, since it should be the only direct child widget. scrollArea = new QScrollArea(this); scrollArea->setWidgetResizable(true); scrollArea->setMinimumSize(0, 0); @@ -58,28 +48,39 @@ FlowWidget::FlowWidget(QWidget *parent, scrollArea = nullptr; } - // Container widget (holds the FlowLayout) - container = new QWidget(useScrollArea ? static_cast(scrollArea) : this); - - // The container should be willing to grow in both axes; its actual size is - // governed by the FlowLayout's sizeHint / heightForWidth, not by a fixed policy. - container->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); - container->setMinimumSize(0, 0); + // Flow Layout inside the scroll area + if (horizontalPolicy == Qt::ScrollBarAlwaysOff && verticalPolicy == Qt::ScrollBarAlwaysOff) { + container = new QWidget(this); + } else { + container = new QWidget(scrollArea); + } flowLayout = new FlowLayout(container, flowDirection); - container->setLayout(flowLayout); - if (useScrollArea) { + container->setLayout(flowLayout); + // The container should expand as much as possible, trusting the scrollArea to constrain it. + if (_flowDirection == Qt::Horizontal) { + container->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); + container->setMinimumWidth(0); + } else { + container->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); + container->setMinimumHeight(0); + } + + // Use the FlowLayout container directly if we disable the ScrollArea + if (horizontalPolicy == Qt::ScrollBarAlwaysOff && verticalPolicy == Qt::ScrollBarAlwaysOff) { + mainLayout->addWidget(container); + } else { scrollArea->setWidget(container); mainLayout->addWidget(scrollArea); - } else { - mainLayout->addWidget(container); } } /** * @brief Adds a widget to the flow layout within the FlowWidget. * + * Adjusts the widget's size policy based on the scroll bar policies. + * * @param widget_to_add The widget to add to the flow layout. */ void FlowWidget::addWidget(QWidget *widget_to_add) const @@ -99,75 +100,77 @@ void FlowWidget::removeWidget(QWidget *widgetToRemove) const } /** - * @brief Removes all widgets from the flow layout and deletes them. + * @brief Clears all widgets from the flow layout. * - * If the layout pointer has somehow been lost it is recreated before returning. + * Deletes each widget and layout item, and recreates the flow layout if it was removed. */ void FlowWidget::clearLayout() { - if (flowLayout) { + if (flowLayout != nullptr) { QLayoutItem *item; - while ((item = flowLayout->takeAt(0))) { - if (item->widget()) { - item->widget()->deleteLater(); - } - delete item; + while ((item = flowLayout->takeAt(0)) != nullptr) { + item->widget()->deleteLater(); // Delete the widget + delete item; // Delete the layout item } } else { - // Defensive fallback: recreate the layout if it was deleted externally. flowLayout = new FlowLayout(container, flowDirection); container->setLayout(flowLayout); } } /** - * @brief Marks the flow layout as dirty so Qt recomputes item positions. + * @brief Handles resize events for the FlowWidget. * - * We do NOT call adjustSize() or activate() here: - * - adjustSize() would freeze geometry by calling setFixedSize internally. - * - activate() called inside a resize event can cause synchronous re-entrancy. - * Qt automatically calls setGeometry on the layout after a resize, so simply - * invalidating is sufficient. + * Triggers layout recalculation and adjusts the scroll area content size. + * + * @param event The resize event containing the new size information. */ void FlowWidget::resizeEvent(QResizeEvent *event) { QWidget::resizeEvent(event); - qCDebug(FlowWidgetSizeLog) << "resizeEvent:" << event->size(); - if (flowLayout) { - flowLayout->invalidate(); + qCDebug(FlowWidgetSizeLog) << event->size(); + + // Trigger the layout to recalculate + if (flowLayout != nullptr) { + flowLayout->invalidate(); // Marks the layout as dirty and requires recalculation + flowLayout->activate(); // Recalculate the layout based on the new size + } + + // Ensure the scroll area and its content adjust correctly + if (scrollArea != nullptr && scrollArea->widget() != nullptr) { + qCDebug(FlowWidgetSizeLog) << "Got a scrollarea: " << scrollArea->widget()->size(); + scrollArea->widget()->adjustSize(); + } else { + container->adjustSize(); } } -void FlowWidget::setSpacing(int hSpacing, int vSpacing) -{ - flowLayout->setHorizontalMargin(hSpacing); - flowLayout->setVerticalMargin(vSpacing); - flowLayout->invalidate(); -} - /** - * @brief Sets every child widget's minimum size to the largest sizeHint in the layout. - * - * Useful for toolbars or button bars where all items should be the same size. + * @brief Sets the minimum size for all widgets inside the FlowWidget to the maximum sizeHint of all of them. */ void FlowWidget::setMinimumSizeToMaxSizeHint() { - QSize maxSize(0, 0); + QSize maxSize(0, 0); // Initialize to a zero size // Iterate over all widgets in the flow layout to find the maximum sizeHint for (int i = 0; i < flowLayout->count(); ++i) { - QLayoutItem *item = flowLayout->itemAt(i); - if (item && item->widget()) { - maxSize = maxSize.expandedTo(item->widget()->sizeHint()); + if (QLayoutItem *item = flowLayout->itemAt(i)) { + if (QWidget *widget = item->widget()) { + // Update the max size based on the sizeHint of each widget + QSize widgetSizeHint = widget->sizeHint(); + maxSize.setWidth(qMax(maxSize.width(), widgetSizeHint.width())); + maxSize.setHeight(qMax(maxSize.height(), widgetSizeHint.height())); + } } } // Set the minimum size for all widgets to the max sizeHint for (int i = 0; i < flowLayout->count(); ++i) { - QLayoutItem *item = flowLayout->itemAt(i); - if (item && item->widget()) { - item->widget()->setMinimumSize(maxSize); + if (QLayoutItem *item = flowLayout->itemAt(i)) { + if (QWidget *widget = item->widget()) { + widget->setMinimumSize(maxSize); + } } } } diff --git a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h index a232336d8..d9fa49937 100644 --- a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h +++ b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h @@ -1,24 +1,22 @@ /** * @file flow_widget.h * @ingroup UI - * @brief A QWidget that wraps a FlowLayout inside an optional QScrollArea. + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef FLOW_WIDGET_H #define FLOW_WIDGET_H - #include "../../../layouts/flow_layout.h" #include #include -#include #include +#include inline Q_LOGGING_CATEGORY(FlowWidgetLog, "flow_widget", QtInfoMsg); inline Q_LOGGING_CATEGORY(FlowWidgetSizeLog, "flow_widget.size", QtInfoMsg); -class FlowWidget : public QWidget +class FlowWidget final : public QWidget { Q_OBJECT @@ -27,20 +25,17 @@ public: Qt::Orientation orientation, Qt::ScrollBarPolicy horizontalPolicy, Qt::ScrollBarPolicy verticalPolicy); - void addWidget(QWidget *widget_to_add) const; void insertWidgetAtIndex(QWidget *toInsert, int index); void removeWidget(QWidget *widgetToRemove) const; void clearLayout(); - [[nodiscard]] int count() const; [[nodiscard]] QLayoutItem *itemAt(int index) const; - QScrollArea *scrollArea; ///< Null when both scroll policies are AlwaysOff. + QScrollArea *scrollArea; public slots: void setMinimumSizeToMaxSizeHint(); - void setSpacing(int hSpacing, int vSpacing); protected: void resizeEvent(QResizeEvent *event) override; @@ -52,4 +47,4 @@ private: QWidget *container; }; -#endif // FLOW_WIDGET_H \ No newline at end of file +#endif // FLOW_WIDGET_H diff --git a/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.cpp b/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.cpp index 97068978d..2fd6cd6b8 100644 --- a/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.cpp +++ b/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.cpp @@ -33,7 +33,7 @@ OverlapControlWidget::OverlapControlWidget(int overlapPercentage, layout->addWidget(overlap_percentage_input); layout->addWidget(overlap_direction); - //! \todo Probably connect this to the parent. + // TODO probably connect this to the parent // connect(card_size_slider, &QSlider::valueChanged, display, &CardPicture::setScaleFactor); } diff --git a/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.h b/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.h index 104a97da9..b2c19a07f 100644 --- a/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.h +++ b/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.h @@ -1,8 +1,8 @@ /** * @file overlap_control_widget.h * @ingroup UI + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef OVERLAP_CONTROL_WIDGET_H #define OVERLAP_CONTROL_WIDGET_H diff --git a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h index 62c620201..9ac6ac80e 100644 --- a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h +++ b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h @@ -1,8 +1,8 @@ /** * @file overlap_widget.h * @ingroup UI + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef OVERLAP_WIDGET_H #define OVERLAP_WIDGET_H diff --git a/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp b/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp index d6df694df..23d19abbb 100644 --- a/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp +++ b/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp @@ -193,8 +193,6 @@ void DeckEditorMenu::refreshShortcuts() aEditDeckInClipboardRaw->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aEditDeckInClipboardRaw")); aPrintDeck->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aPrintDeck")); - aLoadDeckFromWebsite->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aLoadDeckFromWebsite")); - aExportDeckDecklist->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aExportDeckDecklist")); aExportDeckDecklistXyz->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aExportDeckDecklistXyz")); aAnalyzeDeckDeckstats->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aAnalyzeDeck")); diff --git a/cockatrice/src/interface/widgets/menus/deck_editor_menu.h b/cockatrice/src/interface/widgets/menus/deck_editor_menu.h index eff9257bb..ac8f3b787 100644 --- a/cockatrice/src/interface/widgets/menus/deck_editor_menu.h +++ b/cockatrice/src/interface/widgets/menus/deck_editor_menu.h @@ -1,8 +1,8 @@ /** * @file deck_editor_menu.h * @ingroup DeckEditors + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DECK_EDITOR_MENU_H #define DECK_EDITOR_MENU_H diff --git a/cockatrice/src/interface/widgets/menus/tearoff_menu.h b/cockatrice/src/interface/widgets/menus/tearoff_menu.h index ef1dfbcb3..3e6c47012 100644 --- a/cockatrice/src/interface/widgets/menus/tearoff_menu.h +++ b/cockatrice/src/interface/widgets/menus/tearoff_menu.h @@ -1,8 +1,8 @@ /** * @file tearoff_menu.h * @ingroup GameMenus + * @brief TODO: Document this. */ -//! \todo Document this file. #pragma once 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 05e269174..36bccbcc3 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 @@ -8,7 +8,7 @@ * @brief Constructor for the AllZonesCardAmountWidget class. * * Initializes the widget with its layout and sets up the connections and necessary - * UI elements for managing card counts in all the mainboard, tokensboard and sideboard zones. + * UI elements for managing card counts in both the mainboard and sideboard zones. * * @param parent The parent widget. * @param deckStateManager Pointer to the DeckStateManager @@ -31,28 +31,13 @@ AllZonesCardAmountWidget::AllZonesCardAmountWidget(QWidget *parent, buttonBoxMainboard = new CardAmountWidget(this, deckStateManager, cardSizeSlider, rootCard, DECK_ZONE_MAIN); zoneLabelSideboard = new ShadowBackgroundLabel(this, tr("Sideboard")); buttonBoxSideboard = new CardAmountWidget(this, deckStateManager, cardSizeSlider, rootCard, DECK_ZONE_SIDE); - zoneLabelTokensboard = new ShadowBackgroundLabel(this, tr("Tokens")); - buttonBoxTokensboard = new CardAmountWidget(this, deckStateManager, cardSizeSlider, rootCard, DECK_ZONE_TOKENS); layout->addWidget(zoneLabelMainboard, 0, Qt::AlignHCenter | Qt::AlignBottom); layout->addWidget(buttonBoxMainboard, 0, Qt::AlignHCenter | Qt::AlignTop); - layout->addSpacing(12); - layout->addWidget(zoneLabelTokensboard, 0, Qt::AlignHCenter | Qt::AlignBottom); - layout->addWidget(buttonBoxTokensboard, 0, Qt::AlignHCenter | Qt::AlignTop); - layout->addSpacing(13); + layout->addSpacing(25); layout->addWidget(zoneLabelSideboard, 0, Qt::AlignHCenter | Qt::AlignBottom); layout->addWidget(buttonBoxSideboard, 0, Qt::AlignHCenter | Qt::AlignTop); - // Show Tokens buttons for token cards, Mainboard/Sideboard for non-token cards - bool isToken = rootCard.getInfo().getIsToken(); - - zoneLabelMainboard->setVisible(!isToken); - buttonBoxMainboard->setVisible(!isToken); - zoneLabelTokensboard->setVisible(isToken); - buttonBoxTokensboard->setVisible(isToken); - zoneLabelSideboard->setVisible(!isToken); - buttonBoxSideboard->setVisible(!isToken); - connect(cardSizeSlider, &QSlider::valueChanged, this, &AllZonesCardAmountWidget::adjustFontSize); QTimer::singleShot(10, this, [this]() { adjustFontSize(this->cardSizeSlider->value()); }); @@ -82,17 +67,15 @@ void AllZonesCardAmountWidget::adjustFontSize(int scalePercentage) zoneLabelFont.setPointSize(newFontSize); zoneLabelMainboard->setFont(zoneLabelFont); zoneLabelSideboard->setFont(zoneLabelFont); - zoneLabelTokensboard->setFont(zoneLabelFont); // Repaint the widget (if necessary) repaint(); } -void AllZonesCardAmountWidget::setAmounts(int mainboardAmount, int sideboardAmount, int tokensboardAmount) +void AllZonesCardAmountWidget::setAmounts(int mainboardAmount, int sideboardAmount) { buttonBoxMainboard->setAmount(mainboardAmount); buttonBoxSideboard->setAmount(sideboardAmount); - buttonBoxTokensboard->setAmount(tokensboardAmount); } /** @@ -116,21 +99,11 @@ int AllZonesCardAmountWidget::getSideboardAmount() } /** - * @brief Gets the card count in the tokensboard zone. - * - * @return The number of cards in the tokensboard. - */ -int AllZonesCardAmountWidget::getTokensboardAmount() -{ - return buttonBoxTokensboard->getAmount(); -} - -/** - * @brief Checks if the amount is at least one in either the mainboard or sideboard or tokensboard. + * @brief Checks if the amount is at least one in either the mainboard or sideboard. */ bool AllZonesCardAmountWidget::isNonZero() { - return getMainboardAmount() > 0 || getSideboardAmount() > 0 || getTokensboardAmount() > 0; + return getMainboardAmount() > 0 || getSideboardAmount() > 0; } /** 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 de4a984be..d158d257e 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 @@ -2,8 +2,8 @@ * @file all_zones_card_amount_widget.h * @ingroup CardExtraInfoWidgets * @ingroup PrintingWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef ALL_ZONES_CARD_AMOUNT_WIDGET_H #define ALL_ZONES_CARD_AMOUNT_WIDGET_H @@ -23,7 +23,6 @@ public: const ExactCard &rootCard); int getMainboardAmount(); int getSideboardAmount(); - int getTokensboardAmount(); bool isNonZero(); #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) @@ -34,7 +33,7 @@ public: public slots: void adjustFontSize(int scalePercentage); - void setAmounts(int mainboardAmount, int sideboardAmount, int tokensboardAmount); + void setAmounts(int mainboardAmount, int sideboardAmount); private: QVBoxLayout *layout; @@ -43,8 +42,6 @@ private: CardAmountWidget *buttonBoxMainboard; QLabel *zoneLabelSideboard; CardAmountWidget *buttonBoxSideboard; - QLabel *zoneLabelTokensboard; - CardAmountWidget *buttonBoxTokensboard; }; #endif // ALL_ZONES_CARD_AMOUNT_WIDGET_H 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 ff47e7b9c..25222f437 100644 --- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp @@ -11,7 +11,7 @@ * @param parent The parent widget. * @param cardSizeSlider Pointer to the QSlider for adjusting font size. * @param rootCard The root card to manage within the widget. - * @param zoneName The zone name (e.g., DECK_ZONE_MAIN , DECK_ZONE_SIDE, or DECK_ZONE_TOKENS). + * @param zoneName The zone name (e.g., DECK_ZONE_MAIN or DECK_ZONE_SIDE). */ CardAmountWidget::CardAmountWidget(QWidget *parent, DeckStateManager *deckStateManager, @@ -36,16 +36,13 @@ CardAmountWidget::CardAmountWidget(QWidget *parent, incrementButton->setFixedSize(parentWidget()->size().width() / 3, parentWidget()->size().height() / 9); decrementButton->setFixedSize(parentWidget()->size().width() / 3, parentWidget()->size().height() / 9); - // Set up connections based on the zone (Mainboard, Sideboard, or Tokensboard) + // Set up connections based on the zone (Mainboard or Sideboard) if (zoneName == DECK_ZONE_MAIN) { connect(incrementButton, &QPushButton::clicked, this, &CardAmountWidget::addPrintingMainboard); connect(decrementButton, &QPushButton::clicked, this, &CardAmountWidget::removePrintingMainboard); } else if (zoneName == DECK_ZONE_SIDE) { connect(incrementButton, &QPushButton::clicked, this, &CardAmountWidget::addPrintingSideboard); connect(decrementButton, &QPushButton::clicked, this, &CardAmountWidget::removePrintingSideboard); - } else if (zoneName == DECK_ZONE_TOKENS) { - connect(incrementButton, &QPushButton::clicked, this, &CardAmountWidget::addPrintingTokensboard); - connect(decrementButton, &QPushButton::clicked, this, &CardAmountWidget::removePrintingTokensboard); } cardCountInZone = new QLabel(QString::number(amount), this); @@ -140,19 +137,6 @@ void CardAmountWidget::updateCardCount() layout->activate(); } -static QString zoneLogName(const QString &zone) -{ - if (zone == DECK_ZONE_MAIN) { - return "mainboard"; - } else if (zone == DECK_ZONE_SIDE) { - return "sideboard"; - } else if (zone == DECK_ZONE_TOKENS) { - return "tokens"; - } else { - return "unknown"; - } -} - static QModelIndex addAndReplacePrintings(DeckListModel *model, const QModelIndex &existing, const ExactCard &rootCard, @@ -177,9 +161,9 @@ static QModelIndex addAndReplacePrintings(DeckListModel *model, } /** - * @brief Adds a printing of the card to the specified zone (Mainboard, Sideboard, or Tokensboard). + * @brief Adds a printing of the card to the specified zone (Mainboard or Sideboard). * - * @param zone The zone to add the card to (DECK_ZONE_MAIN, DECK_ZONE_SIDE, or DECK_ZONE_TOKENS). + * @param zone The zone to add the card to (DECK_ZONE_MAIN or DECK_ZONE_SIDE). */ void CardAmountWidget::addPrinting(const QString &zone) { @@ -199,13 +183,12 @@ void CardAmountWidget::addPrinting(const QString &zone) } } - QString zoneName = zoneLogName(zone); QString reason = QString("Added %1 copies of '%2 (%3) %4' to %5 [ProviderID: %6]%7") .arg(1 + extraCopies) .arg(rootCard.getName()) .arg(rootCard.getPrinting().getSet()->getShortName()) .arg(rootCard.getPrinting().getProperty("num")) - .arg(zoneName) + .arg(zone == DECK_ZONE_MAIN ? "mainboard" : "sideboard") .arg(rootCard.getPrinting().getUuid()) .arg(replacingProviderless ? " (replaced providerless printings)" : ""); @@ -235,14 +218,6 @@ void CardAmountWidget::addPrintingSideboard() addPrinting(DECK_ZONE_SIDE); } -/** - * @brief Adds a printing to the tokens zone. - */ -void CardAmountWidget::addPrintingTokensboard() -{ - addPrinting(DECK_ZONE_TOKENS); -} - /** * @brief Removes a printing from the mainboard zone. */ @@ -259,27 +234,18 @@ void CardAmountWidget::removePrintingSideboard() decrementCardHelper(DECK_ZONE_SIDE); } -/** - * @brief Removes a printing from the tokens zone. - */ -void CardAmountWidget::removePrintingTokensboard() -{ - decrementCardHelper(DECK_ZONE_TOKENS); -} - /** * @brief Helper function to decrement the card count for a given zone. * - * @param zone The zone from which to remove the card (DECK_ZONE_MAIN, DECK_ZONE_SIDE, or DECK_ZONE_TOKENS). + * @param zone The zone from which to remove the card (DECK_ZONE_MAIN or DECK_ZONE_SIDE). */ void CardAmountWidget::decrementCardHelper(const QString &zone) { - QString zoneName = zoneLogName(zone); QString reason = QString("Removed 1 copy of '%1 (%2) %3' from %4 [ProviderID: %5]") .arg(rootCard.getName()) .arg(rootCard.getPrinting().getSet()->getShortName()) .arg(rootCard.getPrinting().getProperty("num")) - .arg(zoneName) + .arg(zone == DECK_ZONE_MAIN ? "mainboard" : "sideboard") .arg(rootCard.getPrinting().getUuid()); deckStateManager->modifyDeck(reason, [this, &zone](auto model) { 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 2780e3ad2..3051b1691 100644 --- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h @@ -2,8 +2,8 @@ * @file card_amount_widget.h * @ingroup CardExtraInfoWidgets * @ingroup PrintingWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARD_AMOUNT_WIDGET_H #define CARD_AMOUNT_WIDGET_H @@ -60,10 +60,8 @@ private: private slots: void addPrintingMainboard(); void addPrintingSideboard(); - void addPrintingTokensboard(); void removePrintingMainboard(); void removePrintingSideboard(); - void removePrintingTokensboard(); void adjustFontSize(int scalePercentage); }; diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp index 76a416587..71b93b297 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp @@ -105,30 +105,23 @@ void PrintingSelector::printingsInDeckChanged() } /** - * @return A map of uuid to amounts (main, side, tokens). + * @return A map of uuid to amounts (main, side). */ -static QMap tallyUuidCounts(const DeckListModel *model, const QString &cardName) +static QMap> tallyUuidCounts(const DeckListModel *model, const QString &cardName) { - QMap map; + QMap> map; auto mainNodes = model->getCardNodesForZone(DECK_ZONE_MAIN); for (auto &node : mainNodes) { if (node->getName() == cardName) { - map[node->getCardProviderId()].mainboard += node->getNumber(); + map[node->getCardProviderId()].first += node->getNumber(); } } auto sideNodes = model->getCardNodesForZone(DECK_ZONE_SIDE); for (auto &node : sideNodes) { if (node->getName() == cardName) { - map[node->getCardProviderId()].sideboard += node->getNumber(); - } - } - - auto tokensNodes = model->getCardNodesForZone(DECK_ZONE_TOKENS); - for (auto &node : tokensNodes) { - if (node->getName() == cardName) { - map[node->getCardProviderId()].tokensboard += node->getNumber(); + map[node->getCardProviderId()].second += node->getNumber(); } } diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h index 14d73f836..f7844504d 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h @@ -1,8 +1,8 @@ /** * @file printing_selector.h * @ingroup PrintingWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef PRINTING_SELECTOR_H #define PRINTING_SELECTOR_H @@ -22,13 +22,6 @@ #define BATCH_SIZE 10 -struct ZoneCounts -{ - int mainboard = 0; - int sideboard = 0; - int tokensboard = 0; -}; - class DeckStateManager; class PrintingSelectorCardSearchWidget; class PrintingSelectorCardSelectionWidget; @@ -66,9 +59,9 @@ signals: /** * The amounts of the printings in the deck has changed - * @param uuidToAmounts Map of uuids to the amounts (maindeck, sideboard, tokensboard) in the deck + * @param uuidToAmounts Map of uuids to the amounts (maindeck, sideboard) in the deck */ - void cardAmountsChanged(const QMap &uuidToAmounts); + void cardAmountsChanged(const QMap> &uuidToAmounts); private: QVBoxLayout *layout; diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp index edeba86d1..7d0b4882f 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp @@ -67,10 +67,10 @@ void PrintingSelectorCardDisplayWidget::clampSetNameToPicture() update(); } -void PrintingSelectorCardDisplayWidget::updateCardAmounts(const QMap &uuidToAmounts) +void PrintingSelectorCardDisplayWidget::updateCardAmounts(const QMap> &uuidToAmounts) { - auto counts = uuidToAmounts.value(rootCard.getPrinting().getUuid()); - overlayWidget->updateCardAmounts(counts.mainboard, counts.sideboard, counts.tokensboard); + auto [main, side] = uuidToAmounts.value(rootCard.getPrinting().getUuid()); + overlayWidget->updateCardAmounts(main, side); } void PrintingSelectorCardDisplayWidget::resizeEvent(QResizeEvent *event) diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h index 4de561f4f..ac5c7c05f 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h @@ -1,8 +1,8 @@ /** * @file printing_selector_card_display_widget.h * @ingroup PrintingWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H #define PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H @@ -27,7 +27,7 @@ public: public slots: void clampSetNameToPicture(); - void updateCardAmounts(const QMap &uuidToAmounts); + void updateCardAmounts(const QMap> &uuidToAmounts); void resizeEvent(QResizeEvent *event) override; 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 dd5f6dd7f..1508b5243 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 @@ -116,11 +116,9 @@ void PrintingSelectorCardOverlayWidget::enterEvent(QEvent *event) updateVisibility(); } -void PrintingSelectorCardOverlayWidget::updateCardAmounts(int mainboardAmount, - int sideboardAmount, - int tokensboardAmount) +void PrintingSelectorCardOverlayWidget::updateCardAmounts(int mainboardAmount, int sideboardAmount) { - allZonesCardAmountWidget->setAmounts(mainboardAmount, sideboardAmount, tokensboardAmount); + allZonesCardAmountWidget->setAmounts(mainboardAmount, sideboardAmount); updateVisibility(); } @@ -149,9 +147,8 @@ void PrintingSelectorCardOverlayWidget::updateVisibility() */ void PrintingSelectorCardOverlayWidget::updatePinBadgeVisibility() { - if (!pinBadge || !cardInfoPicture) { + if (!pinBadge || !cardInfoPicture) return; - } // Query the persisted preference override to decide whether this printing is pinned. const auto &preferredProviderId = @@ -175,8 +172,8 @@ void PrintingSelectorCardOverlayWidget::updatePinBadgeVisibility() /** * @brief Handles the mouse leave event when the cursor leaves the overlay widget area. * - * When the cursor leaves the widget, the card amount widget is hidden if all of the mainboard, sideboard, and - * tokensboard amounts are zero. + * When the cursor leaves the widget, the card amount widget is hidden if both the mainboard and sideboard + * amounts are zero. * * @param event The event triggered when the mouse leaves the widget. */ diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h index 52a43d220..ae2307c45 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h @@ -1,8 +1,8 @@ /** * @file printing_selector_card_overlay_widget.h * @ingroup PrintingWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H #define PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H @@ -39,7 +39,7 @@ signals: void cardPreferenceChanged(); public slots: - void updateCardAmounts(int mainboardAmount, int sideboardAmount, int tokensboardAmount); + void updateCardAmounts(int mainboardAmount, int sideboardAmount); private slots: void updateVisibility(); diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.h index 3efabe13c..821addd01 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.h @@ -1,8 +1,8 @@ /** * @file printing_selector_card_search_widget.h * @ingroup PrintingWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef PRINTING_SELECTOR_CARD_SEARCH_WIDGET_H #define PRINTING_SELECTOR_CARD_SEARCH_WIDGET_H diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.h index 0aa56c9d8..ecd5c83e3 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.h @@ -1,8 +1,8 @@ /** * @file printing_selector_card_selection_widget.h * @ingroup PrintingWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef PRINTING_SELECTOR_CARD_SELECTION_WIDGET_H #define PRINTING_SELECTOR_CARD_SELECTION_WIDGET_H diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.h index bb5b60cdc..b5a00b81e 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.h @@ -1,8 +1,8 @@ /** * @file printing_selector_card_sorting_widget.h * @ingroup PrintingWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef PRINTING_SELECTOR_CARD_SORTING_WIDGET_H #define PRINTING_SELECTOR_CARD_SORTING_WIDGET_H diff --git a/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.h b/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.h index 140f190df..220f57256 100644 --- a/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.h @@ -2,8 +2,8 @@ * @file set_name_and_collectors_number_display_widget.h * @ingroup CardExtraInfoWidgets * @ingroup PrintingWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef SET_NAME_AND_COLLECTORS_NUMBER_DISPLAY_WIDGET_H #define SET_NAME_AND_COLLECTORS_NUMBER_DISPLAY_WIDGET_H 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 badc437ee..81812104a 100644 --- a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp +++ b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp @@ -35,33 +35,19 @@ void SettingsButtonWidget::setButtonIcon(QPixmap iconMap) button->setIcon(iconMap); } -void SettingsButtonWidget::setButtonText(const QString &text) +void SettingsButtonWidget::setButtonText(const QString &buttonText) { - buttonText = text; - + // 🔓 unlock size constraints button->setMinimumSize(QSize(0, 0)); button->setMaximumSize(QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX)); + button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - button->setText(text); + button->setText(buttonText); + button->setFixedHeight(32); button->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); - button->setMinimumWidth(32); // icon-only fallback minimum -} - -void SettingsButtonWidget::setCompact(bool _compact) -{ - compact = _compact; - if (compact) { - button->setToolButtonStyle(Qt::ToolButtonIconOnly); - button->setFixedWidth(32); - } else { - button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - button->setText(buttonText); - button->setFixedWidth(QWIDGETSIZE_MAX); // release fixed width - button->setMinimumWidth(32); - button->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); - } + button->setMinimumWidth(button->sizeHint().width()); } void SettingsButtonWidget::togglePopup() 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 5dcbe059a..36f01ac38 100644 --- a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h +++ b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h @@ -2,8 +2,8 @@ * @file settings_button_widget.h * @ingroup Widgets * @ingroup Settings + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef SETTINGS_BUTTON_WIDGET_H #define SETTINGS_BUTTON_WIDGET_H @@ -23,11 +23,6 @@ public: void removeSettingsWidget(QWidget *toRemove) const; void setButtonIcon(QPixmap iconMap); void setButtonText(const QString &buttonText); - void setCompact(bool compact); - bool isCompact() const - { - return compact; - } protected: void mousePressEvent(QMouseEvent *event) override; @@ -39,8 +34,6 @@ private slots: private: QHBoxLayout *layout; QToolButton *button; - QString buttonText; - bool compact; public: SettingsPopupWidget *popup; diff --git a/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h b/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h index 01e86abfe..e9605e473 100644 --- a/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h +++ b/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h @@ -2,8 +2,8 @@ * @file settings_popup_widget.h * @ingroup Widgets * @ingroup Settings + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef SETTINGS_POPUP_WIDGET_H #define SETTINGS_POPUP_WIDGET_H diff --git a/cockatrice/src/interface/widgets/replay/replay_manager.cpp b/cockatrice/src/interface/widgets/replay/replay_manager.cpp index a1330a82d..fac3576f2 100644 --- a/cockatrice/src/interface/widgets/replay/replay_manager.cpp +++ b/cockatrice/src/interface/widgets/replay/replay_manager.cpp @@ -19,19 +19,16 @@ ReplayManager::ReplayManager(TabGame *parent, GameReplay *_replay) const int eventCount = replay->event_list_size(); for (int i = 0; i < eventCount; ++i) { int j = i + 1; - while ((j < eventCount) && (replay->event_list(j).seconds_elapsed() == lastEventTimestamp)) { + while ((j < eventCount) && (replay->event_list(j).seconds_elapsed() == lastEventTimestamp)) ++j; - } const int numberEventsThisSecond = j - i; - for (int k = 0; k < numberEventsThisSecond; ++k) { + for (int k = 0; k < numberEventsThisSecond; ++k) replayTimeline.append(replay->event_list(i + k).seconds_elapsed() * 1000 + (int)((qreal)k / (qreal)numberEventsThisSecond * 1000)); - } - if (j < eventCount) { + if (j < eventCount) lastEventTimestamp = replay->event_list(j).seconds_elapsed(); - } i += numberEventsThisSecond - 1; } } @@ -98,7 +95,8 @@ ReplayManager::ReplayManager(TabGame *parent, GameReplay *_replay) void ReplayManager::replayNextEvent(EventProcessingOptions options) { - emit eventReplayed(replay->event_list(timelineWidget->getCurrentEvent()), options); + game->getGame()->getGameEventHandler()->processGameEventContainer( + replay->event_list(timelineWidget->getCurrentEvent()), nullptr, options); } void ReplayManager::replayFinished() diff --git a/cockatrice/src/interface/widgets/replay/replay_manager.h b/cockatrice/src/interface/widgets/replay/replay_manager.h index a3e0126c7..9469adcd4 100644 --- a/cockatrice/src/interface/widgets/replay/replay_manager.h +++ b/cockatrice/src/interface/widgets/replay/replay_manager.h @@ -2,8 +2,8 @@ * @file replay_manager.h * @ingroup Core * @ingroup Replay + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef REPLAY_MANAGER_H #define REPLAY_MANAGER_H @@ -27,7 +27,6 @@ public: signals: void requestChatAndPhaseReset(); - void eventReplayed(const GameEventContainer &cont, EventProcessingOptions options); private: // Replay related members diff --git a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp index 46a3dff40..25ee58b67 100644 --- a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp +++ b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp @@ -27,23 +27,20 @@ void ReplayTimelineWidget::setTimeline(const QList &_replayTimeline) for (int i : replayTimeline) { if (i > binEndTime) { histogram.append(binValue); - if (binValue > maxBinValue) { + if (binValue > maxBinValue) maxBinValue = binValue; - } while (i > binEndTime + BIN_LENGTH) { histogram.append(0); binEndTime += BIN_LENGTH; } binValue = 1; binEndTime += BIN_LENGTH; - } else { + } else ++binValue; - } } histogram.append(binValue); - if (!replayTimeline.isEmpty()) { + if (!replayTimeline.isEmpty()) maxTime = replayTimeline.last(); - } update(); } @@ -56,9 +53,8 @@ void ReplayTimelineWidget::paintEvent(QPaintEvent * /* event */) qreal binWidth = (qreal)width() / histogram.size(); QPainterPath path; path.moveTo(0, height() - 1); - for (int i = 0; i < histogram.size(); ++i) { + for (int i = 0; i < histogram.size(); ++i) path.lineTo(qRound(i * binWidth), (height() - 1) * (1.0 - (qreal)histogram[i] / maxBinValue)); - } path.lineTo(width() - 1, height() - 1); path.lineTo(0, height() - 1); painter.fillPath(path, Qt::black); @@ -103,12 +99,8 @@ void ReplayTimelineWidget::skipToTime(int newTime, bool doRewindBuffering) update(); } -/** - * @brief Handles a backwards skip in the replay timeline. - * - * @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. - */ +/// @param doRewindBuffering When true, if multiple backward skips are made in quick succession, only a single rewind +/// is processed at the end. When false, the backwards skip will always cause an immediate rewind void ReplayTimelineWidget::handleBackwardsSkip(bool doRewindBuffering) { if (doRewindBuffering) { @@ -150,12 +142,11 @@ void ReplayTimelineWidget::replayTimerTimeout() processNewEvents(NORMAL_PLAYBACK); - if (!(currentVisualTime % 1000)) { + if (!(currentVisualTime % 1000)) update(); - } } -/** @brief Processes all unprocessed events up to the current time. */ +/// Processes all unprocessed events up to the current time. void ReplayTimelineWidget::processNewEvents(PlaybackMode playbackMode) { currentProcessedTime = currentVisualTime; @@ -165,14 +156,12 @@ void ReplayTimelineWidget::processNewEvents(PlaybackMode playbackMode) // backwards skip => always skip reveal windows // forwards skip => skip reveal windows that don't happen within a big skip of the target - if (playbackMode == BACKWARD_SKIP || currentProcessedTime - replayTimeline[currentEvent] > BIG_SKIP_MS) { + if (playbackMode == BACKWARD_SKIP || currentProcessedTime - replayTimeline[currentEvent] > BIG_SKIP_MS) options |= SKIP_REVEAL_WINDOW; - } // backwards skip => always skip tap animation - if (playbackMode == BACKWARD_SKIP) { + if (playbackMode == BACKWARD_SKIP) options |= SKIP_TAP_ANIMATION; - } emit processNextEvent(options); ++currentEvent; diff --git a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h index 418d0c7e0..07a0c0b4c 100644 --- a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h +++ b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h @@ -1,8 +1,8 @@ /** * @file replay_timeline_widget.h * @ingroup Replay + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef REPLAY_TIMELINE_WIDGET #define REPLAY_TIMELINE_WIDGET 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 ccbbe9246..731f30942 100644 --- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp +++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp @@ -88,11 +88,10 @@ void ChatView::refreshBlockColors() for (QTextBlock block = doc->begin(); block.isValid(); block = block.next()) { QTextBlockFormat fmt = block.blockFormat(); - if (even) { + if (even) fmt.setBackground(palette().base()); - } else { + else fmt.setBackground(palette().window()); - } fmt.setForeground(palette().text()); @@ -122,11 +121,10 @@ QTextCursor ChatView::prepareBlock(bool same) cursor.insertHtml("
"); } else { QTextBlockFormat blockFormat; - if (evenNumber) { + if (evenNumber) blockFormat.setBackground(palette().base()); - } else { + else blockFormat.setBackground(palette().window()); - } evenNumber = !evenNumber; @@ -146,9 +144,8 @@ void ChatView::appendHtml(const QString &html) { bool atBottom = verticalScrollBar()->value() >= verticalScrollBar()->maximum(); prepareBlock().insertHtml(html); - if (atBottom) { + if (atBottom) verticalScrollBar()->setValue(verticalScrollBar()->maximum()); - } } void ChatView::appendHtmlServerMessage(const QString &html, bool optionalIsBold, QString optionalFontColor) @@ -159,14 +156,12 @@ void ChatView::appendHtmlServerMessage(const QString &html, bool optionalIsBold, "" + QDateTime::currentDateTime().toString("[hh:mm:ss] ") + html + ""; - if (optionalIsBold) { + if (optionalIsBold) htmlText = "" + htmlText + ""; - } prepareBlock().insertHtml(htmlText); - if (atBottom) { + if (atBottom) verticalScrollBar()->setValue(verticalScrollBar()->maximum()); - } } void ChatView::appendCardTag(QTextCursor &cursor, const QString &cardName) @@ -185,9 +180,8 @@ void ChatView::appendCardTag(QTextCursor &cursor, const QString &cardName) void ChatView::appendUrlTag(QTextCursor &cursor, QString url) { - if (!url.contains("://")) { + if (!url.contains("://")) url.prepend("https://"); - } QTextCharFormat oldFormat = cursor.charFormat(); QTextCharFormat anchorFormat = oldFormat; @@ -261,8 +255,7 @@ void ChatView::appendMessage(QString message, defaultFormat = QTextCharFormat(); if (!isUserMessage) { if (messageType == Event_RoomSay::ChatHistory) { - //! \todo Remove hardcoded color. - defaultFormat.setForeground(Qt::gray); + defaultFormat.setForeground(Qt::gray); //! \todo hardcoded color defaultFormat.setFontWeight(QFont::Light); defaultFormat.setFontItalic(true); static const QRegularExpression userNameRegex("^(\\[[^\\]]*\\]\\s)(\\S+):\\s"); @@ -285,8 +278,7 @@ void ChatView::appendMessage(QString message, message.remove(0, pos.relativePosition - 2); // do not remove semicolon } } else { - //! \todo Remove hardcoded color. - defaultFormat.setForeground(Qt::darkGreen); + defaultFormat.setForeground(Qt::darkGreen); //! \todo hardcoded color defaultFormat.setFontWeight(QFont::Bold); } } @@ -325,9 +317,8 @@ void ChatView::appendMessage(QString message, } } - if (atBottom) { + if (atBottom) verticalScrollBar()->setValue(verticalScrollBar()->maximum()); - } } void ChatView::checkTag(QTextCursor &cursor, QString &message) @@ -336,11 +327,10 @@ void ChatView::checkTag(QTextCursor &cursor, QString &message) message = message.mid(6); int closeTagIndex = message.indexOf("[/card]"); QString cardName = message.left(closeTagIndex); - if (closeTagIndex == -1) { + if (closeTagIndex == -1) message.clear(); - } else { + else message = message.mid(closeTagIndex + 7); - } appendCardTag(cursor, cardName); return; @@ -350,11 +340,10 @@ void ChatView::checkTag(QTextCursor &cursor, QString &message) message = message.mid(2); int closeTagIndex = message.indexOf("]]"); QString cardName = message.left(closeTagIndex); - if (closeTagIndex == -1) { + if (closeTagIndex == -1) message.clear(); - } else { + else message = message.mid(closeTagIndex + 2); - } appendCardTag(cursor, cardName); return; @@ -364,11 +353,10 @@ void ChatView::checkTag(QTextCursor &cursor, QString &message) message = message.mid(5); int closeTagIndex = message.indexOf("[/url]"); QString url = message.left(closeTagIndex); - if (closeTagIndex == -1) { + if (closeTagIndex == -1) message.clear(); - } else { + else message = message.mid(closeTagIndex + 6); - } appendUrlTag(cursor, url); return; @@ -599,9 +587,8 @@ QTextFragment ChatView::getFragmentUnderMouse(const QPoint &pos) const QTextBlock::iterator it; for (it = block.begin(); !(it.atEnd()); ++it) { QTextFragment frag = it.fragment(); - if (frag.contains(cursor.position())) { + if (frag.contains(cursor.position())) return frag; - } } return QTextFragment(); } @@ -617,11 +604,10 @@ void ChatView::mouseMoveEvent(QMouseEvent *event) if (scheme == "card") { hoveredItemType = HoveredCard; emit cardNameHovered(hoveredContent); - } else if (scheme == "user") { + } else if (scheme == "user") hoveredItemType = HoveredUser; - } else { + else hoveredItemType = HoveredUrl; - } viewport()->setCursor(Qt::PointingHandCursor); } else { hoveredItemType = HoveredNothing; @@ -664,9 +650,8 @@ void ChatView::mousePressEvent(QMouseEvent *event) case Qt::LeftButton: { if (event->modifiers() == Qt::ControlModifier) { emit openMessageDialog(userName, true); - } else { + } else emit addMentionTag("@" + userName); - } break; } default: @@ -683,18 +668,16 @@ void ChatView::mousePressEvent(QMouseEvent *event) void ChatView::mouseReleaseEvent(QMouseEvent *event) { - if ((event->button() == Qt::MiddleButton) || (event->button() == Qt::LeftButton)) { + if ((event->button() == Qt::MiddleButton) || (event->button() == Qt::LeftButton)) emit deleteCardInfoPopup(QString("_")); - } QTextBrowser::mouseReleaseEvent(event); } void ChatView::openLink(const QUrl &link) { - if ((link.scheme() == "card") || (link.scheme() == "user")) { + if ((link.scheme() == "card") || (link.scheme() == "user")) return; - } QDesktopServices::openUrl(link); } 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 c5ae2b81a..d1939fbea 100644 --- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.h +++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.h @@ -2,8 +2,8 @@ * @file chat_view.h * @ingroup NetworkingWidgets * @ingroup Lobby + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CHATVIEW_H #define CHATVIEW_H diff --git a/cockatrice/src/interface/widgets/server/game_filter_configs.cpp b/cockatrice/src/interface/widgets/server/game_filter_configs.cpp deleted file mode 100644 index 5a6282b75..000000000 --- a/cockatrice/src/interface/widgets/server/game_filter_configs.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "game_filter_configs.h" - -bool GameFilterConfigs::isDefault() const -{ - static const GameFilterConfigs DEFAULT = {}; - return *this == DEFAULT; -} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/server/game_filter_configs.h b/cockatrice/src/interface/widgets/server/game_filter_configs.h deleted file mode 100644 index 0ece7e00c..000000000 --- a/cockatrice/src/interface/widgets/server/game_filter_configs.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef COCKATRICE_GAME_FILTER_CONFIGS_H -#define COCKATRICE_GAME_FILTER_CONFIGS_H - -#include - -/** - * @brief The possible game filter configs. - */ -struct GameFilterConfigs -{ - static constexpr int DEFAULT_MAX_PLAYERS_MIN = 1; - static constexpr int DEFAULT_MAX_PLAYERS_MAX = 99; - - bool hideBuddiesOnlyGames = false; - bool hideIgnoredUserGames = false; - bool hideFullGames = false; - bool hideGamesThatStarted = false; - bool hidePasswordProtectedGames = false; - bool hideNotBuddyCreatedGames = false; - bool hideOpenDecklistGames = false; - QString gameNameFilter = ""; - QStringList creatorNameFilters = {}; - QSet gameTypeFilter = {}; - int maxPlayersFilterMin = DEFAULT_MAX_PLAYERS_MIN; - int maxPlayersFilterMax = DEFAULT_MAX_PLAYERS_MAX; - QTime maxGameAge = {}; - bool showOnlyIfSpectatorsCanWatch = false; - bool showSpectatorPasswordProtected = false; - bool showOnlyIfSpectatorsCanChat = false; - bool showOnlyIfSpectatorsCanSeeHands = false; - - bool operator==(const GameFilterConfigs &) const = default; - - /** - * @brief Checks if this config has exactly the default values. - * - * @return Whether this config has the default values - */ - bool isDefault() const; -}; - -#endif // COCKATRICE_GAME_FILTER_CONFIGS_H diff --git a/cockatrice/src/interface/widgets/server/game_selector.cpp b/cockatrice/src/interface/widgets/server/game_selector.cpp index 9a41ca6ce..0ff2a5542 100644 --- a/cockatrice/src/interface/widgets/server/game_selector.cpp +++ b/cockatrice/src/interface/widgets/server/game_selector.cpp @@ -37,9 +37,8 @@ GameSelector::GameSelector(AbstractClient *_client, connect(gameListView, &QTreeView::customContextMenuRequested, this, &GameSelector::customContextMenu); gameListModel = new GamesModel(_rooms, _gameTypes, this); - gameListProxyModel = new GamesProxyModel(this, tabSupervisor->getUserListManager()); - if (showFilters) { + gameListProxyModel = new GamesProxyModel(this, tabSupervisor->getUserListManager()); gameListProxyModel->setSourceModel(gameListModel); gameListProxyModel->setSortCaseSensitivity(Qt::CaseInsensitive); gameListView->setModel(gameListProxyModel); @@ -61,17 +60,14 @@ GameSelector::GameSelector(AbstractClient *_client, gameListView->setColumnWidth(3, gameListView->columnWidth(3) * 1.2); // game type width gameListView->setColumnWidth(4, gameListView->columnWidth(4) * 1.4); - if (_room) { + if (_room) gameListView->header()->hideSection(gameListModel->roomColIndex()); - } - if (room) { + if (room) gameTypeMap = gameListModel->getGameTypes().value(room->getRoomId()); - } - if (showFilters && restoresettings) { + if (showFilters && restoresettings) gameListProxyModel->loadFilterParameters(gameTypeMap); - } gameListView->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents); @@ -114,9 +110,8 @@ GameSelector::GameSelector(AbstractClient *_client, buttonLayout->addWidget(clearFilterButton); } buttonLayout->addStretch(); - if (room) { + if (room) buttonLayout->addWidget(createButton); - } buttonLayout->addWidget(joinButton); if (tabSupervisor->getUserInfo()->user_level() & ServerInfo_User::IsJudge) { buttonLayout->addWidget(joinAsJudgeButton); @@ -182,11 +177,16 @@ void GameSelector::actSetFilter() { DlgFilterGames dlg(gameTypeMap, gameListProxyModel, this); - if (!dlg.exec()) { + if (!dlg.exec()) return; - } - gameListProxyModel->setGameFilters(dlg.getFilters()); + gameListProxyModel->setGameFilters( + dlg.getHideBuddiesOnlyGames(), dlg.getHideIgnoredUserGames(), dlg.getHideFullGames(), + dlg.getHideGamesThatStarted(), dlg.getHidePasswordProtectedGames(), dlg.getHideNotBuddyCreatedGames(), + dlg.getHideOpenDecklistGames(), dlg.getGameNameFilter(), dlg.getCreatorNameFilters(), dlg.getGameTypeFilter(), + dlg.getMaxPlayersFilterMin(), dlg.getMaxPlayersFilterMax(), dlg.getMaxGameAge(), + dlg.getShowOnlyIfSpectatorsCanWatch(), dlg.getShowSpectatorPasswordProtected(), + dlg.getShowOnlyIfSpectatorsCanChat(), dlg.getShowOnlyIfSpectatorsCanSeeHands()); gameListProxyModel->saveFilterParameters(gameTypeMap); updateTitle(); @@ -378,9 +378,8 @@ void GameSelector::joinGame(const bool asSpectator, const bool asJudge) void GameSelector::disableButtons() { - if (createButton) { + if (createButton) createButton->setEnabled(false); - } joinButton->setEnabled(false); spectateButton->setEnabled(false); @@ -388,9 +387,8 @@ void GameSelector::disableButtons() void GameSelector::enableButtons() { - if (createButton) { + if (createButton) createButton->setEnabled(true); - } // Enable buttons for the currently selected game enableButtonsForIndex(gameListView->currentIndex()); @@ -398,9 +396,8 @@ void GameSelector::enableButtons() void GameSelector::enableButtonsForIndex(const QModelIndex ¤t) { - if (!current.isValid()) { + if (!current.isValid()) return; - } const ServerInfo_Game &game = gameListModel->getGame(current.data(Qt::UserRole).toInt()); bool overrideRestrictions = !tabSupervisor->getAdminLocked(); @@ -413,9 +410,8 @@ void GameSelector::retranslateUi() { filterButton->setText(tr("&Filter games")); clearFilterButton->setText(tr("C&lear filter")); - if (createButton) { + if (createButton) createButton->setText(tr("C&reate")); - } joinButton->setText(tr("&Join")); joinAsJudgeButton->setText(tr("Join as judge")); spectateButton->setText(tr("J&oin as spectator")); diff --git a/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp b/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp index d668b1c33..f7eacd636 100644 --- a/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp +++ b/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp @@ -18,30 +18,46 @@ GameSelectorQuickFilterToolBar::GameSelectorQuickFilterToolBar(QWidget *parent, mainLayout->setContentsMargins(0, 0, 0, 0); mainLayout->setSpacing(5); - const GameFilterConfigs &filters = model->getFilters(); - searchBar = new QLineEdit(this); - searchBar->setText(filters.gameNameFilter); + searchBar->setText(model->getGameNameFilter()); connect(searchBar, &QLineEdit::textChanged, this, [this](const QString &text) { - applyFilters([&](GameFilterConfigs &configs) { configs.gameNameFilter = text; }); + applyFilters([&](auto &, auto &, auto &, auto &, auto &, auto &, auto &, QString &gameNameFilter, auto &, + auto &, auto &, auto &, auto &, auto &, auto &, auto &, auto &) { gameNameFilter = text; }); }); hideGamesNotCreatedByBuddiesCheckBox = new QCheckBox(this); - hideGamesNotCreatedByBuddiesCheckBox->setChecked(filters.hideNotBuddyCreatedGames); + hideGamesNotCreatedByBuddiesCheckBox->setChecked(model->getHideNotBuddyCreatedGames()); connect(hideGamesNotCreatedByBuddiesCheckBox, &QCheckBox::toggled, this, [this](bool checked) { - applyFilters([&](GameFilterConfigs &configs) { configs.hideNotBuddyCreatedGames = checked; }); + applyFilters([&](auto &, auto &, auto &, auto &, auto &, bool &hideNotBuddyCreatedGames, auto &, auto &, + QStringList &creatorNameFilters, auto &, auto &, auto &, auto &, auto &, auto &, auto &, + auto &) { + hideNotBuddyCreatedGames = checked; + + if (checked) { + QStringList buddyNames; + for (auto buddy : tabSupervisor->getUserListManager()->getBuddyList().values()) { + buddyNames << QString::fromStdString(buddy.name()); + } + creatorNameFilters = buddyNames; + } else { + creatorNameFilters.clear(); + } + }); }); hideFullGamesCheckBox = new QCheckBox(this); - hideFullGamesCheckBox->setChecked(filters.hideFullGames); + hideFullGamesCheckBox->setChecked(model->getHideFullGames()); connect(hideFullGamesCheckBox, &QCheckBox::toggled, this, [this](bool checked) { - applyFilters([&](GameFilterConfigs &configs) { configs.hideFullGames = checked; }); + applyFilters([&](auto &, auto &, bool &hideFullGames, auto &, auto &, auto &, auto &, auto &, auto &, auto &, + auto &, auto &, auto &, auto &, auto &, auto &, auto &) { hideFullGames = checked; }); }); hideStartedGamesCheckBox = new QCheckBox(this); - hideStartedGamesCheckBox->setChecked(filters.hideGamesThatStarted); + hideStartedGamesCheckBox->setChecked(model->getHideGamesThatStarted()); connect(hideStartedGamesCheckBox, &QCheckBox::toggled, this, [this](bool checked) { - applyFilters([&](GameFilterConfigs &configs) { configs.hideGamesThatStarted = checked; }); + applyFilters([&](auto &, auto &, auto &, bool &hideGamesThatStarted, auto &, auto &, auto &, auto &, auto &, + auto &, auto &, auto &, auto &, auto &, auto &, auto &, + auto &) { hideGamesThatStarted = checked; }); }); filterToFormatComboBox = new QComboBox(this); @@ -55,25 +71,25 @@ GameSelectorQuickFilterToolBar::GameSelectorQuickFilterToolBar(QWidget *parent, filterToFormatComboBox->addItem(i.value(), i.key()); // text = name, data = type ID } - QSet currentTypes = filters.gameTypeFilter; + QSet currentTypes = model->getGameTypeFilter(); if (currentTypes.size() == 1) { int typeId = *currentTypes.begin(); int index = filterToFormatComboBox->findData(typeId); - if (index >= 0) { + if (index >= 0) filterToFormatComboBox->setCurrentIndex(index); - } } else { filterToFormatComboBox->setCurrentIndex(0); // "All types" by default } // Update proxy model on selection change connect(filterToFormatComboBox, QOverload::of(&QComboBox::currentIndexChanged), this, [this](int index) { - applyFilters([&](GameFilterConfigs &configs) { + applyFilters([&](auto &, auto &, auto &, auto &, auto &, auto &, auto &, auto &, auto &, + QSet &gameTypeFilter, auto &, auto &, auto &, auto &, auto &, auto &, auto &) { QVariant data = filterToFormatComboBox->itemData(index); if (!data.isValid()) { - configs.gameTypeFilter.clear(); + gameTypeFilter.clear(); } else { - configs.gameTypeFilter = {data.toInt()}; + gameTypeFilter = {data.toInt()}; } }); }); @@ -111,15 +127,13 @@ void GameSelectorQuickFilterToolBar::syncFromModel() QSignalBlocker b4(hideFullGamesCheckBox); QSignalBlocker b5(hideStartedGamesCheckBox); - const GameFilterConfigs filters = model->getFilters(); + searchBar->setText(model->getGameNameFilter()); - searchBar->setText(filters.gameNameFilter); + hideGamesNotCreatedByBuddiesCheckBox->setChecked(model->getHideNotBuddyCreatedGames()); + hideFullGamesCheckBox->setChecked(model->getHideFullGames()); + hideStartedGamesCheckBox->setChecked(model->getHideGamesThatStarted()); - hideGamesNotCreatedByBuddiesCheckBox->setChecked(filters.hideNotBuddyCreatedGames); - hideFullGamesCheckBox->setChecked(filters.hideFullGames); - hideStartedGamesCheckBox->setChecked(filters.hideGamesThatStarted); - - QSet types = filters.gameTypeFilter; + QSet types = model->getGameTypeFilter(); if (types.size() == 1) { int idx = filterToFormatComboBox->findData(*types.begin()); filterToFormatComboBox->setCurrentIndex(idx >= 0 ? idx : 0); @@ -128,13 +142,55 @@ void GameSelectorQuickFilterToolBar::syncFromModel() } } -void GameSelectorQuickFilterToolBar::applyFilters(std::function mutator) +void GameSelectorQuickFilterToolBar::applyFilters(std::function &, + int &, + int &, + QTime &, + bool &, + bool &, + bool &, + bool &)> mutator) { - GameFilterConfigs configs = model->getFilters(); + bool hideBuddiesOnlyGames = model->getHideBuddiesOnlyGames(); + bool hideIgnoredUserGames = model->getHideIgnoredUserGames(); + bool hideFullGames = model->getHideFullGames(); + bool hideGamesThatStarted = model->getHideGamesThatStarted(); + bool hidePasswordProtectedGames = model->getHidePasswordProtectedGames(); + bool hideNotBuddyCreatedGames = model->getHideNotBuddyCreatedGames(); + bool hideOpenDecklistGames = model->getHideOpenDecklistGames(); - mutator(configs); + QString gameNameFilter = model->getGameNameFilter(); + QStringList creatorNameFilters = model->getCreatorNameFilters(); + QSet gameTypeFilter = model->getGameTypeFilter(); - model->setGameFilters(configs); + int minPlayers = model->getMaxPlayersFilterMin(); + int maxPlayers = model->getMaxPlayersFilterMax(); + QTime maxGameAge = model->getMaxGameAge(); + + bool showOnlyIfSpectatorsCanWatch = model->getShowOnlyIfSpectatorsCanWatch(); + bool showSpectatorPasswordProtected = model->getShowSpectatorPasswordProtected(); + bool showOnlyIfSpectatorsCanChat = model->getShowOnlyIfSpectatorsCanChat(); + bool showOnlyIfSpectatorsCanSeeHands = model->getShowOnlyIfSpectatorsCanSeeHands(); + + mutator(hideBuddiesOnlyGames, hideIgnoredUserGames, hideFullGames, hideGamesThatStarted, hidePasswordProtectedGames, + hideNotBuddyCreatedGames, hideOpenDecklistGames, gameNameFilter, creatorNameFilters, gameTypeFilter, + minPlayers, maxPlayers, maxGameAge, showOnlyIfSpectatorsCanWatch, showSpectatorPasswordProtected, + showOnlyIfSpectatorsCanChat, showOnlyIfSpectatorsCanSeeHands); + + model->setGameFilters(hideBuddiesOnlyGames, hideIgnoredUserGames, hideFullGames, hideGamesThatStarted, + hidePasswordProtectedGames, hideNotBuddyCreatedGames, hideOpenDecklistGames, gameNameFilter, + creatorNameFilters, gameTypeFilter, minPlayers, maxPlayers, maxGameAge, + showOnlyIfSpectatorsCanWatch, showSpectatorPasswordProtected, showOnlyIfSpectatorsCanChat, + showOnlyIfSpectatorsCanSeeHands); } void GameSelectorQuickFilterToolBar::retranslateUi() diff --git a/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.h b/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.h index 9b7b6e61f..c658418f9 100644 --- a/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.h +++ b/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.h @@ -19,7 +19,23 @@ public: GamesProxyModel *model, const QMap &allGameTypes); void syncFromModel(); - void applyFilters(std::function mutator); + void applyFilters(std::function &, + int &, + int &, + QTime &, + bool &, + bool &, + bool &, + bool &)> mutator); void retranslateUi(); private: diff --git a/cockatrice/src/interface/widgets/server/games_model.cpp b/cockatrice/src/interface/widgets/server/games_model.cpp index 1d30aa7ac..1f05308b8 100644 --- a/cockatrice/src/interface/widgets/server/games_model.cpp +++ b/cockatrice/src/interface/widgets/server/games_model.cpp @@ -23,6 +23,10 @@ enum GameListColumn SPECTATORS }; +const int DEFAULT_MAX_PLAYERS_MIN = 1; +const int DEFAULT_MAX_PLAYERS_MAX = 99; +constexpr auto DEFAULT_MAX_GAME_AGE = QTime(); + const QString GamesModel::getGameCreatedString(const int secs) { static const QTime zeroTime{0, 0}; @@ -63,18 +67,14 @@ GamesModel::GamesModel(const QMap &_rooms, const QMap= gameList.size()) || (index.column() >= columnCount())) { + if ((index.row() >= gameList.size()) || (index.column() >= columnCount())) return QVariant(); - } const ServerInfo_Game &gameentry = gameList[index.row()]; switch (index.column()) { @@ -130,9 +130,8 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const case Qt::DisplayRole: { QStringList result; GameTypeMap gameTypeMap = gameTypes.value(gameentry.room_id()); - for (int i = gameentry.game_types_size() - 1; i >= 0; --i) { + for (int i = gameentry.game_types_size() - 1; i >= 0; --i) result.append(gameTypeMap.value(gameentry.game_types(i))); - } return result.join(", "); } case Qt::TextAlignmentRole: @@ -145,18 +144,14 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const case SORT_ROLE: case Qt::DisplayRole: { QStringList result; - if (gameentry.with_password()) { + if (gameentry.with_password()) result.append(tr("password")); - } - if (gameentry.only_buddies()) { + if (gameentry.only_buddies()) result.append(tr("buddies only")); - } - if (gameentry.only_registered()) { + if (gameentry.only_registered()) result.append(tr("reg. users only")); - } - if (gameentry.share_decklists_on_load()) { + if (gameentry.share_decklists_on_load()) result.append(tr("open decklists")); - } return result.join(", "); } case Qt::DecorationRole: { @@ -214,9 +209,8 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const QVariant GamesModel::headerData(int section, Qt::Orientation /*orientation*/, int role) const { - if ((role != Qt::DisplayRole) && (role != Qt::TextAlignmentRole)) { + if ((role != Qt::DisplayRole) && (role != Qt::TextAlignmentRole)) return QVariant(); - } switch (section) { case ROOM: return tr("Room"); @@ -289,12 +283,44 @@ GamesProxyModel::GamesProxyModel(QObject *parent, const UserListProxy *_userList setDynamicSortFilter(true); } -void GamesProxyModel::setGameFilters(const GameFilterConfigs &_filters) +void GamesProxyModel::setGameFilters(bool _hideBuddiesOnlyGames, + bool _hideIgnoredUserGames, + bool _hideFullGames, + bool _hideGamesThatStarted, + bool _hidePasswordProtectedGames, + bool _hideNotBuddyCreatedGames, + bool _hideOpenDecklistGames, + const QString &_gameNameFilter, + const QStringList &_creatorNameFilters, + const QSet &_gameTypeFilter, + int _maxPlayersFilterMin, + int _maxPlayersFilterMax, + const QTime &_maxGameAge, + bool _showOnlyIfSpectatorsCanWatch, + bool _showSpectatorPasswordProtected, + bool _showOnlyIfSpectatorsCanChat, + bool _showOnlyIfSpectatorsCanSeeHands) { #if (QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)) beginFilterChange(); #endif - filters = _filters; + hideBuddiesOnlyGames = _hideBuddiesOnlyGames; + hideIgnoredUserGames = _hideIgnoredUserGames; + hideFullGames = _hideFullGames; + hideGamesThatStarted = _hideGamesThatStarted; + hidePasswordProtectedGames = _hidePasswordProtectedGames; + hideNotBuddyCreatedGames = _hideNotBuddyCreatedGames; + hideOpenDecklistGames = _hideOpenDecklistGames; + gameNameFilter = _gameNameFilter; + creatorNameFilters = _creatorNameFilters; + gameTypeFilter = _gameTypeFilter; + maxPlayersFilterMin = _maxPlayersFilterMin; + maxPlayersFilterMax = _maxPlayersFilterMax; + maxGameAge = _maxGameAge; + showOnlyIfSpectatorsCanWatch = _showOnlyIfSpectatorsCanWatch; + showSpectatorPasswordProtected = _showSpectatorPasswordProtected; + showOnlyIfSpectatorsCanChat = _showOnlyIfSpectatorsCanChat; + showOnlyIfSpectatorsCanSeeHands = _showOnlyIfSpectatorsCanSeeHands; #if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)) endFilterChange(QSortFilterProxyModel::Direction::Rows); #else @@ -306,9 +332,8 @@ void GamesProxyModel::setGameFilters(const GameFilterConfigs &_filters) int GamesProxyModel::getNumFilteredGames() const { auto *model = qobject_cast(sourceModel()); - if (!model) { + if (!model) return 0; - } int numFilteredGames = 0; for (int row = 0; row < model->rowCount(); ++row) { @@ -321,12 +346,18 @@ int GamesProxyModel::getNumFilteredGames() const void GamesProxyModel::resetFilterParameters() { - setGameFilters({}); + setGameFilters(false, false, false, false, false, false, false, QString(), QStringList(), {}, + DEFAULT_MAX_PLAYERS_MIN, DEFAULT_MAX_PLAYERS_MAX, DEFAULT_MAX_GAME_AGE, false, false, false, false); } bool GamesProxyModel::areFilterParametersSetToDefaults() const { - return filters.isDefault(); + return !hideFullGames && !hideGamesThatStarted && !hidePasswordProtectedGames && !hideBuddiesOnlyGames && + !hideOpenDecklistGames && !hideIgnoredUserGames && !hideNotBuddyCreatedGames && gameNameFilter.isEmpty() && + creatorNameFilters.isEmpty() && gameTypeFilter.isEmpty() && maxPlayersFilterMin == DEFAULT_MAX_PLAYERS_MIN && + maxPlayersFilterMax == DEFAULT_MAX_PLAYERS_MAX && maxGameAge == DEFAULT_MAX_GAME_AGE && + !showOnlyIfSpectatorsCanWatch && !showSpectatorPasswordProtected && !showOnlyIfSpectatorsCanChat && + !showOnlyIfSpectatorsCanSeeHands; } void GamesProxyModel::loadFilterParameters(const QMap &allGameTypes) @@ -342,44 +373,44 @@ void GamesProxyModel::loadFilterParameters(const QMap &allGameType } } - setGameFilters({gameFilters.isHideBuddiesOnlyGames(), gameFilters.isHideIgnoredUserGames(), - gameFilters.isHideFullGames(), gameFilters.isHideGamesThatStarted(), - gameFilters.isHidePasswordProtectedGames(), gameFilters.isHideNotBuddyCreatedGames(), - gameFilters.isHideOpenDecklistGames(), gameFilters.getGameNameFilter(), - gameFilters.getCreatorNameFilters(), newGameTypeFilter, gameFilters.getMinPlayers(), - gameFilters.getMaxPlayers(), gameFilters.getMaxGameAge(), - gameFilters.isShowOnlyIfSpectatorsCanWatch(), gameFilters.isShowSpectatorPasswordProtected(), - gameFilters.isShowOnlyIfSpectatorsCanChat(), gameFilters.isShowOnlyIfSpectatorsCanSeeHands()}); + setGameFilters(gameFilters.isHideBuddiesOnlyGames(), gameFilters.isHideIgnoredUserGames(), + gameFilters.isHideFullGames(), gameFilters.isHideGamesThatStarted(), + gameFilters.isHidePasswordProtectedGames(), gameFilters.isHideNotBuddyCreatedGames(), + gameFilters.isHideOpenDecklistGames(), gameFilters.getGameNameFilter(), + gameFilters.getCreatorNameFilters(), newGameTypeFilter, gameFilters.getMinPlayers(), + gameFilters.getMaxPlayers(), gameFilters.getMaxGameAge(), + gameFilters.isShowOnlyIfSpectatorsCanWatch(), gameFilters.isShowSpectatorPasswordProtected(), + gameFilters.isShowOnlyIfSpectatorsCanChat(), gameFilters.isShowOnlyIfSpectatorsCanSeeHands()); } void GamesProxyModel::saveFilterParameters(const QMap &allGameTypes) { GameFiltersSettings &gameFilters = SettingsCache::instance().gameFilters(); - gameFilters.setHideBuddiesOnlyGames(filters.hideBuddiesOnlyGames); - gameFilters.setHideFullGames(filters.hideFullGames); - gameFilters.setHideGamesThatStarted(filters.hideGamesThatStarted); - gameFilters.setHidePasswordProtectedGames(filters.hidePasswordProtectedGames); - gameFilters.setHideIgnoredUserGames(filters.hideIgnoredUserGames); - gameFilters.setHideNotBuddyCreatedGames(filters.hideNotBuddyCreatedGames); - gameFilters.setHideOpenDecklistGames(filters.hideOpenDecklistGames); - gameFilters.setGameNameFilter(filters.gameNameFilter); - gameFilters.setCreatorNameFilters(filters.creatorNameFilters); + gameFilters.setHideBuddiesOnlyGames(hideBuddiesOnlyGames); + gameFilters.setHideFullGames(hideFullGames); + gameFilters.setHideGamesThatStarted(hideGamesThatStarted); + gameFilters.setHidePasswordProtectedGames(hidePasswordProtectedGames); + gameFilters.setHideIgnoredUserGames(hideIgnoredUserGames); + gameFilters.setHideNotBuddyCreatedGames(hideNotBuddyCreatedGames); + gameFilters.setHideOpenDecklistGames(hideOpenDecklistGames); + gameFilters.setGameNameFilter(gameNameFilter); + gameFilters.setCreatorNameFilters(creatorNameFilters); QMapIterator gameTypeIterator(allGameTypes); while (gameTypeIterator.hasNext()) { gameTypeIterator.next(); - bool enabled = filters.gameTypeFilter.contains(gameTypeIterator.key()); + bool enabled = gameTypeFilter.contains(gameTypeIterator.key()); gameFilters.setGameTypeEnabled(gameTypeIterator.value(), enabled); } - gameFilters.setMinPlayers(filters.maxPlayersFilterMin); - gameFilters.setMaxPlayers(filters.maxPlayersFilterMax); - gameFilters.setMaxGameAge(filters.maxGameAge); + gameFilters.setMinPlayers(maxPlayersFilterMin); + gameFilters.setMaxPlayers(maxPlayersFilterMax); + gameFilters.setMaxGameAge(maxGameAge); - gameFilters.setShowOnlyIfSpectatorsCanWatch(filters.showOnlyIfSpectatorsCanWatch); - gameFilters.setShowSpectatorPasswordProtected(filters.showSpectatorPasswordProtected); - gameFilters.setShowOnlyIfSpectatorsCanChat(filters.showOnlyIfSpectatorsCanChat); - gameFilters.setShowOnlyIfSpectatorsCanSeeHands(filters.showOnlyIfSpectatorsCanSeeHands); + gameFilters.setShowOnlyIfSpectatorsCanWatch(showOnlyIfSpectatorsCanWatch); + gameFilters.setShowSpectatorPasswordProtected(showSpectatorPasswordProtected); + gameFilters.setShowOnlyIfSpectatorsCanChat(showOnlyIfSpectatorsCanChat); + gameFilters.setShowOnlyIfSpectatorsCanSeeHands(showOnlyIfSpectatorsCanSeeHands); } bool GamesProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex & /*sourceParent*/) const @@ -395,48 +426,38 @@ bool GamesProxyModel::filterAcceptsRow(int sourceRow) const static const QDate epochDate = QDateTime::fromSecsSinceEpoch(0, Qt::UTC).date(); #endif auto *model = qobject_cast(sourceModel()); - if (!model) { + if (!model) return false; - } const ServerInfo_Game &game = model->getGame(sourceRow); - if (filters.hideBuddiesOnlyGames && game.only_buddies()) { + if (hideBuddiesOnlyGames && game.only_buddies()) { return false; } - if (filters.hideOpenDecklistGames && game.share_decklists_on_load()) { + if (hideOpenDecklistGames && game.share_decklists_on_load()) { return false; } - if (filters.hideIgnoredUserGames && - userListProxy->isUserIgnored(QString::fromStdString(game.creator_info().name()))) { + if (hideIgnoredUserGames && userListProxy->isUserIgnored(QString::fromStdString(game.creator_info().name()))) { return false; } - if (filters.hideNotBuddyCreatedGames && - !userListProxy->isUserBuddy(QString::fromStdString(game.creator_info().name()))) { + if (hideNotBuddyCreatedGames && !userListProxy->isUserBuddy(QString::fromStdString(game.creator_info().name()))) { return false; } - if (filters.hideFullGames && game.player_count() == game.max_players()) { + if (hideFullGames && game.player_count() == game.max_players()) return false; - } - if (filters.hideGamesThatStarted && game.started()) { + if (hideGamesThatStarted && game.started()) return false; - } - if (!userListProxy->isOwnUserRegistered()) { - if (game.only_registered()) { + if (!userListProxy->isOwnUserRegistered()) + if (game.only_registered()) return false; - } - } - if (filters.hidePasswordProtectedGames && game.with_password()) { + if (hidePasswordProtectedGames && game.with_password()) return false; - } - if (!filters.gameNameFilter.isEmpty()) { - if (!QString::fromStdString(game.description()).contains(filters.gameNameFilter, Qt::CaseInsensitive)) { + if (!gameNameFilter.isEmpty()) + if (!QString::fromStdString(game.description()).contains(gameNameFilter, Qt::CaseInsensitive)) return false; - } - } - if (!filters.creatorNameFilters.isEmpty()) { + if (!creatorNameFilters.isEmpty()) { bool found = false; - for (const auto &createNameFilter : filters.creatorNameFilters) { + for (const auto &createNameFilter : creatorNameFilters) { if (QString::fromStdString(game.creator_info().name()).contains(createNameFilter, Qt::CaseInsensitive)) { found = true; } @@ -447,45 +468,36 @@ bool GamesProxyModel::filterAcceptsRow(int sourceRow) const } QSet gameTypes; - for (int i = 0; i < game.game_types_size(); ++i) { + for (int i = 0; i < game.game_types_size(); ++i) gameTypes.insert(game.game_types(i)); - } - if (!filters.gameTypeFilter.isEmpty() && gameTypes.intersect(filters.gameTypeFilter).isEmpty()) { + if (!gameTypeFilter.isEmpty() && gameTypes.intersect(gameTypeFilter).isEmpty()) return false; - } - if (static_cast(game.max_players()) < filters.maxPlayersFilterMin) { + if (game.max_players() < maxPlayersFilterMin) return false; - } - if (static_cast(game.max_players()) > filters.maxPlayersFilterMax) { + if (game.max_players() > maxPlayersFilterMax) return false; - } - if (filters.maxGameAge.isValid()) { + if (maxGameAge.isValid()) { QDateTime now = QDateTime::currentDateTimeUtc(); qint64 signed_start_time = game.start_time(); // cast to 64 bit value to allow signed value QDateTime total = now.addSecs(-signed_start_time); // a 32 bit value would wrap at 2038-1-19 // games shouldn't have negative ages but we'll not filter them // because qtime wraps after a day we consider all games older than a day to be too old - if (total.isValid() && total.date() >= epochDate && - (total.date() > epochDate || total.time() > filters.maxGameAge)) { + if (total.isValid() && total.date() >= epochDate && (total.date() > epochDate || total.time() > maxGameAge)) { return false; } } - if (filters.showOnlyIfSpectatorsCanWatch) { - if (!game.spectators_allowed()) { + if (showOnlyIfSpectatorsCanWatch) { + if (!game.spectators_allowed()) return false; - } - if (!filters.showSpectatorPasswordProtected && game.spectators_need_password()) { + if (!showSpectatorPasswordProtected && game.spectators_need_password()) return false; - } - if (filters.showOnlyIfSpectatorsCanChat && !game.spectators_can_chat()) { + if (showOnlyIfSpectatorsCanChat && !game.spectators_can_chat()) return false; - } - if (filters.showOnlyIfSpectatorsCanSeeHands && !game.spectators_omniscient()) { + if (showOnlyIfSpectatorsCanSeeHands && !game.spectators_omniscient()) return false; - } } return true; } diff --git a/cockatrice/src/interface/widgets/server/games_model.h b/cockatrice/src/interface/widgets/server/games_model.h index b5f86c291..c6884093d 100644 --- a/cockatrice/src/interface/widgets/server/games_model.h +++ b/cockatrice/src/interface/widgets/server/games_model.h @@ -1,7 +1,6 @@ #ifndef GAMESMODEL_H #define GAMESMODEL_H -#include "game_filter_configs.h" #include "game_type_map.h" #include @@ -122,7 +121,22 @@ private: // - loadFilterParameters() // - saveFilterParameters() // - filterAcceptsRow() - GameFilterConfigs filters; + bool hideBuddiesOnlyGames; + bool hideIgnoredUserGames; + bool hideFullGames; + bool hideGamesThatStarted; + bool hidePasswordProtectedGames; + bool hideNotBuddyCreatedGames; + bool hideOpenDecklistGames; + QString gameNameFilter; + QStringList creatorNameFilters; + QSet gameTypeFilter; + quint32 maxPlayersFilterMin, maxPlayersFilterMax; + QTime maxGameAge; + bool showOnlyIfSpectatorsCanWatch; + bool showSpectatorPasswordProtected; + bool showOnlyIfSpectatorsCanChat; + bool showOnlyIfSpectatorsCanSeeHands; signals: void filtersChanged(); @@ -136,15 +150,182 @@ public: explicit GamesProxyModel(QObject *parent = nullptr, const UserListProxy *_userListProxy = nullptr); // Getters for filter parameters - [[nodiscard]] const GameFilterConfigs &getFilters() const + [[nodiscard]] bool getHideBuddiesOnlyGames() const { - return filters; + return hideBuddiesOnlyGames; + } + [[nodiscard]] bool getHideIgnoredUserGames() const + { + return hideIgnoredUserGames; + } + [[nodiscard]] bool getHideFullGames() const + { + return hideFullGames; + } + [[nodiscard]] bool getHideGamesThatStarted() const + { + return hideGamesThatStarted; + } + [[nodiscard]] bool getHidePasswordProtectedGames() const + { + return hidePasswordProtectedGames; + } + [[nodiscard]] bool getHideNotBuddyCreatedGames() const + { + return hideNotBuddyCreatedGames; + } + [[nodiscard]] bool getHideOpenDecklistGames() const + { + return hideOpenDecklistGames; + } + [[nodiscard]] QString getGameNameFilter() const + { + return gameNameFilter; + } + [[nodiscard]] QStringList getCreatorNameFilters() const + { + return creatorNameFilters; + } + [[nodiscard]] QSet getGameTypeFilter() const + { + return gameTypeFilter; + } + [[nodiscard]] int getMaxPlayersFilterMin() const + { + return maxPlayersFilterMin; + } + [[nodiscard]] int getMaxPlayersFilterMax() const + { + return maxPlayersFilterMax; + } + [[nodiscard]] const QTime &getMaxGameAge() const + { + return maxGameAge; + } + [[nodiscard]] bool getShowOnlyIfSpectatorsCanWatch() const + { + return showOnlyIfSpectatorsCanWatch; + } + [[nodiscard]] bool getShowSpectatorPasswordProtected() const + { + return showSpectatorPasswordProtected; + } + [[nodiscard]] bool getShowOnlyIfSpectatorsCanChat() const + { + return showOnlyIfSpectatorsCanChat; + } + [[nodiscard]] bool getShowOnlyIfSpectatorsCanSeeHands() const + { + return showOnlyIfSpectatorsCanSeeHands; } /** * @brief Sets all game filters at once. */ - void setGameFilters(const GameFilterConfigs &_filters); + void setGameFilters(bool _hideBuddiesOnlyGames, + bool _hideIgnoredUserGames, + bool _hideFullGames, + bool _hideGamesThatStarted, + bool _hidePasswordProtectedGames, + bool _hideNotBuddyCreatedGames, + bool _hideOpenDecklistGames, + const QString &_gameNameFilter, + const QStringList &_creatorNameFilter, + const QSet &_gameTypeFilter, + int _maxPlayersFilterMin, + int _maxPlayersFilterMax, + const QTime &_maxGameAge, + bool _showOnlyIfSpectatorsCanWatch, + bool _showSpectatorPasswordProtected, + bool _showOnlyIfSpectatorsCanChat, + bool _showOnlyIfSpectatorsCanSeeHands); + + // Individual setters + void setHideBuddiesOnlyGames(bool value) + { + hideBuddiesOnlyGames = value; + refresh(); + } + void setHideIgnoredUserGames(bool value) + { + hideIgnoredUserGames = value; + refresh(); + } + void setHideFullGames(bool value) + { + hideFullGames = value; + refresh(); + } + void setHideGamesThatStarted(bool value) + { + hideGamesThatStarted = value; + refresh(); + } + void setHidePasswordProtectedGames(bool value) + { + hidePasswordProtectedGames = value; + refresh(); + } + void setHideNotBuddyCreatedGames(bool value) + { + hideNotBuddyCreatedGames = value; + refresh(); + } + void setHideOpenDecklistGames(bool value) + { + hideOpenDecklistGames = value; + refresh(); + } + void setGameNameFilter(const QString &value) + { + gameNameFilter = value; + refresh(); + } + void setCreatorNameFilters(const QStringList &values) + { + creatorNameFilters = values; + refresh(); + } + void setGameTypeFilter(const QSet &value) + { + gameTypeFilter = value; + refresh(); + } + void setMaxPlayersFilterMin(int value) + { + maxPlayersFilterMin = value; + refresh(); + } + void setMaxPlayersFilterMax(int value) + { + maxPlayersFilterMax = value; + refresh(); + } + void setMaxGameAge(const QTime &value) + { + maxGameAge = value; + refresh(); + } + void setShowOnlyIfSpectatorsCanWatch(bool value) + { + showOnlyIfSpectatorsCanWatch = value; + refresh(); + } + void setShowSpectatorPasswordProtected(bool value) + { + showSpectatorPasswordProtected = value; + refresh(); + } + void setShowOnlyIfSpectatorsCanChat(bool value) + { + showOnlyIfSpectatorsCanChat = value; + refresh(); + } + void setShowOnlyIfSpectatorsCanSeeHands(bool value) + { + showOnlyIfSpectatorsCanSeeHands = value; + refresh(); + } /** * @brief Returns the number of games filtered out by the current filter. diff --git a/cockatrice/src/interface/widgets/server/handle_public_servers.cpp b/cockatrice/src/interface/widgets/server/handle_public_servers.cpp index 8ebb70e83..f37c957a4 100644 --- a/cockatrice/src/interface/widgets/server/handle_public_servers.cpp +++ b/cockatrice/src/interface/widgets/server/handle_public_servers.cpp @@ -37,11 +37,13 @@ void HandlePublicServers::actFinishParsingDownloadedData() QVariantMap jsonMap = jsonResponse.toVariant().toMap(); updateServerINISettings(jsonMap); } else { - qDebug() << "[PUBLIC SERVER HANDLER]" << "JSON Parsing Error:" << parseError.errorString(); + qDebug() << "[PUBLIC SERVER HANDLER]" + << "JSON Parsing Error:" << parseError.errorString(); emit sigPublicServersDownloadedUnsuccessfully(errorCode); } } else { - qDebug() << "[PUBLIC SERVER HANDLER]" << "Error Downloading Public Servers" << errorCode; + qDebug() << "[PUBLIC SERVER HANDLER]" + << "Error Downloading Public Servers" << errorCode; emit sigPublicServersDownloadedUnsuccessfully(errorCode); } diff --git a/cockatrice/src/interface/widgets/server/handle_public_servers.h b/cockatrice/src/interface/widgets/server/handle_public_servers.h index fa924b183..f06bb3ff6 100644 --- a/cockatrice/src/interface/widgets/server/handle_public_servers.h +++ b/cockatrice/src/interface/widgets/server/handle_public_servers.h @@ -1,8 +1,8 @@ /** * @file handle_public_servers.h * @ingroup Server + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_HANDLE_PUBLIC_SERVERS_H #define COCKATRICE_HANDLE_PUBLIC_SERVERS_H diff --git a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp b/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp index a6add3fca..6ca680c3f 100644 --- a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp +++ b/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp @@ -22,9 +22,8 @@ RemoteDeckList_TreeModel::DirectoryNode::~DirectoryNode() void RemoteDeckList_TreeModel::DirectoryNode::clearTree() { - for (int i = 0; i < size(); ++i) { + for (int i = 0; i < size(); ++i) delete at(i); - } clear(); } @@ -32,37 +31,31 @@ QString RemoteDeckList_TreeModel::DirectoryNode::getPath() const { if (parent) { QString parentPath = parent->getPath(); - if (parentPath.isEmpty()) { + if (parentPath.isEmpty()) return name; - } else { + else return parentPath + "/" + name; - } - } else { + } else return name; - } } RemoteDeckList_TreeModel::DirectoryNode *RemoteDeckList_TreeModel::DirectoryNode::getNodeByPath(QStringList path) { QString pathItem; if (parent) { - if (path.isEmpty()) { + if (path.isEmpty()) return this; - } pathItem = path.takeFirst(); - if (pathItem.isEmpty() && name.isEmpty()) { + if (pathItem.isEmpty() && name.isEmpty()) return this; - } } for (int i = 0; i < size(); ++i) { DirectoryNode *node = dynamic_cast(at(i)); - if (!node) { + if (!node) continue; - } - if (node->getName() == pathItem) { + if (node->getName() == pathItem) return node->getNodeByPath(path); - } } return 0; } @@ -73,14 +66,12 @@ RemoteDeckList_TreeModel::FileNode *RemoteDeckList_TreeModel::DirectoryNode::get DirectoryNode *node = dynamic_cast(at(i)); if (node) { FileNode *result = node->getNodeById(id); - if (result) { + if (result) return result; - } } else { FileNode *file = dynamic_cast(at(i)); - if (file->getId() == id) { + if (file->getId() == id) return file; - } } } return 0; @@ -104,11 +95,10 @@ RemoteDeckList_TreeModel::~RemoteDeckList_TreeModel() int RemoteDeckList_TreeModel::rowCount(const QModelIndex &parent) const { DirectoryNode *node = getNode(parent); - if (node) { + if (node) return node->size(); - } else { + else return 0; - } } int RemoteDeckList_TreeModel::columnCount(const QModelIndex & /*parent*/) const @@ -118,12 +108,10 @@ int RemoteDeckList_TreeModel::columnCount(const QModelIndex & /*parent*/) const QVariant RemoteDeckList_TreeModel::data(const QModelIndex &index, int role) const { - if (!index.isValid()) { + if (!index.isValid()) return QVariant(); - } - if (index.column() >= 3) { + if (index.column() >= 3) return QVariant(); - } Node *temp = static_cast(index.internalPointer()); FileNode *file = dynamic_cast(temp); @@ -169,9 +157,8 @@ QVariant RemoteDeckList_TreeModel::data(const QModelIndex &index, int role) cons QVariant RemoteDeckList_TreeModel::headerData(int section, Qt::Orientation orientation, int role) const { - if (orientation != Qt::Horizontal) { + if (orientation != Qt::Horizontal) return QVariant(); - } switch (role) { case Qt::TextAlignmentRole: return section == 1 ? Qt::AlignRight : Qt::AlignLeft; @@ -194,23 +181,20 @@ QVariant RemoteDeckList_TreeModel::headerData(int section, Qt::Orientation orien QModelIndex RemoteDeckList_TreeModel::index(int row, int column, const QModelIndex &parent) const { - if (!hasIndex(row, column, parent)) { + if (!hasIndex(row, column, parent)) return QModelIndex(); - } DirectoryNode *parentNode = getNode(parent); - if (row >= parentNode->size()) { + if (row >= parentNode->size()) return QModelIndex(); - } return createIndex(row, column, parentNode->at(row)); } QModelIndex RemoteDeckList_TreeModel::parent(const QModelIndex &ind) const { - if (!ind.isValid()) { + if (!ind.isValid()) return QModelIndex(); - } return nodeToIndex(static_cast(ind.internalPointer())->getParent()); } @@ -226,9 +210,8 @@ Qt::ItemFlags RemoteDeckList_TreeModel::flags(const QModelIndex &index) const QModelIndex RemoteDeckList_TreeModel::nodeToIndex(Node *node) const { - if (node == nullptr || node == root) { + if (node == nullptr || node == root) return QModelIndex(); - } return createIndex(node->getParent()->indexOf(node), 0, node); } @@ -250,11 +233,10 @@ void RemoteDeckList_TreeModel::addFolderToTree(const ServerInfo_DeckStorage_Tree const int folderItemsSize = folderInfo.items_size(); for (int i = 0; i < folderItemsSize; ++i) { const ServerInfo_DeckStorage_TreeItem &subItem = folderInfo.items(i); - if (subItem.has_folder()) { + if (subItem.has_folder()) addFolderToTree(subItem, newItem); - } else { + else addFileToTree(subItem, newItem); - } } } diff --git a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h b/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h index 3dd91d7a4..8254eb57b 100644 --- a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h +++ b/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h @@ -2,8 +2,8 @@ * @file remote_decklist_tree_widget.h * @ingroup NetworkingWidgets * @ingroup DeckStorageWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef REMOTEDECKLIST_TREEWIDGET_H #define REMOTEDECKLIST_TREEWIDGET_H @@ -75,9 +75,8 @@ public: template [[nodiscard]] T getNode(const QModelIndex &index) const { - if (!index.isValid()) { + if (!index.isValid()) return dynamic_cast(root); - } return dynamic_cast(static_cast(index.internalPointer())); } 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 1f034b767..5152880d9 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 @@ -14,16 +14,14 @@ const int RemoteReplayList_TreeModel::numberOfColumns = 6; RemoteReplayList_TreeModel::MatchNode::MatchNode(const ServerInfo_ReplayMatch &_matchInfo) : RemoteReplayList_TreeModel::Node(QString::fromStdString(_matchInfo.game_name())), matchInfo(_matchInfo) { - for (int i = 0; i < matchInfo.replay_list_size(); ++i) { + for (int i = 0; i < matchInfo.replay_list_size(); ++i) append(new ReplayNode(matchInfo.replay_list(i), this)); - } } RemoteReplayList_TreeModel::MatchNode::~MatchNode() { - for (int i = 0; i < size(); ++i) { + for (int i = 0; i < size(); ++i) delete at(i); - } } void RemoteReplayList_TreeModel::MatchNode::updateMatchInfo(const ServerInfo_ReplayMatch &_matchInfo) @@ -47,26 +45,22 @@ RemoteReplayList_TreeModel::~RemoteReplayList_TreeModel() int RemoteReplayList_TreeModel::rowCount(const QModelIndex &parent) const { - if (!parent.isValid()) { + if (!parent.isValid()) return replayMatches.size(); - } auto *matchNode = dynamic_cast(static_cast(parent.internalPointer())); - if (matchNode) { + if (matchNode) return matchNode->size(); - } else { + else return 0; - } } QVariant RemoteReplayList_TreeModel::data(const QModelIndex &index, int role) const { - if (!index.isValid()) { + if (!index.isValid()) return QVariant(); - } - if (index.column() >= numberOfColumns) { + if (index.column() >= numberOfColumns) return QVariant(); - } auto *replayNode = dynamic_cast(static_cast(index.internalPointer())); if (replayNode) { @@ -109,9 +103,8 @@ QVariant RemoteReplayList_TreeModel::data(const QModelIndex &index, int role) co return QString::fromStdString(matchInfo.game_name()); case 2: { QStringList playerList; - for (int i = 0; i < matchInfo.player_names_size(); ++i) { + for (int i = 0; i < matchInfo.player_names_size(); ++i) playerList.append(QString::fromStdString(matchInfo.player_names(i))); - } return playerList.join(", "); } case 4: @@ -138,9 +131,8 @@ QVariant RemoteReplayList_TreeModel::data(const QModelIndex &index, int role) co QVariant RemoteReplayList_TreeModel::headerData(int section, Qt::Orientation orientation, int role) const { - if (orientation != Qt::Horizontal) { + if (orientation != Qt::Horizontal) return QVariant(); - } switch (role) { case Qt::TextAlignmentRole: switch (section) { @@ -175,20 +167,17 @@ QVariant RemoteReplayList_TreeModel::headerData(int section, Qt::Orientation ori QModelIndex RemoteReplayList_TreeModel::index(int row, int column, const QModelIndex &parent) const { - if (!hasIndex(row, column, parent)) { + if (!hasIndex(row, column, parent)) return QModelIndex(); - } auto *matchNode = dynamic_cast(static_cast(parent.internalPointer())); if (matchNode) { - if (row >= matchNode->size()) { + if (row >= matchNode->size()) return QModelIndex(); - } return createIndex(row, column, (void *)matchNode->at(row)); } else { - if (row >= replayMatches.size()) { + if (row >= replayMatches.size()) return QModelIndex(); - } return createIndex(row, column, (void *)replayMatches[row]); } } @@ -196,9 +185,9 @@ QModelIndex RemoteReplayList_TreeModel::index(int row, int column, const QModelI QModelIndex RemoteReplayList_TreeModel::parent(const QModelIndex &ind) const { MatchNode const *matchNode = dynamic_cast(static_cast(ind.internalPointer())); - if (matchNode) { + if (matchNode) return QModelIndex(); - } else { + else { auto *replayNode = dynamic_cast(static_cast(ind.internalPointer())); return createIndex(replayNode->getParent()->indexOf(replayNode), 0, replayNode->getParent()); } @@ -206,52 +195,45 @@ QModelIndex RemoteReplayList_TreeModel::parent(const QModelIndex &ind) const Qt::ItemFlags RemoteReplayList_TreeModel::flags(const QModelIndex &index) const { - if (!index.isValid()) { + if (!index.isValid()) return Qt::NoItemFlags; - } return Qt::ItemIsEnabled | Qt::ItemIsSelectable; } ServerInfo_Replay const *RemoteReplayList_TreeModel::getReplay(const QModelIndex &index) const { - if (!index.isValid()) { + if (!index.isValid()) return 0; - } auto *node = dynamic_cast(static_cast(index.internalPointer())); - if (!node) { + if (!node) return 0; - } return &node->getReplayInfo(); } ServerInfo_ReplayMatch const *RemoteReplayList_TreeModel::getReplayMatch(const QModelIndex &index) const { - if (!index.isValid()) { + if (!index.isValid()) return nullptr; - } auto *node = dynamic_cast(static_cast(index.internalPointer())); - if (!node) { + if (!node) return nullptr; - } return &node->getMatchInfo(); } ServerInfo_ReplayMatch const *RemoteReplayList_TreeModel::getEnclosingReplayMatch(const QModelIndex &index) const { - if (!index.isValid()) { + if (!index.isValid()) return nullptr; - } auto *node = dynamic_cast(static_cast(index.internalPointer())); if (!node) { auto *_node = dynamic_cast(static_cast(index.internalPointer())); - if (!_node) { + if (!_node) return nullptr; - } return &_node->getParent()->getMatchInfo(); } return &node->getMatchInfo(); @@ -262,9 +244,8 @@ ServerInfo_ReplayMatch const *RemoteReplayList_TreeModel::getEnclosingReplayMatc */ void RemoteReplayList_TreeModel::clearAll() { - for (int i = 0; i < replayMatches.size(); ++i) { + for (int i = 0; i < replayMatches.size(); ++i) delete replayMatches[i]; - } replayMatches.clear(); } @@ -294,26 +275,24 @@ void RemoteReplayList_TreeModel::addMatchInfo(const ServerInfo_ReplayMatch &matc void RemoteReplayList_TreeModel::updateMatchInfo(int gameId, const ServerInfo_ReplayMatch &matchInfo) { - for (int i = 0; i < replayMatches.size(); ++i) { + for (int i = 0; i < replayMatches.size(); ++i) if (replayMatches[i]->getMatchInfo().game_id() == gameId) { replayMatches[i]->updateMatchInfo(matchInfo); emit dataChanged(createIndex(i, 0, (void *)replayMatches[i]), createIndex(i, numberOfColumns - 1, (void *)replayMatches[i])); break; } - } } void RemoteReplayList_TreeModel::removeMatchInfo(int gameId) { - for (int i = 0; i < replayMatches.size(); ++i) { + for (int i = 0; i < replayMatches.size(); ++i) if (replayMatches[i]->getMatchInfo().game_id() == gameId) { beginRemoveRows(QModelIndex(), i, i); replayMatches.removeAt(i); endRemoveRows(); break; } - } } void RemoteReplayList_TreeModel::replayListFinished(const Response &r) @@ -323,9 +302,8 @@ void RemoteReplayList_TreeModel::replayListFinished(const Response &r) beginResetModel(); clearAll(); - for (int i = 0; i < resp.match_list_size(); ++i) { + for (int i = 0; i < resp.match_list_size(); ++i) replayMatches.append(new MatchNode(resp.match_list(i))); - } endResetModel(); emit treeRefreshed(); diff --git a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h b/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h index 10e698aee..6d81aefca 100644 --- a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h +++ b/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h @@ -3,8 +3,8 @@ * @ingroup DeckStorageWidgets * @ingroup Replays * @ingroup NetworkingWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef REMOTEREPLAYLIST_TREEWIDGET_H #define REMOTEREPLAYLIST_TREEWIDGET_H diff --git a/cockatrice/src/interface/widgets/server/user/user_avatar_provider.cpp b/cockatrice/src/interface/widgets/server/user/user_avatar_provider.cpp deleted file mode 100644 index c115caa47..000000000 --- a/cockatrice/src/interface/widgets/server/user/user_avatar_provider.cpp +++ /dev/null @@ -1,48 +0,0 @@ -#include "user_avatar_provider.h" - -#include -#include -#include - -UserAvatarProvider::UserAvatarProvider(AbstractClient *client, QObject *parent) : QObject(parent), client(client) -{ -} - -const QMap &UserAvatarProvider::cache() const -{ - return avatarCache; -} - -void UserAvatarProvider::requestAvatar(const QString &userName) -{ - if (avatarCache.contains(userName) || pending.contains(userName)) { - return; - } - - pending.insert(userName); - - Command_GetUserInfo cmd; - cmd.set_user_name(userName.toStdString()); - - PendingCommand *pend = client->prepareSessionCommand(cmd); - - connect(pend, &PendingCommand::finished, this, [this, userName](const Response &r) { - pending.remove(userName); - - const auto &response = r.GetExtension(Response_GetUserInfo::ext); - const auto &user = response.user_info(); - const std::string &bmp = user.avatar_bmp(); - - QPixmap avatar; - if (!bmp.empty() && - avatar.loadFromData(reinterpret_cast(bmp.data()), static_cast(bmp.size()))) { - avatarCache.insert(userName, avatar); - } else { - avatarCache.insert(userName, QPixmap()); - } - - emit avatarUpdated(userName); - }); - - client->sendCommand(pend); -} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/server/user/user_avatar_provider.h b/cockatrice/src/interface/widgets/server/user/user_avatar_provider.h deleted file mode 100644 index 44491e544..000000000 --- a/cockatrice/src/interface/widgets/server/user/user_avatar_provider.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef COCKATRICE_USER_AVATAR_PROVIDER_H -#define COCKATRICE_USER_AVATAR_PROVIDER_H - -#include -#include -#include -#include - -class AbstractClient; - -class UserAvatarProvider : public QObject -{ - Q_OBJECT - -public: - explicit UserAvatarProvider(AbstractClient *client, QObject *parent = nullptr); - - void requestAvatar(const QString &userName); - const QMap &cache() const; - -signals: - void avatarUpdated(const QString &userName); - -private: - AbstractClient *client; - QMap avatarCache; - QSet pending; -}; - -#endif // COCKATRICE_USER_AVATAR_PROVIDER_H \ No newline at end of file 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 deleted file mode 100644 index 67fb4f684..000000000 --- a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp +++ /dev/null @@ -1,147 +0,0 @@ -#include "user_card_art_provider.h" - -#include "../../../card_picture_loader/card_picture_loader.h" - -#include -#include - -static QString makeKey(const QString &user, const QString &card, const QString &providerId) -{ - return user + u'|' + card + u'|' + providerId; -} - -UserCardArtProvider::UserCardArtProvider(QObject *parent) : QObject(parent) -{ - dbReady = (CardDatabaseManager::getInstance()->getLoadStatus() == LoadStatus::Ok); - - if (!dbReady) { - connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, this, - &UserCardArtProvider::onDatabaseReady); - } -} - -void UserCardArtProvider::onDatabaseReady() -{ - dbReady = true; - processQueue(); -} - -const QMap &UserCardArtProvider::cache() const -{ - return cardArtCache; -} - -void UserCardArtProvider::requestCardArt(const QString &userName, const QString &cardName, const QString &providerId) -{ - if (cardName.isEmpty()) { - return; - } - - const QString key = makeKey(userName, cardName, providerId); - - if (cardArtCache.contains(key) || pending.contains(key)) { - return; - } - - pending.insert(key); - queue.enqueue(key); - - processQueue(); -} - -QPixmap UserCardArtProvider::cropCardArt(const QPixmap &fullRes) -{ - const QSize sz = fullRes.size(); - const int marginX = sz.width() * 0.07; - const int topMargin = sz.height() * 0.11; - const int bottomMargin = sz.height() * 0.45; - - const QRect foilRect(marginX, topMargin, sz.width() - 2 * marginX, sz.height() - topMargin - bottomMargin); - - return fullRes.copy(foilRect.intersected(fullRes.rect())); -} - -void UserCardArtProvider::insertIntoCache(const QString &key, const QPixmap &pixmap) -{ - if (!cardArtCache.contains(key)) { - cacheInsertionOrder.append(key); - while (cacheInsertionOrder.size() > MaxCacheEntries) { - const QString evicted = cacheInsertionOrder.takeFirst(); - cardArtCache.remove(evicted); - } - } - cardArtCache.insert(key, pixmap); -} - -void UserCardArtProvider::processQueue() -{ - if (!dbReady) { - return; - } - - while (!queue.isEmpty()) { - const QString key = queue.dequeue(); - - const QStringList parts = key.split(u'|'); - if (parts.size() != 3) { - pending.remove(key); - continue; - } - - const QString userName = parts.at(0); - const QString cardName = parts.at(1); - const QString providerId = parts.at(2); - - ExactCard card = CardDatabaseManager::query()->getCard({cardName, providerId}); - - if (!card) { - pending.remove(key); - continue; - } - - QPixmap fullRes; - CardPictureLoader::getPixmap(fullRes, card, QSize(745, 1040)); - - // Synchronous hit (already loaded/on disk) - if (!fullRes.isNull()) { - insertIntoCache(key, cropCardArt(fullRes)); - pending.remove(key); - - emit cardArtUpdated(userName); - continue; - } - - // Async load required. - QPointer self(this); - - auto conn = std::make_shared(); - - *conn = connect(card.getCardPtr().data(), &CardInfo::pixmapUpdated, this, - [self, key, userName, card, conn]() mutable { - if (!self) { - return; - } - - QObject::disconnect(*conn); - - QPixmap fullRes; - CardPictureLoader::getPixmap(fullRes, card, QSize(745, 1040)); - - if (!fullRes.isNull()) { - self->insertIntoCache(key, self->cropCardArt(fullRes)); - } else { - self->insertIntoCache(key, QPixmap()); - } - - self->pending.remove(key); - - emit self->cardArtUpdated(userName); - - // Resume processing remaining queued items. - self->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 deleted file mode 100644 index fb2f37812..000000000 --- a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef COCKATRICE_USER_CARD_ART_PROVIDER_H -#define COCKATRICE_USER_CARD_ART_PROVIDER_H - -#include -#include -#include -#include -#include - -class UserCardArtProvider : public QObject -{ - Q_OBJECT - -public: - explicit UserCardArtProvider(QObject *parent = nullptr); - - void requestCardArt(const QString &userName, const QString &cardName, const QString &providerId); - const QMap &cache() const; - static QPixmap cropCardArt(const QPixmap &fullRes); - -signals: - void cardArtUpdated(const QString &userName); - -public slots: - void onDatabaseReady(); - -private: - bool dbReady = false; - static constexpr int MaxCacheEntries = 300; - QList cacheInsertionOrder; // FIFO eviction - QMap cardArtCache; - QSet pending; - QQueue queue; - - void processQueue(); - void insertIntoCache(const QString &key, const QPixmap &pixmap); -}; - -#endif // COCKATRICE_USER_CARD_ART_PROVIDER_H \ No newline at end of file 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 deleted file mode 100644 index 56c9600a0..000000000 --- a/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp +++ /dev/null @@ -1,339 +0,0 @@ -#include "user_card_settings_dialog.h" - -#include "../../../card_picture_loader/card_picture_loader.h" -#include "card/card_completer_proxy_model.h" -#include "card/card_search_model.h" -#include "card_database_display_model.h" -#include "card_database_model.h" -#include "user_card_art_provider.h" -#include "user_list_painter.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -CardArtPreviewWidget::CardArtPreviewWidget(QWidget *parent) : QWidget(parent) -{ - setMinimumSize(400, 72); - setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); -} - -void CardArtPreviewWidget::setPixmap(const QPixmap &pixmap) -{ - sourcePixmap = pixmap; - update(); -} - -void CardArtPreviewWidget::setParams(const CardArtParams &p) -{ - params = p; - update(); -} - -void CardArtPreviewWidget::paintEvent(QPaintEvent *) -{ - QPainter painter(this); - painter.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform | QPainter::TextAntialiasing); - - const QRect rect = this->rect(); - - const QColor accentColor(100, 116, 139); - const QRectF cardRect = QRectF(rect).adjusted(3, 2, -3, -2); - - QLinearGradient bg(cardRect.topLeft(), cardRect.topRight()); - bg.setColorAt(0, accentColor.darker(320)); - bg.setColorAt(1, QColor(18, 22, 30)); - painter.setPen(Qt::NoPen); - painter.setBrush(bg); - painter.drawRoundedRect(cardRect, 6, 6); - painter.setBrush(accentColor); - painter.drawRoundedRect(QRectF(cardRect.left(), cardRect.top(), 3, cardRect.height()), 2, 2); - - if (sourcePixmap.isNull()) { - painter.setPen(QColor(150, 150, 150)); - painter.drawText(rect, Qt::AlignCenter, tr("No card selected")); - return; - } - - UserListPainter::drawCardArt(&painter, rect, rect.right() - 4, - QString(), // userName not needed for override path - nullptr, // no cache - params, - &sourcePixmap // direct pixmap - ); - - // Avatar placeholder so the left-margin interaction is visible - const int avatarX = rect.left() + 14; - const int avatarY = rect.top() + (rect.height() - 36) / 2; - const QRect avatarRect(avatarX, avatarY, 36, 36); - - QPainterPath clip; - clip.addEllipse(avatarRect); - painter.save(); - painter.setClipPath(clip); - painter.setBrush(accentColor.darker(200)); - painter.setPen(Qt::NoPen); - painter.drawEllipse(avatarRect); - painter.restore(); - - painter.setPen(QPen(QColor(70, 80, 95), 2)); - painter.setBrush(Qt::NoBrush); - painter.drawEllipse(avatarRect.adjusted(-1, -1, 1, 1)); -} - -UserCardArtSettingsDialog::UserCardArtSettingsDialog(const CardArtParams &initial, QWidget *parent) - : QDialog(parent), currentParams(initial) -{ - setWindowTitle(tr("Card Art Settings")); - setMinimumWidth(500); - setupUi(); - - // Seed UI from initial params - if (!initial.cardName.isEmpty()) { - searchBar->setText(initial.cardName); - onCardNameChanged(initial.cardName); - } - marginLSpin->setValue(initial.marginPctL); - marginRSpin->setValue(initial.marginPctR); - verticalOffsetSpin->setValue(initial.verticalOffset); - zoomSpin->setValue(initial.zoom); -} - -CardArtParams UserCardArtSettingsDialog::params() const -{ - return currentParams; -} - -QDoubleSpinBox *UserCardArtSettingsDialog::makeSpinBox(double min, double max, double value, double step) -{ - auto *spin = new QDoubleSpinBox; - spin->setRange(min, max); - spin->setSingleStep(step); - spin->setDecimals(3); - spin->setValue(value); - return spin; -} - -void UserCardArtSettingsDialog::initializeSearchBar() -{ - searchBar = new QLineEdit; - searchBar->setPlaceholderText(tr("Type a card name...")); - - cardDatabaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), false, this); - cardDatabaseDisplayModel = new CardDatabaseDisplayModel(this); - cardDatabaseDisplayModel->setSourceModel(cardDatabaseModel); - searchModel = new CardSearchModel(cardDatabaseDisplayModel, this); - - proxyModel = new CardCompleterProxyModel(this); - proxyModel->setSourceModel(searchModel); - proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive); - proxyModel->setFilterRole(Qt::DisplayRole); - - completer = new QCompleter(proxyModel, this); - completer->setCompletionRole(Qt::DisplayRole); - completer->setCompletionMode(QCompleter::PopupCompletion); - completer->setCaseSensitivity(Qt::CaseInsensitive); - completer->setFilterMode(Qt::MatchContains); - completer->setMaxVisibleItems(15); - searchBar->setCompleter(completer); - - connect(searchBar, &QLineEdit::textEdited, searchModel, &CardSearchModel::updateSearchResults); - connect(searchBar, &QLineEdit::textEdited, this, [this](const QString &text) { - const QString pattern = ".*" + QRegularExpression::escape(text) + ".*"; - proxyModel->setFilterRegularExpression(QRegularExpression(pattern, QRegularExpression::CaseInsensitiveOption)); - if (!text.isEmpty()) { - completer->complete(); - } - }); - - connect(completer, static_cast(&QCompleter::activated), this, - [this](const QString &completion) { - if (searchBar->text() != completion) { - searchBar->setText(completion); - searchBar->setCursorPosition(searchBar->text().length()); - } - onCardNameChanged(completion); - }); - - // Also trigger a load when the user hits Return on a typed name - connect(searchBar, &QLineEdit::returnPressed, this, [this]() { onCardNameChanged(searchBar->text()); }); -} - -void UserCardArtSettingsDialog::setupUi() -{ - initializeSearchBar(); - - providerComboBox = new QComboBox; - connect(providerComboBox, &QComboBox::currentIndexChanged, this, [this]() { - currentParams.cardProviderId = providerComboBox->currentData().toString(); - reloadPreview(); - onParamChanged(); - }); - - marginLSpin = makeSpinBox(0.0, 0.95, currentParams.marginPctL, 0.01); - marginRSpin = makeSpinBox(0.0, 0.95, currentParams.marginPctR, 0.01); - verticalOffsetSpin = makeSpinBox(0.0, 1.0, currentParams.verticalOffset, 0.01); - zoomSpin = makeSpinBox(0.1, 4.0, currentParams.zoom, 0.05); - - auto *form = new QFormLayout; - form->addRow(tr("Card name:"), searchBar); - form->addRow(tr("Card ProviderId:"), providerComboBox); - form->addRow(tr("Left margin (%):"), marginLSpin); - form->addRow(tr("Right margin (%):"), marginRSpin); - form->addRow(tr("Vertical offset:"), verticalOffsetSpin); - form->addRow(tr("Zoom:"), zoomSpin); - - auto *controlsGroup = new QGroupBox(tr("Parameters")); - controlsGroup->setLayout(form); - - preview = new CardArtPreviewWidget; - - auto *previewLayout = new QVBoxLayout; - previewLayout->addWidget(preview); - auto *previewGroup = new QGroupBox(tr("Preview")); - previewGroup->setLayout(previewLayout); - - auto *buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); - auto *removeBtn = new QPushButton(tr("Remove Banner Card")); - buttons->addButton(removeBtn, QDialogButtonBox::ResetRole); - - connect(buttons, &QDialogButtonBox::accepted, this, &QDialog::accept); - connect(buttons, &QDialogButtonBox::rejected, this, &QDialog::reject); - connect(removeBtn, &QPushButton::clicked, this, [this]() { - currentParams = CardArtParams{}; // empty cardName signals removal - accept(); - }); - - auto *root = new QVBoxLayout; - root->addWidget(controlsGroup); - root->addWidget(previewGroup); - root->addWidget(buttons); - setLayout(root); - - connect(marginLSpin, &QDoubleSpinBox::valueChanged, this, &UserCardArtSettingsDialog::onParamChanged); - connect(marginRSpin, &QDoubleSpinBox::valueChanged, this, &UserCardArtSettingsDialog::onParamChanged); - connect(verticalOffsetSpin, &QDoubleSpinBox::valueChanged, this, &UserCardArtSettingsDialog::onParamChanged); - connect(zoomSpin, &QDoubleSpinBox::valueChanged, this, &UserCardArtSettingsDialog::onParamChanged); -} - -void UserCardArtSettingsDialog::populateProviderCombo(const QString &cardName) -{ - providerComboBox->clear(); - - auto card = CardDatabaseManager::query()->getCard({cardName}); - - const auto &sets = card.getInfo().getSets(); - - for (const auto &printings : sets) { - for (const auto &p : printings) { - - QString setName = p.getSet()->getLongName(); - QString collector = p.getProperty("num"); - QString uuid = p.getUuid(); - - QString label = setName; - - if (!collector.isEmpty()) { - label += " #" + collector; - } - - providerComboBox->addItem(label, uuid); - } - } -} - -void UserCardArtSettingsDialog::onCardNameChanged(const QString &name) -{ - if (name.isEmpty()) { - currentPixmap = QPixmap(); - preview->setPixmap(currentPixmap); - return; - } - - const ExactCard card = CardDatabaseManager::query()->getCard({name}); - if (!card) { - currentPixmap = QPixmap(); - preview->setPixmap(currentPixmap); - providerComboBox->clear(); - return; - } - - currentParams.cardName = name; - - populateProviderCombo(name); - - if (providerComboBox->count() == 0) { - // No printings found for this card; nothing to preview. - currentPixmap = QPixmap(); - preview->setPixmap(currentPixmap); - currentParams.cardProviderId.clear(); - return; - } - - currentParams.cardProviderId = providerComboBox->currentData().toString(); - reloadPreview(); -} - -void UserCardArtSettingsDialog::reloadPreview() -{ - if (currentParams.cardName.isEmpty()) { - return; - } - - ExactCard card = CardDatabaseManager::query()->getCard({currentParams.cardName, currentParams.cardProviderId}); - if (!card) { - return; - } - - // CardPictureLoader::getPixmap() is async on a cache miss: it enqueues a - // background download and returns a null pixmap immediately. When that - // download finishes, CardPictureLoader::imageLoaded() caches the result - // and calls card.emitPixmapUpdated(), which emits pixmapUpdated() on the - // underlying CardInfo (see exact_card.h). Listen for that, scoped to - // whichever CardInfo we just asked for, so the preview catches up once - // the image actually arrives instead of staying on the placeholder. - // - // Disconnect any previous listener first -- otherwise switching cards - // repeatedly stacks up connections to old CardInfo objects, each of - // which would still fire reloadPreview() (harmlessly, but wastefully) - // whenever ITS art finishes loading later. - disconnect(pixmapUpdatedConnection); - - QPixmap fullRes; - CardPictureLoader::getPixmap(fullRes, card, QSize(745, 1040)); - - if (fullRes.isNull()) { - // Not loaded yet -- wait for the signal instead of giving up. - // card.getCardPtr() is a CardInfoPtr (QSharedPointer); - // .data() gives the raw QObject* needed for connect(). - CardInfo *cardInfo = card.getCardPtr().data(); - if (cardInfo) { - pixmapUpdatedConnection = connect(cardInfo, &CardInfo::pixmapUpdated, this, [this]() { reloadPreview(); }); - } - return; - } - - currentPixmap = UserCardArtProvider::cropCardArt(fullRes); - preview->setPixmap(currentPixmap); - preview->setParams(currentParams); -} - -void UserCardArtSettingsDialog::onParamChanged() -{ - currentParams.marginPctL = marginLSpin->value(); - currentParams.marginPctR = marginRSpin->value(); - currentParams.verticalOffset = verticalOffsetSpin->value(); - currentParams.zoom = zoomSpin->value(); - preview->setParams(currentParams); -} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.h b/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.h deleted file mode 100644 index 018043278..000000000 --- a/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.h +++ /dev/null @@ -1,77 +0,0 @@ -#ifndef COCKATRICE_USER_CARD_ART_SETTINGS_DIALOG_H -#define COCKATRICE_USER_CARD_ART_SETTINGS_DIALOG_H - -#include "user_list_painter.h" - -#include -#include -#include - -class QCompleter; -class QLineEdit; -class QDoubleSpinBox; -class CardDatabaseModel; -class CardDatabaseDisplayModel; -class CardSearchModel; -class CardCompleterProxyModel; - -class CardArtPreviewWidget : public QWidget -{ - Q_OBJECT - -public: - explicit CardArtPreviewWidget(QWidget *parent = nullptr); - - void setPixmap(const QPixmap &pixmap); - void setParams(const CardArtParams ¶ms); - -protected: - void paintEvent(QPaintEvent *event) override; - -private: - QPixmap sourcePixmap; - CardArtParams params; -}; - -class UserCardArtSettingsDialog : public QDialog -{ - Q_OBJECT - -public: - explicit UserCardArtSettingsDialog(const CardArtParams &initial = {}, QWidget *parent = nullptr); - - CardArtParams params() const; - -private slots: - void onCardNameChanged(const QString &name); - void reloadPreview(); - void onParamChanged(); - -private: - void setupUi(); - void populateProviderCombo(const QString &cardName); - void initializeSearchBar(); - QDoubleSpinBox *makeSpinBox(double min, double max, double value, double step); - - QLineEdit *searchBar; - QCompleter *completer; - CardDatabaseModel *cardDatabaseModel; - CardDatabaseDisplayModel *cardDatabaseDisplayModel; - CardSearchModel *searchModel; - CardCompleterProxyModel *proxyModel; - - QComboBox *providerComboBox; - - QMetaObject::Connection pixmapUpdatedConnection; - - QDoubleSpinBox *marginLSpin; - QDoubleSpinBox *marginRSpin; - QDoubleSpinBox *verticalOffsetSpin; - QDoubleSpinBox *zoomSpin; - CardArtPreviewWidget *preview; - - QPixmap currentPixmap; - CardArtParams currentParams; -}; - -#endif // COCKATRICE_USER_CARD_ART_SETTINGS_DIALOG_H \ No newline at end of file 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 5c4a88974..7083ac899 100644 --- a/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp @@ -192,15 +192,13 @@ void UserContextMenu::banUserHistory_processResponse(const Response &resp) table->setMinimumSize(table->horizontalHeader()->length() + (table->columnCount() * 5), table->verticalHeader()->length() + (table->rowCount() * 3)); table->show(); - } else { + } else QMessageBox::information(static_cast(parent()), tr("Ban History"), tr("User has never been banned.")); - } - } else { + } else QMessageBox::critical(static_cast(parent()), tr("Ban History"), tr("Failed to collect ban information.")); - } } void UserContextMenu::warnUserHistory_processResponse(const Response &resp) @@ -230,15 +228,13 @@ void UserContextMenu::warnUserHistory_processResponse(const Response &resp) table->setMinimumSize(table->horizontalHeader()->length() + (table->columnCount() * 5), table->verticalHeader()->length() + (table->rowCount() * 3)); table->show(); - } else { + } else QMessageBox::information(static_cast(parent()), tr("Warning History"), tr("User has never been warned.")); - } - } else { + } else QMessageBox::critical(static_cast(parent()), tr("Warning History"), tr("Failed to collect warning information.")); - } } void UserContextMenu::getAdminNotes_processResponse(const Response &resp) @@ -301,9 +297,8 @@ void UserContextMenu::warnUser_dialogFinished() { auto *dlg = static_cast(sender()); - if (dlg->getName().isEmpty() || userListProxy->getOwnUsername().simplified().isEmpty()) { + if (dlg->getName().isEmpty() || userListProxy->getOwnUsername().simplified().isEmpty()) return; - } Command_WarnUser cmd; cmd.set_user_name(dlg->getName().toStdString()); @@ -436,35 +431,98 @@ void UserContextMenu::showContextMenu(const QPoint &pos, QAction *actionClicked = menu->exec(pos); if (actionClicked == nullptr) { } else if (actionClicked == aDetails) { - execDetails(userName); + auto *infoWidget = + new UserInfoBox(client, false, static_cast(parent()), + Qt::Dialog | Qt::WindowTitleHint | Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint); + infoWidget->setAttribute(Qt::WA_DeleteOnClose); + infoWidget->updateInfo(userName); } else if (actionClicked == aChat) { - execChat(userName); + emit openMessageDialog(userName, true); } else if (actionClicked == aShowGames) { - execShowGames(userName); + Command_GetGamesOfUser cmd; + cmd.set_user_name(userName.toStdString()); + + PendingCommand *pend = client->prepareSessionCommand(cmd); + connect(pend, &PendingCommand::finished, this, &UserContextMenu::gamesOfUserReceived); + + client->sendCommand(pend); } else if (actionClicked == aAddToBuddyList) { - execAddToBuddy(userName); + Command_AddToList cmd; + cmd.set_list("buddy"); + cmd.set_user_name(userName.toStdString()); + + client->sendCommand(client->prepareSessionCommand(cmd)); } else if (actionClicked == aRemoveFromBuddyList) { - execRemoveFromBuddy(userName); + Command_RemoveFromList cmd; + cmd.set_list("buddy"); + cmd.set_user_name(userName.toStdString()); + + client->sendCommand(client->prepareSessionCommand(cmd)); } else if (actionClicked == aAddToIgnoreList) { - execAddToIgnore(userName); + Command_AddToList cmd; + cmd.set_list("ignore"); + cmd.set_user_name(userName.toStdString()); + + client->sendCommand(client->prepareSessionCommand(cmd)); } else if (actionClicked == aRemoveFromIgnoreList) { - execRemoveFromIgnore(userName); + Command_RemoveFromList cmd; + cmd.set_list("ignore"); + cmd.set_user_name(userName.toStdString()); + + client->sendCommand(client->prepareSessionCommand(cmd)); } else if (actionClicked == aKick) { - execKick(playerId); + Command_KickFromGame cmd; + cmd.set_player_id(playerId); + + game->getGameEventHandler()->sendGameCommand(cmd); } else if (actionClicked == aBan) { - execBan(userName); + Command_GetUserInfo cmd; + cmd.set_user_name(userName.toStdString()); + + PendingCommand *pend = client->prepareSessionCommand(cmd); + connect(pend, &PendingCommand::finished, this, &UserContextMenu::banUser_processUserInfoResponse); + client->sendCommand(pend); } else if (actionClicked == aPromoteToMod || actionClicked == aDemoteFromMod) { - execAdjustMod(userName, actionClicked == aPromoteToMod); + Command_AdjustMod cmd; + cmd.set_user_name(userName.toStdString()); + cmd.set_should_be_mod(actionClicked == aPromoteToMod); + + PendingCommand *pend = client->prepareAdminCommand(cmd); + connect(pend, &PendingCommand::finished, this, &UserContextMenu::adjustMod_processUserResponse); + client->sendCommand(pend); } else if (actionClicked == aPromoteToJudge || actionClicked == aDemoteFromJudge) { - execAdjustJudge(userName, actionClicked == aPromoteToJudge); + Command_AdjustMod cmd; + cmd.set_user_name(userName.toStdString()); + cmd.set_should_be_judge(actionClicked == aPromoteToJudge); + + PendingCommand *pend = client->prepareAdminCommand(cmd); + connect(pend, &PendingCommand::finished, this, &UserContextMenu::adjustMod_processUserResponse); + client->sendCommand(pend); } else if (actionClicked == aBanHistory) { - execBanHistory(userName); + Command_GetBanHistory cmd; + cmd.set_user_name(userName.toStdString()); + PendingCommand *pend = client->prepareModeratorCommand(cmd); + connect(pend, &PendingCommand::finished, this, &UserContextMenu::banUserHistory_processResponse); + client->sendCommand(pend); } else if (actionClicked == aWarnUser) { - execWarn(userName); + Command_GetUserInfo cmd; + cmd.set_user_name(userName.toStdString()); + PendingCommand *pend = client->prepareSessionCommand(cmd); + connect(pend, &PendingCommand::finished, this, &UserContextMenu::warnUser_processUserInfoResponse); + client->sendCommand(pend); } else if (actionClicked == aWarnHistory) { - execWarnHistory(userName); + Command_GetWarnHistory cmd; + cmd.set_user_name(userName.toStdString()); + PendingCommand *pend = client->prepareModeratorCommand(cmd); + connect(pend, &PendingCommand::finished, this, &UserContextMenu::warnUserHistory_processResponse); + client->sendCommand(pend); } else if (actionClicked == aGetAdminNotes) { - execAdminNotes(userName); + Command_GetAdminNotes cmd; + cmd.set_user_name(userName.toStdString()); + auto *pend = client->prepareModeratorCommand(cmd); + connect(pend, &PendingCommand::finished, this, &UserContextMenu::getAdminNotes_processResponse); + client->sendCommand(pend); + } else if (actionClicked == aCopyToClipBoard) { QClipboard *clipboard = QGuiApplication::clipboard(); clipboard->setText(deckHash); @@ -474,135 +532,3 @@ void UserContextMenu::showContextMenu(const QPoint &pos, delete menu; } - -void UserContextMenu::execChat(const QString &userName) -{ - emit openMessageDialog(userName, true); -} - -void UserContextMenu::execDetails(const QString &userName) -{ - auto *w = new UserInfoBox(client, false, static_cast(parent()), - Qt::Dialog | Qt::WindowTitleHint | Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint); - w->setAttribute(Qt::WA_DeleteOnClose); - w->updateInfo(userName); -} - -void UserContextMenu::execShowGames(const QString &userName) -{ - Command_GetGamesOfUser cmd; - cmd.set_user_name(userName.toStdString()); - PendingCommand *pend = client->prepareSessionCommand(cmd); - connect(pend, &PendingCommand::finished, this, &UserContextMenu::gamesOfUserReceived); - client->sendCommand(pend); -} - -void UserContextMenu::execAddToBuddy(const QString &userName) -{ - Command_AddToList cmd; - cmd.set_list("buddy"); - cmd.set_user_name(userName.toStdString()); - client->sendCommand(client->prepareSessionCommand(cmd)); -} - -void UserContextMenu::execRemoveFromBuddy(const QString &userName) -{ - Command_RemoveFromList cmd; - cmd.set_list("buddy"); - cmd.set_user_name(userName.toStdString()); - client->sendCommand(client->prepareSessionCommand(cmd)); -} - -void UserContextMenu::execAddToIgnore(const QString &userName) -{ - Command_AddToList cmd; - cmd.set_list("ignore"); - cmd.set_user_name(userName.toStdString()); - client->sendCommand(client->prepareSessionCommand(cmd)); -} - -void UserContextMenu::execRemoveFromIgnore(const QString &userName) -{ - Command_RemoveFromList cmd; - cmd.set_list("ignore"); - cmd.set_user_name(userName.toStdString()); - client->sendCommand(client->prepareSessionCommand(cmd)); -} - -void UserContextMenu::execKick(int playerId) -{ - auto result = QMessageBox::question(static_cast(parent()), tr("Kick Player"), - tr("Are you sure you want to kick this player from the game?"), - QMessageBox::Yes | QMessageBox::No, QMessageBox::No); - if (result == QMessageBox::Yes) { - Command_KickFromGame cmd; - cmd.set_player_id(playerId); - - game->getGameEventHandler()->sendGameCommand(cmd); - } -} - -void UserContextMenu::execBan(const QString &userName) -{ - Command_GetUserInfo cmd; - cmd.set_user_name(userName.toStdString()); - PendingCommand *pend = client->prepareSessionCommand(cmd); - connect(pend, &PendingCommand::finished, this, &UserContextMenu::banUser_processUserInfoResponse); - client->sendCommand(pend); -} - -void UserContextMenu::execWarn(const QString &userName) -{ - Command_GetUserInfo cmd; - cmd.set_user_name(userName.toStdString()); - PendingCommand *pend = client->prepareSessionCommand(cmd); - connect(pend, &PendingCommand::finished, this, &UserContextMenu::warnUser_processUserInfoResponse); - client->sendCommand(pend); -} - -void UserContextMenu::execBanHistory(const QString &userName) -{ - Command_GetBanHistory cmd; - cmd.set_user_name(userName.toStdString()); - PendingCommand *pend = client->prepareModeratorCommand(cmd); - connect(pend, &PendingCommand::finished, this, &UserContextMenu::banUserHistory_processResponse); - client->sendCommand(pend); -} - -void UserContextMenu::execWarnHistory(const QString &userName) -{ - Command_GetWarnHistory cmd; - cmd.set_user_name(userName.toStdString()); - PendingCommand *pend = client->prepareModeratorCommand(cmd); - connect(pend, &PendingCommand::finished, this, &UserContextMenu::warnUserHistory_processResponse); - client->sendCommand(pend); -} - -void UserContextMenu::execAdminNotes(const QString &userName) -{ - Command_GetAdminNotes cmd; - cmd.set_user_name(userName.toStdString()); - auto *pend = client->prepareModeratorCommand(cmd); - connect(pend, &PendingCommand::finished, this, &UserContextMenu::getAdminNotes_processResponse); - client->sendCommand(pend); -} - -void UserContextMenu::execAdjustMod(const QString &userName, bool shouldBeMod) -{ - Command_AdjustMod cmd; - cmd.set_user_name(userName.toStdString()); - cmd.set_should_be_mod(shouldBeMod); - PendingCommand *pend = client->prepareAdminCommand(cmd); - connect(pend, &PendingCommand::finished, this, &UserContextMenu::adjustMod_processUserResponse); - client->sendCommand(pend); -} - -void UserContextMenu::execAdjustJudge(const QString &userName, bool shouldBeJudge) -{ - Command_AdjustMod cmd; - cmd.set_user_name(userName.toStdString()); - cmd.set_should_be_judge(shouldBeJudge); - PendingCommand *pend = client->prepareAdminCommand(cmd); - connect(pend, &PendingCommand::finished, this, &UserContextMenu::adjustMod_processUserResponse); - client->sendCommand(pend); -} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/server/user/user_context_menu.h b/cockatrice/src/interface/widgets/server/user/user_context_menu.h index 00fdc51fe..0056d74ae 100644 --- a/cockatrice/src/interface/widgets/server/user/user_context_menu.h +++ b/cockatrice/src/interface/widgets/server/user/user_context_menu.h @@ -1,8 +1,8 @@ /** * @file user_context_menu.h * @ingroup Lobby + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef USER_CONTEXT_MENU_H #define USER_CONTEXT_MENU_H @@ -74,29 +74,6 @@ public: int playerId, const QString &deckHash, ChatView *chatView = nullptr); - - const UserListProxy *getUserListProxy() const - { - return userListProxy; - } - - // Individual action entry points — used by UserInfoPopup to trigger - // actions without re-running the full context menu flow. - void execChat(const QString &userName); - void execDetails(const QString &userName); - void execShowGames(const QString &userName); - void execAddToBuddy(const QString &userName); - void execRemoveFromBuddy(const QString &userName); - void execAddToIgnore(const QString &userName); - void execRemoveFromIgnore(const QString &userName); - void execKick(int playerId); - void execBan(const QString &userName); - void execWarn(const QString &userName); - void execBanHistory(const QString &userName); - void execWarnHistory(const QString &userName); - void execAdminNotes(const QString &userName); - void execAdjustMod(const QString &userName, bool shouldBeMod); - void execAdjustJudge(const QString &userName, bool shouldBeJudge); }; #endif 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 416cd42e3..9ae4a42c2 100644 --- a/cockatrice/src/interface/widgets/server/user/user_info_box.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_info_box.cpp @@ -5,7 +5,6 @@ #include "../../interface/widgets/dialogs/dlg_edit_password.h" #include "../../interface/widgets/dialogs/dlg_edit_user.h" #include "../../interface/widgets/utility/get_text_with_max.h" -#include "user_card_settings_dialog.h" #include #include @@ -62,13 +61,11 @@ UserInfoBox::UserInfoBox(AbstractClient *_client, bool _editable, QWidget *paren buttonsLayout->addWidget(&editButton); buttonsLayout->addWidget(&passwordButton); buttonsLayout->addWidget(&avatarButton); - buttonsLayout->addWidget(&bannerCardButton); mainLayout->addLayout(buttonsLayout, 7, 0, 1, 3); connect(&editButton, &QPushButton::clicked, this, &UserInfoBox::actEdit); connect(&passwordButton, &QPushButton::clicked, this, &UserInfoBox::actPassword); connect(&avatarButton, &QPushButton::clicked, this, &UserInfoBox::actAvatar); - connect(&bannerCardButton, &QPushButton::clicked, this, &UserInfoBox::actBannerCard); } setWindowTitle(tr("User Information")); @@ -86,21 +83,26 @@ void UserInfoBox::retranslateUi() editButton.setText(tr("Edit")); passwordButton.setText(tr("Change password")); avatarButton.setText(tr("Change avatar")); - bannerCardButton.setText(tr("Edit Banner Card")); +} + +/** + * Creates the default profile pic that is used when the user doesn't have a custom pic + */ +static QPixmap createDefaultAvatar(int height, const ServerInfo_User &user) +{ + return UserLevelPixmapGenerator::generatePixmap(height, UserLevelFlags(user.user_level()), user.pawn_colors(), + false, QString::fromStdString(user.privlevel())); } void UserInfoBox::updateInfo(const ServerInfo_User &user) { - currentUserInfo = user; - hasUserInfo = true; + currentUserInfo = &user; const UserLevelFlags userLevel(user.user_level()); - pawnColors = user.pawn_colors(); - privLevel = QString::fromStdString(user.privlevel()); const std::string &bmp = user.avatar_bmp(); if (!avatarPixmap.loadFromData((const uchar *)bmp.data(), static_cast(bmp.size()))) { - avatarPixmap = UserLevelPixmapGenerator::generatePixmap(64, userLevel, pawnColors, false, privLevel); + avatarPixmap = createDefaultAvatar(64, user); hasAvatar = false; } else { hasAvatar = true; @@ -118,21 +120,20 @@ void UserInfoBox::updateInfo(const ServerInfo_User &user) countryLabel3.setText(""); } - userLevelIcon.setPixmap(UserLevelPixmapGenerator::generatePixmap(15, userLevel, pawnColors, false, privLevel)); + userLevelIcon.setPixmap(UserLevelPixmapGenerator::generatePixmap(15, userLevel, user.pawn_colors(), false, + QString::fromStdString(user.privlevel()))); QString userLevelText; - if (userLevel.testFlag(ServerInfo_User::IsAdmin)) { + if (userLevel.testFlag(ServerInfo_User::IsAdmin)) userLevelText = tr("Administrator"); - } else if (userLevel.testFlag(ServerInfo_User::IsModerator)) { + else if (userLevel.testFlag(ServerInfo_User::IsModerator)) userLevelText = tr("Moderator"); - } else if (userLevel.testFlag(ServerInfo_User::IsRegistered)) { + else if (userLevel.testFlag(ServerInfo_User::IsRegistered)) userLevelText = tr("Registered user"); - } else { + else userLevelText = tr("Unregistered user"); - } - if (userLevel.testFlag(ServerInfo_User::IsJudge)) { + if (userLevel.testFlag(ServerInfo_User::IsJudge)) userLevelText += " | " + tr("Judge"); - } if (user.has_privlevel() && user.privlevel() != "NONE") { userLevelText += " | " + QString("%1").arg(user.privlevel().c_str()); @@ -151,17 +152,15 @@ void UserInfoBox::updateInfo(const ServerInfo_User &user) QString UserInfoBox::getAgeString(int ageSeconds) { QString accountAgeString = tr("Unknown"); - if (ageSeconds <= 0) { + if (ageSeconds <= 0) return accountAgeString; - } // secsSinceEpoch is in utc auto secsSinceEpoch = QDateTime::currentSecsSinceEpoch() - ageSeconds; // the date is in local time, fromSecsSinceEpoch expects a timestamp from utc and converts it to local time auto date = QDateTime::fromSecsSinceEpoch(secsSinceEpoch).date(); - if (!date.isValid()) { + if (!date.isValid()) return accountAgeString; - } // now can be local time as the date is also local time auto now = QDate::currentDate(); @@ -219,9 +218,8 @@ void UserInfoBox::actEditInternal(const Response &r) QString realName = QString::fromStdString(user.real_name()); DlgEditUser dlg(this, email, country, realName); - if (!dlg.exec()) { + if (!dlg.exec()) return; - } Command_AccountEdit cmd; cmd.set_real_name(dlg.getRealName().toStdString()); @@ -233,9 +231,8 @@ void UserInfoBox::actEditInternal(const Response &r) getTextWithMax(this, tr("Enter Password"), tr("Password verification is required in order to change your email address"), QLineEdit::Password, "", &ok); - if (!ok) { + if (!ok) return; - } cmd.set_password_check(password.toStdString()); cmd.set_email(dlg.getEmail().toStdString()); } // servers that support password hash do not require all fields to be filled anymore @@ -253,9 +250,8 @@ void UserInfoBox::actEditInternal(const Response &r) void UserInfoBox::actPassword() { DlgEditPassword dlg(this); - if (!dlg.exec()) { + if (!dlg.exec()) return; - } auto oldPassword = dlg.getOldPassword(); auto newPassword = dlg.getNewPassword(); @@ -300,9 +296,8 @@ void UserInfoBox::changePassword(const QString &oldPassword, const QString &newP void UserInfoBox::actAvatar() { DlgEditAvatar dlg(this); - if (!dlg.exec()) { + if (!dlg.exec()) return; - } Command_AccountImage cmd; cmd.set_image(dlg.getImage().data(), dlg.getImage().size()); @@ -313,49 +308,6 @@ void UserInfoBox::actAvatar() client->sendCommand(pend); } -void UserInfoBox::actBannerCard() -{ - CardArtParams initial; - if (hasUserInfo && currentUserInfo.has_card_art_params()) { - const auto &cap = currentUserInfo.card_art_params(); - initial.cardName = QString::fromStdString(cap.card_name()); - initial.marginPctL = cap.margin_pct_l(); - initial.marginPctR = cap.margin_pct_r(); - initial.verticalOffset = cap.vertical_offset(); - initial.zoom = cap.zoom(); - } - - UserCardArtSettingsDialog dlg(initial, this); - if (dlg.exec() != QDialog::Accepted) { - return; - } - - const CardArtParams p = dlg.params(); - - Command_SetCardArtParams cmd; - cmd.set_card_name(p.cardName.toStdString()); - if (!p.cardName.isEmpty()) { - cmd.set_card_provider_id(p.cardProviderId.toStdString()); - cmd.set_margin_pct_l(p.marginPctL); - cmd.set_margin_pct_r(p.marginPctR); - cmd.set_vertical_offset(p.verticalOffset); - cmd.set_zoom(p.zoom); - } - - PendingCommand *pend = client->prepareSessionCommand(cmd); - connect(pend, &PendingCommand::finished, this, [p, this](const Response &r) { - if (r.response_code() != Response::RespOk) { - QMessageBox::critical(this, tr("Error"), - tr("The selected card is blacklisted on this server or another error occurred.")); - } else { - updateInfo(nameLabel.text()); // re-fetch so currentUserInfo reflects the change - QMessageBox::information(this, tr("Information"), - p.cardName.isEmpty() ? tr("Banner card removed.") : tr("Banner card updated.")); - } - }); - client->sendCommand(pend); -} - void UserInfoBox::processEditResponse(const Response &r) { switch (r.response_code()) { @@ -413,7 +365,7 @@ void UserInfoBox::processAvatarResponse(const Response &r) break; case Response::RespInternalError: default: - QMessageBox::critical(this, tr("Error"), tr("An error occured while trying to update your avatar.")); + QMessageBox::critical(this, tr("Error"), tr("An error occured while trying to updater your avatar.")); break; } } @@ -425,7 +377,7 @@ void UserInfoBox::resizeEvent(QResizeEvent *event) resizedPixmap = avatarPixmap.scaled(avatarPic.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation); } else { int height = qMin(avatarPic.size().width(), avatarPic.size().height()); - resizedPixmap = UserLevelPixmapGenerator::generatePixmap(height, userLevel, pawnColors, false, privLevel); + resizedPixmap = createDefaultAvatar(height, *currentUserInfo); } avatarPic.setPixmap(resizedPixmap); 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 955cb9d3d..d3d926bed 100644 --- a/cockatrice/src/interface/widgets/server/user/user_info_box.h +++ b/cockatrice/src/interface/widgets/server/user/user_info_box.h @@ -1,8 +1,8 @@ /** * @file user_info_box.h * @ingroup Lobby + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef USERINFOBOX_H #define USERINFOBOX_H @@ -11,10 +11,8 @@ #include #include #include -#include -#include -#include +class ServerInfo_User; class AbstractClient; class Response; @@ -26,14 +24,10 @@ private: bool editable; QLabel avatarPic, userLevelIcon, nameLabel, realNameLabel1, realNameLabel2, countryLabel1, countryLabel2, countryLabel3, userLevelLabel1, userLevelLabel2, accountAgeLabel1, accountAgeLabel2; - QPushButton editButton, passwordButton, avatarButton, bannerCardButton; + QPushButton editButton, passwordButton, avatarButton; QPixmap avatarPixmap; bool hasAvatar; - ServerInfo_User currentUserInfo; - bool hasUserInfo = false; - UserLevelFlags userLevel; - ServerInfo_User::PawnColorsOverride pawnColors; - QString privLevel; + const ServerInfo_User *currentUserInfo; static QString getAgeString(int ageSeconds); @@ -41,6 +35,12 @@ public: UserInfoBox(AbstractClient *_client, bool editable, QWidget *parent = nullptr, Qt::WindowFlags flags = {}); void retranslateUi(); + inline static QPair getDaysAndYearsBetween(const QDate &then, const QDate &now) + { + int years = now.addDays(1 - then.dayOfYear()).year() - then.year(); // there is no yearsTo + int days = then.addYears(years).daysTo(now); + return {days, years}; + } private slots: void processResponse(const Response &r); void processEditResponse(const Response &r); @@ -51,7 +51,6 @@ private slots: void actEditInternal(const Response &r); void actPassword(); void actAvatar(); - void actBannerCard(); public slots: void updateInfo(const ServerInfo_User &user); void updateInfo(const QString &userName); 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 919bc2707..069e438a9 100644 --- a/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp @@ -53,9 +53,8 @@ QStringList UserConnection_Information::getServerInfo(const QString &find) for (int i = 0; i < size; i++) { QString _saveName = servers.getValue(QString("saveName%1").arg(i), "server", "server_details").toString(); - if (find != _saveName) { + if (find != _saveName) continue; - } 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(); @@ -74,9 +73,8 @@ QStringList UserConnection_Information::getServerInfo(const QString &find) break; } - if (_server.empty()) { + if (_server.empty()) qCWarning(UserInfoConnectionLog) << "There was a problem!"; - } return _server; } diff --git a/cockatrice/src/interface/widgets/server/user/user_info_connection.h b/cockatrice/src/interface/widgets/server/user/user_info_connection.h index 6278815a9..cfba22346 100644 --- a/cockatrice/src/interface/widgets/server/user/user_info_connection.h +++ b/cockatrice/src/interface/widgets/server/user/user_info_connection.h @@ -1,8 +1,8 @@ /** * @file user_info_connection.h * @ingroup Client + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef USERCONNECTION_INFORMATION_H #define USERCONNECTION_INFORMATION_H diff --git a/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp b/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp deleted file mode 100644 index 2b4dcb8ed..000000000 --- a/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp +++ /dev/null @@ -1,656 +0,0 @@ -#include "user_info_popup.h" - -#include "../../interface/pixel_map_generator.h" -#include "../../interface/widgets/tabs/tab_supervisor.h" -#include "user_list_painter.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// ── Compact game row delegate ───────────────────────────────────────────────── - -class PopupGameDelegate : public QStyledItemDelegate -{ -public: - using QStyledItemDelegate::QStyledItemDelegate; - - QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const override - { - return QSize(0, 38); - } - - void paint(QPainter *p, const QStyleOptionViewItem &option, const QModelIndex &index) const override - { - const QVariant var = index.data(PopupRoles::GameData); - if (!var.isValid()) { - QStyledItemDelegate::paint(p, option, index); - return; - } - - p->save(); - p->setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing); - - const QRect rect = option.rect; - const ServerInfo_Game game = var.value(); - const bool selected = option.state & QStyle::State_Selected; - - p->fillRect(rect, selected ? QColor(35, 45, 62) : QColor(14, 18, 26)); - - // State colour dot - const QColor dot = game.started() ? QColor(239, 68, 68) - : (game.player_count() >= game.max_players()) ? QColor(249, 115, 22) - : game.with_password() ? QColor(59, 130, 246) - : QColor(34, 197, 94); - p->setPen(Qt::NoPen); - p->setBrush(dot); - p->drawEllipse(QRectF(rect.left() + 9, rect.top() + (rect.height() - 8) / 2.0, 8, 8)); - - // Game title (bold, elided) - QFont tf = option.font; - tf.setBold(true); - p->setFont(tf); - p->setPen(QColor(205, 215, 230)); - const int textX = rect.left() + 26; - const int countW = 52; - const int titleW = rect.width() - textX - countW - 6; - p->drawText(QRect(textX, rect.top(), titleW, rect.height()), Qt::AlignVCenter | Qt::AlignLeft, - QFontMetrics(tf).elidedText(QString::fromStdString(game.description()), Qt::ElideRight, titleW)); - - // Player count - const bool full = game.player_count() >= game.max_players(); - p->setFont(option.font); - p->setPen(full ? QColor(249, 115, 22) : QColor(110, 128, 150)); - p->drawText(QRect(rect.right() - countW - 4, rect.top(), countW, rect.height()), - Qt::AlignVCenter | Qt::AlignRight, - QStringLiteral("%1/%2").arg(game.player_count()).arg(game.max_players())); - - // Row separator - p->setPen(QColor(24, 32, 44)); - p->drawLine(rect.bottomLeft(), rect.bottomRight()); - - p->restore(); - } -}; - -// ── UserInfoHeaderWidget ────────────────────────────────────────────────────── - -UserInfoHeaderWidget::UserInfoHeaderWidget(QWidget *parent) : QWidget(parent) -{ - setFixedHeight(HeaderHeight); - setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); -} - -void UserInfoHeaderWidget::setUserData(const ServerInfo_User &user, - bool online, - const QPixmap &avatar, - const QPixmap &cardArt, - const CardArtParams ¶ms) -{ - m_user = user; - m_online = online; - m_avatar = avatar; - m_cardArt = cardArt; - m_params = params; - update(); -} - -void UserInfoHeaderWidget::paintEvent(QPaintEvent *) -{ - QPainter p(this); - p.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform | QPainter::TextAntialiasing); - - const QRect rect = this->rect(); - const UserLevelFlags level(m_user.user_level()); - const QString userName = QString::fromStdString(m_user.name()); - const QString privLevel = QString::fromStdString(m_user.privlevel()); - - // Dark base - p.fillRect(rect, QColor(14, 18, 26)); - - // ── Card art background ─────────────────────────────────────────────────── - if (!m_cardArt.isNull()) { - const int w = rect.width(); - const int h = rect.height(); - const int mL = qRound(w * m_params.marginPctL); - const int mR = qRound(w * m_params.marginPctR); - const int dW = w - mL - mR; - - const double base = qMax(double(dW) / m_cardArt.width(), double(h) / m_cardArt.height()); - const double scale = base * m_params.zoom; - const int sW = qRound(m_cardArt.width() * scale); - const int sH = qRound(m_cardArt.height() * scale); - - const QPixmap scaled = m_cardArt.scaled(sW, sH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); - const int srcX = (sW - dW) / 2; - const int srcY = qBound(0, qRound((sH - h) * m_params.verticalOffset), qMax(0, sH - h)); - - QImage img = scaled.copy(srcX, srcY, dW, h).toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied); - { - QPainter mask(&img); - mask.setCompositionMode(QPainter::CompositionMode_DestinationIn); - QLinearGradient g(0, 0, img.width(), 0); - g.setColorAt(0.00, Qt::transparent); - g.setColorAt(0.18, Qt::white); - g.setColorAt(0.82, Qt::white); - g.setColorAt(1.00, Qt::transparent); - mask.fillRect(img.rect(), g); - } - p.setOpacity(0.48); - p.drawImage(mL, 0, img); - p.setOpacity(1.0); - } - - // Bottom gradient overlay so avatar and text are always legible - { - QLinearGradient ov(0, 0, 0, rect.height()); - ov.setColorAt(0.0, QColor(14, 18, 26, 0)); - ov.setColorAt(0.55, QColor(14, 18, 26, 110)); - ov.setColorAt(1.0, QColor(14, 18, 26, 230)); - p.fillRect(rect, ov); - } - - // ── Avatar ──────────────────────────────────────────────────────────────── - const QColor accent = [&]() -> QColor { - if (level.testFlag(ServerInfo_User::IsAdmin)) { - return QColor(245, 158, 11); - } - if (level.testFlag(ServerInfo_User::IsModerator)) { - return QColor(59, 130, 246); - } - if (level.testFlag(ServerInfo_User::IsJudge)) { - return QColor(168, 85, 247); - } - return QColor(100, 116, 139); - }(); - - const int ax = LeftPad; - const int ay = rect.height() - AvatarSize - 10; - const QRect ar(ax, ay, AvatarSize, AvatarSize); - - QPainterPath clip; - clip.addEllipse(ar); - p.save(); - p.setClipPath(clip); - - if (!m_avatar.isNull()) { - p.drawPixmap(ar, m_avatar.scaled(ar.size(), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation)); - } else { - p.setPen(Qt::NoPen); - p.setBrush(accent.darker(200)); - p.drawEllipse(ar); - const QPixmap pawn = - UserLevelPixmapGenerator::generatePixmap(AvatarPawnSize, level, m_user.pawn_colors(), false, privLevel); - p.drawPixmap(ar.center().x() - AvatarPawnSize / 2, ar.center().y() - AvatarPawnSize / 2, pawn); - } - p.restore(); - - // Status ring - p.setPen(QPen(m_online ? QColor(34, 197, 94) : QColor(70, 80, 95), 2.5)); - p.setBrush(Qt::NoBrush); - p.drawEllipse(QRectF(ar).adjusted(-1.25, -1.25, 1.25, 1.25)); - - // ── Username + badge ────────────────────────────────────────────────────── - const int tx = ax + AvatarSize + AvatarToTextGap; - const int tw = rect.width() - tx - 8; - - QFont nf = font(); - nf.setBold(true); - nf.setPointSizeF(nf.pointSizeF() * 1.12); - p.setFont(nf); - p.setPen(m_online ? QColor(220, 228, 240) : QColor(90, 100, 115)); - p.drawText(QRect(tx, ay, tw, AvatarSize / 2 + 4), Qt::AlignBottom | Qt::AlignLeft, - QFontMetrics(nf).elidedText(userName, Qt::ElideRight, tw)); - - // Level / priv badge - struct - { - QString text; - QColor color; - } badge; - if (level.testFlag(ServerInfo_User::IsAdmin)) { - badge = {"ADMIN", QColor(245, 158, 11)}; - } else if (level.testFlag(ServerInfo_User::IsModerator)) { - badge = {"MOD", QColor(59, 130, 246)}; - } else if (level.testFlag(ServerInfo_User::IsJudge)) { - badge = {"JUDGE", QColor(168, 85, 247)}; - } else if (privLevel == "VIP") { - badge = {"VIP", QColor(20, 184, 166)}; - } else if (privLevel == "DONATOR") { - badge = {"DONATOR", QColor(249, 115, 22)}; - } - - if (!badge.text.isEmpty()) { - QFont bf = font(); - bf.setPointSizeF(bf.pointSizeF() * 0.70); - bf.setBold(true); - p.setFont(bf); - const QFontMetrics bfm(bf); - const int bw = bfm.horizontalAdvance(badge.text) + 10; - const QRect br(tx, ay + AvatarSize / 2 + 6, bw, 15); - p.setPen(Qt::NoPen); - p.setBrush(badge.color.darker(160)); - p.drawRoundedRect(br, 3, 3); - p.setPen(badge.color.lighter(150)); - p.drawText(br, Qt::AlignCenter, badge.text); - } -} - -// ── UserInfoPopup ───────────────────────────────────────────────────────────── - -UserInfoPopup::UserInfoPopup(TabSupervisor *ts, - AbstractClient *client, - const QMap *avatarCache, - const QMap *cardArtCache, - const QMap *cardArtParamsMap, - QWidget *parent) - : QFrame(parent, Qt::Tool | Qt::FramelessWindowHint), m_ts(ts), m_client(client), m_avatarCache(avatarCache), - m_cardArtCache(cardArtCache), m_cardArtParamsMap(cardArtParamsMap) -{ - setAttribute(Qt::WA_ShowWithoutActivating); - setFixedWidth(PopupWidth); - setFrameShape(QFrame::NoFrame); - buildUi(); -} - -void UserInfoPopup::buildUi() -{ - setStyleSheet(QStringLiteral("UserInfoPopup {" - " background:#0e1218;" - " border:1px solid #1e2838;" - " border-radius:8px;" - "}")); - - auto *root = new QVBoxLayout(this); - root->setContentsMargins(0, 0, 0, 0); - root->setSpacing(0); - - // Header - m_header = new UserInfoHeaderWidget(this); - root->addWidget(m_header); - - // Action area — rebuilt per user - m_actionArea = new QWidget(this); - m_actionArea->setStyleSheet(QStringLiteral("background:#0e1218;")); - root->addWidget(m_actionArea); - - // Thin separator - auto *sep = new QFrame(this); - sep->setFrameShape(QFrame::HLine); - sep->setStyleSheet(QStringLiteral("color:#1a2434; margin: 0 8px;")); - root->addWidget(sep); - - // Games header row - auto *gh = new QHBoxLayout; - gh->setContentsMargins(10, 4, 8, 2); - auto *gl = new QLabel(tr("Games"), this); - gl->setStyleSheet(QStringLiteral("color:#6882a0; font-size:11px; font-weight:bold; background:transparent;")); - gh->addWidget(gl); - gh->addStretch(); - m_refreshBtn = new QPushButton(QStringLiteral("↻"), this); - m_refreshBtn->setFixedSize(20, 20); - m_refreshBtn->setFlat(true); - m_refreshBtn->setStyleSheet( - QStringLiteral("QPushButton{color:#6882a0;border:none;font-size:14px;background:transparent;}" - "QPushButton:hover{color:white;}")); - connect(m_refreshBtn, &QPushButton::clicked, this, &UserInfoPopup::refreshGames); - gh->addWidget(m_refreshBtn); - root->addLayout(gh); - - // Status label - m_gamesStatus = new QLabel(this); - m_gamesStatus->setAlignment(Qt::AlignCenter); - m_gamesStatus->setStyleSheet( - QStringLiteral("color:#3a4a5e; font-size:11px; padding:10px; background:transparent;")); - root->addWidget(m_gamesStatus); - - // Games list - m_gamesModel = new QStandardItemModel(this); - m_gamesView = new QListView(this); - m_gamesView->setModel(m_gamesModel); - m_gamesView->setItemDelegate(new PopupGameDelegate(m_gamesView)); - m_gamesView->setFrameShape(QFrame::NoFrame); - m_gamesView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - m_gamesView->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); - m_gamesView->setMaximumHeight(220); - m_gamesView->setStyleSheet(QStringLiteral("QListView{background:#0e1218;border:none;}" - "QListView::item:selected{background:#232e42;}")); - m_gamesView->setContextMenuPolicy(Qt::CustomContextMenu); - connect(m_gamesView, &QListView::customContextMenuRequested, this, &UserInfoPopup::onGamesContextMenu); - - root->addWidget(m_gamesView); - - // Close button — positioned absolutely in the top-right corner - m_closeBtn = new QPushButton(QStringLiteral("✕"), this); - m_closeBtn->setFixedSize(22, 22); - m_closeBtn->setFlat(true); - m_closeBtn->setStyleSheet(QStringLiteral("QPushButton{background:rgba(14,18,26,180);color:#607080;" - "border:none;border-radius:11px;font-size:10px;}" - "QPushButton:hover{color:white;background:rgba(200,50,50,200);}")); - connect(m_closeBtn, &QPushButton::clicked, this, &UserInfoPopup::closeRequested); -} - -// ── Action button factory ───────────────────────────────────────────────────── - -static QPushButton *makeBtn(const QString &label, const QString &tip, QWidget *p) -{ - auto *b = new QPushButton(label, p); - b->setToolTip(tip); - b->setFixedHeight(26); - b->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - b->setStyleSheet(QStringLiteral("QPushButton{" - " background:#192030;color:#b8c8de;border:1px solid #263040;" - " border-radius:4px;font-size:11px;padding:0 4px;" - "}" - "QPushButton:hover{background:#223050;color:white;}" - "QPushButton:pressed{background:#162030;}" - "QPushButton:disabled{color:#384858;border-color:#192030;}")); - return b; -} - -void UserInfoPopup::rebuildActionButtons(const ServerInfo_User &userInfo, bool online, bool isBuddy, bool isIgnored) -{ - // Clear previous contents - delete m_actionArea->layout(); - const auto old = m_actionArea->findChildren(QString{}, Qt::FindDirectChildrenOnly); - for (auto *w : old) { - w->deleteLater(); - } - - const QString name = QString::fromStdString(userInfo.name()); - const auto ownLevel = UserLevelFlags(m_ts->getUserInfo()->user_level()); - const bool isSelf = (name == QString::fromStdString(m_ts->getUserInfo()->name())); - const bool isMod = ownLevel.testFlag(ServerInfo_User::IsModerator); - const bool isAdmin = ownLevel.testFlag(ServerInfo_User::IsAdmin); - const auto their = UserLevelFlags(userInfo.user_level()); - const bool isReg = their.testFlag(ServerInfo_User::IsRegistered); - - auto *grid = new QGridLayout(m_actionArea); - grid->setContentsMargins(8, 6, 8, 6); - grid->setSpacing(4); - - int row = 0, col = 0; - const int cols = 3; - auto add = [&](QPushButton *btn) { - grid->addWidget(btn, row, col); - if (++col == cols) { - col = 0; - ++row; - } - }; - - // ── Always visible ──────────────────────────────────────────────────────── - auto *chat = makeBtn(tr("Chat"), tr("Open private chat"), m_actionArea); - chat->setEnabled(!isSelf && online); - connect(chat, &QPushButton::clicked, this, [this, name] { emit chatRequested(name); }); - add(chat); - - auto *prof = makeBtn(tr("Profile"), tr("View user profile"), m_actionArea); - connect(prof, &QPushButton::clicked, this, [this, name] { emit detailsRequested(name); }); - add(prof); - - auto *games = makeBtn(tr("Games"), tr("Show this user's games"), m_actionArea); - games->setEnabled(!isSelf && online); - connect(games, &QPushButton::clicked, this, [this, name] { emit showGamesRequested(name); }); - add(games); - - // ── Buddy / ignore (registered users only) ──────────────────────────────── - if (!isSelf && isReg) { - if (isBuddy) { - auto *b = makeBtn(tr("− Buddy"), tr("Remove from buddy list"), m_actionArea); - connect(b, &QPushButton::clicked, this, [this, name] { emit removeBuddyRequested(name); }); - add(b); - } else { - auto *b = makeBtn(tr("+ Buddy"), tr("Add to buddy list"), m_actionArea); - connect(b, &QPushButton::clicked, this, [this, name] { emit addBuddyRequested(name); }); - add(b); - } - if (isIgnored) { - auto *b = makeBtn(tr("− Ignore"), tr("Remove from ignore list"), m_actionArea); - connect(b, &QPushButton::clicked, this, [this, name] { emit removeIgnoreRequested(name); }); - add(b); - } else { - auto *b = makeBtn(tr("+ Ignore"), tr("Add to ignore list"), m_actionArea); - connect(b, &QPushButton::clicked, this, [this, name] { emit addIgnoreRequested(name); }); - add(b); - } - } - - // ── Moderator actions ───────────────────────────────────────────────────── - if (!isSelf && (isMod || isAdmin)) { - if (col != 0) { - ++row; - col = 0; - } // start mod section on a fresh row - - auto *ban = makeBtn(tr("Ban"), tr("Ban from server"), m_actionArea); - auto *warn = makeBtn(tr("Warn"), tr("Warn user"), m_actionArea); - auto *bLog = makeBtn(tr("Ban log"), tr("View ban history"), m_actionArea); - auto *wLog = makeBtn(tr("Warn log"), tr("View warning history"), m_actionArea); - connect(ban, &QPushButton::clicked, this, [this, name] { emit banRequested(name); }); - connect(warn, &QPushButton::clicked, this, [this, name] { emit warnRequested(name); }); - connect(bLog, &QPushButton::clicked, this, [this, name] { emit banHistoryRequested(name); }); - connect(wLog, &QPushButton::clicked, this, [this, name] { emit warnHistoryRequested(name); }); - add(ban); - add(warn); - add(bLog); - add(wLog); - } - - // ── Admin actions ───────────────────────────────────────────────────────── - if (!isSelf && isAdmin) { - auto *notes = makeBtn(tr("Notes"), tr("View admin notes"), m_actionArea); - connect(notes, &QPushButton::clicked, this, [this, name] { emit adminNotesRequested(name); }); - add(notes); - - if (their.testFlag(ServerInfo_User::IsModerator)) { - auto *b = makeBtn(tr("− Mod"), tr("Demote from moderator"), m_actionArea); - connect(b, &QPushButton::clicked, this, [this, name] { emit demoteFromModRequested(name); }); - add(b); - } else if (isReg) { - auto *b = makeBtn(tr("+ Mod"), tr("Promote to moderator"), m_actionArea); - connect(b, &QPushButton::clicked, this, [this, name] { emit promoteToModRequested(name); }); - add(b); - } - if (their.testFlag(ServerInfo_User::IsJudge)) { - auto *b = makeBtn(tr("− Judge"), tr("Demote from judge"), m_actionArea); - connect(b, &QPushButton::clicked, this, [this, name] { emit demoteFromJudgeRequested(name); }); - add(b); - } else if (isReg) { - auto *b = makeBtn(tr("+ Judge"), tr("Promote to judge"), m_actionArea); - connect(b, &QPushButton::clicked, this, [this, name] { emit promoteToJudgeRequested(name); }); - add(b); - } - } - - m_actionArea->adjustSize(); -} - -void UserInfoPopup::updateActionButtons(const ServerInfo_User &userInfo, bool online, bool isBuddy, bool isIgnored) -{ - rebuildActionButtons(userInfo, online, isBuddy, isIgnored); - adjustSize(); -} - -void UserInfoPopup::onGamesContextMenu(const QPoint &pos) -{ - const QModelIndex idx = m_gamesView->indexAt(pos); - if (!idx.isValid()) { - return; - } - - const QVariant var = idx.data(PopupRoles::GameData); - if (!var.isValid()) { - return; - } - const ServerInfo_Game game = var.value(); - - QMenu menu(this); - menu.setStyleSheet( - QStringLiteral("QMenu{background:#12182a;color:#c8d8ec;border:1px solid #1e2838;border-radius:4px;}" - "QMenu::item:selected{background:#223050;}")); - - const bool canJoin = !game.started() && game.player_count() < game.max_players(); - QAction *join = menu.addAction(tr("Join game")); - join->setEnabled(canJoin); - - QAction *spec = nullptr; - if (game.spectators_allowed()) { - spec = menu.addAction(tr("Spectate")); - } - - const QAction *chosen = menu.exec(m_gamesView->viewport()->mapToGlobal(pos)); - if (!chosen) { - return; - } - - if (chosen == join) { - emit joinGameRequested(game.game_id(), game.room_id(), false); - } else if (spec && chosen == spec) { - emit joinGameRequested(game.game_id(), game.room_id(), true); - } -} - -// ── showForUser ─────────────────────────────────────────────────────────────── - -void UserInfoPopup::showForUser(const QString &userName, - const ServerInfo_User &userInfo, - bool online, - bool isBuddy, - bool isIgnored) -{ - m_currentUser = userName; - m_currentUserInfo = userInfo; - m_currentOnline = online; - - // Header - const QPixmap avatar = m_avatarCache ? m_avatarCache->value(userName) : QPixmap{}; - const CardArtParams params = (m_cardArtParamsMap && m_cardArtParamsMap->contains(userName)) - ? m_cardArtParamsMap->value(userName) - : CardArtParams{}; - const QString artKey = userName + u'|' + params.cardName + u'|' + params.cardProviderId; - const QPixmap cardArt = (m_cardArtCache && !params.cardName.isEmpty()) ? m_cardArtCache->value(artKey) : QPixmap{}; - m_header->setUserData(userInfo, online, avatar, cardArt, params); - - // Actions - rebuildActionButtons(userInfo, online, isBuddy, isIgnored); - - // Games list reset - m_gamesModel->clear(); - m_gamesView->hide(); - m_gamesStatus->setText(tr("Loading games…")); - m_gamesStatus->show(); - - // Close button — top-right corner, above everything - m_closeBtn->move(PopupWidth - m_closeBtn->width() - 6, 6); - m_closeBtn->raise(); - - adjustSize(); - fetchGames(); -} - -// ── Games fetch ─────────────────────────────────────────────────────────────── - -void UserInfoPopup::fetchGames() -{ - if (!m_client || m_currentUser.isEmpty()) { - return; - } - - Command_GetGamesOfUser cmd; - cmd.set_user_name(m_currentUser.toStdString()); - - const QString snapshot = m_currentUser; - PendingCommand *pend = m_client->prepareSessionCommand(cmd); - connect(pend, &PendingCommand::finished, this, - [this, snapshot](const Response &r) { onGamesReceived(r, snapshot); }); - m_client->sendCommand(pend); -} - -void UserInfoPopup::onGamesReceived(const Response &r, const QString &forUser) -{ - if (forUser != m_currentUser) { - return; // stale response — different user showing now - } - - m_gamesModel->clear(); - - if (r.response_code() != Response::RespOk) { - m_gamesStatus->setText(tr("Could not load games.")); - m_gamesStatus->show(); - m_gamesView->hide(); - return; - } - - const auto &resp = r.GetExtension(Response_GetGamesOfUser::ext); - if (resp.game_list_size() == 0) { - m_gamesStatus->setText(tr("No active games.")); - m_gamesStatus->show(); - m_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); - m_gamesModel->appendRow(item); - } - - m_gamesStatus->hide(); - m_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 = m_gamesModel->rowCount(); - const int visible = qMin(count, maxRows); - m_gamesView->setFixedHeight(visible * rowH + 2); - m_gamesView->setVerticalScrollBarPolicy(count > maxRows ? Qt::ScrollBarAlwaysOn : Qt::ScrollBarAlwaysOff); - - adjustSize(); -} - -void UserInfoPopup::refreshGames() -{ - m_gamesModel->clear(); - m_gamesView->hide(); - m_gamesStatus->setText(tr("Loading games…")); - m_gamesStatus->show(); - fetchGames(); -} - -// ── Mouse events ────────────────────────────────────────────────────────────── - -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -void UserInfoPopup::enterEvent(QEnterEvent *e) -{ - QFrame::enterEvent(e); - emit mouseEnteredPopup(); -} -#else -void UserInfoPopup::enterEvent(QEvent *e) -{ - QFrame::enterEvent(e); - emit mouseEnteredPopup(); -} -#endif -void UserInfoPopup::leaveEvent(QEvent *e) -{ - QFrame::leaveEvent(e); - emit mouseLeftPopup(); -} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/server/user/user_info_popup.h b/cockatrice/src/interface/widgets/server/user/user_info_popup.h deleted file mode 100644 index 0e03147c4..000000000 --- a/cockatrice/src/interface/widgets/server/user/user_info_popup.h +++ /dev/null @@ -1,181 +0,0 @@ -#ifndef COCKATRICE_USER_INFO_POPUP_H -#define COCKATRICE_USER_INFO_POPUP_H - -#include "../../interface/widgets/server/game_type_map.h" -#include "user_list_painter.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -class AbstractClient; -class QLabel; -class QPushButton; -class TabSupervisor; - -// ── Roles ───────────────────────────────────────────────────────────────────── - -namespace PopupRoles -{ -constexpr int GameData = Qt::UserRole + 10; -} - -// ── Header widget ───────────────────────────────────────────────────────────── - -/** - * @class UserInfoHeaderWidget - * @brief Paints the enlarged banner card art + circular avatar section at the - * top of the UserInfoPopup. - * - * Layout mirrors UserListPainter but at a larger scale: the card art fills the - * full width as a semi-transparent background, a bottom gradient ensures the - * avatar and username text remain legible, and the status ring colour matches - * the UserListPainter convention. - */ -class UserInfoHeaderWidget : public QWidget -{ - Q_OBJECT - - static constexpr int HeaderHeight = 130; - static constexpr int AvatarSize = 68; - static constexpr int AvatarPawnSize = 46; - static constexpr int LeftPad = 14; - static constexpr int AvatarToTextGap = 10; - -public: - explicit UserInfoHeaderWidget(QWidget *parent = nullptr); - - void setUserData(const ServerInfo_User &user, - bool online, - const QPixmap &avatar, - const QPixmap &cardArt, - const CardArtParams ¶ms); - -protected: - void paintEvent(QPaintEvent *e) override; - -private: - ServerInfo_User m_user; - bool m_online = false; - QPixmap m_avatar; - QPixmap m_cardArt; - CardArtParams m_params; -}; - -// ── Main popup ──────────────────────────────────────────────────────────────── - -/** - * @class UserInfoPopup - * @brief Floating panel showing an enlarged user card, quick action buttons, - * and a live scrollable games list. - * - * Lifecycle (mirrors DeckEditorDeckDockWidget): - * - showForUser() — populate, position externally, call show() - * - mouseEnteredPopup / mouseLeftPopup — caller manages hide timer - * - closeRequested() — emitted by the internal close button - * - * The popup is a Qt::Tool frameless child so windowOpacity animations and - * move() in screen coordinates work identically to CardInfoPictureEnlargedWidget. - * - * Action signals map 1-to-1 to UserContextMenu::exec*() methods so all action - * logic stays in one place. - */ -class UserInfoPopup : public QFrame -{ - Q_OBJECT - - static constexpr int PopupWidth = 316; - -public: - explicit UserInfoPopup(TabSupervisor *tabSupervisor, - AbstractClient *client, - const QMap *avatarCache, - const QMap *cardArtCache, - const QMap *cardArtParamsMap, - QWidget *parent); - - /** - * Populate the popup for @p userName and kick off a game list fetch. - * Call show() / move() externally after this. - */ - void - showForUser(const QString &userName, const ServerInfo_User &userInfo, bool online, bool isBuddy, bool isIgnored); - void fetchGames(); - - [[nodiscard]] QString currentUser() const - { - return m_currentUser; - } - - /** Called when buddy/ignore status changes externally while popup is open. */ - void updateActionButtons(const ServerInfo_User &userInfo, bool online, bool isBuddy, bool isIgnored); - -signals: - void mouseEnteredPopup(); - void mouseLeftPopup(); - void closeRequested(); - - /** Emitted when the user requests joining or spectating a game in the list. */ - void joinGameRequested(int gameId, int roomId, bool asSpectator); - - // ── Action signals — connect to UserContextMenu::exec*() ────────────────── - void chatRequested(const QString &userName); - void detailsRequested(const QString &userName); - void showGamesRequested(const QString &userName); - void addBuddyRequested(const QString &userName); - void removeBuddyRequested(const QString &userName); - void addIgnoreRequested(const QString &userName); - void removeIgnoreRequested(const QString &userName); - void banRequested(const QString &userName); - void warnRequested(const QString &userName); - void banHistoryRequested(const QString &userName); - void warnHistoryRequested(const QString &userName); - void adminNotesRequested(const QString &userName); - void promoteToModRequested(const QString &userName); - void demoteFromModRequested(const QString &userName); - void promoteToJudgeRequested(const QString &userName); - void demoteFromJudgeRequested(const QString &userName); - -protected: -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) - void enterEvent(QEnterEvent *e) override; -#else - void enterEvent(QEvent *e) override; -#endif - void leaveEvent(QEvent *e) override; - -private slots: - void refreshGames(); - void onGamesReceived(const Response &r, const QString &forUser); - void onGamesContextMenu(const QPoint &pos); - -private: - void buildUi(); - void rebuildActionButtons(const ServerInfo_User &userInfo, bool online, bool isBuddy, bool isIgnored); - - TabSupervisor *m_ts; - AbstractClient *m_client; - const QMap *m_avatarCache; - const QMap *m_cardArtCache; - const QMap *m_cardArtParamsMap; - - QString m_currentUser; - ServerInfo_User m_currentUserInfo; - bool m_currentOnline = false; - - UserInfoHeaderWidget *m_header; - QWidget *m_actionArea; ///< rebuilt per user - QListView *m_gamesView; - QStandardItemModel *m_gamesModel; - QLabel *m_gamesStatus; - QPushButton *m_closeBtn; - QPushButton *m_refreshBtn; -}; - -#endif // COCKATRICE_USER_INFO_POPUP_H \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/server/user/user_list_manager.cpp b/cockatrice/src/interface/widgets/server/user/user_list_manager.cpp index 216420006..4bc2c84d6 100644 --- a/cockatrice/src/interface/widgets/server/user/user_list_manager.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_list_manager.cpp @@ -42,9 +42,6 @@ void UserListManager::handleDisconnect() delete ownUserInfo; ownUserInfo = nullptr; - - // Full rebuild — all lists are gone - emit listReset(); } void UserListManager::setOwnUserInfo(const ServerInfo_User &userInfo) @@ -66,77 +63,74 @@ void UserListManager::processListUsersResponse(const Response &response) const int userListSize = resp.user_list_size(); for (int i = 0; i < userListSize; ++i) { const ServerInfo_User &info = resp.user_list(i); - onlineUsers.insert(QString::fromStdString(info.name()), info); + const QString &userName = QString::fromStdString(info.name()); + onlineUsers.insert(userName, info); } - - // Bulk load complete — widgets rebuild once from the now-populated map - emit listReset(); } void UserListManager::processUserJoinedEvent(const Event_UserJoined &event) { const auto &info = event.user_info(); - const QString name = QString::fromStdString(info.name()); - onlineUsers.insert(name, info); - - emit userJoinedOnline(info); + const QString &userName = QString::fromStdString(info.name()); + onlineUsers.insert(userName, info); } void UserListManager::processUserLeftEvent(const Event_UserLeft &event) { - const QString name = QString::fromStdString(event.name()); - onlineUsers.remove(name); - - emit userLeftOnline(name); + const auto &userName = QString::fromStdString(event.name()); + onlineUsers.remove(userName); } void UserListManager::buddyListReceived(const QList &_buddyList) { for (const auto &user : _buddyList) { - buddyUsers.insert(QString::fromStdString(user.name()), user); + const auto &userName = QString::fromStdString(user.name()); + buddyUsers.insert(userName, user); } - - // Bulk load — one reset covers all newly added entries - emit listReset(); } void UserListManager::ignoreListReceived(const QList &_ignoreList) { for (const auto &user : _ignoreList) { - ignoredUsers.insert(QString::fromStdString(user.name()), user); + const auto &userName = QString::fromStdString(user.name()); + ignoredUsers.insert(userName, user); } - - // Bulk load — one reset covers all newly added entries - emit listReset(); } void UserListManager::processAddToListEvent(const Event_AddToList &event) { const auto &user = event.user_info(); - const QString userName = QString::fromStdString(user.name()); - const QString listType = QString::fromStdString(event.list_name()); + const auto &userName = QString::fromStdString(user.name()); - if (listType == "buddy") { - buddyUsers.insert(userName, user); - emit addedToBuddyList(user); - } else if (listType == "ignore") { - ignoredUsers.insert(userName, user); - emit addedToIgnoreList(user); + const auto &userListType = QString::fromStdString(event.list_name()); + + QMap *userMap; + if (userListType == "buddy") { + userMap = &buddyUsers; + } else if (userListType == "ignore") { + userMap = &ignoredUsers; + } else { + return; } + + userMap->insert(userName, user); } void UserListManager::processRemoveFromListEvent(const Event_RemoveFromList &event) { - const QString listType = QString::fromStdString(event.list_name()); - const QString userName = QString::fromStdString(event.user_name()); + const auto &userListType = QString::fromStdString(event.list_name()); + const auto &userName = QString::fromStdString(event.user_name()); - if (listType == "buddy") { - buddyUsers.remove(userName); - emit removedFromBuddyList(userName); - } else if (listType == "ignore") { - ignoredUsers.remove(userName); - emit removedFromIgnoreList(userName); + QMap *userMap; + if (userListType == "buddy") { + userMap = &buddyUsers; + } else if (userListType == "ignore") { + userMap = &ignoredUsers; + } else { + return; } + + userMap->remove(userName); } bool UserListManager::isOwnUserRegistered() const @@ -161,9 +155,16 @@ bool UserListManager::isUserIgnored(const QString &userName) const const ServerInfo_User *UserListManager::getOnlineUser(const QString &userName) const { - const QString lower = userName.toLower(); - const auto it = std::find_if(onlineUsers.begin(), onlineUsers.end(), [&lower](const ServerInfo_User &user) { - return lower == QString::fromStdString(user.name()).toLower(); - }); - return it != onlineUsers.end() ? &*it : nullptr; + const QString &userNameToMatchLower = userName.toLower(); + + const auto it = + std::find_if(onlineUsers.begin(), onlineUsers.end(), [&userNameToMatchLower](const ServerInfo_User &user) { + return userNameToMatchLower == QString::fromStdString(user.name()).toLower(); + }); + + if (it != onlineUsers.end()) { + return &*it; + } + + return nullptr; } \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/server/user/user_list_manager.h b/cockatrice/src/interface/widgets/server/user/user_list_manager.h index 6238f0799..f378bd08d 100644 --- a/cockatrice/src/interface/widgets/server/user/user_list_manager.h +++ b/cockatrice/src/interface/widgets/server/user/user_list_manager.h @@ -1,8 +1,8 @@ /** * @file user_list_manager.h * @ingroup Lobby + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_USER_LIST_MANAGER_H #define COCKATRICE_USER_LIST_MANAGER_H @@ -47,17 +47,15 @@ public: explicit UserListManager(AbstractClient *_client, QObject *parent = nullptr); ~UserListManager() override; - [[nodiscard]] const QMap &getAllUsersList() const + [[nodiscard]] QMap getAllUsersList() const { return onlineUsers; } - - [[nodiscard]] const QMap &getBuddyList() const + [[nodiscard]] QMap getBuddyList() const { return buddyUsers; } - - [[nodiscard]] const QMap &getIgnoreList() const + [[nodiscard]] QMap getIgnoreList() const { return ignoredUsers; } @@ -73,26 +71,8 @@ public slots: void handleDisconnect(); signals: - /** - * The entire list needs to be rebuilt from scratch. - * Fired on disconnect, reconnect, and initial bulk loads - * (Command_ListUsers response, initial buddy/ignore lists). - */ - void listReset(); - - // ── Online user presence ────────────────────────────────────────────────── - /** A user came online (or joined the room). Full ServerInfo_User available. */ - void userJoinedOnline(const ServerInfo_User &user); - /** A user went offline (or left the room). */ - void userLeftOnline(const QString &userName); - - // ── Buddy list mutations (individual, post-login) ───────────────────────── - void addedToBuddyList(const ServerInfo_User &user); - void removedFromBuddyList(const QString &userName); - - // ── Ignore list mutations (individual, post-login) ──────────────────────── - void addedToIgnoreList(const ServerInfo_User &user); - void removedFromIgnoreList(const QString &userName); + void userLeft(const QString &userName); + void userJoined(const ServerInfo_User &userInfo); }; #endif // COCKATRICE_USER_LIST_MANAGER_H diff --git a/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp b/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp deleted file mode 100644 index 8891ff268..000000000 --- a/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp +++ /dev/null @@ -1,342 +0,0 @@ -#include "user_list_painter.h" - -#include "../../interface/pixel_map_generator.h" - -#include -#include -#include -#include -#include -#include - -static constexpr int RowHeight = 72; -static constexpr int AvatarSize = 36; -static constexpr int LeftPadding = 14; -static constexpr int TextSpacing = 10; - -QSize UserListPainter::sizeHint() -{ - return QSize(0, RowHeight); -} - -QColor UserListPainter::getAccentColor(const UserLevelFlags &userLevel, bool online) -{ - QColor accentColor; - - if (userLevel.testFlag(ServerInfo_User::IsAdmin)) { - accentColor = QColor(245, 158, 11); - } else if (userLevel.testFlag(ServerInfo_User::IsModerator)) { - accentColor = QColor(59, 130, 246); - } else if (userLevel.testFlag(ServerInfo_User::IsJudge)) { - accentColor = QColor(168, 85, 247); - } else { - accentColor = QColor(100, 116, 139); - } - - if (!online) { - accentColor = accentColor.darker(160); - } - - return accentColor; -} - -int UserListPainter::getCardRight(const QStyleOptionViewItem &option, const QRect &rect) -{ - int scrollBarWidth = 0; - - if (const auto *scrollArea = qobject_cast(option.widget)) { - const QScrollBar *sb = scrollArea->verticalScrollBar(); - if (sb && sb->isVisible()) { - scrollBarWidth = sb->width(); - } - } - - const int viewportRight = option.widget ? option.widget->width() - scrollBarWidth : rect.right(); - - return qMin(rect.right(), viewportRight - 4); -} - -void UserListPainter::drawBackground(QPainter *painter, - const QRectF &cardRect, - const QColor &accentColor, - bool selected) -{ - QLinearGradient bg(cardRect.topLeft(), cardRect.topRight()); - bg.setColorAt(0, selected ? accentColor.darker(130) : accentColor.darker(320)); - bg.setColorAt(1, selected ? QColor(40, 48, 60) : QColor(18, 22, 30)); - - painter->setPen(Qt::NoPen); - painter->setBrush(bg); - painter->drawRoundedRect(cardRect, 6, 6); - - painter->setBrush(accentColor); - painter->drawRoundedRect(QRectF(cardRect.left(), cardRect.top(), 3, cardRect.height()), 2, 2); -} - -static QString makeKey(const QString &user, const QString &card, const QString &providerId) -{ - return user + u'|' + card + u'|' + providerId; -} - -void UserListPainter::drawCardArt(QPainter *painter, - const QRect &rect, - int cardRight, - const QString &userName, - const QMap *cardArtCache, - const CardArtParams ¶ms, - const QPixmap *overridePixmap = nullptr) -{ - QPixmap art; - - if (overridePixmap && !overridePixmap->isNull()) { - art = *overridePixmap; - } else { - if (!cardArtCache) { - return; - } - - const QString key = makeKey(userName, params.cardName, params.cardProviderId); - - if (!cardArtCache->contains(key)) { - return; - } - - art = cardArtCache->value(key); - } - - if (art.isNull()) { - return; - } - - const int cardH = rect.height() - 4; - const int totalW = cardRight - rect.left(); - const int marginL = qRound(totalW * params.marginPctL); - const int marginR = qRound(totalW * params.marginPctR); - const int drawW = totalW - marginL - marginR; - - const double basescale = qMax(double(drawW) / art.width(), double(cardH) / art.height()); - const double scale = basescale * params.zoom; - - const int scaledW = qRound(art.width() * scale); - const int scaledH = qRound(art.height() * scale); - - const QPixmap scaled = art.scaled(scaledW, scaledH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); - - const int srcX = (scaledW - drawW) / 2; - const int srcY = qRound((scaledH - cardH) * params.verticalOffset); - - // Clamp srcY so we never copy outside the pixmap bounds - const int safeSrcY = qBound(0, srcY, qMax(0, scaledH - cardH)); - - QImage img = - scaled.copy(srcX, safeSrcY, drawW, cardH).toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied); - - { - QPainter mask(&img); - mask.setCompositionMode(QPainter::CompositionMode_DestinationIn); - - QLinearGradient grad(0, 0, img.width(), 0); - grad.setColorAt(0.00, Qt::transparent); - grad.setColorAt(0.22, Qt::white); - grad.setColorAt(0.78, Qt::white); - grad.setColorAt(1.00, Qt::transparent); - - mask.fillRect(img.rect(), grad); - } - - painter->setOpacity(0.55); - painter->drawImage(rect.left() + marginL, rect.top() + 2, img); - painter->setOpacity(1.0); -} - -QRect UserListPainter::getAvatarRect(const QRect &rect) -{ - const int avatarX = rect.left() + LeftPadding; - const int avatarY = rect.top() + (rect.height() - AvatarSize) / 2; - return QRect(avatarX, avatarY, AvatarSize, AvatarSize); -} - -void UserListPainter::drawAvatar(QPainter *painter, - const QRect &avatarRect, - const QString &userName, - const QColor &accentColor, - const UserLevelFlags &userLevel, - const ServerInfo_User &userInfo, - const QString &privLevel, - const QMap *avatarCache) -{ - QPainterPath clipPath; - clipPath.addEllipse(avatarRect); - - painter->save(); - painter->setClipPath(clipPath); - - bool drewAvatar = false; - - if (avatarCache && avatarCache->contains(userName)) { - const QPixmap &avatar = avatarCache->value(userName); - if (!avatar.isNull()) { - painter->drawPixmap( - avatarRect, avatar.scaled(avatarRect.size(), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation)); - drewAvatar = true; - } - } - - if (!drewAvatar) { - painter->setBrush(accentColor.darker(200)); - painter->setPen(Qt::NoPen); - painter->drawEllipse(avatarRect); - - const QPixmap pawn = - UserLevelPixmapGenerator::generatePixmap(24, userLevel, userInfo.pawn_colors(), false, privLevel); - - painter->drawPixmap(avatarRect.center().x() - 12, avatarRect.center().y() - 12, pawn); - } - - painter->restore(); -} - -void UserListPainter::drawStatusRing(QPainter *painter, const QRect &avatarRect, bool online) -{ - const QColor statusColor = online ? QColor(34, 197, 94) : QColor(70, 80, 95); - - painter->setPen(QPen(statusColor, 2)); - painter->setBrush(Qt::NoBrush); - painter->drawEllipse(avatarRect.adjusted(-1, -1, 1, 1)); -} - -void UserListPainter::drawUserName(QPainter *painter, - const QStyleOptionViewItem &option, - const QRect &rect, - int cardRight, - int textX, - const QString &userName, - bool online, - bool selected) -{ - QFont nameFont = option.font; - nameFont.setBold(true); - painter->setFont(nameFont); - - const QRect nameRect(textX, rect.top() + 8, cardRight - textX - 10, 20); - const QString elidedName = QFontMetrics(nameFont).elidedText(userName, Qt::ElideRight, cardRight - textX - 10); - - painter->setPen(QColor(0, 0, 0, 200)); - painter->drawText(nameRect.translated(1, 1), Qt::AlignVCenter | Qt::AlignLeft, elidedName); - - painter->setPen(online ? (selected ? Qt::white : QColor(226, 232, 240)) : QColor(90, 100, 115)); - painter->drawText(nameRect, Qt::AlignVCenter | Qt::AlignLeft, elidedName); -} - -void UserListPainter::drawCountryFlag(QPainter *painter, const QRect &rect, int textX, const ServerInfo_User &userInfo) -{ - const QPixmap flag = CountryPixmapGenerator::generatePixmap(13, QString::fromStdString(userInfo.country())); - if (!flag.isNull()) { - painter->drawPixmap(textX, rect.top() + 46, flag); - } -} - -QList UserListPainter::buildBadges(const UserLevelFlags &userLevel, const QString &privLevel) -{ - QList badges; - - if (userLevel.testFlag(ServerInfo_User::IsAdmin)) { - badges << Badge{"ADMIN", QColor(245, 158, 11)}; - } else if (userLevel.testFlag(ServerInfo_User::IsModerator)) { - badges << Badge{"MOD", QColor(59, 130, 246)}; - } else if (userLevel.testFlag(ServerInfo_User::IsJudge)) { - badges << Badge{"JUDGE", QColor(168, 85, 247)}; - } - - if (privLevel == "VIP") { - badges << Badge{"VIP", QColor(20, 184, 166)}; - } else if (privLevel == "DONATOR") { - badges << Badge{"DONATOR", QColor(249, 115, 22)}; - } - - return badges; -} - -void UserListPainter::drawBadges(QPainter *painter, - const QStyleOptionViewItem &option, - const QRect &rect, - int cardRight, - const QList &badges, - bool online) -{ - if (badges.isEmpty()) { - return; - } - - QFont badgeFont = option.font; - badgeFont.setPointSizeF(badgeFont.pointSizeF() * 0.68); - badgeFont.setBold(true); - painter->setFont(badgeFont); - - QFontMetrics fm(badgeFont); - - int totalBadgeW = 0; - for (const Badge &b : badges) { - totalBadgeW += fm.horizontalAdvance(b.text) + 8 + 4; - } - totalBadgeW -= 4; - - int bx = cardRight - 6 - totalBadgeW; - - for (const Badge &b : badges) { - const QColor col = online ? b.color : b.color.darker(180); - const int bw = fm.horizontalAdvance(b.text) + 8; - const QRect br(bx, rect.top() + 44, bw, 13); - - painter->setPen(Qt::NoPen); - painter->setBrush(col.darker(online ? 160 : 220)); - painter->drawRoundedRect(br, 3, 3); - - painter->setPen(col.lighter(online ? 160 : 100)); - painter->drawText(br, Qt::AlignCenter, b.text); - - bx += bw + 4; - } -} - -void UserListPainter::paint(QPainter *painter, - const QStyleOptionViewItem &option, - const QModelIndex &index, - const ServerInfo_User &userInfo, - const QMap *avatarCache, - const QMap *cardArtCache, - const QMap *cardArtParamsMap) -{ - painter->save(); - painter->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform | QPainter::TextAntialiasing); - - const QRect rect = option.rect; - const bool online = index.data(Qt::UserRole + 1).toBool(); - const bool selected = option.state & QStyle::State_Selected; - const UserLevelFlags userLevel(userInfo.user_level()); - const QString userName = QString::fromStdString(userInfo.name()); - const QString privLevel = QString::fromStdString(userInfo.privlevel()); - const QColor accentColor = getAccentColor(userLevel, online); - const QRectF cardRect = QRectF(rect).adjusted(3, 2, -3, -2); - const int cardRight = getCardRight(option, rect); - - const CardArtParams params = (cardArtParamsMap && cardArtParamsMap->contains(userName)) - ? cardArtParamsMap->value(userName) - : CardArtParams{}; - - drawBackground(painter, cardRect, accentColor, selected); - drawCardArt(painter, rect, cardRight, userName, cardArtCache, params); - - const QRect avatarRect = getAvatarRect(rect); - drawAvatar(painter, avatarRect, userName, accentColor, userLevel, userInfo, privLevel, avatarCache); - drawStatusRing(painter, avatarRect, online); - - const int textX = avatarRect.right() + TextSpacing; - drawUserName(painter, option, rect, cardRight, textX, userName, online, selected); - drawCountryFlag(painter, rect, textX, userInfo); - - const QList badges = buildBadges(userLevel, privLevel); - drawBadges(painter, option, rect, cardRight, badges, online); - - painter->restore(); -} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/server/user/user_list_painter.h b/cockatrice/src/interface/widgets/server/user/user_list_painter.h deleted file mode 100644 index 28cab9675..000000000 --- a/cockatrice/src/interface/widgets/server/user/user_list_painter.h +++ /dev/null @@ -1,87 +0,0 @@ -#ifndef COCKATRICE_USER_LIST_PAINTER_H -#define COCKATRICE_USER_LIST_PAINTER_H - -#include "user_level.h" - -#include -#include -#include -#include -#include -#include - -class QPainter; -class QModelIndex; -class QStyleOptionViewItem; -class ServerInfo_User; - -struct CardArtParams -{ - QString cardName = ""; - QString cardProviderId = ""; - double marginPctL = 0.33; - double marginPctR = 0.02; - double verticalOffset = 0.35; - double zoom = 1.0; -}; - -class UserListPainter -{ -public: - static void paint(QPainter *painter, - const QStyleOptionViewItem &option, - const QModelIndex &index, - const ServerInfo_User &userInfo, - const QMap *avatarCache, - const QMap *cardArtCache, - const QMap *cardArtParamsMap); - - static QSize sizeHint(); - - static void drawCardArt(QPainter *painter, - const QRect &rect, - int cardRight, - const QString &userName, - const QMap *cardArtCache, - const CardArtParams ¶ms, - const QPixmap *overridePixmap); - -private: - struct Badge - { - QString text; - QColor color; - }; - - static QColor getAccentColor(const UserLevelFlags &userLevel, bool online); - static int getCardRight(const QStyleOptionViewItem &option, const QRect &rect); - static void drawBackground(QPainter *painter, const QRectF &cardRect, const QColor &accentColor, bool selected); - static QRect getAvatarRect(const QRect &rect); - static void drawAvatar(QPainter *painter, - const QRect &avatarRect, - const QString &userName, - const QColor &accentColor, - const UserLevelFlags &userLevel, - const ServerInfo_User &userInfo, - const QString &privLevel, - const QMap *avatarCache); - static void drawStatusRing(QPainter *painter, const QRect &avatarRect, bool online); - static void drawUserName(QPainter *painter, - const QStyleOptionViewItem &option, - const QRect &rect, - int cardRight, - int textX, - const QString &userName, - bool online, - bool selected); - static void drawCountryFlag(QPainter *painter, const QRect &rect, int textX, const ServerInfo_User &userInfo); - static QList buildBadges(const UserLevelFlags &userLevel, const QString &privLevel); - static void drawBadges(QPainter *painter, - const QStyleOptionViewItem &option, - const QRect &rect, - int cardRight, - const QList &badges, - bool online); -}; - -#endif // COCKATRICE_USER_LIST_PAINTER_H \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/server/user/user_list_proxy.h b/cockatrice/src/interface/widgets/server/user/user_list_proxy.h index 626f89b8f..bff76077f 100644 --- a/cockatrice/src/interface/widgets/server/user/user_list_proxy.h +++ b/cockatrice/src/interface/widgets/server/user/user_list_proxy.h @@ -2,8 +2,8 @@ * @file user_list_proxy.h * @ingroup UI * @ingroup Lobby + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_USERLISTPROXY_H #define COCKATRICE_USERLISTPROXY_H 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 09480b1a1..852743479 100644 --- a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp @@ -1,13 +1,10 @@ #include "user_list_widget.h" -#include "../../../../client/settings/cache_settings.h" -#include "../../../card_picture_loader/card_picture_loader.h" #include "../../interface/pixel_map_generator.h" #include "../../interface/widgets/tabs/tab_account.h" #include "../../interface/widgets/tabs/tab_supervisor.h" #include "../game_selector.h" #include "user_context_menu.h" -#include "user_list_painter.h" #include #include @@ -18,19 +15,14 @@ #include #include #include -#include -#include #include #include #include #include #include -#include #include #include -#include -#include -#include +#include BanDialog::BanDialog(const ServerInfo_User &info, QWidget *parent) : QDialog(parent) { @@ -48,9 +40,8 @@ BanDialog::BanDialog(const ServerInfo_User &info, QWidget *parent) : QDialog(par idBanCheckBox->setChecked(true); idBanEdit = new QLineEdit(QString::fromStdString(info.clientid())); idBanEdit->setMaxLength(MAX_NAME_LENGTH); - if (QString::fromStdString(info.clientid()).isEmpty()) { + if (QString::fromStdString(info.clientid()).isEmpty()) idBanCheckBox->setChecked(false); - } QGridLayout *banTypeGrid = new QGridLayout; banTypeGrid->addWidget(nameBanCheckBox, 0, 0); @@ -216,30 +207,27 @@ void BanDialog::okClicked() return; } - if (nameBanCheckBox->isChecked()) { + if (nameBanCheckBox->isChecked()) if (nameBanEdit->text().simplified() == "") { QMessageBox::critical(this, tr("Error"), tr("You must have a value in the name ban when selecting the name ban checkbox.")); return; } - } - if (ipBanCheckBox->isChecked()) { + if (ipBanCheckBox->isChecked()) if (ipBanEdit->text().simplified() == "") { QMessageBox::critical(this, tr("Error"), tr("You must have a value in the ip ban when selecting the ip ban checkbox.")); return; } - } - if (idBanCheckBox->isChecked()) { + if (idBanCheckBox->isChecked()) if (idBanEdit->text().simplified() == "") { QMessageBox::critical( this, tr("Error"), tr("You must have a value in the clientid ban when selecting the clientid ban checkbox.")); return; } - } accept(); } @@ -316,18 +304,7 @@ QString AdminNotesDialog::getNotes() const return notes->toPlainText(); } -namespace UserListRoles -{ -constexpr int Online = Qt::UserRole + 1; -constexpr int UserInfo = Qt::UserRole + 2; -} // namespace UserListRoles - -UserListItemDelegate::UserListItemDelegate(QObject *const parent, - const QMap *avatarCache, - const QMap *cardArtCache, - const QMap *cardArtParamsMap) - : QStyledItemDelegate(parent), avatarCache(avatarCache), cardArtCache(cardArtCache), - cardArtParamsMap(cardArtParamsMap) +UserListItemDelegate::UserListItemDelegate(QObject *const parent) : QStyledItemDelegate(parent) { } @@ -350,32 +327,6 @@ bool UserListItemDelegate::editorEvent(QEvent *event, return QStyledItemDelegate::editorEvent(event, model, option, index); } -QSize UserListItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const -{ - if (!SettingsCache::instance().getStyleUserList()) { - return QStyledItemDelegate::sizeHint(option, index); - } - return UserListPainter::sizeHint(); -} - -void UserListItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const -{ - if (!SettingsCache::instance().getStyleUserList()) { - QStyledItemDelegate::paint(painter, option, index); - return; - } - - const QVariant var = index.data(UserListRoles::UserInfo); - - if (!var.isValid()) { - QStyledItemDelegate::paint(painter, option, index); - return; - } - - UserListPainter::paint(painter, option, index, var.value(), avatarCache, cardArtCache, - cardArtParamsMap); -} - UserListTWI::UserListTWI(const ServerInfo_User &_userInfo) : QTreeWidgetItem(Type) { setUserInfo(_userInfo); @@ -392,12 +343,11 @@ void UserListTWI::setUserInfo(const ServerInfo_User &_userInfo) setData(2, Qt::UserRole, QString::fromStdString(userInfo.name())); setData(2, Qt::DisplayRole, QString::fromStdString(userInfo.name())); setData(3, Qt::InitialSortOrderRole, QString::fromStdString(userInfo.privlevel())); - setData(0, UserListRoles::UserInfo, QVariant::fromValue(userInfo)); } void UserListTWI::setOnline(bool online) { - setData(0, UserListRoles::Online, online); + setData(0, Qt::UserRole + 1, online); setData(2, Qt::ForegroundRole, online ? qApp->palette().brush(QPalette::WindowText) : QBrush(Qt::gray)); } @@ -416,8 +366,8 @@ void UserListTWI::setOnline(bool online) bool UserListTWI::operator<(const QTreeWidgetItem &other) const { // Sort by online/offline - if (data(0, UserListRoles::Online) != other.data(0, UserListRoles::Online)) { - return data(0, UserListRoles::Online).toBool(); + if (data(0, Qt::UserRole + 1) != other.data(0, Qt::UserRole + 1)) { + return data(0, Qt::UserRole + 1).toBool(); } const auto &lhsUserLevelFlags = UserLevelFlags(data(0, Qt::UserRole).toInt()); @@ -464,100 +414,20 @@ UserListWidget::UserListWidget(TabSupervisor *_tabSupervisor, QWidget *parent) : QGroupBox(parent), tabSupervisor(_tabSupervisor), client(_client), type(_type), onlineCount(0) { - avatarProvider = new UserAvatarProvider(client, this); - cardArtProvider = new UserCardArtProvider(this); - - itemDelegate = - new UserListItemDelegate(this, &avatarProvider->cache(), &cardArtProvider->cache(), &cardArtParamsMap); - + itemDelegate = new UserListItemDelegate(this); userContextMenu = new UserContextMenu(tabSupervisor, this); connect(userContextMenu, &UserContextMenu::openMessageDialog, this, &UserListWidget::openMessageDialog); userTree = new QTreeWidget; - userTree->setColumnCount(4); // 0=display, 1=flag(hidden), 2=name(hidden), 3=privlevel(hidden) - userTree->header()->setSectionResizeMode(0, QHeaderView::Stretch); + userTree->setColumnCount(3); + userTree->header()->setSectionResizeMode(QHeaderView::ResizeToContents); userTree->header()->setMinimumSectionSize(0); userTree->setHeaderHidden(true); userTree->setRootIsDecorated(false); userTree->setIconSize(QSize(20, 18)); userTree->setItemDelegate(itemDelegate); userTree->setAlternatingRowColors(true); - userTree->hideColumn(1); - userTree->hideColumn(2); - userTree->hideColumn(3); connect(userTree, &QTreeWidget::itemActivated, this, &UserListWidget::userClicked); - userTree->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - userTree->header()->setStretchLastSection(true); - - // ── Hover popup ─────────────────────────────────────────────────────────── - m_userInfoPopup = new UserInfoPopup(tabSupervisor, tabSupervisor->getClient(), &avatarProvider->cache(), - &cardArtProvider->cache(), &cardArtParamsMap, - window()); // parented to main window so it floats above siblings - - m_userInfoPopup->hide(); - m_userInfoPopup->setWindowOpacity(0.0); - m_userInfoPopup->installEventFilter(this); - - connectPopupSignals(); - - m_showPopupTimer = new QTimer(this); - m_showPopupTimer->setSingleShot(true); - m_showPopupTimer->setInterval(280); - connect(m_showPopupTimer, &QTimer::timeout, this, [this] { - if (!m_hoveredUser.isEmpty()) { - showPopupForUser(m_hoveredUser); - } - }); - - m_hidePopupTimer = new QTimer(this); - m_hidePopupTimer->setSingleShot(true); - m_hidePopupTimer->setInterval(160); - connect(m_hidePopupTimer, &QTimer::timeout, this, [this] { - if (!m_popupPinned && !m_userInfoPopup->underMouse() && !userTree->underMouse()) { - hidePopup(); - } - }); - - userTree->setMouseTracking(true); - userTree->viewport()->setMouseTracking(true); - userTree->viewport()->installEventFilter(this); - - // Pin on item click - connect(userTree, &QTreeWidget::itemClicked, this, [this](QTreeWidgetItem *item, int) { - if (!SettingsCache::instance().getStyleUserList()) { - return; - } - const QString name = static_cast(item)->getUserInfo().name().c_str(); - m_popupPinned = false; // reset so showPopupForUser can update - showPopupForUser(name); - m_popupPinned = true; // pin after showing - }); - - connect(userTree->selectionModel(), &QItemSelectionModel::selectionChanged, this, - [this](const QItemSelection &sel, const QItemSelection &) { - // if (m_rebuildingTree) return; - if (sel.isEmpty() && m_popupPinned) { - m_popupPinned = false; - hidePopup(); - } - }); - - // Hide popup when list scrolls (reference row has moved) - connect(userTree->verticalScrollBar(), &QScrollBar::valueChanged, this, [this] { - m_showPopupTimer->stop(); - hidePopup(true); - }); - - // Forward join requests from popup upward - connect(m_userInfoPopup, &UserInfoPopup::joinGameRequested, this, &UserListWidget::joinGameRequested); - - connect(avatarProvider, &UserAvatarProvider::avatarUpdated, this, - [this](const QString &) { userTree->viewport()->update(); }); - connect(cardArtProvider, &UserCardArtProvider::cardArtUpdated, this, - [this](const QString &) { userTree->viewport()->update(); }); - - connect(&SettingsCache::instance(), &SettingsCache::styleUserListChanged, this, &UserListWidget::applyDisplayMode); - applyDisplayMode(); QVBoxLayout *vbox = new QVBoxLayout; vbox->addWidget(userTree); @@ -567,296 +437,6 @@ UserListWidget::UserListWidget(TabSupervisor *_tabSupervisor, retranslateUi(); } -void UserListWidget::bind(UserListManager *mgr) -{ - manager = mgr; - - // ── Full rebuild: disconnect / reconnect / bulk initial load ────────────── - connect(manager, &UserListManager::listReset, this, &UserListWidget::rebuild); - - // ── Online users list (AllUsersList / RoomList) ─────────────────────────── - if (type == AllUsersList || type == RoomList) { - connect(manager, &UserListManager::userJoinedOnline, this, - [this](const ServerInfo_User &user) { processUserInfo(user, true); }); - connect(manager, &UserListManager::userLeftOnline, this, [this](const QString &name) { deleteUser(name); }); - } - - // ── Buddy list ──────────────────────────────────────────────────────────── - if (type == BuddyList) { - connect(manager, &UserListManager::addedToBuddyList, this, [this](const ServerInfo_User &user) { - const QString name = QString::fromStdString(user.name()); - processUserInfo(user, manager->getOnlineUser(name) != nullptr); - }); - connect(manager, &UserListManager::removedFromBuddyList, this, - [this](const QString &name) { deleteUser(name); }); - // Track online presence changes for buddies already in the tree - connect(manager, &UserListManager::userJoinedOnline, this, [this](const ServerInfo_User &user) { - const QString name = QString::fromStdString(user.name()); - if (users.contains(name)) { - users[name]->setUserInfo(user); - setUserOnline(name, true); - } - }); - connect(manager, &UserListManager::userLeftOnline, this, [this](const QString &name) { - if (users.contains(name)) { - setUserOnline(name, false); - } - }); - } - - // ── Ignore list ─────────────────────────────────────────────────────────── - if (type == IgnoreList) { - connect(manager, &UserListManager::addedToIgnoreList, this, [this](const ServerInfo_User &user) { - const QString name = QString::fromStdString(user.name()); - processUserInfo(user, manager->getOnlineUser(name) != nullptr); - }); - connect(manager, &UserListManager::removedFromIgnoreList, this, - [this](const QString &name) { deleteUser(name); }); - } - - // ── Popup button refresh ────────────────────────────────────────────────── - // Any buddy/ignore mutation while the popup is open refreshes its buttons - auto refreshIfPopupOpen = [this](const QString &name) { - if (m_userInfoPopup && m_userInfoPopup->isVisible() && m_userInfoPopup->currentUser() == name) { - refreshPopupButtons(name); - } - }; - auto refreshCurrentPopup = [refreshIfPopupOpen](const ServerInfo_User &u) { - refreshIfPopupOpen(QString::fromStdString(u.name())); - }; - - connect(manager, &UserListManager::addedToBuddyList, this, refreshCurrentPopup); - connect(manager, &UserListManager::removedFromBuddyList, this, refreshIfPopupOpen); - connect(manager, &UserListManager::addedToIgnoreList, this, refreshCurrentPopup); - connect(manager, &UserListManager::removedFromIgnoreList, this, refreshIfPopupOpen); - connect(manager, &UserListManager::userJoinedOnline, this, refreshCurrentPopup); - connect(manager, &UserListManager::userLeftOnline, this, refreshIfPopupOpen); - - rebuild(); -} - -void UserListWidget::refreshPopupButtons(const QString &userName) -{ - UserListTWI *item = users.value(userName); - if (!item) { - return; - } - - const UserListProxy *proxy = tabSupervisor->getUserListManager(); - const bool online = item->data(0, UserListRoles::Online).toBool(); - const bool isBuddy = proxy->isUserBuddy(userName); - const bool isIgn = proxy->isUserIgnored(userName); - - m_userInfoPopup->updateActionButtons(item->getUserInfo(), online, isBuddy, isIgn); - positionPopup(userName); // height may have changed — reposition -} - -void UserListWidget::hideEvent(QHideEvent *e) -{ - QGroupBox::hideEvent(e); - m_showPopupTimer->stop(); - m_hidePopupTimer->stop(); - hidePopup(true); -} - -void UserListWidget::applyDisplayMode() -{ - const bool styled = SettingsCache::instance().getStyleUserList(); - - if (styled) { - userTree->header()->setSectionResizeMode(0, QHeaderView::Stretch); - userTree->hideColumn(1); - userTree->hideColumn(2); - userTree->hideColumn(3); - } else { - userTree->header()->setSectionResizeMode(QHeaderView::ResizeToContents); - userTree->showColumn(1); - userTree->showColumn(2); - userTree->hideColumn(3); - } - - userTree->viewport()->update(); -} - -void UserListWidget::connectPopupSignals() -{ - connect(m_userInfoPopup, &UserInfoPopup::closeRequested, this, [this] { - m_popupPinned = false; - hidePopup(true); - }); - connect(m_userInfoPopup, &UserInfoPopup::mouseEnteredPopup, m_hidePopupTimer, &QTimer::stop); - connect(m_userInfoPopup, &UserInfoPopup::mouseLeftPopup, this, [this] { - if (!m_popupPinned) { - m_hidePopupTimer->start(); - } - }); - - // Wire all action signals to UserContextMenu::exec*() - connect(m_userInfoPopup, &UserInfoPopup::chatRequested, userContextMenu, &UserContextMenu::execChat); - connect(m_userInfoPopup, &UserInfoPopup::detailsRequested, userContextMenu, &UserContextMenu::execDetails); - connect(m_userInfoPopup, &UserInfoPopup::showGamesRequested, userContextMenu, &UserContextMenu::execShowGames); - connect(m_userInfoPopup, &UserInfoPopup::addBuddyRequested, userContextMenu, &UserContextMenu::execAddToBuddy); - connect(m_userInfoPopup, &UserInfoPopup::removeBuddyRequested, userContextMenu, - &UserContextMenu::execRemoveFromBuddy); - connect(m_userInfoPopup, &UserInfoPopup::addIgnoreRequested, userContextMenu, &UserContextMenu::execAddToIgnore); - connect(m_userInfoPopup, &UserInfoPopup::removeIgnoreRequested, userContextMenu, - &UserContextMenu::execRemoveFromIgnore); - connect(m_userInfoPopup, &UserInfoPopup::banRequested, userContextMenu, &UserContextMenu::execBan); - connect(m_userInfoPopup, &UserInfoPopup::warnRequested, userContextMenu, &UserContextMenu::execWarn); - connect(m_userInfoPopup, &UserInfoPopup::banHistoryRequested, userContextMenu, &UserContextMenu::execBanHistory); - connect(m_userInfoPopup, &UserInfoPopup::warnHistoryRequested, userContextMenu, &UserContextMenu::execWarnHistory); - connect(m_userInfoPopup, &UserInfoPopup::adminNotesRequested, userContextMenu, &UserContextMenu::execAdminNotes); - connect(m_userInfoPopup, &UserInfoPopup::promoteToModRequested, this, - [this](const QString &n) { userContextMenu->execAdjustMod(n, true); }); - connect(m_userInfoPopup, &UserInfoPopup::demoteFromModRequested, this, - [this](const QString &n) { userContextMenu->execAdjustMod(n, false); }); - connect(m_userInfoPopup, &UserInfoPopup::promoteToJudgeRequested, this, - [this](const QString &n) { userContextMenu->execAdjustJudge(n, true); }); - connect(m_userInfoPopup, &UserInfoPopup::demoteFromJudgeRequested, this, - [this](const QString &n) { userContextMenu->execAdjustJudge(n, false); }); -} - -bool UserListWidget::eventFilter(QObject *obj, QEvent *event) -{ - if (obj == userTree->viewport()) { - if (event->type() == QEvent::MouseMove) { - if (!SettingsCache::instance().getStyleUserList()) { - return QGroupBox::eventFilter(obj, event); - } - auto *me = static_cast(event); - auto *twi = static_cast(userTree->itemAt(me->pos())); - const QString hovName = twi ? QString::fromStdString(twi->getUserInfo().name()) : QString{}; - - if (hovName != m_hoveredUser) { - m_hoveredUser = hovName; - if (!hovName.isEmpty()) { - m_hidePopupTimer->stop(); - if (!m_popupPinned) { - m_showPopupTimer->start(); - } - } else { - m_showPopupTimer->stop(); - if (!m_popupPinned) { - m_hidePopupTimer->start(); - } - } - } - } else if (event->type() == QEvent::Leave) { - m_hoveredUser.clear(); - m_showPopupTimer->stop(); - if (!m_popupPinned) { - m_hidePopupTimer->start(); - } - } - } - - return QGroupBox::eventFilter(obj, event); -} - -void UserListWidget::showPopupForUser(const QString &userName) -{ - UserListTWI *item = users.value(userName); - if (!item) { - return; - } - - const ServerInfo_User &info = item->getUserInfo(); - const bool online = item->data(0, UserListRoles::Online).toBool(); - const bool isBuddy = userContextMenu->getUserListProxy()->isUserBuddy(userName); - const bool isIgn = userContextMenu->getUserListProxy()->isUserIgnored(userName); - - m_userInfoPopup->showForUser(userName, info, online, isBuddy, isIgn); - - // Realize the native window at opacity 0 before positioning so that: - // 1) move() applies to an existing native handle (not overridden by Qt's - // default centering logic on first show) - // 2) adjustSize() inside positionPopup() can measure the final laid-out - // geometry correctly - m_userInfoPopup->setWindowOpacity(0.0); - m_userInfoPopup->show(); - m_userInfoPopup->raise(); - - positionPopup(userName); // geometry is now accurate; move() sticks - - auto *fade = new QPropertyAnimation(m_userInfoPopup, "windowOpacity", m_userInfoPopup); - fade->setDuration(120); - fade->setStartValue(0.0); - fade->setEndValue(1.0); - fade->start(QAbstractAnimation::DeleteWhenStopped); -} - -void UserListWidget::positionPopup(const QString &userName) -{ - UserListTWI *item = users.value(userName); - if (!item) { - return; - } - - QWidget *vp = userTree->viewport(); - const QRect itemR = userTree->visualItemRect(item); - const QPoint itemTL = vp->mapToGlobal(itemR.topLeft()); - const QPoint vpTL = vp->mapToGlobal(vp->rect().topLeft()); - const QPoint vpTR = vp->mapToGlobal(vp->rect().topRight()); - - m_userInfoPopup->adjustSize(); - const int popW = m_userInfoPopup->width(); - const int popH = m_userInfoPopup->height(); - const int margin = 12; - - const QRect screen = QGuiApplication::primaryScreen()->availableGeometry(); - - // ── X: prefer the side with more space ─────────────────────────────────── - const int spaceLeft = vpTL.x() - screen.left() - margin; - const int spaceRight = screen.right() - vpTR.x() - margin; - int x; - if (spaceLeft >= spaceRight) { - x = (spaceLeft >= popW) ? (vpTL.x() - margin - popW) : (vpTR.x() + margin); - } else { - x = (spaceRight >= popW) ? (vpTR.x() + margin) : (vpTL.x() - margin - popW); - } - x = qBound(screen.left() + margin, x, screen.right() - popW - margin); - - // ── Y: grow down if there's room, otherwise grow up ─────────────────────── - const int itemTopY = itemTL.y(); - const int spaceBelow = screen.bottom() - itemTopY - margin; - const int spaceAbove = itemTopY - screen.top() - margin; - - int y; - if (spaceBelow >= popH) { - y = itemTopY; // top edges align, popup grows downward - } else if (spaceAbove >= popH) { - y = itemTopY - popH; // bottom of popup meets top of item, grows upward - } else { - // Neither side fits cleanly — pick the roomier side and let clamp handle the rest - y = (spaceBelow >= spaceAbove) ? itemTopY : (itemTopY - popH); - } - y = qBound(screen.top() + margin, y, screen.bottom() - popH - margin); - - m_userInfoPopup->move(x, y); -} - -void UserListWidget::hidePopup(bool immediate) -{ - m_showPopupTimer->stop(); - m_hidePopupTimer->stop(); - if (!m_userInfoPopup->isVisible()) { - return; - } - - if (immediate) { - m_userInfoPopup->hide(); - return; - } - - // Fade out - auto *fade = new QPropertyAnimation(m_userInfoPopup, "windowOpacity", m_userInfoPopup); - fade->setDuration(100); - fade->setStartValue(m_userInfoPopup->windowOpacity()); - fade->setEndValue(0.0); - connect(fade, &QPropertyAnimation::finished, m_userInfoPopup, &QWidget::hide); - fade->start(QAbstractAnimation::DeleteWhenStopped); -} - void UserListWidget::retranslateUi() { userContextMenu->retranslateUi(); @@ -877,117 +457,58 @@ void UserListWidget::retranslateUi() updateCount(); } -void UserListWidget::rebuild() -{ - userTree->clear(); - users.clear(); - cardArtParamsMap.clear(); - onlineCount = 0; - - if (!manager) { - return; - } - - const QMap *source = nullptr; - - switch (type) { - case AllUsersList: - case RoomList: - source = &manager->getAllUsersList(); - break; - case BuddyList: - source = &manager->getBuddyList(); - break; - case IgnoreList: - source = &manager->getIgnoreList(); - break; - } - - for (auto it = source->cbegin(); it != source->cend(); ++it) { - processUserInfo(it.value(), manager->getOnlineUser(it.key()) != nullptr); - } - - sortItems(); -} - void UserListWidget::processUserInfo(const ServerInfo_User &user, bool online) { const QString userName = QString::fromStdString(user.name()); - - // Always update params from the latest ServerInfo_User, whether the - // item is new or existing, so a live server-push refreshes the rendering. - if (user.has_card_art_params()) { - const auto &cap = user.card_art_params(); - CardArtParams params; - params.cardName = QString::fromStdString(cap.card_name()); - params.cardProviderId = QString::fromStdString(cap.card_provider_id()); - params.marginPctL = cap.margin_pct_l(); - params.marginPctR = cap.margin_pct_r(); - params.verticalOffset = cap.vertical_offset(); - params.zoom = cap.zoom(); - cardArtParamsMap.insert(userName, params); - cardArtProvider->requestCardArt(userName, params.cardName, params.cardProviderId); - } else { - cardArtParamsMap.remove(userName); // clear stale params on removal - } - UserListTWI *item = users.value(userName); - if (item) { + if (item) item->setUserInfo(user); - } else { + else { item = new UserListTWI(user); users.insert(userName, item); userTree->addTopLevelItem(item); - if (online) { + if (online) ++onlineCount; - } updateCount(); - avatarProvider->requestAvatar(userName); } item->setOnline(online); - sortItems(); - userTree->viewport()->update(); } bool UserListWidget::deleteUser(const QString &userName) { UserListTWI *twi = users.value(userName); - if (!twi) { - return false; + if (twi) { + users.remove(userName); + userTree->takeTopLevelItem(userTree->indexOfTopLevelItem(twi)); + if (twi->data(0, Qt::UserRole + 1).toBool()) + --onlineCount; + delete twi; + updateCount(); + return true; } - users.remove(userName); - userTree->takeTopLevelItem(userTree->indexOfTopLevelItem(twi)); - if (twi->data(0, Qt::UserRole + 1).toBool()) { - --onlineCount; - } - delete twi; - updateCount(); - return true; + return false; } void UserListWidget::setUserOnline(const QString &userName, bool online) { UserListTWI *twi = users.value(userName); - if (!twi) { + if (!twi) return; - } twi->setOnline(online); - if (online) { + if (online) ++onlineCount; - } else { + else --onlineCount; - } updateCount(); } void UserListWidget::updateCount() { QString str = titleStr; - if ((type == BuddyList) || (type == IgnoreList)) { + if ((type == BuddyList) || (type == IgnoreList)) str = str.arg(onlineCount); - } setTitle(str.arg(userTree->topLevelItemCount())); } @@ -1007,5 +528,5 @@ void UserListWidget::showContextMenu(const QPoint &pos, const QModelIndex &index void UserListWidget::sortItems() { - userTree->sortItems(0, Qt::AscendingOrder); + userTree->sortItems(1, Qt::AscendingOrder); } diff --git a/cockatrice/src/interface/widgets/server/user/user_list_widget.h b/cockatrice/src/interface/widgets/server/user/user_list_widget.h index d70cdfbbd..036837673 100644 --- a/cockatrice/src/interface/widgets/server/user/user_list_widget.h +++ b/cockatrice/src/interface/widgets/server/user/user_list_widget.h @@ -1,23 +1,15 @@ /** * @file user_list_widget.h * @ingroup Lobby + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef USERLIST_H #define USERLIST_H -#include "../../cards/card_info_picture_art_crop_widget.h" -#include "user_avatar_provider.h" -#include "user_card_art_provider.h" -#include "user_info_popup.h" -#include "user_list_manager.h" -#include "user_list_painter.h" - #include #include #include -#include #include #include #include @@ -102,21 +94,12 @@ public: class UserListItemDelegate : public QStyledItemDelegate { - const QMap *avatarCache; - const QMap *cardArtCache; - const QMap *cardArtParamsMap; - public: - explicit UserListItemDelegate(QObject *const parent, - const QMap *avatarCache, - const QMap *cardArtCache, - const QMap *cardArtParamsMap); + explicit UserListItemDelegate(QObject *const parent); bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) override; - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; }; class UserListTWI : public QTreeWidgetItem @@ -148,22 +131,6 @@ public: }; private: - UserListManager *manager = nullptr; - UserAvatarProvider *avatarProvider = nullptr; - UserCardArtProvider *cardArtProvider = nullptr; - QMap cardArtParamsMap; - // ── Hover popup ─────────────────────────────────────────────────────────── - UserInfoPopup *m_userInfoPopup = nullptr; - QTimer *m_showPopupTimer = nullptr; - QTimer *m_hidePopupTimer = nullptr; - QString m_hoveredUser; - bool m_popupPinned = false; - - void showPopupForUser(const QString &userName); - void hidePopup(bool immediate = false); - void positionPopup(const QString &userName); - void connectPopupSignals(); - QMap users; TabSupervisor *tabSupervisor; AbstractClient *client; @@ -174,7 +141,6 @@ private: int onlineCount; QString titleStr; void updateCount(); - void refreshPopupButtons(const QString &userName); private slots: void userClicked(QTreeWidgetItem *item, int column); signals: @@ -183,18 +149,13 @@ signals: void removeBuddy(const QString &userName); void addIgnore(const QString &userName); void removeIgnore(const QString &userName); - void joinGameRequested(int gameId, int roomId, bool asSpectator); public: UserListWidget(TabSupervisor *_tabSupervisor, AbstractClient *_client, UserListType _type, QWidget *parent = nullptr); - void bind(UserListManager *mgr); - void applyDisplayMode(); - bool eventFilter(QObject *obj, QEvent *event) override; void retranslateUi(); - void rebuild(); void processUserInfo(const ServerInfo_User &user, bool online); bool deleteUser(const QString &userName); void setUserOnline(const QString &userName, bool online); @@ -204,9 +165,6 @@ public: } void showContextMenu(const QPoint &pos, const QModelIndex &index); void sortItems(); - -protected: - void hideEvent(QHideEvent *e) override; }; #endif diff --git a/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.h b/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.h deleted file mode 100644 index 4cbf2d71a..000000000 --- a/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef COCKATRICE_ABSTRACT_SETTINGS_PAGE_H -#define COCKATRICE_ABSTRACT_SETTINGS_PAGE_H - -#include - -#define WIKI_CUSTOM_PIC_URL "https://github.com/Cockatrice/Cockatrice/wiki/Custom-Picture-Download-URLs" -#define WIKI_CUSTOM_SHORTCUTS "https://github.com/Cockatrice/Cockatrice/wiki/Custom-Keyboard-Shortcuts" -#define WIKI_TRANSLATION_FAQ "https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ" - -class AbstractSettingsPage : public QWidget -{ -public: - virtual void retranslateUi() = 0; -}; - -#endif // COCKATRICE_ABSTRACT_SETTINGS_PAGE_H diff --git a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp deleted file mode 100644 index e00484ebf..000000000 --- a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp +++ /dev/null @@ -1,453 +0,0 @@ -#include "appearance_settings_page.h" - -#include "../../../client/settings/cache_settings.h" -#include "../../client/settings/card_counter_settings.h" -#include "../../palette_editor/palette_editor_dialog.h" -#include "../dialogs/override_printing_warning.h" -#include "../interface/theme_manager.h" -#include "../interface/widgets/general/background_sources.h" - -#include -#include -#include -#include -#include - -AppearanceSettingsPage::AppearanceSettingsPage() -{ - SettingsCache &settings = SettingsCache::instance(); - - // Theme settings - QString themeName = SettingsCache::instance().getThemeName(); - - QStringList themeDirs = themeManager->getAvailableThemes().keys(); - for (int i = 0; i < themeDirs.size(); i++) { - themeBox.addItem(themeDirs[i]); - if (themeDirs[i] == themeName) { - themeBox.setCurrentIndex(i); - } - } - - connect(&themeBox, qOverload(&QComboBox::currentIndexChanged), this, &AppearanceSettingsPage::themeBoxChanged); - connect(&openThemeButton, &QPushButton::clicked, this, &AppearanceSettingsPage::openThemeLocation); - - schemeCombo.addItem(tr("Light"), QStringLiteral("Light")); - schemeCombo.addItem(tr("Dark"), QStringLiteral("Dark")); -#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) - schemeCombo.addItem(tr("System"), QStringLiteral("System")); -#endif - - // Seed from whatever the current theme already has saved - const QString dirPath = themeManager->getAvailableThemes().value(SettingsCache::instance().getThemeName()); - const ThemeConfig cfg = ThemeConfig::fromThemeDir(dirPath); - const QString current = cfg.colorScheme; - const int seedIdx = schemeCombo.findData(current); - schemeCombo.setCurrentIndex(seedIdx >= 0 ? seedIdx : 0); - - connect(&schemeCombo, &QComboBox::currentIndexChanged, this, - [this] { themeManager->setColorScheme(schemeCombo.currentData().toString()); }); - - connect(themeManager, &ThemeManager::themeChanged, this, [this, dirPath] { - const QString newDir = themeManager->getAvailableThemes().value(SettingsCache::instance().getThemeName()); - const ThemeConfig cfg = ThemeConfig::fromThemeDir(newDir); - const QString current = cfg.colorScheme; - - schemeCombo.blockSignals(true); - const int idx = schemeCombo.findData(current); - schemeCombo.setCurrentIndex(idx >= 0 ? idx : 0); - schemeCombo.blockSignals(false); - }); - - connect(&editPaletteButton, &QPushButton::clicked, this, &AppearanceSettingsPage::editPalette); - - auto *themeGrid = new QGridLayout; - themeGrid->addWidget(&themeLabel, 0, 0); - themeGrid->addWidget(&themeBox, 0, 1); - themeGrid->addWidget(&openThemeButton, 1, 1); - themeGrid->addWidget(&schemeComboLabel, 2, 0); - themeGrid->addWidget(&schemeCombo, 2, 1); - themeGrid->addWidget(&editPaletteButton, 3, 1); - - themeGroupBox = new QGroupBox; - themeGroupBox->setLayout(themeGrid); - - // Home tab settings - for (const auto &entry : BackgroundSources::all()) { - homeTabBackgroundSourceBox.addItem(QObject::tr(entry.trKey), QVariant::fromValue(entry.type)); - } - - QString homeTabBackgroundSource = SettingsCache::instance().getHomeTabBackgroundSource(); - int homeTabBackgroundSourceId = - homeTabBackgroundSourceBox.findData(BackgroundSources::fromId(homeTabBackgroundSource)); - if (homeTabBackgroundSourceId != -1) { - homeTabBackgroundSourceBox.setCurrentIndex(homeTabBackgroundSourceId); - } - - connect(&homeTabBackgroundSourceBox, QOverload::of(&QComboBox::currentIndexChanged), this, [this]() { - auto type = homeTabBackgroundSourceBox.currentData().value(); - SettingsCache::instance().setHomeTabBackgroundSource(BackgroundSources::toId(type)); - updateHomeTabSettingsVisibility(); - }); - - homeTabBackgroundShuffleFrequencySpinBox.setRange(0, 3600); - homeTabBackgroundShuffleFrequencySpinBox.setSuffix(tr(" seconds")); - homeTabBackgroundShuffleFrequencySpinBox.setValue(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency()); - connect(&homeTabBackgroundShuffleFrequencySpinBox, qOverload(&QSpinBox::valueChanged), - &SettingsCache::instance(), &SettingsCache::setHomeTabBackgroundShuffleFrequency); - - homeTabDisplayCardNameCheckBox.setChecked(settings.getHomeTabDisplayCardName()); - connect(&homeTabDisplayCardNameCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, - &SettingsCache::setHomeTabDisplayCardName); - - updateHomeTabSettingsVisibility(); - - auto *homeTabGrid = new QGridLayout; - homeTabGrid->addWidget(&homeTabBackgroundSourceLabel, 0, 0); - homeTabGrid->addWidget(&homeTabBackgroundSourceBox, 0, 1); - homeTabGrid->addWidget(&homeTabBackgroundShuffleFrequencyLabel, 1, 0); - homeTabGrid->addWidget(&homeTabBackgroundShuffleFrequencySpinBox, 1, 1); - homeTabGrid->addWidget(&homeTabDisplayCardNameCheckBox, 2, 0, 1, 2); - - homeTabGroupBox = new QGroupBox; - homeTabGroupBox->setLayout(homeTabGrid); - - styleUserListCheckBox.setChecked(settings.getStyleUserList()); - connect(&styleUserListCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setStyleUserList); - - auto stylingTabGrid = new QGridLayout; - stylingTabGrid->addWidget(&styleUserListCheckBox, 0, 0, 1, 2); - - stylingGroupBox = new QGroupBox; - stylingGroupBox->setLayout(stylingTabGrid); - - // Menu settings - showShortcutsCheckBox.setChecked(settings.getShowShortcuts()); - connect(&showShortcutsCheckBox, &QCheckBox::QT_STATE_CHANGED, this, &AppearanceSettingsPage::showShortcutsChanged); - - showGameSelectorFilterToolbarCheckBox.setChecked(settings.getShowGameSelectorFilterToolbar()); - connect(&showGameSelectorFilterToolbarCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, - &SettingsCache::setShowGameSelectorFilterToolbar); - - auto *menuGrid = new QGridLayout; - menuGrid->addWidget(&showShortcutsCheckBox, 0, 0); - menuGrid->addWidget(&showGameSelectorFilterToolbarCheckBox, 1, 0); - - menuGroupBox = new QGroupBox; - menuGroupBox->setLayout(menuGrid); - - // Printings settings - overrideAllCardArtWithPersonalPreferenceCheckBox.setChecked(settings.getOverrideAllCardArtWithPersonalPreference()); - connect(&overrideAllCardArtWithPersonalPreferenceCheckBox, &QCheckBox::QT_STATE_CHANGED, this, - &AppearanceSettingsPage::overrideAllCardArtWithPersonalPreferenceToggled); - - bumpSetsWithCardsInDeckToTopCheckBox.setChecked(settings.getBumpSetsWithCardsInDeckToTop()); - connect(&bumpSetsWithCardsInDeckToTopCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, - &SettingsCache::setBumpSetsWithCardsInDeckToTop); - - auto *printingsGrid = new QGridLayout; - printingsGrid->addWidget(&overrideAllCardArtWithPersonalPreferenceCheckBox, 0, 0, 1, 2); - printingsGrid->addWidget(&bumpSetsWithCardsInDeckToTopCheckBox, 1, 0, 1, 2); - - printingsGroupBox = new QGroupBox; - printingsGroupBox->setLayout(printingsGrid); - - // Card rendering - displayCardNamesCheckBox.setChecked(settings.getDisplayCardNames()); - connect(&displayCardNamesCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setDisplayCardNames); - - autoRotateSidewaysLayoutCardsCheckBox.setChecked(settings.getAutoRotateSidewaysLayoutCards()); - connect(&autoRotateSidewaysLayoutCardsCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, - &SettingsCache::setAutoRotateSidewaysLayoutCards); - - cardScalingCheckBox.setChecked(settings.getScaleCards()); - connect(&cardScalingCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setCardScaling); - - roundCardCornersCheckBox.setChecked(settings.getRoundCardCorners()); - connect(&roundCardCornersCheckBox, &QAbstractButton::toggled, &settings, &SettingsCache::setRoundCardCorners); - - connect(&maxFontSizeForCardsEdit, qOverload(&QSpinBox::valueChanged), &settings, - &SettingsCache::setMaxFontSize); - maxFontSizeForCardsEdit.setValue(settings.getMaxFontSize()); - maxFontSizeForCardsLabel.setBuddy(&maxFontSizeForCardsEdit); - maxFontSizeForCardsEdit.setMinimum(9); - maxFontSizeForCardsEdit.setMaximum(100); - - auto *cardsGrid = new QGridLayout; - cardsGrid->addWidget(&displayCardNamesCheckBox, 0, 0, 1, 2); - cardsGrid->addWidget(&autoRotateSidewaysLayoutCardsCheckBox, 1, 0, 1, 2); - cardsGrid->addWidget(&cardScalingCheckBox, 2, 0, 1, 2); - cardsGrid->addWidget(&roundCardCornersCheckBox, 3, 0, 1, 2); - cardsGrid->addWidget(&maxFontSizeForCardsLabel, 4, 0, 1, 1); - cardsGrid->addWidget(&maxFontSizeForCardsEdit, 4, 1, 1, 1); - - cardsGroupBox = new QGroupBox; - cardsGroupBox->setLayout(cardsGrid); - - // Card layout - verticalCardOverlapPercentBox.setValue(settings.getStackCardOverlapPercent()); - verticalCardOverlapPercentBox.setRange(0, 80); - connect(&verticalCardOverlapPercentBox, qOverload(&QSpinBox::valueChanged), &settings, - &SettingsCache::setStackCardOverlapPercent); - - cardViewInitialRowsMaxBox.setRange(1, 999); - cardViewInitialRowsMaxBox.setValue(SettingsCache::instance().getCardViewInitialRowsMax()); - connect(&cardViewInitialRowsMaxBox, qOverload(&QSpinBox::valueChanged), this, - &AppearanceSettingsPage::cardViewInitialRowsMaxChanged); - - cardViewExpandedRowsMaxBox.setRange(1, 999); - cardViewExpandedRowsMaxBox.setValue(SettingsCache::instance().getCardViewExpandedRowsMax()); - connect(&cardViewExpandedRowsMaxBox, qOverload(&QSpinBox::valueChanged), this, - &AppearanceSettingsPage::cardViewExpandedRowsMaxChanged); - - auto *cardLayoutGrid = new QGridLayout; - cardLayoutGrid->addWidget(&verticalCardOverlapPercentLabel, 0, 0, 1, 1); - cardLayoutGrid->addWidget(&verticalCardOverlapPercentBox, 0, 1, 1, 1); - cardLayoutGrid->addWidget(&cardViewInitialRowsMaxLabel, 1, 0); - cardLayoutGrid->addWidget(&cardViewInitialRowsMaxBox, 1, 1); - cardLayoutGrid->addWidget(&cardViewExpandedRowsMaxLabel, 2, 0); - cardLayoutGrid->addWidget(&cardViewExpandedRowsMaxBox, 2, 1); - - cardLayoutGroupBox = new QGroupBox; - cardLayoutGroupBox->setLayout(cardLayoutGrid); - - // Card counter colors - - auto *cardCounterColorsLayout = new QGridLayout; - cardCounterColorsLayout->setColumnStretch(1, 1); - cardCounterColorsLayout->setColumnStretch(3, 1); - cardCounterColorsLayout->setColumnStretch(5, 1); - - auto &cardCounterSettings = SettingsCache::instance().cardCounters(); - for (int index = 0; index < 6; ++index) { - auto *pushButton = new QPushButton; - pushButton->setStyleSheet(QString("background-color: %1").arg(cardCounterSettings.color(index).name())); - - connect(&SettingsCache::instance().cardCounters(), &CardCounterSettings::colorChanged, pushButton, - [index, pushButton](int changedIndex, const QColor &color) { - if (index == changedIndex) { - pushButton->setStyleSheet(QString("background-color: %1").arg(color.name())); - } - }); - - connect(pushButton, &QPushButton::clicked, this, [index, this]() { - auto &cardCounterSettings = SettingsCache::instance().cardCounters(); - - auto newColor = QColorDialog::getColor(cardCounterSettings.color(index), this); - if (!newColor.isValid()) { - return; - } - - cardCounterSettings.setColor(index, newColor); - }); - - auto *colorName = new QLabel; - cardCounterNames.append(colorName); - - int row = index / 3; - int column = 2 * (index % 3); - - cardCounterColorsLayout->addWidget(pushButton, row, column); - cardCounterColorsLayout->addWidget(colorName, row, column + 1); - } - - auto *cardCountersLayout = new QVBoxLayout; - cardCountersLayout->addLayout(cardCounterColorsLayout, 1); - - cardCountersGroupBox = new QGroupBox; - cardCountersGroupBox->setLayout(cardCountersLayout); - - // Hand layout - horizontalHandCheckBox.setChecked(settings.getHorizontalHand()); - connect(&horizontalHandCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setHorizontalHand); - - leftJustifiedHandCheckBox.setChecked(settings.getLeftJustified()); - connect(&leftJustifiedHandCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setLeftJustified); - - auto *handGrid = new QGridLayout; - handGrid->addWidget(&horizontalHandCheckBox, 0, 0, 1, 2); - handGrid->addWidget(&leftJustifiedHandCheckBox, 1, 0, 1, 2); - - handGroupBox = new QGroupBox; - handGroupBox->setLayout(handGrid); - - // table grid layout - invertVerticalCoordinateCheckBox.setChecked(settings.getInvertVerticalCoordinate()); - connect(&invertVerticalCoordinateCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, - &SettingsCache::setInvertVerticalCoordinate); - - minPlayersForMultiColumnLayoutEdit.setMinimum(2); - minPlayersForMultiColumnLayoutEdit.setValue(settings.getMinPlayersForMultiColumnLayout()); - connect(&minPlayersForMultiColumnLayoutEdit, qOverload(&QSpinBox::valueChanged), &settings, - &SettingsCache::setMinPlayersForMultiColumnLayout); - minPlayersForMultiColumnLayoutLabel.setBuddy(&minPlayersForMultiColumnLayoutEdit); - - auto *tableGrid = new QGridLayout; - tableGrid->addWidget(&invertVerticalCoordinateCheckBox, 0, 0, 1, 2); - tableGrid->addWidget(&minPlayersForMultiColumnLayoutLabel, 1, 0, 1, 1); - tableGrid->addWidget(&minPlayersForMultiColumnLayoutEdit, 1, 1, 1, 1); - - tableGroupBox = new QGroupBox; - tableGroupBox->setLayout(tableGrid); - - // putting it all together - auto *mainLayout = new QVBoxLayout; - mainLayout->addWidget(themeGroupBox); - mainLayout->addWidget(homeTabGroupBox); - mainLayout->addWidget(stylingGroupBox); - mainLayout->addWidget(menuGroupBox); - mainLayout->addWidget(printingsGroupBox); - mainLayout->addWidget(cardsGroupBox); - mainLayout->addWidget(cardLayoutGroupBox); - mainLayout->addWidget(cardCountersGroupBox); - mainLayout->addWidget(handGroupBox); - mainLayout->addWidget(tableGroupBox); - mainLayout->addStretch(); - - setLayout(mainLayout); - - connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &AppearanceSettingsPage::retranslateUi); - retranslateUi(); -} - -void AppearanceSettingsPage::themeBoxChanged(int index) -{ - QStringList themeDirs = themeManager->getAvailableThemes().keys(); - if (index >= 0 && index < themeDirs.count()) { - SettingsCache::instance().setThemeName(themeDirs.at(index)); - } -} - -void AppearanceSettingsPage::openThemeLocation() -{ - QString dir = SettingsCache::instance().getThemesPath(); - QDir dirDir = dir; - dirDir.cdUp(); - // open if dir exists, create if parent dir does exist - if (dirDir.exists() && dirDir.mkpath(dir)) { - QDesktopServices::openUrl(QUrl::fromLocalFile(dir)); - } else { - QMessageBox::critical(this, tr("Error"), tr("Could not create themes directory at '%1'.").arg(dir)); - } -} - -void AppearanceSettingsPage::editPalette() -{ - PaletteEditorDialog dlg(themeManager->getCurrentThemePath(), SettingsCache::instance().getThemeName(), this); - dlg.exec(); -} - -void AppearanceSettingsPage::updateHomeTabSettingsVisibility() -{ - bool visible = - SettingsCache::instance().getHomeTabBackgroundSource() != BackgroundSources::toId(BackgroundSources::Theme); - - homeTabBackgroundShuffleFrequencyLabel.setVisible(visible); - homeTabBackgroundShuffleFrequencySpinBox.setVisible(visible); - homeTabDisplayCardNameCheckBox.setVisible(visible); -} - -void AppearanceSettingsPage::showShortcutsChanged(QT_STATE_CHANGED_T value) -{ - SettingsCache::instance().setShowShortcuts(value); - qApp->setAttribute(Qt::AA_DontShowShortcutsInContextMenus, value == 0); // 0 = unchecked -} - -void AppearanceSettingsPage::overrideAllCardArtWithPersonalPreferenceToggled(QT_STATE_CHANGED_T value) -{ - bool enable = static_cast(value); - - bool accepted = OverridePrintingWarning::execMessageBox(this, enable); - - if (!accepted) { - // If user cancels, revert the checkbox/state back - QTimer::singleShot(0, this, [this, enable]() { - overrideAllCardArtWithPersonalPreferenceCheckBox.blockSignals(true); - overrideAllCardArtWithPersonalPreferenceCheckBox.setChecked(!enable); - overrideAllCardArtWithPersonalPreferenceCheckBox.blockSignals(false); - }); - } -} - -/** - * Updates the settings for cardViewInitialRowsMax. - * Forces expanded rows max to always be >= initial rows max - * @param value The new value - */ -void AppearanceSettingsPage::cardViewInitialRowsMaxChanged(int value) -{ - SettingsCache::instance().setCardViewInitialRowsMax(value); - if (cardViewExpandedRowsMaxBox.value() < value) { - cardViewExpandedRowsMaxBox.setValue(value); - } -} - -/** - * Updates the settings for cardViewExpandedRowsMax. - * Forces initial rows max to always be <= expanded rows max - * @param value The new value - */ -void AppearanceSettingsPage::cardViewExpandedRowsMaxChanged(int value) -{ - SettingsCache::instance().setCardViewExpandedRowsMax(value); - if (cardViewInitialRowsMaxBox.value() > value) { - cardViewInitialRowsMaxBox.setValue(value); - } -} - -void AppearanceSettingsPage::retranslateUi() -{ - themeGroupBox->setTitle(tr("Theme settings")); - themeLabel.setText(tr("Current theme:")); - openThemeButton.setText(tr("Open themes folder")); - schemeComboLabel.setText(tr("Active theme palette:")); - editPaletteButton.setText(tr("Edit theme palette")); - - homeTabGroupBox->setTitle(tr("Home tab settings")); - homeTabBackgroundSourceLabel.setText(tr("Home tab background source:")); - homeTabBackgroundShuffleFrequencyLabel.setText(tr("Home tab background shuffle frequency:")); - homeTabBackgroundShuffleFrequencySpinBox.setSpecialValueText(tr("Disabled")); - homeTabDisplayCardNameCheckBox.setText(tr("Display card name of background in bottom right")); - - stylingGroupBox->setTitle(tr("Styling settings")); - styleUserListCheckBox.setText(tr("Style user list")); - - menuGroupBox->setTitle(tr("Menu settings")); - showShortcutsCheckBox.setText(tr("Show keyboard shortcuts in right-click menus")); - showGameSelectorFilterToolbarCheckBox.setText(tr("Show game filter toolbar above list in room tab")); - - printingsGroupBox->setTitle(tr("Card printings")); - overrideAllCardArtWithPersonalPreferenceCheckBox.setText( - tr("Override all card art with personal set preference (Pre-ProviderID change behavior)")); - bumpSetsWithCardsInDeckToTopCheckBox.setText( - tr("Bump sets that the deck contains cards from to the top in the printing selector")); - - cardsGroupBox->setTitle(tr("Card rendering")); - displayCardNamesCheckBox.setText(tr("Display card names on cards having a picture")); - autoRotateSidewaysLayoutCardsCheckBox.setText(tr("Auto-Rotate cards with sideways layout")); - cardScalingCheckBox.setText(tr("Scale cards on mouse over")); - roundCardCornersCheckBox.setText(tr("Use rounded card corners")); - maxFontSizeForCardsLabel.setText(tr("Maximum font size for information displayed on cards:")); - - cardLayoutGroupBox->setTitle(tr("Card layout")); - verticalCardOverlapPercentLabel.setText( - tr("Minimum overlap percentage of cards on the stack and in vertical hand")); - cardViewInitialRowsMaxLabel.setText(tr("Maximum initial height for card view window:")); - cardViewInitialRowsMaxBox.setSuffix(tr(" rows")); - cardViewExpandedRowsMaxLabel.setText(tr("Maximum expanded height for card view window:")); - cardViewExpandedRowsMaxBox.setSuffix(tr(" rows")); - - cardCountersGroupBox->setTitle(tr("Card counters")); - - auto &cardCounterSettings = SettingsCache::instance().cardCounters(); - for (int index = 0; index < cardCounterNames.size(); ++index) { - cardCounterNames[index]->setText(tr("Counter %1").arg(cardCounterSettings.displayName(index))); - } - - handGroupBox->setTitle(tr("Hand layout")); - horizontalHandCheckBox.setText(tr("Display hand horizontally (wastes space)")); - leftJustifiedHandCheckBox.setText(tr("Enable left justification")); - - tableGroupBox->setTitle(tr("Table grid layout")); - invertVerticalCoordinateCheckBox.setText(tr("Invert vertical coordinate")); - minPlayersForMultiColumnLayoutLabel.setText(tr("Minimum player count for multi-column layout:")); -} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h deleted file mode 100644 index e223d70f8..000000000 --- a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h +++ /dev/null @@ -1,79 +0,0 @@ -#ifndef COCKATRICE_APPEARANCE_SETTINGS_PAGE_H -#define COCKATRICE_APPEARANCE_SETTINGS_PAGE_H - -#include "abstract_settings_page.h" - -#include -#include -#include -#include -#include -#include -#include - -class AppearanceSettingsPage : public AbstractSettingsPage -{ - Q_OBJECT -private slots: - void themeBoxChanged(int index); - void openThemeLocation(); - void editPalette(); - void updateHomeTabSettingsVisibility(); - void showShortcutsChanged(QT_STATE_CHANGED_T enabled); - void overrideAllCardArtWithPersonalPreferenceToggled(QT_STATE_CHANGED_T enabled); - - void cardViewInitialRowsMaxChanged(int value); - void cardViewExpandedRowsMaxChanged(int value); - -private: - QLabel themeLabel; - QComboBox themeBox; - QPushButton openThemeButton; - QLabel schemeComboLabel; - QComboBox schemeCombo; - QPushButton editPaletteButton; - QLabel homeTabBackgroundSourceLabel; - QComboBox homeTabBackgroundSourceBox; - QLabel homeTabBackgroundShuffleFrequencyLabel; - QSpinBox homeTabBackgroundShuffleFrequencySpinBox; - QCheckBox homeTabDisplayCardNameCheckBox; - QCheckBox styleUserListCheckBox; - QLabel minPlayersForMultiColumnLayoutLabel; - QLabel maxFontSizeForCardsLabel; - QCheckBox showShortcutsCheckBox; - QCheckBox showGameSelectorFilterToolbarCheckBox; - QCheckBox overrideAllCardArtWithPersonalPreferenceCheckBox; - QCheckBox bumpSetsWithCardsInDeckToTopCheckBox; - QCheckBox displayCardNamesCheckBox; - QCheckBox autoRotateSidewaysLayoutCardsCheckBox; - QCheckBox cardScalingCheckBox; - QCheckBox roundCardCornersCheckBox; - QLabel verticalCardOverlapPercentLabel; - QSpinBox verticalCardOverlapPercentBox; - QLabel cardViewInitialRowsMaxLabel; - QSpinBox cardViewInitialRowsMaxBox; - QLabel cardViewExpandedRowsMaxLabel; - QSpinBox cardViewExpandedRowsMaxBox; - QCheckBox horizontalHandCheckBox; - QCheckBox leftJustifiedHandCheckBox; - QCheckBox invertVerticalCoordinateCheckBox; - QGroupBox *themeGroupBox; - QGroupBox *homeTabGroupBox; - QGroupBox *stylingGroupBox; - QGroupBox *menuGroupBox; - QGroupBox *printingsGroupBox; - QGroupBox *cardsGroupBox; - QGroupBox *cardLayoutGroupBox; - QGroupBox *handGroupBox; - QGroupBox *tableGroupBox; - QGroupBox *cardCountersGroupBox; - QList cardCounterNames; - QSpinBox minPlayersForMultiColumnLayoutEdit; - QSpinBox maxFontSizeForCardsEdit; - -public: - AppearanceSettingsPage(); - void retranslateUi() override; -}; - -#endif // COCKATRICE_APPEARANCE_SETTINGS_PAGE_H 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 deleted file mode 100644 index b7d699ebc..000000000 --- a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp +++ /dev/null @@ -1,241 +0,0 @@ -#include "deck_editor_settings_page.h" - -#include "../../../client/settings/cache_settings.h" -#include "update/card_spoiler/spoiler_background_updater.h" - -#include -#include -#include -#include -#include -#include -#include - -DeckEditorSettingsPage::DeckEditorSettingsPage() -{ - picDownloadCheckBox.setChecked(SettingsCache::instance().getPicDownload()); - connect(&picDownloadCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setPicDownload); - - urlLinkLabel.setTextInteractionFlags(Qt::LinksAccessibleByMouse); - urlLinkLabel.setOpenExternalLinks(true); - - connect(&resetDownloadURLs, &QPushButton::clicked, this, &DeckEditorSettingsPage::resetDownloadedURLsButtonClicked); - - auto *lpGeneralGrid = new QGridLayout; - auto *lpSpoilerGrid = new QGridLayout; - - mcDownloadSpoilersCheckBox.setChecked(SettingsCache::instance().getDownloadSpoilersStatus()); - - mpSpoilerSavePathLineEdit = new QLineEdit(SettingsCache::instance().getSpoilerCardDatabasePath()); - mpSpoilerSavePathLineEdit->setReadOnly(true); - mpSpoilerPathButton = new QPushButton("..."); - connect(mpSpoilerPathButton, &QPushButton::clicked, this, &DeckEditorSettingsPage::spoilerPathButtonClicked); - - updateNowButton = new QPushButton; - updateNowButton->setFixedWidth(150); - connect(updateNowButton, &QPushButton::clicked, this, &DeckEditorSettingsPage::updateSpoilers); - - // Update the GUI depending on if the box is ticked or not - setSpoilersEnabled(mcDownloadSpoilersCheckBox.isChecked()); - - urlList = new QListWidget; - urlList->setSelectionMode(QAbstractItemView::SingleSelection); - urlList->setAlternatingRowColors(true); - urlList->setDragEnabled(true); - urlList->setDragDropMode(QAbstractItemView::InternalMove); - connect(urlList->model(), &QAbstractItemModel::rowsMoved, this, &DeckEditorSettingsPage::urlListChanged); - - urlList->addItems(SettingsCache::instance().downloads().getAllURLs()); - - aAdd = new QAction(this); - aAdd->setIcon(QPixmap("theme:icons/increment")); - connect(aAdd, &QAction::triggered, this, &DeckEditorSettingsPage::actAddURL); - - aEdit = new QAction(this); - aEdit->setIcon(QPixmap("theme:icons/pencil")); - connect(aEdit, &QAction::triggered, this, &DeckEditorSettingsPage::actEditURL); - - aRemove = new QAction(this); - aRemove->setIcon(QPixmap("theme:icons/decrement")); - connect(aRemove, &QAction::triggered, this, &DeckEditorSettingsPage::actRemoveURL); - - auto *urlToolBar = new QToolBar; - urlToolBar->setOrientation(Qt::Vertical); - urlToolBar->addAction(aAdd); - urlToolBar->addAction(aRemove); - urlToolBar->addAction(aEdit); - urlToolBar->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); - - auto *urlListLayout = new QHBoxLayout; - urlListLayout->addWidget(urlToolBar); - urlListLayout->addWidget(urlList); - - // Top Layout - lpGeneralGrid->addWidget(&picDownloadCheckBox, 0, 0); - lpGeneralGrid->addWidget(&resetDownloadURLs, 0, 1); - lpGeneralGrid->addLayout(urlListLayout, 1, 0, 1, 2); - lpGeneralGrid->addWidget(&urlLinkLabel, 4, 0); - - // Spoiler Layout - lpSpoilerGrid->addWidget(&mcDownloadSpoilersCheckBox, 0, 0); - lpSpoilerGrid->addWidget(&mcSpoilerSaveLabel, 1, 0); - lpSpoilerGrid->addWidget(mpSpoilerSavePathLineEdit, 1, 1); - lpSpoilerGrid->addWidget(mpSpoilerPathButton, 1, 2); - lpSpoilerGrid->addWidget(&lastUpdatedLabel, 2, 0); - lpSpoilerGrid->addWidget(updateNowButton, 2, 1); - lpSpoilerGrid->addWidget(&infoOnSpoilersLabel, 3, 0, 1, 3, Qt::AlignTop); - - // On a change to the checkbox, hide/un-hide the other fields - connect(&mcDownloadSpoilersCheckBox, &QCheckBox::toggled, &SettingsCache::instance(), - &SettingsCache::setDownloadSpoilerStatus); - connect(&mcDownloadSpoilersCheckBox, &QCheckBox::toggled, this, &DeckEditorSettingsPage::setSpoilersEnabled); - - mpGeneralGroupBox = new QGroupBox; - mpGeneralGroupBox->setLayout(lpGeneralGrid); - - mpSpoilerGroupBox = new QGroupBox; - mpSpoilerGroupBox->setLayout(lpSpoilerGrid); - - auto *lpMainLayout = new QVBoxLayout; - lpMainLayout->addWidget(mpGeneralGroupBox); - lpMainLayout->addWidget(mpSpoilerGroupBox); - - setLayout(lpMainLayout); - - connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &DeckEditorSettingsPage::retranslateUi); - retranslateUi(); -} - -void DeckEditorSettingsPage::resetDownloadedURLsButtonClicked() -{ - SettingsCache::instance().downloads().resetToDefaultURLs(); - urlList->clear(); - urlList->addItems(SettingsCache::instance().downloads().getAllURLs()); - QMessageBox::information(this, tr("Success"), tr("Download URLs have been reset.")); -} - -void DeckEditorSettingsPage::actAddURL() -{ - bool ok; - QString msg = QInputDialog::getText(this, tr("Add URL"), tr("URL:"), QLineEdit::Normal, QString(), &ok); - if (ok) { - urlList->addItem(msg); - storeSettings(); - } -} - -void DeckEditorSettingsPage::actRemoveURL() -{ - if (urlList->currentItem() != nullptr) { - delete urlList->takeItem(urlList->currentRow()); - storeSettings(); - } -} - -void DeckEditorSettingsPage::actEditURL() -{ - if (urlList->currentItem()) { - QString oldText = urlList->currentItem()->text(); - bool ok; - QString msg = QInputDialog::getText(this, tr("Edit URL"), tr("URL:"), QLineEdit::Normal, oldText, &ok); - if (ok) { - urlList->currentItem()->setText(msg); - storeSettings(); - } - } -} - -void DeckEditorSettingsPage::storeSettings() -{ - qInfo() << "URL Priority Reset"; - - QStringList downloadUrls; - for (int i = 0; i < urlList->count(); i++) { - qInfo() << "Priority" << i << ":" << urlList->item(i)->text(); - downloadUrls << urlList->item(i)->text(); - } - SettingsCache::instance().downloads().setDownloadUrls(downloadUrls); -} - -void DeckEditorSettingsPage::urlListChanged(const QModelIndex &, int, int, const QModelIndex &, int) -{ - storeSettings(); -} - -void DeckEditorSettingsPage::updateSpoilers() -{ - // Disable the button so the user can only press it once at a time - updateNowButton->setDisabled(true); - updateNowButton->setText(tr("Updating...")); - - // 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->setDisabled(false); - updateNowButton->setText(tr("Update Spoilers")); -} - -QString DeckEditorSettingsPage::getLastUpdateTime() -{ - QString fileName = SettingsCache::instance().getSpoilerCardDatabasePath(); - QFileInfo fi(fileName); - QDir fileDir(fi.path()); - QFile file(fileName); - - if (file.exists()) { - return fi.lastModified().toString("MMM d, hh:mm"); - } - - return QString(); -} - -void DeckEditorSettingsPage::spoilerPathButtonClicked() -{ - QString lsPath = QFileDialog::getExistingDirectory(this, tr("Choose path"), mpSpoilerSavePathLineEdit->text()); - if (lsPath.isEmpty()) { - return; - } - - mpSpoilerSavePathLineEdit->setText(lsPath + "/spoiler.xml"); - SettingsCache::instance().setSpoilerDatabasePath(lsPath + "/spoiler.xml"); -} - -void DeckEditorSettingsPage::setSpoilersEnabled(bool anInput) -{ - msDownloadSpoilersLabel.setEnabled(anInput); - mcSpoilerSaveLabel.setEnabled(anInput); - mpSpoilerSavePathLineEdit->setEnabled(anInput); - mpSpoilerPathButton->setEnabled(anInput); - lastUpdatedLabel.setEnabled(anInput); - updateNowButton->setEnabled(anInput); - infoOnSpoilersLabel.setEnabled(anInput); - - if (!anInput) { - SpoilerBackgroundUpdater::deleteSpoilerFile(); - } -} - -void DeckEditorSettingsPage::retranslateUi() -{ - mpGeneralGroupBox->setTitle(tr("URL Download Priority")); - mpSpoilerGroupBox->setTitle(tr("Spoilers")); - 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")); - updateNowButton->setText(tr("Update Spoilers")); - aAdd->setText(tr("Add New URL")); - aEdit->setText(tr("Edit URL")); - aRemove->setText(tr("Remove URL")); -} \ No newline at end of file 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 deleted file mode 100644 index 5db009c8a..000000000 --- a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.h +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef COCKATRICE_DECK_EDITOR_SETTINGS_PAGE_H -#define COCKATRICE_DECK_EDITOR_SETTINGS_PAGE_H - -#include "abstract_settings_page.h" - -#include -#include -#include -#include -#include - -class DeckEditorSettingsPage : public AbstractSettingsPage -{ - Q_OBJECT -public: - DeckEditorSettingsPage(); - void retranslateUi() override; - QString getLastUpdateTime(); - -private slots: - void storeSettings(); - void urlListChanged(const QModelIndex &, int, int, const QModelIndex &, int); - void setSpoilersEnabled(bool); - void spoilerPathButtonClicked(); - void updateSpoilers(); - void unlockSettings(); - void actAddURL(); - void actRemoveURL(); - void actEditURL(); - void resetDownloadedURLsButtonClicked(); - -private: - QPushButton resetDownloadURLs; - QLabel urlLinkLabel; - QCheckBox picDownloadCheckBox; - QListWidget *urlList; - QAction *aAdd, *aEdit, *aRemove; - QCheckBox mcDownloadSpoilersCheckBox; - QLabel msDownloadSpoilersLabel; - QGroupBox *mpGeneralGroupBox; - QGroupBox *mpSpoilerGroupBox; - - QLineEdit *mpSpoilerSavePathLineEdit; - QLabel mcSpoilerSaveLabel; - QLabel lastUpdatedLabel; - QLabel infoOnSpoilersLabel; - QPushButton *mpSpoilerPathButton; - QPushButton *updateNowButton; -}; - -#endif // COCKATRICE_DECK_EDITOR_SETTINGS_PAGE_H diff --git a/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp deleted file mode 100644 index 9faf67578..000000000 --- a/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp +++ /dev/null @@ -1,407 +0,0 @@ -#include "general_settings_page.h" - -#include "../../../client/settings/cache_settings.h" -#include "../main.h" -#include "update/client/release_channel.h" - -#include -#include -#include -#include -#include - -enum startupCardUpdateCheckBehaviorIndex -{ - startupCardUpdateCheckBehaviorIndexNone, - startupCardUpdateCheckBehaviorIndexPrompt, - startupCardUpdateCheckBehaviorIndexAlways -}; - -GeneralSettingsPage::GeneralSettingsPage() -{ - // language settings - QStringList languageCodes = findQmFiles(); - for (const QString &code : languageCodes) { - QString langName = languageName(code); - languageBox.addItem(langName, code); - } - - QString setLanguage = QCoreApplication::translate("i18n", DEFAULT_LANG_NAME); - int index = languageBox.findText(setLanguage, Qt::MatchExactly); - if (index == -1) { - qWarning() << "could not find language" << setLanguage; - } else { - languageBox.setCurrentIndex(index); - } - - advertiseTranslationPageLabel.setTextInteractionFlags(Qt::LinksAccessibleByMouse); - advertiseTranslationPageLabel.setOpenExternalLinks(true); - - connect(&languageBox, qOverload(&QComboBox::currentIndexChanged), this, - &GeneralSettingsPage::languageBoxChanged); - - auto *languageGrid = new QGridLayout; - languageGrid->addWidget(&languageLabel, 0, 0); - languageGrid->addWidget(&languageBox, 0, 1); - languageGrid->addWidget(&advertiseTranslationPageLabel, 1, 1, Qt::AlignRight); - - languageGroupBox = new QGroupBox; - languageGroupBox->setLayout(languageGrid); - - // version settings - SettingsCache &settings = SettingsCache::instance(); - startupUpdateCheckCheckBox.setChecked(settings.getCheckUpdatesOnStartup()); - - connect(&startupUpdateCheckCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, - &SettingsCache::setCheckUpdatesOnStartup); - - updateNotificationCheckBox.setChecked(settings.getNotifyAboutUpdates()); - - connect(&updateNotificationCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setNotifyAboutUpdate); - - connect(&newVersionOracleCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, - &SettingsCache::setNotifyAboutNewVersion); - - auto *versionGrid = new QGridLayout; - versionGrid->addWidget(&updateReleaseChannelLabel, 0, 0); - versionGrid->addWidget(&updateReleaseChannelBox, 0, 1); - versionGrid->addWidget(&startupUpdateCheckCheckBox, 1, 0, 1, 2); - versionGrid->addWidget(&updateNotificationCheckBox, 2, 0, 1, 2); - versionGrid->addWidget(&newVersionOracleCheckBox, 3, 0, 1, 2); - - versionGroupBox = new QGroupBox; - versionGroupBox->setLayout(versionGrid); - - // card database settings - startupCardUpdateCheckBehaviorSelector.addItem(""); // these will be set in retranslateUI - startupCardUpdateCheckBehaviorSelector.addItem(""); - startupCardUpdateCheckBehaviorSelector.addItem(""); - if (SettingsCache::instance().getStartupCardUpdateCheckPromptForUpdate()) { - startupCardUpdateCheckBehaviorSelector.setCurrentIndex(startupCardUpdateCheckBehaviorIndexPrompt); - } else if (SettingsCache::instance().getStartupCardUpdateCheckAlwaysUpdate()) { - startupCardUpdateCheckBehaviorSelector.setCurrentIndex(startupCardUpdateCheckBehaviorIndexAlways); - } else { - startupCardUpdateCheckBehaviorSelector.setCurrentIndex(startupCardUpdateCheckBehaviorIndexNone); - } - - connect(&startupCardUpdateCheckBehaviorSelector, QOverload::of(&QComboBox::currentIndexChanged), this, - [](int index) { - SettingsCache::instance().setStartupCardUpdateCheckPromptForUpdate( - index == startupCardUpdateCheckBehaviorIndexPrompt); - SettingsCache::instance().setStartupCardUpdateCheckAlwaysUpdate( - index == startupCardUpdateCheckBehaviorIndexAlways); - }); - - cardUpdateCheckIntervalSpinBox.setMinimum(1); - cardUpdateCheckIntervalSpinBox.setMaximum(30); - cardUpdateCheckIntervalSpinBox.setValue(settings.getCardUpdateCheckInterval()); - - connect(&cardUpdateCheckIntervalSpinBox, qOverload(&QSpinBox::valueChanged), &settings, - &SettingsCache::setCardUpdateCheckInterval); - - newVersionOracleCheckBox.setChecked(settings.getNotifyAboutNewVersion()); - - auto *cardDatabaseGrid = new QGridLayout; - cardDatabaseGrid->addWidget(&startupCardUpdateCheckBehaviorLabel, 0, 0); - cardDatabaseGrid->addWidget(&startupCardUpdateCheckBehaviorSelector, 0, 1); - cardDatabaseGrid->addWidget(&cardUpdateCheckIntervalLabel, 1, 0); - cardDatabaseGrid->addWidget(&cardUpdateCheckIntervalSpinBox, 1, 1); - cardDatabaseGrid->addWidget(&lastCardUpdateCheckDateLabel, 2, 1); - - cardDatabaseGroupBox = new QGroupBox; - cardDatabaseGroupBox->setLayout(cardDatabaseGrid); - - // startup settings - showTipsOnStartup.setChecked(settings.getShowTipsOnStartup()); - - connect(&showTipsOnStartup, &QCheckBox::clicked, &settings, &SettingsCache::setShowTipsOnStartup); - - auto *startupGrid = new QGridLayout; - startupGrid->addWidget(&showTipsOnStartup, 0, 0, 1, 2); - - startupGroupBox = new QGroupBox; - startupGroupBox->setLayout(startupGrid); - - // paths settings - deckPathEdit = new QLineEdit(settings.getDeckPath()); - deckPathEdit->setReadOnly(true); - auto *deckPathButton = new QPushButton("..."); - connect(deckPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::deckPathButtonClicked); - - filtersPathEdit = new QLineEdit(settings.getFiltersPath()); - filtersPathEdit->setReadOnly(true); - auto *filtersPathButton = new QPushButton("..."); - connect(filtersPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::filtersPathButtonClicked); - - replaysPathEdit = new QLineEdit(settings.getReplaysPath()); - replaysPathEdit->setReadOnly(true); - auto *replaysPathButton = new QPushButton("..."); - connect(replaysPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::replaysPathButtonClicked); - - picsPathEdit = new QLineEdit(settings.getPicsPath()); - picsPathEdit->setReadOnly(true); - auto *picsPathButton = new QPushButton("..."); - connect(picsPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::picsPathButtonClicked); - - cardDatabasePathEdit = new QLineEdit(settings.getCardDatabasePath()); - cardDatabasePathEdit->setReadOnly(true); - auto *cardDatabasePathButton = new QPushButton("..."); - connect(cardDatabasePathButton, &QPushButton::clicked, this, &GeneralSettingsPage::cardDatabasePathButtonClicked); - - customCardDatabasePathEdit = new QLineEdit(settings.getCustomCardDatabasePath()); - customCardDatabasePathEdit->setReadOnly(true); - auto *customCardDatabasePathButton = new QPushButton("..."); - connect(customCardDatabasePathButton, &QPushButton::clicked, this, - &GeneralSettingsPage::customCardDatabaseButtonClicked); - - tokenDatabasePathEdit = new QLineEdit(settings.getTokenDatabasePath()); - tokenDatabasePathEdit->setReadOnly(true); - auto *tokenDatabasePathButton = new QPushButton("..."); - connect(tokenDatabasePathButton, &QPushButton::clicked, this, &GeneralSettingsPage::tokenDatabasePathButtonClicked); - - // Required init here to avoid crashing on Portable builds - resetAllPathsButton = new QPushButton; - - bool isPortable = settings.getIsPortableBuild(); - if (isPortable) { - deckPathEdit->setEnabled(false); - filtersPathEdit->setEnabled(false); - replaysPathEdit->setEnabled(false); - picsPathEdit->setEnabled(false); - cardDatabasePathEdit->setEnabled(false); - customCardDatabasePathEdit->setEnabled(false); - tokenDatabasePathEdit->setEnabled(false); - - deckPathButton->setVisible(false); - replaysPathButton->setVisible(false); - picsPathButton->setVisible(false); - cardDatabasePathButton->setVisible(false); - customCardDatabasePathButton->setVisible(false); - tokenDatabasePathButton->setVisible(false); - } else { - connect(resetAllPathsButton, &QPushButton::clicked, this, &GeneralSettingsPage::resetAllPathsClicked); - allPathsResetLabel = new QLabel(tr("All paths have been reset")); - allPathsResetLabel->setVisible(false); - } - - auto *pathsGrid = new QGridLayout; - pathsGrid->addWidget(&deckPathLabel, 0, 0); - pathsGrid->addWidget(deckPathEdit, 0, 1); - pathsGrid->addWidget(deckPathButton, 0, 2); - pathsGrid->addWidget(&filtersPathLabel, 1, 0); - pathsGrid->addWidget(filtersPathEdit, 1, 1); - pathsGrid->addWidget(filtersPathButton, 1, 2); - pathsGrid->addWidget(&replaysPathLabel, 2, 0); - pathsGrid->addWidget(replaysPathEdit, 2, 1); - pathsGrid->addWidget(replaysPathButton, 2, 2); - pathsGrid->addWidget(&picsPathLabel, 3, 0); - pathsGrid->addWidget(picsPathEdit, 3, 1); - pathsGrid->addWidget(picsPathButton, 3, 2); - pathsGrid->addWidget(&cardDatabasePathLabel, 4, 0); - pathsGrid->addWidget(cardDatabasePathEdit, 4, 1); - pathsGrid->addWidget(cardDatabasePathButton, 4, 2); - pathsGrid->addWidget(&customCardDatabasePathLabel, 5, 0); - pathsGrid->addWidget(customCardDatabasePathEdit, 5, 1); - pathsGrid->addWidget(customCardDatabasePathButton, 5, 2); - pathsGrid->addWidget(&tokenDatabasePathLabel, 6, 0); - pathsGrid->addWidget(tokenDatabasePathEdit, 6, 1); - pathsGrid->addWidget(tokenDatabasePathButton, 6, 2); - if (!isPortable) { - pathsGrid->addWidget(resetAllPathsButton, 7, 0); - pathsGrid->addWidget(allPathsResetLabel, 7, 1); - } - pathsGroupBox = new QGroupBox; - pathsGroupBox->setLayout(pathsGrid); - - auto *mainLayout = new QVBoxLayout; - mainLayout->addWidget(languageGroupBox); - mainLayout->addWidget(versionGroupBox); - mainLayout->addWidget(cardDatabaseGroupBox); - mainLayout->addWidget(startupGroupBox); - mainLayout->addWidget(pathsGroupBox); - mainLayout->addStretch(); - - GeneralSettingsPage::retranslateUi(); - - // connect the ReleaseChannel combo box only after the entries are inserted in retranslateUi - connect(&updateReleaseChannelBox, qOverload(&QComboBox::currentIndexChanged), &settings, - &SettingsCache::setUpdateReleaseChannelIndex); - updateReleaseChannelBox.setCurrentIndex(settings.getUpdateReleaseChannelIndex()); - - setLayout(mainLayout); - - connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &GeneralSettingsPage::retranslateUi); - retranslateUi(); -} - -QStringList GeneralSettingsPage::findQmFiles() -{ - QDir dir(translationPath); - QStringList fileNames = dir.entryList(QStringList(translationPrefix + "_*.qm"), QDir::Files, QDir::Name); - fileNames.replaceInStrings(QRegularExpression(translationPrefix + "_(.*)\\.qm"), "\\1"); - return fileNames; -} - -QString GeneralSettingsPage::languageName(const QString &lang) -{ - QTranslator qTranslator; - - QString appNameHint = translationPrefix + "_" + lang; - bool appTranslationLoaded = qTranslator.load(appNameHint, translationPath); - if (!appTranslationLoaded) { - qCWarning(GeneralSettingsPageLog) - << "Unable to load" << translationPrefix << "translation" << appNameHint << "at" << translationPath; - } - - return qTranslator.translate("i18n", DEFAULT_LANG_NAME); -} - -void GeneralSettingsPage::deckPathButtonClicked() -{ - QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), deckPathEdit->text()); - if (path.isEmpty()) { - return; - } - - deckPathEdit->setText(path); - SettingsCache::instance().setDeckPath(path); -} - -void GeneralSettingsPage::filtersPathButtonClicked() -{ - QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), filtersPathEdit->text()); - if (path.isEmpty()) { - return; - } - - filtersPathEdit->setText(path); - SettingsCache::instance().setFiltersPath(path); -} - -void GeneralSettingsPage::replaysPathButtonClicked() -{ - QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), replaysPathEdit->text()); - if (path.isEmpty()) { - return; - } - - replaysPathEdit->setText(path); - SettingsCache::instance().setReplaysPath(path); -} - -void GeneralSettingsPage::picsPathButtonClicked() -{ - QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), picsPathEdit->text()); - if (path.isEmpty()) { - return; - } - - picsPathEdit->setText(path); - SettingsCache::instance().setPicsPath(path); -} - -void GeneralSettingsPage::cardDatabasePathButtonClicked() -{ - QString path = QFileDialog::getOpenFileName(this, tr("Choose path"), cardDatabasePathEdit->text()); - if (path.isEmpty()) { - return; - } - - cardDatabasePathEdit->setText(path); - SettingsCache::instance().setCardDatabasePath(path); -} - -void GeneralSettingsPage::customCardDatabaseButtonClicked() -{ - QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), customCardDatabasePathEdit->text()); - if (path.isEmpty()) { - return; - } - - customCardDatabasePathEdit->setText(path); - SettingsCache::instance().setCustomCardDatabasePath(path); -} - -void GeneralSettingsPage::tokenDatabasePathButtonClicked() -{ - QString path = QFileDialog::getOpenFileName(this, tr("Choose path"), tokenDatabasePathEdit->text()); - if (path.isEmpty()) { - return; - } - - tokenDatabasePathEdit->setText(path); - SettingsCache::instance().setTokenDatabasePath(path); -} - -void GeneralSettingsPage::resetAllPathsClicked() -{ - SettingsCache &settings = SettingsCache::instance(); - settings.resetPaths(); - deckPathEdit->setText(settings.getDeckPath()); - replaysPathEdit->setText(settings.getReplaysPath()); - picsPathEdit->setText(settings.getPicsPath()); - cardDatabasePathEdit->setText(settings.getCardDatabasePath()); - customCardDatabasePathEdit->setText(settings.getCustomCardDatabasePath()); - tokenDatabasePathEdit->setText(settings.getTokenDatabasePath()); - allPathsResetLabel->setVisible(true); -} - -void GeneralSettingsPage::languageBoxChanged(int index) -{ - SettingsCache::instance().setLang(languageBox.itemData(index).toString()); -} - -void GeneralSettingsPage::retranslateUi() -{ - languageGroupBox->setTitle(tr("Language settings")); - languageLabel.setText(tr("Language:")); - - versionGroupBox->setTitle(tr("Version settings")); - cardDatabaseGroupBox->setTitle(tr("Card database")); - startupGroupBox->setTitle(tr("Startup settings")); - - if (SettingsCache::instance().getIsPortableBuild()) { - pathsGroupBox->setTitle(tr("Paths (editing disabled in portable mode)")); - } else { - pathsGroupBox->setTitle(tr("Paths")); - } - advertiseTranslationPageLabel.setText( - QString("%2").arg(WIKI_TRANSLATION_FAQ).arg(tr("How to help with translations"))); - deckPathLabel.setText(tr("Decks directory:")); - filtersPathLabel.setText(tr("Filters directory:")); - replaysPathLabel.setText(tr("Replays directory:")); - picsPathLabel.setText(tr("Pictures directory:")); - cardDatabasePathLabel.setText(tr("Card database:")); - customCardDatabasePathLabel.setText(tr("Custom database directory:")); - tokenDatabasePathLabel.setText(tr("Token database:")); - updateReleaseChannelLabel.setText(tr("Update channel")); - startupUpdateCheckCheckBox.setText(tr("Check for client updates on startup")); - startupCardUpdateCheckBehaviorLabel.setText(tr("Check for card database updates on startup")); - startupCardUpdateCheckBehaviorSelector.setItemText(startupCardUpdateCheckBehaviorIndexNone, tr("Don't check")); - startupCardUpdateCheckBehaviorSelector.setItemText(startupCardUpdateCheckBehaviorIndexPrompt, - tr("Prompt for update")); - startupCardUpdateCheckBehaviorSelector.setItemText(startupCardUpdateCheckBehaviorIndexAlways, - tr("Always update in the background")); - cardUpdateCheckIntervalLabel.setText(tr("Check for card database updates every")); - cardUpdateCheckIntervalSpinBox.setSuffix(tr(" days")); - updateNotificationCheckBox.setText(tr("Notify if a feature supported by the server is missing in my client")); - newVersionOracleCheckBox.setText(tr("Automatically run Oracle when running a new version of Cockatrice")); - showTipsOnStartup.setText(tr("Show tips on startup")); - resetAllPathsButton->setText(tr("Reset all paths")); - - const auto &settings = SettingsCache::instance(); - - QDate lastCheckDate = settings.getLastCardUpdateCheck(); - int daysAgo = lastCheckDate.daysTo(QDate::currentDate()); - - lastCardUpdateCheckDateLabel.setText( - tr("Last update check on %1 (%2 days ago)").arg(lastCheckDate.toString()).arg(daysAgo)); - - // We can't change the strings after they're put into the QComboBox, so this is our workaround - int oldIndex = updateReleaseChannelBox.currentIndex(); - updateReleaseChannelBox.clear(); - for (ReleaseChannel *chan : settings.getUpdateReleaseChannels()) { - updateReleaseChannelBox.addItem(tr(chan->getName().toUtf8())); - } - updateReleaseChannelBox.setCurrentIndex(oldIndex); -} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/settings_page/general_settings_page.h b/cockatrice/src/interface/widgets/settings_page/general_settings_page.h deleted file mode 100644 index 8aa39ff65..000000000 --- a/cockatrice/src/interface/widgets/settings_page/general_settings_page.h +++ /dev/null @@ -1,76 +0,0 @@ -#ifndef COCKATRICE_GENERAL_SETTINGS_PAGE_H -#define COCKATRICE_GENERAL_SETTINGS_PAGE_H - -#include "abstract_settings_page.h" - -#include -#include -#include -#include -#include -#include -#include - -inline Q_LOGGING_CATEGORY(GeneralSettingsPageLog, "general_settings_page"); - -class GeneralSettingsPage : public AbstractSettingsPage -{ - Q_OBJECT -public: - GeneralSettingsPage(); - void retranslateUi() override; - -private slots: - void deckPathButtonClicked(); - void filtersPathButtonClicked(); - void replaysPathButtonClicked(); - void picsPathButtonClicked(); - void cardDatabasePathButtonClicked(); - void customCardDatabaseButtonClicked(); - void tokenDatabasePathButtonClicked(); - void resetAllPathsClicked(); - void languageBoxChanged(int index); - -private: - QStringList findQmFiles(); - QString languageName(const QString &lang); - - QGroupBox *languageGroupBox; - QGroupBox *versionGroupBox; - QGroupBox *cardDatabaseGroupBox; - QGroupBox *startupGroupBox; - QGroupBox *pathsGroupBox; - - QLineEdit *deckPathEdit; - QLineEdit *filtersPathEdit; - QLineEdit *replaysPathEdit; - QLineEdit *picsPathEdit; - QLineEdit *cardDatabasePathEdit; - QLineEdit *customCardDatabasePathEdit; - QLineEdit *tokenDatabasePathEdit; - QPushButton *resetAllPathsButton; - QLabel *allPathsResetLabel; - QComboBox languageBox; - QCheckBox startupUpdateCheckCheckBox; - QLabel startupCardUpdateCheckBehaviorLabel; - QComboBox startupCardUpdateCheckBehaviorSelector; - QLabel cardUpdateCheckIntervalLabel; - QSpinBox cardUpdateCheckIntervalSpinBox; - QLabel lastCardUpdateCheckDateLabel; - QCheckBox updateNotificationCheckBox; - QCheckBox newVersionOracleCheckBox; - QComboBox updateReleaseChannelBox; - QLabel languageLabel; - QLabel deckPathLabel; - QLabel filtersPathLabel; - QLabel replaysPathLabel; - QLabel picsPathLabel; - QLabel cardDatabasePathLabel; - QLabel customCardDatabasePathLabel; - QLabel tokenDatabasePathLabel; - QLabel updateReleaseChannelLabel; - QLabel advertiseTranslationPageLabel; - QCheckBox showTipsOnStartup; -}; - -#endif // COCKATRICE_GENERAL_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 deleted file mode 100644 index 831cb442c..000000000 --- a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp +++ /dev/null @@ -1,259 +0,0 @@ -#include "messages_settings_page.h" - -#include "../../../client/settings/cache_settings.h" -#include "../interface/widgets/utility/get_text_with_max.h" - -#include -#include -#include -#include - -MessagesSettingsPage::MessagesSettingsPage() -{ - chatMentionCheckBox.setChecked(SettingsCache::instance().getChatMention()); - connect(&chatMentionCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setChatMention); - - chatMentionCompleterCheckbox.setChecked(SettingsCache::instance().getChatMentionCompleter()); - connect(&chatMentionCompleterCheckbox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setChatMentionCompleter); - - explainMessagesLabel.setTextInteractionFlags(Qt::LinksAccessibleByMouse); - explainMessagesLabel.setOpenExternalLinks(true); - - ignoreUnregUsersMainChat.setChecked(SettingsCache::instance().getIgnoreUnregisteredUsers()); - ignoreUnregUserMessages.setChecked(SettingsCache::instance().getIgnoreUnregisteredUserMessages()); - ignoreNonBuddyUserMessages.setChecked(SettingsCache::instance().getIgnoreNonBuddyUserMessages()); - - connect(&ignoreUnregUsersMainChat, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setIgnoreUnregisteredUsers); - connect(&ignoreUnregUserMessages, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setIgnoreUnregisteredUserMessages); - connect(&ignoreNonBuddyUserMessages, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setIgnoreNonBuddyUserMessages); - - invertMentionForeground.setChecked(SettingsCache::instance().getChatMentionForeground()); - connect(&invertMentionForeground, &QCheckBox::QT_STATE_CHANGED, this, &MessagesSettingsPage::updateTextColor); - - invertHighlightForeground.setChecked(SettingsCache::instance().getChatHighlightForeground()); - connect(&invertHighlightForeground, &QCheckBox::QT_STATE_CHANGED, this, - &MessagesSettingsPage::updateTextHighlightColor); - - mentionColor = new QLineEdit(); - mentionColor->setText(SettingsCache::instance().getChatMentionColor()); - updateMentionPreview(); - connect(mentionColor, &QLineEdit::textChanged, this, &MessagesSettingsPage::updateColor); - - messagePopups.setChecked(SettingsCache::instance().getShowMessagePopup()); - connect(&messagePopups, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setShowMessagePopups); - - mentionPopups.setChecked(SettingsCache::instance().getShowMentionPopup()); - connect(&mentionPopups, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setShowMentionPopups); - - roomHistory.setChecked(SettingsCache::instance().getRoomHistory()); - connect(&roomHistory, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), &SettingsCache::setRoomHistory); - - customAlertString = new QLineEdit(); - customAlertString->setText(SettingsCache::instance().getHighlightWords()); - connect(customAlertString, &QLineEdit::textChanged, &SettingsCache::instance(), &SettingsCache::setHighlightWords); - - auto *chatGrid = new QGridLayout; - chatGrid->addWidget(&chatMentionCheckBox, 0, 0); - chatGrid->addWidget(&invertMentionForeground, 0, 1); - chatGrid->addWidget(mentionColor, 0, 2); - chatGrid->addWidget(&chatMentionCompleterCheckbox, 1, 0); - chatGrid->addWidget(&ignoreUnregUsersMainChat, 2, 0); - chatGrid->addWidget(&hexLabel, 1, 2); - chatGrid->addWidget(&ignoreUnregUserMessages, 3, 0); - chatGrid->addWidget(&ignoreNonBuddyUserMessages, 4, 0); - chatGrid->addWidget(&messagePopups, 5, 0); - chatGrid->addWidget(&mentionPopups, 6, 0); - chatGrid->addWidget(&roomHistory, 7, 0); - chatGroupBox = new QGroupBox; - chatGroupBox->setLayout(chatGrid); - - highlightColor = new QLineEdit(); - highlightColor->setText(SettingsCache::instance().getChatHighlightColor()); - updateHighlightPreview(); - connect(highlightColor, &QLineEdit::textChanged, this, &MessagesSettingsPage::updateHighlightColor); - - auto *highlightNotice = new QGridLayout; - highlightNotice->addWidget(highlightColor, 0, 2); - highlightNotice->addWidget(&invertHighlightForeground, 0, 1); - highlightNotice->addWidget(&hexHighlightLabel, 1, 2); - highlightNotice->addWidget(customAlertString, 0, 0); - highlightNotice->addWidget(&customAlertStringLabel, 1, 0); - highlightGroupBox = new QGroupBox; - highlightGroupBox->setLayout(highlightNotice); - - messageList = new QListWidget; - - int count = SettingsCache::instance().messages().getCount(); - for (int i = 0; i < count; i++) { - messageList->addItem(SettingsCache::instance().messages().getMessageAt(i)); - } - - aAdd = new QAction(this); - aAdd->setIcon(QPixmap("theme:icons/increment")); - connect(aAdd, &QAction::triggered, this, &MessagesSettingsPage::actAdd); - - aEdit = new QAction(this); - aEdit->setIcon(QPixmap("theme:icons/pencil")); - connect(aEdit, &QAction::triggered, this, &MessagesSettingsPage::actEdit); - - aRemove = new QAction(this); - aRemove->setIcon(QPixmap("theme:icons/decrement")); - connect(aRemove, &QAction::triggered, this, &MessagesSettingsPage::actRemove); - - auto *messageToolBar = new QToolBar; - messageToolBar->setOrientation(Qt::Vertical); - messageToolBar->addAction(aAdd); - messageToolBar->addAction(aRemove); - messageToolBar->addAction(aEdit); - messageToolBar->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); - - auto *messageListLayout = new QHBoxLayout; - messageListLayout->addWidget(messageToolBar); - messageListLayout->addWidget(messageList); - - auto *messagesLayout = new QVBoxLayout; // combines the explainer label with the actual messages widget pieces - messagesLayout->addLayout(messageListLayout); - messagesLayout->addWidget(&explainMessagesLabel); - - messageGroupBox = new QGroupBox; // draws a box around the above layout and allows it to be titled - messageGroupBox->setLayout(messagesLayout); - - auto *mainLayout = new QVBoxLayout; // combines the messages groupbox with the rest of the menu - mainLayout->addWidget(messageGroupBox); - mainLayout->addWidget(chatGroupBox); - mainLayout->addWidget(highlightGroupBox); - - setLayout(mainLayout); - - connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &MessagesSettingsPage::retranslateUi); - retranslateUi(); -} - -void MessagesSettingsPage::updateColor(const QString &value) -{ -#if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)) - QColor colorToSet = QColor::fromString("#" + value); -#else - QColor colorToSet; - colorToSet.setNamedColor("#" + value); -#endif - if (colorToSet.isValid()) { - SettingsCache::instance().setChatMentionColor(value); - updateMentionPreview(); - } -} - -void MessagesSettingsPage::updateHighlightColor(const QString &value) -{ -#if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)) - QColor colorToSet = QColor::fromString("#" + value); -#else - QColor colorToSet; - colorToSet.setNamedColor("#" + value); -#endif - if (colorToSet.isValid()) { - SettingsCache::instance().setChatHighlightColor(value); - updateHighlightPreview(); - } -} - -void MessagesSettingsPage::updateTextColor(QT_STATE_CHANGED_T value) -{ - SettingsCache::instance().setChatMentionForeground(value); - updateMentionPreview(); -} - -void MessagesSettingsPage::updateTextHighlightColor(QT_STATE_CHANGED_T value) -{ - SettingsCache::instance().setChatHighlightForeground(value); - updateHighlightPreview(); -} - -void MessagesSettingsPage::updateMentionPreview() -{ - mentionColor->setStyleSheet( - "QLineEdit{background:#" + SettingsCache::instance().getChatMentionColor() + - ";color: " + (SettingsCache::instance().getChatMentionForeground() ? "white" : "black") + ";}"); -} - -void MessagesSettingsPage::updateHighlightPreview() -{ - highlightColor->setStyleSheet( - "QLineEdit{background:#" + SettingsCache::instance().getChatHighlightColor() + - ";color: " + (SettingsCache::instance().getChatHighlightForeground() ? "white" : "black") + ";}"); -} - -void MessagesSettingsPage::storeSettings() -{ - SettingsCache::instance().messages().setCount(messageList->count()); - for (int i = 0; i < messageList->count(); i++) { - SettingsCache::instance().messages().setMessageAt(i, messageList->item(i)->text()); - } - emit SettingsCache::instance().messages().messageMacrosChanged(); -} - -void MessagesSettingsPage::actAdd() -{ - bool ok; - QString msg = - getTextWithMax(this, tr("Add message"), tr("Message:"), QLineEdit::Normal, QString(), &ok, MAX_TEXT_LENGTH); - if (ok) { - messageList->addItem(msg); - storeSettings(); - } -} - -void MessagesSettingsPage::actEdit() -{ - if (messageList->currentItem()) { - QString oldText = messageList->currentItem()->text(); - bool ok; - QString msg = - getTextWithMax(this, tr("Edit message"), tr("Message:"), QLineEdit::Normal, oldText, &ok, MAX_TEXT_LENGTH); - if (ok) { - messageList->currentItem()->setText(msg); - storeSettings(); - } - } -} - -void MessagesSettingsPage::actRemove() -{ - if (messageList->currentItem() != nullptr) { - delete messageList->takeItem(messageList->currentRow()); - storeSettings(); - } -} - -void MessagesSettingsPage::retranslateUi() -{ - chatGroupBox->setTitle(tr("Chat settings")); - highlightGroupBox->setTitle(tr("Custom alert words")); - chatMentionCheckBox.setText(tr("Enable chat mentions")); - chatMentionCompleterCheckbox.setText(tr("Enable mention completer")); - messageGroupBox->setTitle(tr("In-game message macros")); - explainMessagesLabel.setText( - QString("%2").arg(WIKI_CUSTOM_SHORTCUTS).arg(tr("How to use in-game message macros"))); - ignoreUnregUsersMainChat.setText(tr("Ignore chat room messages sent by unregistered users")); - ignoreUnregUserMessages.setText(tr("Ignore private messages sent by unregistered users")); - ignoreNonBuddyUserMessages.setText(tr("Ignore private messages sent by non-buddy users")); - invertMentionForeground.setText(tr("Invert text color")); - invertHighlightForeground.setText(tr("Invert text color")); - messagePopups.setText(tr("Enable desktop notifications for private messages")); - mentionPopups.setText(tr("Enable desktop notification for mentions")); - roomHistory.setText(tr("Enable room message history on join")); - hexLabel.setText(tr("(Color is hexadecimal)")); - hexHighlightLabel.setText(tr("(Color is hexadecimal)")); - customAlertStringLabel.setText(tr("Separate words with a space, alphanumeric characters only")); - customAlertString->setPlaceholderText(tr("Word1 Word2 Word3")); - aAdd->setText(tr("Add New Message")); - aEdit->setText(tr("Edit Message")); - aRemove->setText(tr("Remove Message")); -} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.h b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.h deleted file mode 100644 index e98ae0592..000000000 --- a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.h +++ /dev/null @@ -1,59 +0,0 @@ -#ifndef COCKATRICE_MESSAGES_SETTINGS_PAGE_H -#define COCKATRICE_MESSAGES_SETTINGS_PAGE_H - -#include "abstract_settings_page.h" - -#include -#include -#include -#include -#include - -class MessagesSettingsPage : public AbstractSettingsPage -{ - Q_OBJECT -public: - MessagesSettingsPage(); - void retranslateUi() override; - -private slots: - void actAdd(); - void actEdit(); - void actRemove(); - void updateColor(const QString &value); - void updateHighlightColor(const QString &value); - void updateTextColor(QT_STATE_CHANGED_T value); - void updateTextHighlightColor(QT_STATE_CHANGED_T value); - -private: - QListWidget *messageList; - QAction *aAdd; - QAction *aEdit; - QAction *aRemove; - QCheckBox chatMentionCheckBox; - QCheckBox chatMentionCompleterCheckbox; - QCheckBox invertMentionForeground; - QCheckBox invertHighlightForeground; - QCheckBox ignoreUnregUsersMainChat; - QCheckBox ignoreUnregUserMessages; - QCheckBox ignoreNonBuddyUserMessages; - QCheckBox messagePopups; - QCheckBox mentionPopups; - QCheckBox roomHistory; - QGroupBox *chatGroupBox; - QGroupBox *highlightGroupBox; - QGroupBox *messageGroupBox; - QLineEdit *mentionColor; - QLineEdit *highlightColor; - QLineEdit *customAlertString; - QLabel hexLabel; - QLabel hexHighlightLabel; - QLabel customAlertStringLabel; - QLabel explainMessagesLabel; - - void storeSettings(); - void updateMentionPreview(); - void updateHighlightPreview(); -}; - -#endif // COCKATRICE_MESSAGES_SETTINGS_PAGE_H diff --git a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp deleted file mode 100644 index e7a04ef79..000000000 --- a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp +++ /dev/null @@ -1,128 +0,0 @@ -#include "shortcut_settings_page.h" - -#include "../../../client/settings/cache_settings.h" -#include "../../../client/settings/shortcut_treeview.h" -#include "../interface/widgets/utility/custom_line_edit.h" -#include "../interface/widgets/utility/sequence_edit.h" - -#include -#include - -ShortcutSettingsPage::ShortcutSettingsPage() -{ - // search bar - searchEdit = new SearchLineEdit; - searchEdit->setObjectName("searchEdit"); - searchEdit->setClearButtonEnabled(true); - - setFocusProxy(searchEdit); - setFocusPolicy(Qt::ClickFocus); - - // table - shortcutsTable = new ShortcutTreeView(this); - - shortcutsTable->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - shortcutsTable->setEditTriggers(QAbstractItemView::NoEditTriggers); - shortcutsTable->setColumnWidth(0, width() / 3 * 2); - searchEdit->setTreeView(shortcutsTable); - - connect(searchEdit, &SearchLineEdit::textChanged, shortcutsTable, &ShortcutTreeView::updateSearchString); - - // edit widget - currentActionGroupLabel = new QLabel(this); - currentActionGroupName = new QLabel(this); - currentActionLabel = new QLabel(this); - currentActionName = new QLabel(this); - currentShortcutLabel = new QLabel(this); - editTextBox = new SequenceEdit("", this); - shortcutsTable->installEventFilter(editTextBox); - - // buttons - faqLabel = new QLabel(this); - faqLabel->setTextInteractionFlags(Qt::LinksAccessibleByMouse); - faqLabel->setOpenExternalLinks(true); - - btnResetAll = new QPushButton(this); - btnClearAll = new QPushButton(this); - - btnResetAll->setIcon(QPixmap("theme:icons/update")); - btnClearAll->setIcon(QPixmap("theme:icons/clearsearch")); - - // layout - auto *_editLayout = new QGridLayout; - _editLayout->addWidget(currentActionGroupLabel, 0, 0); - _editLayout->addWidget(currentActionGroupName, 0, 1); - _editLayout->addWidget(currentActionLabel, 1, 0); - _editLayout->addWidget(currentActionName, 1, 1); - _editLayout->addWidget(currentShortcutLabel, 2, 0); - _editLayout->addWidget(editTextBox, 2, 1); - - editShortcutGroupBox = new QGroupBox; - editShortcutGroupBox->setLayout(_editLayout); - - auto *_buttonsLayout = new QHBoxLayout; - _buttonsLayout->addWidget(faqLabel); - _buttonsLayout->addWidget(btnResetAll); - _buttonsLayout->addWidget(btnClearAll); - - auto *_mainLayout = new QVBoxLayout; - _mainLayout->addWidget(searchEdit); - _mainLayout->addWidget(shortcutsTable); - _mainLayout->addWidget(editShortcutGroupBox); - _mainLayout->addLayout(_buttonsLayout); - - setLayout(_mainLayout); - - connect(btnResetAll, &QPushButton::clicked, this, &ShortcutSettingsPage::resetShortcuts); - connect(btnClearAll, &QPushButton::clicked, this, &ShortcutSettingsPage::clearShortcuts); - - connect(shortcutsTable, &ShortcutTreeView::currentItemChanged, this, &ShortcutSettingsPage::currentItemChanged); - - connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &ShortcutSettingsPage::retranslateUi); - retranslateUi(); -} - -void ShortcutSettingsPage::currentItemChanged(const QString &key) -{ - if (key.isEmpty()) { - currentActionGroupName->setText(""); - currentActionName->setText(""); - editTextBox->setShortcutName(""); - } else { - QString group = SettingsCache::instance().shortcuts().getShortcut(key).getGroupName(); - QString action = SettingsCache::instance().shortcuts().getShortcut(key).getName(); - currentActionGroupName->setText(group); - currentActionName->setText(action); - editTextBox->setShortcutName(key); - } -} - -void ShortcutSettingsPage::resetShortcuts() -{ - if (QMessageBox::question(this, tr("Restore all default shortcuts"), - tr("Do you really want to restore all default shortcuts?")) == QMessageBox::Yes) { - SettingsCache::instance().shortcuts().resetAllShortcuts(); - } -} - -void ShortcutSettingsPage::clearShortcuts() -{ - if (QMessageBox::question(this, tr("Clear all default shortcuts"), - tr("Do you really want to clear all shortcuts?")) == QMessageBox::Yes) { - SettingsCache::instance().shortcuts().clearAllShortcuts(); - } -} - -void ShortcutSettingsPage::retranslateUi() -{ - shortcutsTable->retranslateUi(); - - currentActionGroupLabel->setText(tr("Section:")); - currentActionLabel->setText(tr("Action:")); - currentShortcutLabel->setText(tr("Shortcut:")); - editTextBox->retranslateUi(); - faqLabel->setText(QString("%2").arg(WIKI_CUSTOM_SHORTCUTS).arg(tr("How to set custom shortcuts"))); - btnResetAll->setText(tr("Restore all default shortcuts")); - btnClearAll->setText(tr("Clear all shortcuts")); - searchEdit->setPlaceholderText(tr("Search by shortcut name")); -} diff --git a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.h b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.h deleted file mode 100644 index 05391df77..000000000 --- a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef COCKATRICE_SHORTCUT_SETTINGS_PAGE_H -#define COCKATRICE_SHORTCUT_SETTINGS_PAGE_H - -#include "abstract_settings_page.h" - -#include -#include -#include -#include - -class SequenceEdit; -class ShortcutTreeView; -class SearchLineEdit; - -class ShortcutSettingsPage : public AbstractSettingsPage -{ - Q_OBJECT -public: - ShortcutSettingsPage(); - void retranslateUi() override; - -private: - SearchLineEdit *searchEdit; - ShortcutTreeView *shortcutsTable; - QVBoxLayout *mainLayout; - QHBoxLayout *buttonsLayout; - QGroupBox *editShortcutGroupBox; - QGridLayout *editLayout; - QLabel *currentActionGroupLabel; - QLabel *currentActionGroupName; - QLabel *currentActionLabel; - QLabel *currentActionName; - QLabel *currentShortcutLabel; - SequenceEdit *editTextBox; - QLabel *faqLabel; - QPushButton *btnResetAll; - QPushButton *btnClearAll; - -private slots: - void resetShortcuts(); - void clearShortcuts(); - void currentItemChanged(const QString &key); -}; - -#endif // COCKATRICE_SHORTCUT_SETTINGS_PAGE_H diff --git a/cockatrice/src/interface/widgets/settings_page/sound_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/sound_settings_page.cpp deleted file mode 100644 index e7e92ea15..000000000 --- a/cockatrice/src/interface/widgets/settings_page/sound_settings_page.cpp +++ /dev/null @@ -1,86 +0,0 @@ -#include "sound_settings_page.h" - -#include "../../../client/settings/cache_settings.h" -#include "../client/sound_engine.h" - -#include - -SoundSettingsPage::SoundSettingsPage() -{ - soundEnabledCheckBox.setChecked(SettingsCache::instance().getSoundEnabled()); - connect(&soundEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setSoundEnabled); - - QString themeName = SettingsCache::instance().getSoundThemeName(); - - QStringList themeDirs = soundEngine->getAvailableThemes().keys(); - for (int i = 0; i < themeDirs.size(); i++) { - themeBox.addItem(themeDirs[i]); - if (themeDirs[i] == themeName) { - themeBox.setCurrentIndex(i); - } - } - - connect(&themeBox, qOverload(&QComboBox::currentIndexChanged), this, &SoundSettingsPage::themeBoxChanged); - connect(&soundTestButton, &QPushButton::clicked, soundEngine, &SoundEngine::testSound); - - masterVolumeSlider = new QSlider(Qt::Horizontal); - masterVolumeSlider->setMinimum(0); - masterVolumeSlider->setMaximum(100); - masterVolumeSlider->setValue(SettingsCache::instance().getMasterVolume()); - masterVolumeSlider->setToolTip(QString::number(SettingsCache::instance().getMasterVolume())); - connect(&SettingsCache::instance(), &SettingsCache::masterVolumeChanged, this, - &SoundSettingsPage::masterVolumeChanged); - connect(masterVolumeSlider, &QSlider::sliderReleased, soundEngine, &SoundEngine::testSound); - connect(masterVolumeSlider, &QSlider::valueChanged, &SettingsCache::instance(), &SettingsCache::setMasterVolume); - - masterVolumeSpinBox = new QSpinBox(); - masterVolumeSpinBox->setMinimum(0); - masterVolumeSpinBox->setMaximum(100); - masterVolumeSpinBox->setValue(SettingsCache::instance().getMasterVolume()); - connect(masterVolumeSlider, &QSlider::valueChanged, masterVolumeSpinBox, &QSpinBox::setValue); - connect(masterVolumeSpinBox, qOverload(&QSpinBox::valueChanged), masterVolumeSlider, &QSlider::setValue); - - auto *soundGrid = new QGridLayout; - soundGrid->addWidget(&soundEnabledCheckBox, 0, 0, 1, 3); - soundGrid->addWidget(&masterVolumeLabel, 1, 0); - soundGrid->addWidget(masterVolumeSlider, 1, 1); - soundGrid->addWidget(masterVolumeSpinBox, 1, 2); - soundGrid->addWidget(&themeLabel, 2, 0); - soundGrid->addWidget(&themeBox, 2, 1); - soundGrid->addWidget(&soundTestButton, 3, 1); - - soundGroupBox = new QGroupBox; - soundGroupBox->setLayout(soundGrid); - - auto *mainLayout = new QVBoxLayout; - mainLayout->addWidget(soundGroupBox); - mainLayout->addStretch(); - - setLayout(mainLayout); - - connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &SoundSettingsPage::retranslateUi); - retranslateUi(); -} - -void SoundSettingsPage::themeBoxChanged(int index) -{ - QStringList themeDirs = soundEngine->getAvailableThemes().keys(); - if (index >= 0 && index < themeDirs.count()) { - SettingsCache::instance().setSoundThemeName(themeDirs.at(index)); - } -} - -void SoundSettingsPage::masterVolumeChanged(int value) -{ - masterVolumeSlider->setToolTip(QString::number(value)); -} - -void SoundSettingsPage::retranslateUi() -{ - soundEnabledCheckBox.setText(tr("Enable &sounds")); - themeLabel.setText(tr("Current sounds theme:")); - soundTestButton.setText(tr("Test system sound engine")); - soundGroupBox->setTitle(tr("Sound settings")); - masterVolumeLabel.setText(tr("Master volume")); -} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/settings_page/sound_settings_page.h b/cockatrice/src/interface/widgets/settings_page/sound_settings_page.h deleted file mode 100644 index f90bcbc5a..000000000 --- a/cockatrice/src/interface/widgets/settings_page/sound_settings_page.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef COCKATRICE_SOUND_SETTINGS_PAGE_H -#define COCKATRICE_SOUND_SETTINGS_PAGE_H - -#include "abstract_settings_page.h" - -#include -#include -#include -#include -#include -#include - -class SoundSettingsPage : public AbstractSettingsPage -{ - Q_OBJECT -public: - SoundSettingsPage(); - void retranslateUi() override; - -private: - QLabel themeLabel; - QComboBox themeBox; - QGroupBox *soundGroupBox; - QPushButton soundTestButton; - QCheckBox soundEnabledCheckBox; - QLabel masterVolumeLabel; - QSlider *masterVolumeSlider; - QSpinBox *masterVolumeSpinBox; - -private slots: - void masterVolumeChanged(int value); - void themeBoxChanged(int index); -}; - -#endif // COCKATRICE_SOUND_SETTINGS_PAGE_H diff --git a/cockatrice/src/interface/widgets/settings_page/storage_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/storage_settings_page.cpp deleted file mode 100644 index c9d3c7789..000000000 --- a/cockatrice/src/interface/widgets/settings_page/storage_settings_page.cpp +++ /dev/null @@ -1,244 +0,0 @@ -#include "storage_settings_page.h" - -#include "../../../client/settings/cache_settings.h" -#include "../interface/card_picture_loader/card_picture_loader.h" - -#include -#include -#include - -StorageSettingsPage::StorageSettingsPage() -{ - auto *lpNetworkCacheGrid = new QGridLayout; - auto *lpImageBackupGrid = new QGridLayout; - auto *lpPixmapCacheGrid = new QGridLayout; - - networkCacheExplainerLabel.setWordWrap(true); - imageBackupExplainerLabel.setWordWrap(true); - pixmapCacheExplainerLabel.setWordWrap(true); - - connect(&clearDownloadedPicsButton, &QPushButton::clicked, this, - &StorageSettingsPage::clearDownloadedPicsButtonClicked); - - connect(&clearPixmapCacheButton, &QPushButton::clicked, this, &StorageSettingsPage::clearPixmapCacheButtonClicked); - - // pixmap cache - pixmapCacheEdit.setMinimum(PIXMAPCACHE_SIZE_MIN); - // 2047 is the max value to avoid overflowing of QPixmapCache::setCacheLimit(int size) - pixmapCacheEdit.setMaximum(PIXMAPCACHE_SIZE_MAX); - pixmapCacheEdit.setSingleStep(64); - pixmapCacheEdit.setValue(SettingsCache::instance().getPixmapCacheSize()); - pixmapCacheEdit.setSuffix(" MB"); - - // Caching method - - cardPictureLoaderCacheMethodComboBox = new QComboBox; - for (auto method : CardPictureLoaderCacheMethod::methods()) { - cardPictureLoaderCacheMethodComboBox->addItem(method.displayName, static_cast(method.id)); - } - - int currentCacheMethod = static_cast(SettingsCache::instance().getCardPictureLoaderCacheMethod()); - - int currentIndex = cardPictureLoaderCacheMethodComboBox->findData(currentCacheMethod); - if (currentIndex >= 0) { - cardPictureLoaderCacheMethodComboBox->setCurrentIndex(currentIndex); - } - - connect(cardPictureLoaderCacheMethodComboBox, qOverload(&QComboBox::currentIndexChanged), this, - [this](int index) { - auto cacheMethod = static_cast( - cardPictureLoaderCacheMethodComboBox->itemData(index).toInt()); - - bool useNetworkCache = (cacheMethod == CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE); - - if (useNetworkCache) { - clearImageBackupsButtonClicked(); - } else { - clearDownloadedPicsButtonClicked(); - } - - mpNetworkCacheGroupBox->setEnabled(useNetworkCache); - mpImageBackupGroupBox->setEnabled(!useNetworkCache); - - SettingsCache::instance().setCardImageCacheMethod(cacheMethod); - }); - - // Network Cache - - networkCacheEdit.setMinimum(NETWORK_CACHE_SIZE_MIN); - networkCacheEdit.setMaximum(NETWORK_CACHE_SIZE_MAX); - networkCacheEdit.setSingleStep(1); - networkCacheEdit.setValue(SettingsCache::instance().getNetworkCacheSizeInMB()); - networkCacheEdit.setSuffix(" MB"); - - networkRedirectCacheTtlEdit.setMinimum(NETWORK_REDIRECT_CACHE_TTL_MIN); - networkRedirectCacheTtlEdit.setMaximum(NETWORK_REDIRECT_CACHE_TTL_MAX); - networkRedirectCacheTtlEdit.setSingleStep(1); - networkRedirectCacheTtlEdit.setValue(SettingsCache::instance().getRedirectCacheTtl()); - - // Image Backup - localCardImageStorageNamingSchemeComboBox = new QComboBox; - for (const auto &scheme : CardPictureLoaderLocalSchemes::exportSchemes()) { - localCardImageStorageNamingSchemeComboBox->addItem(scheme.displayName, static_cast(scheme.id)); - } - - int current = static_cast(SettingsCache::instance().getLocalCardImageStorageNamingScheme()); - - int index = localCardImageStorageNamingSchemeComboBox->findData(current); - if (index >= 0) { - localCardImageStorageNamingSchemeComboBox->setCurrentIndex(index); - } - - connect(localCardImageStorageNamingSchemeComboBox, qOverload(&QComboBox::currentIndexChanged), this, - [this](int index) { - auto scheme = static_cast( - localCardImageStorageNamingSchemeComboBox->itemData(index).toInt()); - SettingsCache::instance().setLocalCardImageStorageNamingScheme(scheme); - }); - - connect(&clearBackupsButton, &QPushButton::clicked, this, &StorageSettingsPage::clearImageBackupsButtonClicked); - - auto cacheMethodLayout = new QHBoxLayout; - cacheMethodLayout->addWidget(&cardPictureLoaderCacheMethodLabel); - cacheMethodLayout->addWidget(cardPictureLoaderCacheMethodComboBox); - - auto networkCacheLayout = new QHBoxLayout; - networkCacheLayout->addWidget(&clearDownloadedPicsButton); - networkCacheLayout->addStretch(); - networkCacheLayout->addWidget(&networkCacheLabel); - networkCacheLayout->addWidget(&networkCacheEdit); - - auto networkRedirectCacheLayout = new QHBoxLayout; - networkRedirectCacheLayout->addStretch(); - networkRedirectCacheLayout->addWidget(&networkRedirectCacheTtlLabel); - networkRedirectCacheLayout->addWidget(&networkRedirectCacheTtlEdit); - - auto pixmapCacheLayout = new QHBoxLayout; - pixmapCacheLayout->addWidget(&clearPixmapCacheButton); - pixmapCacheLayout->addStretch(); - pixmapCacheLayout->addWidget(&pixmapCacheLabel); - pixmapCacheLayout->addWidget(&pixmapCacheEdit); - - lpNetworkCacheGrid->addWidget(&networkCacheExplainerLabel, 0, 0); - lpNetworkCacheGrid->addLayout(networkCacheLayout, 1, 0); - lpNetworkCacheGrid->addLayout(networkRedirectCacheLayout, 2, 0); - - // Image Backup Layout - lpImageBackupGrid->addWidget(&imageBackupExplainerLabel, 0, 0, 1, 2); - lpImageBackupGrid->addWidget(&localCardImageStorageNamingSchemeLabel, 1, 0); - lpImageBackupGrid->addWidget(localCardImageStorageNamingSchemeComboBox, 1, 1); - lpImageBackupGrid->addWidget(&clearBackupsButton, 2, 0); - - lpPixmapCacheGrid->addWidget(&pixmapCacheExplainerLabel, 0, 0); - lpPixmapCacheGrid->addLayout(pixmapCacheLayout, 1, 0); - - connect(&pixmapCacheEdit, qOverload(&QSpinBox::valueChanged), &SettingsCache::instance(), - &SettingsCache::setPixmapCacheSize); - connect(&networkCacheEdit, qOverload(&QSpinBox::valueChanged), &SettingsCache::instance(), - &SettingsCache::setNetworkCacheSizeInMB); - connect(&networkRedirectCacheTtlEdit, qOverload(&QSpinBox::valueChanged), &SettingsCache::instance(), - &SettingsCache::setNetworkRedirectCacheTtl); - - mpCacheMethodGroupBox = new QGroupBox; - mpCacheMethodGroupBox->setLayout(cacheMethodLayout); - - mpNetworkCacheGroupBox = new QGroupBox; - mpNetworkCacheGroupBox->setLayout(lpNetworkCacheGrid); - - mpImageBackupGroupBox = new QGroupBox; - mpImageBackupGroupBox->setLayout(lpImageBackupGrid); - - mpPixmapCacheGroupBox = new QGroupBox; - mpPixmapCacheGroupBox->setLayout(lpPixmapCacheGrid); - - auto *lpMainLayout = new QVBoxLayout; - - lpMainLayout->addWidget(mpCacheMethodGroupBox); - lpMainLayout->addWidget(mpNetworkCacheGroupBox); - lpMainLayout->addWidget(mpImageBackupGroupBox); - lpMainLayout->addWidget(mpPixmapCacheGroupBox); - lpMainLayout->addStretch(); - - setLayout(lpMainLayout); - - bool useNetworkCache = SettingsCache::instance().getCardPictureLoaderCacheMethod() == - CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE; - - mpNetworkCacheGroupBox->setEnabled(useNetworkCache); - mpImageBackupGroupBox->setEnabled(!useNetworkCache); - - connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &StorageSettingsPage::retranslateUi); - retranslateUi(); -} - -void StorageSettingsPage::clearDownloadedPicsButtonClicked() -{ - CardPictureLoader::clearNetworkCache(); - CardPictureLoader::clearPixmapCache(); - QMessageBox::information(this, tr("Success"), tr("Cached card pictures have been reset.")); -} - -void StorageSettingsPage::clearImageBackupsButtonClicked() -{ - QString picsPath = SettingsCache::instance().getPicsPath() + "/downloadedPics"; - - QDir dir(picsPath); - bool success = dir.removeRecursively(); - - CardPictureLoader::clearPixmapCache(); - - if (success) { - QMessageBox::information(this, tr("Success"), tr("Downloaded card pictures have been reset.")); - } else { - QMessageBox::critical(this, tr("Error"), tr("One or more downloaded card pictures could not be cleared.")); - } -} - -void StorageSettingsPage::clearPixmapCacheButtonClicked() -{ - CardPictureLoader::clearPixmapCache(); - QMessageBox::information(this, tr("Success"), tr("In-memory (currently loaded) card pictures have been reset.")); -} - -void StorageSettingsPage::retranslateUi() -{ - cardPictureLoaderCacheMethodLabel.setText(tr("Card Picture Loader Caching Method:")); - - networkCacheExplainerLabel.setText( - tr("The network cache is the preferred way of storing images. Downloaded images " - "are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors " - "this cache and deletes the least recently seen card images to ensure the cache does not exceed the " - "configured size.")); - imageBackupExplainerLabel.setText( - tr("Writing card images directly to a folder on your hard drive is another way " - "of storing images. This does not change how Cockatrice accesses or downloads " - "images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it " - "is up to you to ensure sufficient available space. It should also be noted that if a provider outage " - "causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you " - "manually delete the file, as opposed to using the network cache, which automatically rotates and thus " - "correct errors after a while.")); - pixmapCacheExplainerLabel.setText( - tr("This is the in-memory picture cache used by the application at runtime. It determines how much memory " - "(RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will " - "allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make " - "Cockatrice reload all images from the network cache or the disk.")); - - clearDownloadedPicsButton.setText(tr("Delete Cached Images")); - clearBackupsButton.setText(tr("Delete Saved Images")); - clearPixmapCacheButton.setText(tr("Clear In-Memory Images")); - - mpCacheMethodGroupBox->setTitle(tr("Card Picture Loader Cache Method")); - mpNetworkCacheGroupBox->setTitle(tr("Network Cache")); - mpImageBackupGroupBox->setTitle(tr("Filesystem")); - mpPixmapCacheGroupBox->setTitle(tr("In-Memory Picture Cache")); - - networkCacheLabel.setText(tr("Network Cache Size:")); - networkCacheEdit.setToolTip(tr("On-disk cache for downloaded pictures")); - networkRedirectCacheTtlLabel.setText(tr("Redirect Cache TTL:")); - networkRedirectCacheTtlEdit.setToolTip(tr("How long cached redirects for urls are valid for.")); - pixmapCacheLabel.setText(tr("Picture Cache Size:")); - pixmapCacheEdit.setToolTip(tr("In-memory cache for pictures not currently on screen")); - localCardImageStorageNamingSchemeLabel.setText(tr("Naming scheme:")); - - networkRedirectCacheTtlEdit.setSuffix(" " + tr("Day(s)")); -} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/settings_page/storage_settings_page.h b/cockatrice/src/interface/widgets/settings_page/storage_settings_page.h deleted file mode 100644 index 5c8a00981..000000000 --- a/cockatrice/src/interface/widgets/settings_page/storage_settings_page.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef COCKATRICE_STORAGE_SETTINGS_PAGE_H -#define COCKATRICE_STORAGE_SETTINGS_PAGE_H - -#include "abstract_settings_page.h" - -#include -#include -#include -#include -#include - -class StorageSettingsPage : public AbstractSettingsPage -{ - Q_OBJECT -public: - StorageSettingsPage(); - void retranslateUi() override; - -private slots: - void clearDownloadedPicsButtonClicked(); - void clearImageBackupsButtonClicked(); - void clearPixmapCacheButtonClicked(); - -private: - QPushButton clearDownloadedPicsButton; - QPushButton clearBackupsButton; - QPushButton clearPixmapCacheButton; - - QGroupBox *mpCacheMethodGroupBox; - QGroupBox *mpNetworkCacheGroupBox; - QGroupBox *mpImageBackupGroupBox; - QGroupBox *mpPixmapCacheGroupBox; - - QLabel networkCacheExplainerLabel; - QLabel imageBackupExplainerLabel; - QLabel pixmapCacheExplainerLabel; - - QLabel cardPictureLoaderCacheMethodLabel; - QComboBox *cardPictureLoaderCacheMethodComboBox; - QLabel networkCacheLabel; - QSpinBox networkCacheEdit; - QLabel networkRedirectCacheTtlLabel; - QSpinBox networkRedirectCacheTtlEdit; - QSpinBox pixmapCacheEdit; - QLabel pixmapCacheLabel; - QLabel localCardImageStorageNamingSchemeLabel; - QComboBox *localCardImageStorageNamingSchemeComboBox; -}; - -#endif // COCKATRICE_STORAGE_SETTINGS_PAGE_H diff --git a/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp deleted file mode 100644 index 44b30d29c..000000000 --- a/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp +++ /dev/null @@ -1,248 +0,0 @@ -#include "user_interface_settings_page.h" - -#include "../../../client/settings/cache_settings.h" -#include "../interface/widgets/tabs/tab_supervisor.h" - -#include - -enum visualDeckStoragePromptForConversionIndex -{ - visualDeckStoragePromptForConversionIndexNone, - visualDeckStoragePromptForConversionIndexPrompt, - visualDeckStoragePromptForConversionIndexAlways -}; - -UserInterfaceSettingsPage::UserInterfaceSettingsPage() -{ - // general settings and notification settings - notificationsEnabledCheckBox.setChecked(SettingsCache::instance().getNotificationsEnabled()); - connect(¬ificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setNotificationsEnabled); - connect(¬ificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, this, - &UserInterfaceSettingsPage::setNotificationEnabled); - - specNotificationsEnabledCheckBox.setChecked(SettingsCache::instance().getSpectatorNotificationsEnabled()); - specNotificationsEnabledCheckBox.setEnabled(SettingsCache::instance().getNotificationsEnabled()); - connect(&specNotificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setSpectatorNotificationsEnabled); - - buddyConnectNotificationsEnabledCheckBox.setChecked( - SettingsCache::instance().getBuddyConnectNotificationsEnabled()); - buddyConnectNotificationsEnabledCheckBox.setEnabled(SettingsCache::instance().getNotificationsEnabled()); - connect(&buddyConnectNotificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setBuddyConnectNotificationsEnabled); - - doubleClickToPlayCheckBox.setChecked(SettingsCache::instance().getDoubleClickToPlay()); - connect(&doubleClickToPlayCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setDoubleClickToPlay); - - clickPlaysAllSelectedCheckBox.setChecked(SettingsCache::instance().getClickPlaysAllSelected()); - connect(&clickPlaysAllSelectedCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setClickPlaysAllSelected); - - playToStackCheckBox.setChecked(SettingsCache::instance().getPlayToStack()); - connect(&playToStackCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setPlayToStack); - - doNotDeleteArrowsInSubPhasesCheckBox.setChecked(SettingsCache::instance().getDoNotDeleteArrowsInSubPhases()); - connect(&doNotDeleteArrowsInSubPhasesCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setDoNotDeleteArrowsInSubPhases); - - closeEmptyCardViewCheckBox.setChecked(SettingsCache::instance().getCloseEmptyCardView()); - connect(&closeEmptyCardViewCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setCloseEmptyCardView); - - focusCardViewSearchBarCheckBox.setChecked(SettingsCache::instance().getFocusCardViewSearchBar()); - connect(&focusCardViewSearchBarCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setFocusCardViewSearchBar); - - annotateTokensCheckBox.setChecked(SettingsCache::instance().getAnnotateTokens()); - connect(&annotateTokensCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setAnnotateTokens); - - showDragSelectionCountCheckBox.setChecked(SettingsCache::instance().getShowDragSelectionCount()); - connect(&showDragSelectionCountCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setShowDragSelectionCount); - - showTotalSelectionCountCheckBox.setChecked(SettingsCache::instance().getShowTotalSelectionCount()); - connect(&showTotalSelectionCountCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setShowTotalSelectionCount); - - showSubtypeSelectionTallyCheckBox.setChecked(SettingsCache::instance().getShowSubtypeSelectionTally()); - connect(&showSubtypeSelectionTallyCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setShowSubtypeSelectionTally); - - useTearOffMenusCheckBox.setChecked(SettingsCache::instance().getUseTearOffMenus()); - connect(&useTearOffMenusCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - [](const QT_STATE_CHANGED_T state) { SettingsCache::instance().setUseTearOffMenus(state == Qt::Checked); }); - - keepGameChatFocusCheckBox.setChecked(SettingsCache::instance().getKeepGameChatFocus()); - connect(&keepGameChatFocusCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setKeepGameChatFocus); - - auto *generalGrid = new QGridLayout; - generalGrid->addWidget(&doubleClickToPlayCheckBox, 0, 0); - generalGrid->addWidget(&clickPlaysAllSelectedCheckBox, 1, 0); - generalGrid->addWidget(&playToStackCheckBox, 2, 0); - generalGrid->addWidget(&doNotDeleteArrowsInSubPhasesCheckBox, 3, 0); - generalGrid->addWidget(&closeEmptyCardViewCheckBox, 4, 0); - generalGrid->addWidget(&focusCardViewSearchBarCheckBox, 5, 0); - generalGrid->addWidget(&annotateTokensCheckBox, 6, 0); - generalGrid->addWidget(&showDragSelectionCountCheckBox, 7, 0); - generalGrid->addWidget(&showTotalSelectionCountCheckBox, 8, 0); - generalGrid->addWidget(&showSubtypeSelectionTallyCheckBox, 9, 0); - generalGrid->addWidget(&useTearOffMenusCheckBox, 10, 0); - generalGrid->addWidget(&keepGameChatFocusCheckBox, 11, 0); - - generalGroupBox = new QGroupBox; - generalGroupBox->setLayout(generalGrid); - - auto *notificationsGrid = new QGridLayout; - notificationsGrid->addWidget(¬ificationsEnabledCheckBox, 0, 0); - notificationsGrid->addWidget(&specNotificationsEnabledCheckBox, 1, 0); - notificationsGrid->addWidget(&buddyConnectNotificationsEnabledCheckBox, 2, 0); - - notificationsGroupBox = new QGroupBox; - notificationsGroupBox->setLayout(notificationsGrid); - - // animation settings - tapAnimationCheckBox.setChecked(SettingsCache::instance().getTapAnimation()); - connect(&tapAnimationCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setTapAnimation); - - auto *animationGrid = new QGridLayout; - animationGrid->addWidget(&tapAnimationCheckBox, 0, 0); - - animationGroupBox = new QGroupBox; - animationGroupBox->setLayout(animationGrid); - - // deck editor settings - openDeckInNewTabCheckBox.setChecked(SettingsCache::instance().getOpenDeckInNewTab()); - connect(&openDeckInNewTabCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setOpenDeckInNewTab); - - visualDeckStorageInGameCheckBox.setChecked(SettingsCache::instance().getVisualDeckStorageInGame()); - connect(&visualDeckStorageInGameCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setVisualDeckStorageInGame); - - visualDeckStorageSelectionAnimationCheckBox.setChecked( - SettingsCache::instance().getVisualDeckStorageSelectionAnimation()); - connect(&visualDeckStorageSelectionAnimationCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setVisualDeckStorageSelectionAnimation); - - visualDeckStoragePromptForConversionSelector.addItem(""); // these will be set in retranslateUI - visualDeckStoragePromptForConversionSelector.addItem(""); - visualDeckStoragePromptForConversionSelector.addItem(""); - if (SettingsCache::instance().getVisualDeckStoragePromptForConversion()) { - visualDeckStoragePromptForConversionSelector.setCurrentIndex(visualDeckStoragePromptForConversionIndexPrompt); - } else if (SettingsCache::instance().getVisualDeckStorageAlwaysConvert()) { - visualDeckStoragePromptForConversionSelector.setCurrentIndex(visualDeckStoragePromptForConversionIndexAlways); - } else { - visualDeckStoragePromptForConversionSelector.setCurrentIndex(visualDeckStoragePromptForConversionIndexNone); - } - connect(&visualDeckStoragePromptForConversionSelector, QOverload::of(&QComboBox::currentIndexChanged), this, - [](int index) { - SettingsCache::instance().setVisualDeckStoragePromptForConversion( - index == visualDeckStoragePromptForConversionIndexPrompt); - SettingsCache::instance().setVisualDeckStorageAlwaysConvert( - index == visualDeckStoragePromptForConversionIndexAlways); - }); - - defaultDeckEditorTypeSelector.addItem(""); // these will be set in retranslateUI - defaultDeckEditorTypeSelector.addItem(""); - defaultDeckEditorTypeSelector.setCurrentIndex(SettingsCache::instance().getDefaultDeckEditorType()); - connect(&defaultDeckEditorTypeSelector, QOverload::of(&QComboBox::currentIndexChanged), - &SettingsCache::instance(), &SettingsCache::setDefaultDeckEditorType); - - auto *deckEditorGrid = new QGridLayout; - deckEditorGrid->addWidget(&openDeckInNewTabCheckBox, 0, 0); - deckEditorGrid->addWidget(&visualDeckStorageInGameCheckBox, 1, 0); - deckEditorGrid->addWidget(&visualDeckStorageSelectionAnimationCheckBox, 2, 0); - deckEditorGrid->addWidget(&visualDeckStoragePromptForConversionLabel, 3, 0); - deckEditorGrid->addWidget(&visualDeckStoragePromptForConversionSelector, 3, 1); - deckEditorGrid->addWidget(&defaultDeckEditorTypeLabel, 4, 0); - deckEditorGrid->addWidget(&defaultDeckEditorTypeSelector, 4, 1); - - deckEditorGroupBox = new QGroupBox; - deckEditorGroupBox->setLayout(deckEditorGrid); - - // replay settings - rewindBufferingMsBox.setRange(0, 9999); - rewindBufferingMsBox.setValue(SettingsCache::instance().getRewindBufferingMs()); - connect(&rewindBufferingMsBox, qOverload(&QSpinBox::valueChanged), &SettingsCache::instance(), - &SettingsCache::setRewindBufferingMs); - - auto *replayGrid = new QGridLayout; - replayGrid->addWidget(&rewindBufferingMsLabel, 0, 0, 1, 1); - replayGrid->addWidget(&rewindBufferingMsBox, 0, 1, 1, 1); - - replayGroupBox = new QGroupBox; - replayGroupBox->setLayout(replayGrid); - - // putting it all together - auto *mainLayout = new QVBoxLayout; - mainLayout->addWidget(generalGroupBox); - mainLayout->addWidget(notificationsGroupBox); - mainLayout->addWidget(animationGroupBox); - mainLayout->addWidget(deckEditorGroupBox); - mainLayout->addWidget(replayGroupBox); - mainLayout->addStretch(); - - setLayout(mainLayout); - - connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &UserInterfaceSettingsPage::retranslateUi); - retranslateUi(); -} - -void UserInterfaceSettingsPage::setNotificationEnabled(QT_STATE_CHANGED_T i) -{ - specNotificationsEnabledCheckBox.setEnabled(i != 0); - buddyConnectNotificationsEnabledCheckBox.setEnabled(i != 0); - if (i == 0) { - specNotificationsEnabledCheckBox.setChecked(false); - buddyConnectNotificationsEnabledCheckBox.setChecked(false); - } -} - -void UserInterfaceSettingsPage::retranslateUi() -{ - generalGroupBox->setTitle(tr("General interface settings")); - doubleClickToPlayCheckBox.setText(tr("&Double-click cards to play them (instead of single-click)")); - clickPlaysAllSelectedCheckBox.setText(tr("&Clicking plays all selected cards (instead of just the clicked card)")); - playToStackCheckBox.setText(tr("&Play all nonlands onto the stack (not the battlefield) by default")); - doNotDeleteArrowsInSubPhasesCheckBox.setText(tr("Do not delete &arrows inside of subphases")); - closeEmptyCardViewCheckBox.setText(tr("Close card view window when last card is removed")); - focusCardViewSearchBarCheckBox.setText(tr("Auto focus search bar when card view window is opened")); - annotateTokensCheckBox.setText(tr("Annotate card text on tokens")); - showDragSelectionCountCheckBox.setText(tr("Show selection count during drag selection")); - showTotalSelectionCountCheckBox.setText(tr("Show total selection count")); - showSubtypeSelectionTallyCheckBox.setText(tr("Show subtype breakdown in selection tally")); - useTearOffMenusCheckBox.setText(tr("Use tear-off menus, allowing right click menus to persist on screen")); - keepGameChatFocusCheckBox.setText( - tr("Keep game chat focused when clicking in game (Note: disables card view search bar)")); - - notificationsGroupBox->setTitle(tr("Notifications settings")); - notificationsEnabledCheckBox.setText(tr("Enable notifications in taskbar")); - specNotificationsEnabledCheckBox.setText(tr("Notify in the taskbar for game events while you are spectating")); - buddyConnectNotificationsEnabledCheckBox.setText(tr("Notify in the taskbar when users in your buddy list connect")); - animationGroupBox->setTitle(tr("Animation settings")); - tapAnimationCheckBox.setText(tr("&Tap/untap animation")); - deckEditorGroupBox->setTitle(tr("Deck editor/storage settings")); - openDeckInNewTabCheckBox.setText(tr("Open deck in new tab by default")); - visualDeckStorageInGameCheckBox.setText(tr("Use visual deck storage in game lobby")); - visualDeckStorageSelectionAnimationCheckBox.setText(tr("Use selection animation for Visual Deck Storage")); - visualDeckStoragePromptForConversionLabel.setText( - tr("When adding a tag in the visual deck storage to a .txt deck:")); - visualDeckStoragePromptForConversionSelector.setItemText(visualDeckStoragePromptForConversionIndexNone, - tr("do nothing")); - visualDeckStoragePromptForConversionSelector.setItemText(visualDeckStoragePromptForConversionIndexPrompt, - tr("ask to convert to .cod")); - visualDeckStoragePromptForConversionSelector.setItemText(visualDeckStoragePromptForConversionIndexAlways, - tr("always convert to .cod")); - defaultDeckEditorTypeLabel.setText(tr("Default deck editor type")); - defaultDeckEditorTypeSelector.setItemText(TabSupervisor::ClassicDeckEditor, tr("Classic Deck Editor")); - defaultDeckEditorTypeSelector.setItemText(TabSupervisor::VisualDeckEditor, tr("Visual Deck Editor")); - replayGroupBox->setTitle(tr("Replay settings")); - rewindBufferingMsLabel.setText(tr("Buffer time for backwards skip via shortcut:")); - rewindBufferingMsBox.setSuffix(" ms"); -} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.h b/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.h deleted file mode 100644 index 06f0e6b83..000000000 --- a/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef COCKATRICE_USER_INTERFACE_SETTINGS_PAGE_H -#define COCKATRICE_USER_INTERFACE_SETTINGS_PAGE_H - -#include "abstract_settings_page.h" - -#include -#include -#include -#include -#include -#include - -class UserInterfaceSettingsPage : public AbstractSettingsPage -{ - Q_OBJECT -private slots: - void setNotificationEnabled(QT_STATE_CHANGED_T); - -private: - QCheckBox notificationsEnabledCheckBox; - QCheckBox specNotificationsEnabledCheckBox; - QCheckBox buddyConnectNotificationsEnabledCheckBox; - QCheckBox doubleClickToPlayCheckBox; - QCheckBox clickPlaysAllSelectedCheckBox; - QCheckBox playToStackCheckBox; - QCheckBox doNotDeleteArrowsInSubPhasesCheckBox; - QCheckBox closeEmptyCardViewCheckBox; - QCheckBox focusCardViewSearchBarCheckBox; - QCheckBox annotateTokensCheckBox; - QCheckBox showDragSelectionCountCheckBox; - QCheckBox showTotalSelectionCountCheckBox; - QCheckBox showSubtypeSelectionTallyCheckBox; - QCheckBox useTearOffMenusCheckBox; - QCheckBox keepGameChatFocusCheckBox; - QCheckBox tapAnimationCheckBox; - QCheckBox openDeckInNewTabCheckBox; - QLabel visualDeckStoragePromptForConversionLabel; - QComboBox visualDeckStoragePromptForConversionSelector; - QCheckBox visualDeckStorageInGameCheckBox; - QCheckBox visualDeckStorageSelectionAnimationCheckBox; - QLabel defaultDeckEditorTypeLabel; - QComboBox defaultDeckEditorTypeSelector; - QLabel rewindBufferingMsLabel; - QSpinBox rewindBufferingMsBox; - QGroupBox *generalGroupBox; - QGroupBox *notificationsGroupBox; - QGroupBox *animationGroupBox; - QGroupBox *deckEditorGroupBox; - QGroupBox *replayGroupBox; - -public: - UserInterfaceSettingsPage(); - void retranslateUi() override; -}; - -#endif // COCKATRICE_USER_INTERFACE_SETTINGS_PAGE_H 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 4bb8ffca4..afc834e10 100644 --- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include /** * @brief Constructs the AbstractTabDeckEditor. @@ -56,9 +56,6 @@ AbstractTabDeckEditor::AbstractTabDeckEditor(TabSupervisor *_tabSupervisor) : Ta deckStateManager = new DeckStateManager(this); - databaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), true, this); - databaseModel->setObjectName("databaseModel"); - cardDatabaseDockWidget = new DeckEditorCardDatabaseDockWidget(this); deckDockWidget = new DeckEditorDeckDockWidget(this); cardInfoDockWidget = new DeckEditorCardInfoDockWidget(this); @@ -108,17 +105,16 @@ void AbstractTabDeckEditor::registerDockWidget(QMenu *_viewMenu, QDockWidget *wi dockToActions.insert(widget, {menu, aVisible, aFloating, defaultSize}); } +/** + * @brief Updates the card info dock and printing selector. + * @param card The card to display. + */ void AbstractTabDeckEditor::updateCard(const ExactCard &card) { cardInfoDockWidget->updateCard(card); printingSelectorDockWidget->printingSelector->setCard(card.getCardPtr()); } -void AbstractTabDeckEditor::updateCardInfo(const ExactCard &card) -{ - cardInfoDockWidget->updateCard(card); -} - /** @brief Placeholder: called when the deck changes. */ void AbstractTabDeckEditor::onDeckChanged() { @@ -133,14 +129,48 @@ void AbstractTabDeckEditor::onDeckModified() emit tabTextChanged(this, getTabText()); } -void AbstractTabDeckEditor::addCard(const ExactCard &card, const QString &zoneName) +/** + * @brief Helper for adding a card to a deck zone. + * @param card Card to add. + * @param zoneName Zone to add the card to. + */ +void AbstractTabDeckEditor::addCardHelper(const ExactCard &card, const QString &zoneName) { deckStateManager->addCard(card, zoneName); + + cardDatabaseDockWidget->highlightAllSearchEdit(); } -void AbstractTabDeckEditor::decrementCard(const ExactCard &card, const QString &zoneName) +/** + * @brief Adds a card to the main deck or sideboard depending on Ctrl key. + */ +void AbstractTabDeckEditor::actAddCard(const ExactCard &card) { - deckStateManager->decrementCard(card, zoneName); + if (QApplication::keyboardModifiers() & Qt::ControlModifier) + actAddCardToSideboard(card); + else + addCardHelper(card, DECK_ZONE_MAIN); + + deckMenu->setSaveStatus(true); +} + +/** @brief Adds a card to the sideboard explicitly. */ +void AbstractTabDeckEditor::actAddCardToSideboard(const ExactCard &card) +{ + addCardHelper(card, DECK_ZONE_SIDE); + deckMenu->setSaveStatus(true); +} + +/** @brief Decrements a card from the main deck. */ +void AbstractTabDeckEditor::actDecrementCard(const ExactCard &card) +{ + deckStateManager->decrementCard(card, DECK_ZONE_MAIN); +} + +/** @brief Decrements a card from the sideboard. */ +void AbstractTabDeckEditor::actDecrementCardFromSideboard(const ExactCard &card) +{ + deckStateManager->decrementCard(card, DECK_ZONE_SIDE); } /** @@ -173,9 +203,8 @@ void AbstractTabDeckEditor::setDeck(const LoadedDeck &_deck) void AbstractTabDeckEditor::actNewDeck() { auto deckOpenLocation = confirmOpen(false); - if (deckOpenLocation == CANCELLED) { + if (deckOpenLocation == CANCELLED) return; - } if (deckOpenLocation == NEW_TAB) { emit openDeckEditor(LoadedDeck()); @@ -200,25 +229,22 @@ void AbstractTabDeckEditor::cleanDeckAndResetModified() AbstractTabDeckEditor::DeckOpenLocation AbstractTabDeckEditor::confirmOpen(const bool openInSameTabIfBlank) { if (SettingsCache::instance().getOpenDeckInNewTab()) { - if (openInSameTabIfBlank && deckStateManager->isBlankNewDeck()) { + if (openInSameTabIfBlank && deckStateManager->isBlankNewDeck()) return SAME_TAB; - } else { + else return NEW_TAB; - } } - if (!deckStateManager->isModified()) { + if (!deckStateManager->isModified()) return SAME_TAB; - } tabSupervisor->setCurrentWidget(this); QMessageBox *msgBox = createSaveConfirmationWindow(); QPushButton *newTabButton = msgBox->addButton(tr("Open in new tab"), QMessageBox::ApplyRole); int ret = msgBox->exec(); - if (msgBox->clickedButton() == newTabButton) { + if (msgBox->clickedButton() == newTabButton) return NEW_TAB; - } switch (ret) { case QMessageBox::Save: @@ -251,14 +277,12 @@ QMessageBox *AbstractTabDeckEditor::createSaveConfirmationWindow() void AbstractTabDeckEditor::actLoadDeck() { auto deckOpenLocation = confirmOpen(); - if (deckOpenLocation == CANCELLED) { + if (deckOpenLocation == CANCELLED) return; - } DlgLoadDeck dialog(this); - if (!dialog.exec()) { + if (!dialog.exec()) return; - } QString fileName = dialog.selectedFiles().at(0); openDeckFromFile(fileName, deckOpenLocation); @@ -271,9 +295,8 @@ void AbstractTabDeckEditor::actLoadDeck() void AbstractTabDeckEditor::actOpenRecent(const QString &fileName) { auto deckOpenLocation = confirmOpen(); - if (deckOpenLocation == CANCELLED) { + if (deckOpenLocation == CANCELLED) return; - } openDeckFromFile(fileName, deckOpenLocation); } @@ -326,9 +349,8 @@ bool AbstractTabDeckEditor::actSaveDeck() return true; } - if (loadedDeck.lastLoadInfo.fileName.isEmpty()) { + if (loadedDeck.lastLoadInfo.fileName.isEmpty()) return actSaveDeckAs(); - } if (DeckLoader::saveToFile(loadedDeck)) { deckStateManager->setModified(false); @@ -356,9 +378,8 @@ bool AbstractTabDeckEditor::actSaveDeckAs() dialog.setNameFilters(DeckLoader::FILE_NAME_FILTERS); dialog.selectFile(deckList.getName().trimmed()); - if (!dialog.exec()) { + if (!dialog.exec()) return false; - } QString fileName = dialog.selectedFiles().at(0); DeckFileFormat::Format fmt = DeckFileFormat::getFormatFromName(fileName); @@ -384,11 +405,10 @@ bool AbstractTabDeckEditor::actSaveDeckAs() */ void AbstractTabDeckEditor::saveDeckRemoteFinished(const Response &response) { - if (response.response_code() != Response::RespOk) { + if (response.response_code() != Response::RespOk) QMessageBox::critical(this, tr("Error"), tr("The deck could not be saved.")); - } else { + else deckStateManager->setModified(false); - } } /** @@ -398,14 +418,12 @@ void AbstractTabDeckEditor::saveDeckRemoteFinished(const Response &response) void AbstractTabDeckEditor::actLoadDeckFromClipboard() { auto deckOpenLocation = confirmOpen(); - if (deckOpenLocation == CANCELLED) { + if (deckOpenLocation == CANCELLED) return; - } DlgLoadDeckFromClipboard dlg(this); - if (!dlg.exec()) { + if (!dlg.exec()) return; - } if (deckOpenLocation == NEW_TAB) { emit openDeckEditor({.deckList = dlg.getDeckList()}); @@ -425,9 +443,8 @@ void AbstractTabDeckEditor::editDeckInClipboard(bool annotated) { LoadedDeck loadedDeck = deckStateManager->toLoadedDeck(); DlgEditDeckInClipboard dlg(loadedDeck.deckList, annotated, this); - if (!dlg.exec()) { + if (!dlg.exec()) return; - } setDeck({dlg.getDeckList(), loadedDeck.lastLoadInfo}); deckStateManager->setModified(true); @@ -485,14 +502,12 @@ void AbstractTabDeckEditor::actPrintDeck() void AbstractTabDeckEditor::actLoadDeckFromWebsite() { auto deckOpenLocation = confirmOpen(); - if (deckOpenLocation == CANCELLED) { + if (deckOpenLocation == CANCELLED) return; - } DlgLoadDeckFromWebsite dlg(this); - if (!dlg.exec()) { + if (!dlg.exec()) return; - } if (deckOpenLocation == NEW_TAB) { emit openDeckEditor({.deckList = dlg.getDeck()}); @@ -542,14 +557,14 @@ void AbstractTabDeckEditor::actExportDeckDecklistXyz() /** @brief Analyzes the deck using DeckStats. */ void AbstractTabDeckEditor::actAnalyzeDeckDeckstats() { - auto *interface = new DeckStatsInterface(this); + auto *interface = new DeckStatsInterface(*cardDatabaseDockWidget->getDatabase(), this); interface->analyzeDeck(deckStateManager->getDeckList()); } /** @brief Analyzes the deck using TappedOut. */ void AbstractTabDeckEditor::actAnalyzeDeckTappedout() { - auto *interface = new TappedOutInterface(this); + auto *interface = new TappedOutInterface(*cardDatabaseDockWidget->getDatabase(), this); interface->analyzeDeck(deckStateManager->getDeckList()); } @@ -575,11 +590,10 @@ bool AbstractTabDeckEditor::confirmClose() if (deckStateManager->isModified()) { tabSupervisor->setCurrentWidget(this); int ret = createSaveConfirmationWindow()->exec(); - if (ret == QMessageBox::Save) { + if (ret == QMessageBox::Save) return actSaveDeck(); - } else if (ret == QMessageBox::Cancel) { + else if (ret == QMessageBox::Cancel) return false; - } } return true; } @@ -587,20 +601,7 @@ bool AbstractTabDeckEditor::confirmClose() /** @brief Handles close requests from outside (tab manager). */ bool AbstractTabDeckEditor::closeRequest() { - if (!confirmClose()) { + if (!confirmClose()) return false; - } return close(); } - -void AbstractTabDeckEditor::showPrintingSelector() -{ - printingSelectorDockWidget->printingSelector->setCard(cardInfoDockWidget->cardInfo->getCard().getCardPtr()); - printingSelectorDockWidget->printingSelector->updateDisplay(); - printingSelectorDockWidget->setVisible(true); -} - -void AbstractTabDeckEditor::openEdhrecTab(const CardInfoPtr &info, bool isCommander) -{ - getTabSupervisor()->addEdhrecTab(info, isCommander); -} diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h index 34c585597..477c3f973 100644 --- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h +++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h @@ -77,8 +77,8 @@ class QAction; * * **Key Methods:** * - * - addCard(const ExactCard &card, const QString &zoneName) — Adds a card to the deck. - * - decrementCard(const ExactCard &card, const QString &zoneName) — Removes a single instance of a card from the deck. + * - actAddCard(const ExactCard &card) — Adds a card to the deck. + * - actDecrementCard(const ExactCard &card) — Removes a single instance of a card from the deck. * - actRemoveCard() — Removes the currently selected card from the deck. * - actSaveDeckAs() — Performs a "Save As" action for the deck. * - updateCard(const ExactCard &card) — Updates the currently displayed card info in the dock. @@ -126,7 +126,6 @@ public: // UI Elements DeckStateManager *deckStateManager; - CardDatabaseModel *databaseModel; ///< Card database DeckEditorMenu *deckMenu; ///< Menu for deck operations DeckEditorCardDatabaseDockWidget *cardDatabaseDockWidget; ///< Database dock DeckEditorCardInfoDockWidget *cardInfoDockWidget; ///< Card info dock @@ -141,35 +140,22 @@ public slots: /** @brief Called when the deck is modified. */ virtual void onDeckModified(); - /** - * @brief Updates the card info dock and printing selector. - * @param card The card to display. + /** @brief Updates the card info panel. + * @param card The card to display. */ void updateCard(const ExactCard &card); - /** - * @brief Updates just the card info dock - * @param card The card to display - */ - void updateCardInfo(const ExactCard &card); + /** @brief Adds a card to the main deck or sideboard based on Ctrl key. */ + void actAddCard(const ExactCard &card); - /** - * @brief Adds a card to the given zone - * @param card Card to add. - * @param zoneName Zone to add the card to. - */ - void addCard(const ExactCard &card, const QString &zoneName); + /** @brief Adds a card to the sideboard explicitly. */ + void actAddCardToSideboard(const ExactCard &card); - /** - * @brief Decrements a card from the given zone - * - * Use an ExactCard with empty PrintingInfo if you want to remove a card by name regardless of printing. - * Otherwise, it won't remove anything unless there's an exact printing match. - * - * @param card Card to decrement. - * @param zoneName Zone to decrement from. - */ - void decrementCard(const ExactCard &card, const QString &zoneName); + /** @brief Decrements a card from the main deck. */ + void actDecrementCard(const ExactCard &card); + + /** @brief Decrements a card from the sideboard. */ + void actDecrementCardFromSideboard(const ExactCard &card); /** @brief Opens a recently opened deck file. */ void actOpenRecent(const QString &fileName); @@ -180,15 +166,8 @@ public slots: /** @brief Requests closing the tab. */ bool closeRequest() override; - /** @brief Shows the printing selector dock and updates it with the current card. */ - void showPrintingSelector(); - - /** - * @brief Opens an EDHRec tab for the given card - * @param info The card - * @param isCommander The type of search - */ - void openEdhrecTab(const CardInfoPtr &info, bool isCommander); + /** @brief Shows the printing selector dock. Pure virtual. */ + virtual void showPrintingSelector() = 0; signals: /** @brief Emitted when a deck should be opened in a new editor tab. */ @@ -314,6 +293,9 @@ protected: */ QMessageBox *createSaveConfirmationWindow(); + /** @brief Helper function to add a card to a specific deck zone. */ + void addCardHelper(const ExactCard &card, const QString &zoneName); + /** @brief Opens a deck from a file. */ virtual void openDeckFromFile(const QString &fileName, DeckOpenLocation deckOpenLocation); diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_formats.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_formats.h index 5b5c16302..ac1b66e14 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_formats.h +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_formats.h @@ -98,79 +98,55 @@ inline static DeckFormat apiNameToFormat(const QString &name) { const QString n = name.trimmed(); - if (n.compare("Standard", Qt::CaseInsensitive) == 0) { + if (n.compare("Standard", Qt::CaseInsensitive) == 0) return DeckFormat::Standard; - } - if (n.compare("Modern", Qt::CaseInsensitive) == 0) { + if (n.compare("Modern", Qt::CaseInsensitive) == 0) return DeckFormat::Modern; - } - if (n.compare("Commander", Qt::CaseInsensitive) == 0) { + if (n.compare("Commander", Qt::CaseInsensitive) == 0) return DeckFormat::Commander; - } - if (n.compare("Legacy", Qt::CaseInsensitive) == 0) { + if (n.compare("Legacy", Qt::CaseInsensitive) == 0) return DeckFormat::Legacy; - } - if (n.compare("Vintage", Qt::CaseInsensitive) == 0) { + if (n.compare("Vintage", Qt::CaseInsensitive) == 0) return DeckFormat::Vintage; - } - if (n.compare("Pauper", Qt::CaseInsensitive) == 0) { + if (n.compare("Pauper", Qt::CaseInsensitive) == 0) return DeckFormat::Pauper; - } - if (n.compare("Custom", Qt::CaseInsensitive) == 0) { + if (n.compare("Custom", Qt::CaseInsensitive) == 0) return DeckFormat::Custom; - } - if (n.compare("Frontier", Qt::CaseInsensitive) == 0) { + if (n.compare("Frontier", Qt::CaseInsensitive) == 0) return DeckFormat::Frontier; - } - if (n.compare("Future Std", Qt::CaseInsensitive) == 0) { + if (n.compare("Future Std", Qt::CaseInsensitive) == 0) return DeckFormat::FutureStandard; - } - if (n.compare("Penny Dreadful", Qt::CaseInsensitive) == 0) { + if (n.compare("Penny Dreadful", Qt::CaseInsensitive) == 0) return DeckFormat::PennyDreadful; - } - if (n.compare("1v1 Commander", Qt::CaseInsensitive) == 0) { + if (n.compare("1v1 Commander", Qt::CaseInsensitive) == 0) return DeckFormat::Commander1v1; - } - if (n.compare("Dual Commander", Qt::CaseInsensitive) == 0) { + if (n.compare("Dual Commander", Qt::CaseInsensitive) == 0) return DeckFormat::DualCommander; - } - if (n.compare("Brawl", Qt::CaseInsensitive) == 0) { + if (n.compare("Brawl", Qt::CaseInsensitive) == 0) return DeckFormat::Brawl; - } - if (n.compare("Alchemy", Qt::CaseInsensitive) == 0) { + if (n.compare("Alchemy", Qt::CaseInsensitive) == 0) return DeckFormat::Alchemy; - } - if (n.compare("Historic", Qt::CaseInsensitive) == 0) { + if (n.compare("Historic", Qt::CaseInsensitive) == 0) return DeckFormat::Historic; - } - if (n.compare("Gladiator", Qt::CaseInsensitive) == 0) { + if (n.compare("Gladiator", Qt::CaseInsensitive) == 0) return DeckFormat::Gladiator; - } - if (n.compare("Oathbreaker", Qt::CaseInsensitive) == 0) { + if (n.compare("Oathbreaker", Qt::CaseInsensitive) == 0) return DeckFormat::Oathbreaker; - } - if (n.compare("Old School", Qt::CaseInsensitive) == 0) { + if (n.compare("Old School", Qt::CaseInsensitive) == 0) return DeckFormat::OldSchool; - } - if (n.compare("Pauper Commander", Qt::CaseInsensitive) == 0) { + if (n.compare("Pauper Commander", Qt::CaseInsensitive) == 0) return DeckFormat::PauperCommander; - } - if (n.compare("Pioneer", Qt::CaseInsensitive) == 0) { + if (n.compare("Pioneer", Qt::CaseInsensitive) == 0) return DeckFormat::Pioneer; - } - if (n.compare("PreDH", Qt::CaseInsensitive) == 0) { + if (n.compare("PreDH", Qt::CaseInsensitive) == 0) return DeckFormat::PreDH; - } - if (n.compare("Premodern", Qt::CaseInsensitive) == 0) { + if (n.compare("Premodern", Qt::CaseInsensitive) == 0) return DeckFormat::Premodern; - } - if (n.compare("Standard Brawl", Qt::CaseInsensitive) == 0) { + if (n.compare("Standard Brawl", Qt::CaseInsensitive) == 0) return DeckFormat::StandardBrawl; - } - if (n.compare("Timeless", Qt::CaseInsensitive) == 0) { + if (n.compare("Timeless", Qt::CaseInsensitive) == 0) return DeckFormat::Timeless; - } return DeckFormat::Unknown; } diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp index 46c229156..5b879f8ae 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp @@ -21,16 +21,16 @@ void ArchidektApiResponseCard::fromJson(const QJsonObject &json) edition.fromJson(json.value("edition").toObject()); flavor = json.value("flavor").toString(); - //! \todo Parse games and options fields (not really important). - // games = {""}; - // options = {""}; + //! \todo but not really important + //! \todo games = {""}; + //! \todo options = {""}; scryfallImageHash = json.value("scryfallImageHash").toString(); oracleCard = json.value("oracleCard").toObject(); owned = json.value("owned").toInt(); pinnedStatus = json.value("pinnedStatus").toInt(); rarity = json.value("rarity").toString(); - //! \todo Parse globalCategories field (not really important). - // globalCategories = {""}; + //! \todo but not really important + //! \todo globalCategories = {""}; } void ArchidektApiResponseCard::debugPrint() const diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.h index 559580da2..265498228 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.h +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.h @@ -24,7 +24,7 @@ public: QJsonObject getOracleCard() const { return oracleCard; - } + }; QString getCollectorNumber() const { diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.h index 118cf5b13..f3961dc6f 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.h +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.h @@ -33,7 +33,7 @@ public: ArchidektApiResponseCard getCard() const { return card; - } + }; QList getCategories() const { diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.cpp index a27d8d961..98d8c6c8c 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.cpp @@ -44,7 +44,7 @@ void ArchidektApiResponseDeck::fromJson(const QJsonObject &json) cards.append(entry); } - //! \todo Parse customCards field (not really important). + // TODO but not really important // customCards = {""}; } diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.h index b539d9dd1..fce437751 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.h +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.h @@ -27,7 +27,7 @@ public: QVector getCards() const { return cards; - } + }; QVector getCategories() const { @@ -37,7 +37,7 @@ public: QString getDeckName() const { return name; - } + }; int getDeckFormat() const { diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp index 416621b41..16ea60487 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp @@ -23,7 +23,7 @@ void ArchidektApiResponseDeckListingContainer::fromJson(const QJsonObject &json) theoryCrafted = json.value("theoryCrafted").toBool(); game = json.value("game").toString(); hasDescription = json.value("hasDescription").toBool(); - //! \todo Parse tags field. + // TODO // tags = {""}; parentFolderId = json.value("parentFolderId").toInt(); owner.fromJson(json.value("owner").toObject()); diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp index 3d6eac03d..2ba926f8b 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp @@ -7,7 +7,7 @@ void ArchidektApiResponseDeckOwner::fromJson(const QJsonObject &json) avatar = QUrl(json.value("avatar").toString()); moderator = json.value("moderator").toBool(); pledgeLevel = json.value("pledgeLevel").toInt(); - //! \todo Parse roles field (not really important). + // TODO but not really important // roles = {""}; } diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp index 70156df79..c26220869 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp @@ -20,27 +20,21 @@ static QString timeAgo(const QString ×tamp) { QDateTime dt = QDateTime::fromString(timestamp, Qt::ISODate); - if (!dt.isValid()) { + if (!dt.isValid()) return timestamp; // fallback if parsing fails - } qint64 secs = dt.secsTo(QDateTime::currentDateTimeUtc()); - if (secs < 60) { + if (secs < 60) return QString("%1 seconds ago").arg(secs); - } - if (secs < 3600) { + if (secs < 3600) return QString("%1 minutes ago").arg(secs / 60); - } - if (secs < 86400) { + if (secs < 86400) return QString("%1 hours ago").arg(secs / 3600); - } - if (secs < 30 * 86400) { + if (secs < 30 * 86400) return QString("%1 days ago").arg(secs / 86400); - } - if (secs < 365 * 86400) { + if (secs < 365 * 86400) return QString("%1 months ago").arg(secs / (30 * 86400)); - } return QString("%1 years ago").arg(secs / (365 * 86400)); } diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.h index f9a887aa4..479de5fc8 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.h @@ -82,16 +82,16 @@ public: void resizeEvent(QResizeEvent *event) override; private: - /** @brief Slider controlling the scale of card thumbnails in all deck entry widgets. */ + /// Slider controlling the scale of card thumbnails in all deck entry widgets. CardSizeWidget *cardSizeSlider; - /** @brief Main horizontal layout containing the FlowWidget. */ + /// Main horizontal layout containing the FlowWidget. QHBoxLayout *layout; - /** @brief Container providing scrollable multi-row flow layout of deck entries. */ + /// Container providing scrollable multi-row flow layout of deck entries. FlowWidget *flowWidget; - /** @brief Shared network manager used to download card images for all child entry widgets. */ + /// Shared network manager used to download card images for all child entry widgets. QNetworkAccessManager *imageNetworkManager; }; 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 6b30fe00c..352d55c79 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp @@ -93,11 +93,10 @@ void TabArchidekt::initializeUi() colorLayout->addWidget(manaSymbol); connect(manaSymbol, &ManaSymbolWidget::colorToggled, this, [this](QChar c, bool active) { - if (active) { + if (active) activeColors.insert(c); - } else { + else activeColors.remove(c); - } doSearch(); }); } @@ -299,18 +298,16 @@ void TabArchidekt::setupFilterWidgets() searchModel->updateSearchResults(text); QString pattern = ".*" + QRegularExpression::escape(text) + ".*"; proxyModel->setFilterRegularExpression(QRegularExpression(pattern, QRegularExpression::CaseInsensitiveOption)); - if (!text.isEmpty()) { + if (!text.isEmpty()) completer->complete(); - } }); connect(commandersField, &QLineEdit::textChanged, this, [=](const QString &text) { searchModel->updateSearchResults(text); QString pattern = ".*" + QRegularExpression::escape(text) + ".*"; proxyModel->setFilterRegularExpression(QRegularExpression(pattern, QRegularExpression::CaseInsensitiveOption)); - if (!text.isEmpty()) { + if (!text.isEmpty()) completer->complete(); - } }); // Assemble secondary toolbar @@ -495,13 +492,12 @@ QString TabArchidekt::buildSearchUrl() QString logic = "GTE"; QString selected = minDeckSizeLogicCombo->currentText(); - if (selected == "≥") { + if (selected == "≥") logic = "GTE"; - } else if (selected == "≤") { + else if (selected == "≤") logic = "LTE"; - } else { + else logic = ""; - } if (!logic.isEmpty()) { query.addQueryItem("sizeLogic", logic); @@ -639,7 +635,7 @@ void TabArchidekt::processDeckResponse(QJsonObject reply) auto display = new ArchidektApiResponseDeckDisplayWidget(resultsContainer, deckData, cardSizeSlider); connect(display, &ArchidektApiResponseDeckDisplayWidget::requestNavigation, this, &TabArchidekt::actNavigatePage); - connect(display, &ArchidektApiResponseDeckDisplayWidget::requestSearch, this, &TabArchidekt::doSearch); + connect(display, &ArchidektApiResponseDeckDisplayWidget::requestSearch, this, &TabArchidekt::doSearchImmediate); connect(display, &ArchidektApiResponseDeckDisplayWidget::openInDeckEditor, tabSupervisor, &TabSupervisor::openDeckInNewTab); resultsLayout->addWidget(display); @@ -670,4 +666,4 @@ void TabArchidekt::prettyPrintJson(const QJsonValue &value, int indentLevel) } else if (value.isNull()) { qInfo().noquote() << indent + "null"; } -} +} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h index 7bc97c431..cd4f9d99c 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h @@ -1,8 +1,8 @@ /** * @file edhrec_deck_api_response.h * @ingroup ApiResponses + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef EDHREC_DECK_API_RESPONSE_H #define EDHREC_DECK_API_RESPONSE_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h index bd874d067..66a407acd 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h @@ -1,8 +1,8 @@ /** * @file edhrec_api_response_card_prices.h * @ingroup ApiResponses + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_PRICES_H #define EDHREC_COMMANDER_API_RESPONSE_CARD_PRICES_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h index d76dda490..07b53dd97 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h @@ -1,8 +1,8 @@ /** * @file edhrec_api_response_card_container.h * @ingroup ApiResponses + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CONTAINER_ENTRY_H #define CONTAINER_ENTRY_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h index 931850ea9..86d78c5e3 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h @@ -1,8 +1,8 @@ /** * @file edhrec_api_response_card_details.h * @ingroup ApiResponses + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARD_VIEW_H #define CARD_VIEW_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h index 2df29de0c..15691fbe4 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h @@ -1,8 +1,8 @@ /** * @file edhrec_api_response_card_list.h * @ingroup ApiResponses + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARD_LIST_H #define CARD_LIST_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h index 293e9a150..629eb8273 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h @@ -1,8 +1,8 @@ /** * @file edhrec_commander_api_response_commander_details.h * @ingroup ApiResponses + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_H #define EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h index 695498e2b..fb89c0b12 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h @@ -1,8 +1,8 @@ /** * @file edhrec_top_cards_api_response.h * @ingroup ApiResponses + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef EDHREC_TOP_CARDS_API_RESPONSE_H #define EDHREC_TOP_CARDS_API_RESPONSE_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h index 10aa51ff4..26c5afedb 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h @@ -1,8 +1,8 @@ /** * @file edhrec_top_commanders_api_response.h * @ingroup ApiResponses + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef EDHREC_TOP_COMMANDERS_API_RESPONSE_H #define EDHREC_TOP_COMMANDERS_API_RESPONSE_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h index 0337d94f8..48219893a 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h @@ -1,8 +1,8 @@ /** * @file edhrec_top_tags_api_response.h * @ingroup ApiResponses + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef EDHREC_TOP_TAGS_API_RESPONSE_H #define EDHREC_TOP_TAGS_API_RESPONSE_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h index 8943ae9f3..80d32a394 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h @@ -1,8 +1,8 @@ /** * @file edhrec_api_response_card_prices_display_widget.h * @ingroup ApiResponseDisplayWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef EDHREC_API_RESPONSE_CARD_PRICES_DISPLAY_WIDGET_H #define EDHREC_API_RESPONSE_CARD_PRICES_DISPLAY_WIDGET_H 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 5daf32412..82dcfb8b0 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 @@ -1,8 +1,8 @@ /** * @file edhrec_api_response_card_details_display_widget.h * @ingroup ApiResponseDisplayWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_DETAILS_DISPLAY_WIDGET_H #define EDHREC_COMMANDER_API_RESPONSE_CARD_DETAILS_DISPLAY_WIDGET_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h index 516d820eb..43baddb4c 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h @@ -1,8 +1,8 @@ /** * @file edhrec_api_response_card_inclusion_display_widget.h * @ingroup ApiResponseDisplayWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef EDHREC_API_RESPONSE_CARD_INCLUSION_DISPLAY_WIDGET_H #define EDHREC_API_RESPONSE_CARD_INCLUSION_DISPLAY_WIDGET_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h index 555da6ecf..d34c3da34 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h @@ -1,8 +1,8 @@ /** * @file edhrec_api_response_card_list_display_widget.h * @ingroup ApiResponseDisplayWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_LIST_DISPLAY_WIDGET_H #define EDHREC_COMMANDER_API_RESPONSE_CARD_LIST_DISPLAY_WIDGET_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h index 5800b5497..c2e1c018c 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h @@ -1,8 +1,8 @@ /** * @file edhrec_api_response_card_synergy_display_widget.h * @ingroup ApiResponseDisplayWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef EDHREC_API_RESPONSE_CARD_SYNERGY_DISPLAY_WIDGET_H #define EDHREC_API_RESPONSE_CARD_SYNERGY_DISPLAY_WIDGET_H 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 4201ce3b3..8e74588e2 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 @@ -1,8 +1,8 @@ /** * @file edhrec_api_response_commander_details_display_widget.h * @ingroup ApiResponseDisplayWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_DISPLAY_WIDGET_H #define EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_DISPLAY_WIDGET_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h index 80da8a7f8..1678e1380 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h @@ -1,8 +1,8 @@ /** * @file edhrec_commander_api_response_display_widget.h * @ingroup ApiResponseDisplayWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef EDHREC_COMMANDER_API_RESPONSE_DISPLAY_WIDGET_H #define EDHREC_COMMANDER_API_RESPONSE_DISPLAY_WIDGET_H 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 9b46b54ba..10dfa8223 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 @@ -1,8 +1,8 @@ /** * @file edhrec_commander_api_response_navigation_widget.h * @ingroup ApiResponseDisplayWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef EDHREC_COMMANDER_API_RESPONSE_NAVIGATION_WIDGET_H #define EDHREC_COMMANDER_API_RESPONSE_NAVIGATION_WIDGET_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h index 30998391c..e2748bf10 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h @@ -1,8 +1,8 @@ /** * @file edhrec_top_cards_api_response_display_widget.h * @ingroup ApiResponseDisplayWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef EDHREC_TOP_CARDS_API_RESPONSE_DISPLAY_WIDGET_H #define EDHREC_TOP_CARDS_API_RESPONSE_DISPLAY_WIDGET_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h index 2b9563ea5..766518c02 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h @@ -1,8 +1,8 @@ /** * @file edhrec_top_commanders_api_response_display_widget.h * @ingroup ApiResponseDisplayWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef EDHREC_TOP_COMMANDERS_API_RESPONSE_DISPLAY_WIDGET_H #define EDHREC_TOP_COMMANDERS_API_RESPONSE_DISPLAY_WIDGET_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h index 4a4fc8991..64228b85d 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h @@ -1,8 +1,8 @@ /** * @file edhrec_top_tags_api_response_display_widget.h * @ingroup ApiResponseDisplayWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef EDHREC_TOP_TAGS_API_RESPONSE_DISPLAY_WIDGET_H #define EDHREC_TOP_TAGS_API_RESPONSE_DISPLAY_WIDGET_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h index 5ce36c9cf..b5ee8d2ca 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h @@ -1,8 +1,8 @@ /** * @file tab_edhrec.h * @ingroup Tabs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TAB_EDHREC_H #define TAB_EDHREC_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h index a7ed83efd..04cf03fc1 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h @@ -1,8 +1,8 @@ /** * @file tab_edhrec_main.h * @ingroup Tabs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TAB_EDHREC_MAIN_H #define TAB_EDHREC_MAIN_H diff --git a/cockatrice/src/interface/widgets/tabs/tab.h b/cockatrice/src/interface/widgets/tabs/tab.h index 6ea1f5077..7cff01130 100644 --- a/cockatrice/src/interface/widgets/tabs/tab.h +++ b/cockatrice/src/interface/widgets/tabs/tab.h @@ -1,8 +1,8 @@ /** * @file tab.h * @ingroup Tabs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TAB_H #define TAB_H diff --git a/cockatrice/src/interface/widgets/tabs/tab_account.cpp b/cockatrice/src/interface/widgets/tabs/tab_account.cpp index 2cc8165e8..e61732f90 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_account.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_account.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include TabAccount::TabAccount(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User &userInfo) : Tab(_tabSupervisor), client(_client) diff --git a/cockatrice/src/interface/widgets/tabs/tab_account.h b/cockatrice/src/interface/widgets/tabs/tab_account.h index 887038ebb..e09c12eb2 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_account.h +++ b/cockatrice/src/interface/widgets/tabs/tab_account.h @@ -1,8 +1,8 @@ /** * @file tab_account.h * @ingroup AccountTabs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TAB_ACCOUNT_H #define TAB_ACCOUNT_H diff --git a/cockatrice/src/interface/widgets/tabs/tab_admin.cpp b/cockatrice/src/interface/widgets/tabs/tab_admin.cpp index 16f17e03e..533e1cc83 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_admin.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_admin.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include ShutdownDialog::ShutdownDialog(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/interface/widgets/tabs/tab_admin.h b/cockatrice/src/interface/widgets/tabs/tab_admin.h index 0da098ba5..e1935e351 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_admin.h +++ b/cockatrice/src/interface/widgets/tabs/tab_admin.h @@ -1,8 +1,8 @@ /** * @file tab_admin.h * @ingroup ServerTabs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TAB_ADMIN_H #define TAB_ADMIN_H diff --git a/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.cpp b/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.cpp deleted file mode 100644 index 3dc4de15f..000000000 --- a/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.cpp +++ /dev/null @@ -1,293 +0,0 @@ -#include "tab_card_art_rules.h" - -#include "libcockatrice/card/database/card_database_manager.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -CardArtRulesModel::CardArtRulesModel(AbstractClient *client, QObject *parent) - : QAbstractTableModel(parent), client(client) -{ -} - -int CardArtRulesModel::rowCount(const QModelIndex &parent) const -{ - if (parent.isValid()) { - return 0; - } - return static_cast(entries.size()); -} - -int CardArtRulesModel::columnCount(const QModelIndex &parent) const -{ - Q_UNUSED(parent); - return 4; -} - -QVariant CardArtRulesModel::data(const QModelIndex &index, int role) const -{ - if (!index.isValid()) { - return {}; - } - - const auto &e = entries.at(index.row()); - - if (role == Qt::DisplayRole) { - switch (index.column()) { - case 0: - return e.cardName; - case 1: - return e.cardProviderId; - case 2: - return e.mode; - case 3: - return e.reason; - } - } - - return {}; -} - -QVariant CardArtRulesModel::headerData(int section, Qt::Orientation orientation, int role) const -{ - if (orientation != Qt::Horizontal || role != Qt::DisplayRole) { - return {}; - } - - switch (section) { - case 0: - return tr("Card"); - case 1: - return tr("ProviderId"); - case 2: - return tr("Mode"); - case 3: - return tr("Reason"); - default: - return {}; - } -} - -void CardArtRulesModel::refresh() -{ - Command_ListCardArtRules cmd; - - PendingCommand *pend = client->prepareModeratorCommand(cmd); - - connect(pend, &PendingCommand::finished, this, &CardArtRulesModel::onRefreshFinished); - - client->sendCommand(pend); -} - -void CardArtRulesModel::clear() -{ - beginResetModel(); - entries.clear(); - endResetModel(); -} - -QString CardArtRulesModel::cardAt(int row) const -{ - if (row < 0 || row >= static_cast(entries.size())) { - return {}; - } - - return entries[row].cardName; -} - -const CardArtRulesModel::Entry *CardArtRulesModel::entryAt(int row) const -{ - if (row < 0 || row >= static_cast(entries.size())) { - return nullptr; - } - - return &entries[row]; -} - -void CardArtRulesModel::onRefreshFinished(const Response &r) -{ - if (r.response_code() != Response::RespOk) { - return; - } - - const auto &resp = r.GetExtension(Response_ListCardArtRules::ext); - - beginResetModel(); - entries.clear(); - - for (const auto &e : resp.entries()) { - entries.push_back({QString::fromStdString(e.card_name()), QString::fromStdString(e.card_provider_id()), - QString::fromStdString(e.mode()), QString::fromStdString(e.reason())}); - } - - endResetModel(); -} - -TabCardArtRules::TabCardArtRules(TabSupervisor *parent, AbstractClient *_client) : Tab(parent), client(_client) -{ - setupUi(); - refresh(); -} - -void TabCardArtRules::setupUi() -{ - auto *central = new QWidget(this); - - initSearchBar(); - - providerComboBox = new QComboBox; - modeBox = new QComboBox; - reasonEdit = new QLineEdit; - - addBtn = new QPushButton; - removeBtn = new QPushButton; - refreshBtn = new QPushButton; - - modeBox->addItems({"ALLOW", "DENY"}); - - tableModel = new CardArtRulesModel(client, this); - - table = new QTableView; - table->setModel(tableModel); - table->setSelectionBehavior(QAbstractItemView::SelectRows); - table->setSelectionMode(QAbstractItemView::SingleSelection); - - auto *form = new QFormLayout; - form->addRow(tr("Card:"), searchEdit); - form->addRow(tr("ProviderId:"), providerComboBox); - form->addRow(tr("Mode:"), modeBox); - form->addRow(tr("Reason:"), reasonEdit); - - auto *buttons = new QHBoxLayout; - buttons->addWidget(addBtn); - buttons->addWidget(removeBtn); - buttons->addWidget(refreshBtn); - - auto *layout = new QVBoxLayout; - layout->addLayout(form); - layout->addLayout(buttons); - layout->addWidget(table); - - central->setLayout(layout); - setCentralWidget(central); - - connect(addBtn, &QPushButton::clicked, this, &TabCardArtRules::addRule); - - connect(removeBtn, &QPushButton::clicked, this, &TabCardArtRules::removeSelected); - - connect(refreshBtn, &QPushButton::clicked, this, &TabCardArtRules::refresh); - - retranslateUi(); -} - -void TabCardArtRules::initSearchBar() -{ - searchEdit = new QLineEdit; - searchEdit->setPlaceholderText(tr("Type a card name...")); - - cardDbModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), false, this); - cardDbDisplayModel = new CardDatabaseDisplayModel(this); - cardDbDisplayModel->setSourceModel(cardDbModel); - cardSearchModel = new CardSearchModel(cardDbDisplayModel, this); - - cardProxyModel = new CardCompleterProxyModel(this); - cardProxyModel->setSourceModel(cardSearchModel); - cardProxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive); - - searchCompleter = new QCompleter(cardProxyModel, this); - searchCompleter->setCompletionRole(Qt::DisplayRole); - searchCompleter->setCompletionMode(QCompleter::PopupCompletion); - searchCompleter->setCaseSensitivity(Qt::CaseInsensitive); - searchCompleter->setFilterMode(Qt::MatchContains); - searchCompleter->setMaxVisibleItems(15); - searchEdit->setCompleter(searchCompleter); - - connect(searchEdit, &QLineEdit::textEdited, cardSearchModel, &CardSearchModel::updateSearchResults); - connect(searchEdit, &QLineEdit::textEdited, this, [this](const QString &text) { - const QString pattern = ".*" + QRegularExpression::escape(text) + ".*"; - cardProxyModel->setFilterRegularExpression( - QRegularExpression(pattern, QRegularExpression::CaseInsensitiveOption)); - if (!text.isEmpty()) { - searchCompleter->complete(); - } - }); - connect(searchCompleter, static_cast(&QCompleter::activated), this, - [this](const QString &name) { searchEdit->setText(name); }); - connect(searchEdit, &QLineEdit::editingFinished, this, - [this]() { populateProviderCombo(searchEdit->text().trimmed()); }); -} - -void TabCardArtRules::populateProviderCombo(const QString &cardName) -{ - providerComboBox->clear(); - - auto card = CardDatabaseManager::query()->getCard({cardName}); - - const auto &sets = card.getInfo().getSets(); - - for (const auto &printings : sets) { - for (const auto &p : printings) { - - QString setName = p.getSet()->getLongName(); - QString collector = p.getProperty("num"); - QString uuid = p.getUuid(); - - QString label = setName; - - if (!collector.isEmpty()) { - label += " #" + collector; - } - - providerComboBox->addItem(label, uuid); - } - } -} - -void TabCardArtRules::retranslateUi() -{ - addBtn->setText(tr("Add rule")); - removeBtn->setText(tr("Remove rule")); - refreshBtn->setText(tr("Refresh")); -} - -void TabCardArtRules::refresh() -{ - tableModel->refresh(); -} - -void TabCardArtRules::addRule() -{ - Command_AddCardArtRule cmd; - cmd.set_card_name(searchEdit->text().toStdString()); - cmd.set_card_provider_id(providerComboBox->currentData().toString().toStdString()); - cmd.set_mode(modeBox->currentText().toStdString()); - cmd.set_reason(reasonEdit->text().toStdString()); - - client->sendCommand(client->prepareModeratorCommand(cmd)); - - refresh(); -} - -void TabCardArtRules::removeSelected() -{ - QModelIndex idx = table->currentIndex(); - if (!idx.isValid()) { - return; - } - - Command_RemoveCardArtRule cmd; - const auto e = tableModel->entryAt(idx.row()); - - cmd.set_card_name(e->cardName.toStdString()); - cmd.set_card_provider_id(e->cardProviderId.toStdString()); - - client->sendCommand(client->prepareModeratorCommand(cmd)); - - refresh(); -} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.h b/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.h deleted file mode 100644 index b9ea2ca83..000000000 --- a/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef COCKATRICE_DLG_CARD_ART_RULES_H -#define COCKATRICE_DLG_CARD_ART_RULES_H - -#include "card/card_search_model.h" -#include "tab_supervisor.h" - -#include -#include -#include -#include -#include - -class AbstractClient; - -class CardArtRulesModel : public QAbstractTableModel -{ - Q_OBJECT - -public: - struct Entry - { - QString cardName; - QString cardProviderId; - QString mode; - QString reason; - }; - - explicit CardArtRulesModel(AbstractClient *client, QObject *parent = nullptr); - - int rowCount(const QModelIndex &parent = QModelIndex()) const override; - int columnCount(const QModelIndex &parent = QModelIndex()) const override; - QVariant data(const QModelIndex &index, int role) const override; - QVariant headerData(int section, Qt::Orientation orientation, int role) const override; - - void refresh(); - void clear(); - - QString cardAt(int row) const; - const Entry *entryAt(int row) const; - -private slots: - void onRefreshFinished(const Response &r); - -private: - AbstractClient *client; - std::vector entries; -}; - -class TabCardArtRules : public Tab -{ - Q_OBJECT - -public: - TabCardArtRules(TabSupervisor *parent, AbstractClient *client); - - QString getTabText() const override - { - return tr("Card Art Rules"); - } - void retranslateUi() override; - -private: - void setupUi(); - -private slots: - void addRule(); - void removeSelected(); - void refresh(); - -private: - AbstractClient *client; - - QLineEdit *searchEdit; - void initSearchBar(); - void populateProviderCombo(const QString &cardName); - QCompleter *searchCompleter; - CardDatabaseModel *cardDbModel; - CardDatabaseDisplayModel *cardDbDisplayModel; - CardSearchModel *cardSearchModel; - CardCompleterProxyModel *cardProxyModel; - QComboBox *providerComboBox; - QComboBox *modeBox; - QLineEdit *reasonEdit; - - QPushButton *addBtn; - QPushButton *removeBtn; - QPushButton *refreshBtn; - - QTableView *table; - CardArtRulesModel *tableModel; -}; - -#endif // COCKATRICE_DLG_CARD_ART_RULES_H diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp index 3878e12e0..59ee6bdeb 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp @@ -21,6 +21,7 @@ #include #include #include +#include /** * @brief Constructs a new TabDeckEditor object. @@ -80,9 +81,8 @@ void TabDeckEditor::createMenus() QString TabDeckEditor::getTabText() const { QString result = tr("Deck: %1").arg(deckStateManager->getSimpleDeckName()); - if (deckStateManager->isModified()) { + if (deckStateManager->isModified()) result.prepend("* "); - } return result; } @@ -119,6 +119,16 @@ void TabDeckEditor::refreshShortcuts() aResetLayout->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aResetLayout")); } +/** + * @brief Displays the printing selector dock with the current card. + */ +void TabDeckEditor::showPrintingSelector() +{ + printingSelectorDockWidget->printingSelector->setCard(cardInfoDockWidget->cardInfo->getCard().getCardPtr()); + printingSelectorDockWidget->printingSelector->updateDisplay(); + printingSelectorDockWidget->setVisible(true); +} + /** * @brief Loads deck editor layout from settings or resets to default. */ @@ -127,9 +137,9 @@ void TabDeckEditor::loadLayout() LayoutsSettings &layouts = SettingsCache::instance().layouts(); auto layoutState = layouts.getDeckEditorLayoutState(); - if (layoutState.isNull()) { + if (layoutState.isNull()) restartLayout(); - } else { + else { restoreState(layoutState); restoreGeometry(layouts.getDeckEditorGeometry()); } diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h index 14be59cd7..ab7a0bfc5 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h +++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h @@ -83,6 +83,10 @@ public: /** @brief Creates menus for deck editing and view options. */ void createMenus() override; + +public slots: + /** @brief Shows the printing selector dock and updates it with current card. */ + void showPrintingSelector() override; }; #endif diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp index 8e2b114d9..26e3f2ecf 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp @@ -28,7 +28,6 @@ #include #include #include -#include TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor, AbstractClient *_client, @@ -182,9 +181,8 @@ void TabDeckStorage::retranslateUi() QString TabDeckStorage::getTargetPath() const { RemoteDeckList_TreeModel::Node *curRight = serverDirView->getCurrentItem(); - if (curRight == nullptr) { + if (curRight == nullptr) return {}; - } auto *dir = dynamic_cast(curRight); if (dir == nullptr) { dir = dynamic_cast(curRight->getParent()); @@ -239,15 +237,13 @@ void TabDeckStorage::actOpenLocalDeck() { QModelIndexList curLefts = localDirView->selectionModel()->selectedRows(); for (const auto &curLeft : curLefts) { - if (localDirModel->isDir(curLeft)) { + if (localDirModel->isDir(curLeft)) continue; - } QString filePath = localDirModel->filePath(curLeft); std::optional deckOpt = DeckLoader::loadFromFile(filePath, DeckFileFormat::Cockatrice, true); - if (!deckOpt) { + if (!deckOpt) continue; - } emit openDeckEditor(deckOpt.value()); } @@ -324,12 +320,10 @@ void TabDeckStorage::uploadDeck(const QString &filePath, const QString &targetPa QString deckName = getTextWithMax(this, tr("Enter deck name"), tr("This decklist does not have a name.\nPlease enter a name:"), QLineEdit::Normal, deckFileInfo.completeBaseName(), &ok); - if (!ok) { + if (!ok) return; - } - if (deckName.isEmpty()) { + if (deckName.isEmpty()) deckName = tr("Unnamed deck"); - } deck.setName(deckName); } else { deck.setName(deck.getName().left(MAX_NAME_LENGTH)); @@ -378,9 +372,8 @@ void TabDeckStorage::actNewLocalFolder() bool ok; QString folderName = QInputDialog::getText(this, tr("New folder"), tr("Name of new folder:"), QLineEdit::Normal, "", &ok); - if (!ok || folderName.isEmpty()) { + if (!ok || folderName.isEmpty()) return; - } localDirModel->mkdir(dirIndex, folderName); } @@ -394,9 +387,8 @@ void TabDeckStorage::actDeleteLocalDeck() } if (QMessageBox::warning(this, tr("Delete local file"), tr("Are you sure you want to delete the selected files?"), - QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) { + QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return; - } for (const auto &curLeft : curLefts) { if (curLeft.isValid()) { @@ -422,9 +414,8 @@ void TabDeckStorage::actOpenRemoteDeck() { for (const auto &curRight : serverDirView->getCurrentSelection()) { RemoteDeckList_TreeModel::FileNode *node = dynamic_cast(curRight); - if (!node) { + if (!node) continue; - } Command_DeckDownload cmd; cmd.set_deck_id(node->getId()); @@ -437,17 +428,15 @@ void TabDeckStorage::actOpenRemoteDeck() void TabDeckStorage::openRemoteDeckFinished(const Response &r, const CommandContainer &commandContainer) { - if (r.response_code() != Response::RespOk) { + if (r.response_code() != Response::RespOk) return; - } const Response_DeckDownload &resp = r.GetExtension(Response_DeckDownload::ext); const Command_DeckDownload &cmd = commandContainer.session_command(0).GetExtension(Command_DeckDownload::ext); std::optional deckOpt = DeckLoader::loadFromRemote(QString::fromStdString(resp.deck()), cmd.deck_id()); - if (!deckOpt) { + if (!deckOpt) return; - } emit openDeckEditor(deckOpt.value()); } @@ -499,9 +488,8 @@ void TabDeckStorage::downloadFinished(const Response &r, const CommandContainer & /*commandContainer*/, const QVariant &extraData) { - if (r.response_code() != Response::RespOk) { + if (r.response_code() != Response::RespOk) return; - } const Response_DeckDownload &resp = r.GetExtension(Response_DeckDownload::ext); QString filePath = extraData.toString(); @@ -516,14 +504,12 @@ void TabDeckStorage::actNewFolder() QString targetPath = getTargetPath(); int max_length = MAX_NAME_LENGTH - targetPath.length() - 1; // generated length would be path + / + name - if (max_length < 1) { // can't create path that's short enough + if (max_length < 1) // can't create path that's short enough return; - } QString folderName = getTextWithMax(this, tr("New folder"), tr("Name of new folder:"), max_length); - if (folderName.isEmpty()) { + if (folderName.isEmpty()) return; - } // '/' isn't a valid filename character on *nix so we're choosing to replace it with a different arbitrary // character. @@ -541,9 +527,8 @@ void TabDeckStorage::actNewFolder() void TabDeckStorage::newFolderFinished(const Response &response, const CommandContainer &commandContainer) { - if (response.response_code() != Response::RespOk) { + if (response.response_code() != Response::RespOk) return; - } const Command_DeckNewDir &cmd = commandContainer.session_command(0).GetExtension(Command_DeckNewDir::ext); serverDirView->addFolderToTree(QString::fromStdString(cmd.dir_name()), @@ -577,9 +562,8 @@ void TabDeckStorage::deleteRemoteDeck(const RemoteDeckList_TreeModel::Node *curR PendingCommand *pend; if (const auto *dir = dynamic_cast(curRight)) { QString targetPath = dir->getPath(); - if (targetPath.isEmpty()) { + if (targetPath.isEmpty()) return; - } if (targetPath.length() > MAX_NAME_LENGTH) { qCritical() << "target path to delete is too long" << targetPath; return; @@ -601,26 +585,22 @@ void TabDeckStorage::deleteRemoteDeck(const RemoteDeckList_TreeModel::Node *curR void TabDeckStorage::deleteDeckFinished(const Response &response, const CommandContainer &commandContainer) { - if (response.response_code() != Response::RespOk) { + if (response.response_code() != Response::RespOk) return; - } const Command_DeckDel &cmd = commandContainer.session_command(0).GetExtension(Command_DeckDel::ext); RemoteDeckList_TreeModel::Node *toDelete = serverDirView->getNodeById(cmd.deck_id()); - if (toDelete) { + if (toDelete) serverDirView->removeNode(toDelete); - } } void TabDeckStorage::deleteFolderFinished(const Response &response, const CommandContainer &commandContainer) { - if (response.response_code() != Response::RespOk) { + if (response.response_code() != Response::RespOk) return; - } const Command_DeckDelDir &cmd = commandContainer.session_command(0).GetExtension(Command_DeckDelDir::ext); RemoteDeckList_TreeModel::Node *toDelete = serverDirView->getNodeByPath(QString::fromStdString(cmd.path())); - if (toDelete) { + if (toDelete) serverDirView->removeNode(toDelete); - } } diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h index a863e0625..f8c0497f7 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h +++ b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h @@ -2,8 +2,8 @@ * @file tab_deck_storage.h * @ingroup DeckStorageWidgets * @ingroup Tabs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TAB_DECK_STORAGE_H #define TAB_DECK_STORAGE_H diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.cpp b/cockatrice/src/interface/widgets/tabs/tab_game.cpp index 600647171..161829b35 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_game.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_game.cpp @@ -1,21 +1,18 @@ #include "tab_game.h" #include "../../../client/settings/cache_settings.h" +#include "../game/board/arrow_item.h" +#include "../game/board/card_item.h" +#include "../game/deckview/deck_view_container.h" +#include "../game/deckview/tabbed_deck_view_container.h" #include "../game/game.h" -#include "../game/player/player_logic.h" +#include "../game/game_scene.h" +#include "../game/game_view.h" +#include "../game/log/message_log_widget.h" +#include "../game/phases_toolbar.h" +#include "../game/player/player.h" +#include "../game/player/player_list_widget.h" #include "../game/replay.h" -#include "../game_graphics/board/arrow_item.h" -#include "../game_graphics/board/card_item.h" -#include "../game_graphics/deckview/deck_view_container.h" -#include "../game_graphics/deckview/tabbed_deck_view_container.h" -#include "../game_graphics/game_scene.h" -#include "../game_graphics/game_view.h" -#include "../game_graphics/log/message_log_widget.h" -#include "../game_graphics/phases_toolbar.h" -#include "../game_graphics/player/menu/card_menu.h" -#include "../game_graphics/player/menu/player_menu.h" -#include "../game_graphics/player/player_graphics_item.h" -#include "../game_graphics/player/player_list_widget.h" #include "../interface/card_picture_loader/card_picture_loader.h" #include "../interface/widgets/cards/card_info_frame_widget.h" #include "../interface/widgets/dialogs/dlg_create_game.h" @@ -44,13 +41,13 @@ #include #include #include -#include +#include TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay) : Tab(_tabSupervisor), sayLabel(nullptr), sayEdit(nullptr) { // THIS CTOR IS USED ON REPLAY - game = new Replay(this, _replay, tabSupervisor->getIsLocalGame()); + game = new Replay(this, _replay); createCardInfoDock(true); createPlayerListDock(true); @@ -94,7 +91,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, : Tab(_tabSupervisor), userListProxy(_tabSupervisor->getUserListManager()) { // THIS CTOR IS USED ON GAMES - game = new Game(this, tabSupervisor->getIsLocalGame(), _clients, event, _roomGameTypes); + game = new Game(this, _clients, event, _roomGameTypes); createCardInfoDock(); createPlayerListDock(); @@ -128,9 +125,8 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, refreshShortcuts(); // append game to rooms game list for others to see - for (int i = game->getGameMetaInfo()->gameTypesSize() - 1; i >= 0; i--) { + for (int i = game->getGameMetaInfo()->gameTypesSize() - 1; i >= 0; i--) gameTypes.append(game->getGameMetaInfo()->findRoomGameType(i)); - } QTimer::singleShot(0, this, &TabGame::loadLayout); } @@ -286,14 +282,12 @@ void TabGame::retranslateUi() updatePlayerListDockTitle(); cardInfoDock->setWindowTitle(tr("Card Info") + (cardInfoDock->isWindow() ? tabText : QString())); messageLayoutDock->setWindowTitle(tr("Messages") + (messageLayoutDock->isWindow() ? tabText : QString())); - if (replayDock) { + if (replayDock) replayDock->setWindowTitle(tr("Replay Timeline") + (replayDock->isWindow() ? tabText : QString())); - } if (phasesMenu) { - for (int i = 0; i < phaseActions.size(); ++i) { + for (int i = 0; i < phaseActions.size(); ++i) phaseActions[i]->setText(phasesToolbar->getLongPhaseName(i)); - } phasesMenu->setTitle(tr("&Phases")); } @@ -319,9 +313,8 @@ void TabGame::retranslateUi() if (aRotateViewCCW) { aRotateViewCCW->setText(tr("Rotate View Co&unterclockwise")); } - if (aGameInfo) { + if (aGameInfo) aGameInfo->setText(tr("Game &information")); - } if (aConcede) { if (game->getPlayerManager()->isMainPlayerConceded()) { aConcede->setText(tr("Un&concede")); @@ -366,14 +359,13 @@ void TabGame::retranslateUi() cardInfoFrameWidget->retranslateUi(); - for (auto playerView : scene->getPlayers().values()) { - playerView->retranslateUi(); - } + QMapIterator i(game->getPlayerManager()->getPlayers()); + while (i.hasNext()) + i.next().value()->getGraphicsItem()->retranslateUi(); QMapIterator j(deckViewContainers); - while (j.hasNext()) { + while (j.hasNext()) j.next().value()->playerDeckView->retranslateUi(); - } scene->retranslateUi(); } @@ -491,22 +483,19 @@ void TabGame::actGameInfo() void TabGame::actConcede() { - PlayerLogic *player = game->getPlayerManager()->getActiveLocalPlayer(game->getGameState()->getActivePlayer()); - if (player == nullptr) { + Player *player = game->getPlayerManager()->getActiveLocalPlayer(game->getGameState()->getActivePlayer()); + if (player == nullptr) return; - } if (!player->getConceded()) { if (QMessageBox::question(this, tr("Concede"), tr("Are you sure you want to concede this game?"), - QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes) { + QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes) return; - } emit game->getPlayerManager()->activeLocalPlayerConceded(); } else { if (QMessageBox::question(this, tr("Unconcede"), tr("You have already conceded. Do you want to return to this game?"), - QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes) { + QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes) return; - } emit game->getPlayerManager()->activeLocalPlayerUnconceded(); } } @@ -522,23 +511,20 @@ bool TabGame::leaveGame() if (!game->getPlayerManager()->isSpectator()) { tabSupervisor->setCurrentWidget(this); if (QMessageBox::question(this, tr("Leave game"), tr("Are you sure you want to leave this game?"), - QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes) { + QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes) return false; - } } - if (!replayDock) { + if (!replayDock) emit gameLeft(); - } } return true; } void TabGame::actSay() { - if (completer->popup()->isVisible()) { + if (completer->popup()->isVisible()) return; - } if (sayEdit->text().startsWith("/card ")) { cardInfoFrameWidget->setCard(sayEdit->text().mid(6)); @@ -583,9 +569,8 @@ void TabGame::actPhaseAction() void TabGame::actNextPhase() { int phase = game->getGameState()->getCurrentPhase(); - if (++phase >= phasesToolbar->phaseCount()) { + if (++phase >= phasesToolbar->phaseCount()) phase = 0; - } emit phaseChanged(phase); } @@ -608,9 +593,16 @@ void TabGame::actNextPhaseAction() void TabGame::actRemoveLocalArrows() { - auto *local = game->getPlayerManager()->getActiveLocalPlayer(game->getGameState()->getActivePlayer()); - if (local) { - scene->clearArrowsForPlayer(local->getPlayerInfo()->getId()); + QMapIterator playerIterator(game->getPlayerManager()->getPlayers()); + while (playerIterator.hasNext()) { + Player *player = playerIterator.next().value(); + if (!player->getPlayerInfo()->getLocal()) + continue; + QMapIterator arrowIterator(player->getArrows()); + while (arrowIterator.hasNext()) { + ArrowItem *a = arrowIterator.next().value(); + emit arrowDeletionRequested(a->getId()); + } } } @@ -649,19 +641,15 @@ void TabGame::notifyPlayerKicked() msgBox.exec(); } -PlayerLogic *TabGame::addPlayer(PlayerLogic *newPlayer) +Player *TabGame::addPlayer(Player *newPlayer) { QString newPlayerName = "@" + newPlayer->getPlayerInfo()->getName(); addPlayerToAutoCompleteList(newPlayerName); scene->addPlayer(newPlayer); - auto *view = scene->viewForPlayer(newPlayer->getPlayerInfo()->getId()); - - connect(newPlayer, &PlayerLogic::newCardAdded, this, &TabGame::newCardAdded); - connect(newPlayer, &PlayerLogic::openDeckEditor, this, &TabGame::openDeckEditor); - connect(view->getPlayerMenu(), &PlayerMenu::cardMenuUpdated, this, &TabGame::setCardMenu); - connect(view, &PlayerGraphicsItem::cardInfoRequested, this, &TabGame::viewCardInfo); + connect(newPlayer, &Player::newCardAdded, this, &TabGame::newCardAdded); + connect(newPlayer->getPlayerMenu(), &PlayerMenu::cardMenuUpdated, this, &TabGame::setCardMenu); messageLog->connectToPlayerEventHandler(newPlayer->getPlayerEventHandler()); @@ -674,17 +662,17 @@ PlayerLogic *TabGame::addPlayer(PlayerLogic *newPlayer) addLocalPlayer(newPlayer, newPlayer->getPlayerInfo()->getId()); } - gameMenu->insertMenu(playersSeparator, view->getPlayerMenu()->getPlayerMenu()); + gameMenu->insertMenu(playersSeparator, newPlayer->getPlayerMenu()->getPlayerMenu()); createZoneForPlayer(newPlayer, newPlayer->getPlayerInfo()->getId()); return newPlayer; } -void TabGame::addLocalPlayer(PlayerLogic *newPlayer, int playerId) +void TabGame::addLocalPlayer(Player *newPlayer, int playerId) { if (game->getGameState()->getClients().size() == 1) { - scene->viewForPlayer(playerId)->getPlayerMenu()->setShortcutsActive(); + newPlayer->getPlayerMenu()->setShortcutsActive(); } auto *deckView = new TabbedDeckViewContainer(playerId, this); @@ -702,26 +690,29 @@ void TabGame::addLocalPlayer(PlayerLogic *newPlayer, int playerId) } } -void TabGame::processPlayerLeave(PlayerLogic *leavingPlayer) +void TabGame::processPlayerLeave(Player *leavingPlayer) { - removePlayerFromAutoCompleteList("@" + leavingPlayer->getPlayerInfo()->getName()); + QString playerName = "@" + leavingPlayer->getPlayerInfo()->getName(); + removePlayerFromAutoCompleteList(playerName); + + scene->removePlayer(leavingPlayer); // When we inserted the playerMenu into the gameMenu earlier, Qt wrapped the playerMenu into a QAction*, which lives // independently and does not get cleaned up when the source menu gets destroyed. We have to manually clean here. - auto *view = scene->viewForPlayer(leavingPlayer->getPlayerInfo()->getId()); - if (view) { - // Find and remove the QAction pointing to this menu - QMenu *menu = view->getPlayerMenu()->getPlayerMenu(); - for (QAction *act : gameMenu->actions()) { - if (act->menu() == menu) { - gameMenu->removeAction(act); - delete act; - break; + if (leavingPlayer->getPlayerMenu()) { + QMenu *menu = leavingPlayer->getPlayerMenu()->getPlayerMenu(); + if (menu) { + // Find and remove the QAction pointing to this menu + QList actions = gameMenu->actions(); + for (QAction *act : actions) { + if (act->menu() == menu) { + gameMenu->removeAction(act); + delete act; // deletes the QAction wrapper around the submenu + break; + } } } } - - scene->removePlayer(leavingPlayer); } void TabGame::processRemotePlayerDeckSelect(QString deckList, int playerId, QString playerName) @@ -746,13 +737,13 @@ void TabGame::processMultipleRemotePlayerDeckSelect(QVectorplayerDeckView->setReadyStart(ready); } -void TabGame::createZoneForPlayer(PlayerLogic *newPlayer, int playerId) +void TabGame::createZoneForPlayer(Player *newPlayer, int playerId) { if (!game->getPlayerManager()->getSpectators().contains(playerId)) { @@ -815,10 +806,9 @@ void TabGame::startGame(bool _resuming) mainWidget->setCurrentWidget(gamePlayAreaWidget); if (!_resuming) { - QMapIterator playerIterator(game->getPlayerManager()->getPlayers()); - while (playerIterator.hasNext()) { + QMapIterator playerIterator(game->getPlayerManager()->getPlayers()); + while (playerIterator.hasNext()) playerIterator.next().value()->setGameStarted(); - } } playerListWidget->setGameStarted(true, game->getGameState()->isResuming()); @@ -858,26 +848,25 @@ void TabGame::closeGame() gameMenu->addAction(aLeaveGame); } -PlayerLogic *TabGame::setActivePlayer(int id) +Player *TabGame::setActivePlayer(int id) { - PlayerLogic *player = game->getPlayerManager()->getPlayer(id); - if (!player) { + Player *player = game->getPlayerManager()->getPlayer(id); + if (!player) return nullptr; - } playerListWidget->setActivePlayer(id); - QMapIterator i(game->getPlayerManager()->getPlayers()); + QMapIterator i(game->getPlayerManager()->getPlayers()); while (i.hasNext()) { i.next(); if (i.value() == player) { i.value()->setActive(true); if (game->getGameState()->getClients().size() > 1) { - scene->viewForPlayer(i.value()->getPlayerInfo()->getId())->getPlayerMenu()->setShortcutsActive(); + i.value()->getPlayerMenu()->setShortcutsActive(); } } else { i.value()->setActive(false); if (game->getGameState()->getClients().size() > 1) { - scene->viewForPlayer(i.value()->getPlayerInfo()->getId())->getPlayerMenu()->setShortcutsInactive(); + i.value()->getPlayerMenu()->setShortcutsInactive(); } } } @@ -893,13 +882,8 @@ void TabGame::setActivePhase(int phase) void TabGame::newCardAdded(AbstractCardItem *card) { - connect(card, &AbstractCardItem::rightClicked, scene, &GameScene::onCardRightClicked); - connect(card, &AbstractCardItem::playSelected, scene, &GameScene::playSelected); - connect(card, &AbstractCardItem::playSelectedFaceDown, scene, &GameScene::playSelectedFaceDown); - connect(card, &AbstractCardItem::hideSelected, scene, &GameScene::hideSelected); connect(card, &AbstractCardItem::hovered, cardInfoFrameWidget, qOverload(&CardInfoFrameWidget::setCard)); - connect(card, &AbstractCardItem::selectionChanged, scene, &GameScene::onCardSelectionChanged); connect(card, &AbstractCardItem::showCardInfoPopup, this, &TabGame::showCardInfoPopup); connect(card, SIGNAL(deleteCardInfoPopup(QString)), this, SLOT(deleteCardInfoPopup(QString))); connect(card, &AbstractCardItem::cardShiftClicked, this, &TabGame::linkCardToChat); @@ -910,31 +894,26 @@ QString TabGame::getTabText() const QString gameTypeInfo; if (!gameTypes.empty()) { gameTypeInfo = gameTypes.at(0); - if (gameTypes.size() > 1) { + if (gameTypes.size() > 1) gameTypeInfo.append("..."); - } } QString gameDesc(game->getGameMetaInfo()->description()); QString gameId(QString::number(game->getGameMetaInfo()->gameId())); QString tabText; - if (replayDock) { + if (replayDock) tabText.append(tr("Replay") + " "); - } - if (!gameTypeInfo.isEmpty()) { + if (!gameTypeInfo.isEmpty()) tabText.append(gameTypeInfo + " "); - } if (!gameDesc.isEmpty()) { - if (gameDesc.length() >= 15) { + if (gameDesc.length() >= 15) tabText.append("| " + gameDesc.left(15) + "... "); - } else { + else tabText.append("| " + gameDesc + " "); - } } - if (!tabText.isEmpty()) { + if (!tabText.isEmpty()) tabText.append("| "); - } tabText.append("#" + gameId); return tabText; @@ -943,7 +922,7 @@ QString TabGame::getTabText() const /** * @param menu The menu to set. Pass in nullptr to set the menu to empty. */ -void TabGame::setCardMenu(CardMenu *menu) +void TabGame::setCardMenu(QMenu *menu) { if (!aCardMenu) { return; @@ -970,6 +949,8 @@ void TabGame::createMenuItems() connect(aReverseTurn, &QAction::triggered, game->getGameEventHandler(), &GameEventHandler::handleReverseTurn); aRemoveLocalArrows = new QAction(this); connect(aRemoveLocalArrows, &QAction::triggered, this, &TabGame::actRemoveLocalArrows); + connect(this, &TabGame::arrowDeletionRequested, game->getGameEventHandler(), + &GameEventHandler::handleArrowDeletion); aRotateViewCW = new QAction(this); connect(aRotateViewCW, &QAction::triggered, this, &TabGame::actRotateViewCW); aRotateViewCCW = new QAction(this); @@ -1146,16 +1127,12 @@ void TabGame::actResetLayout() void TabGame::createPlayAreaWidget(bool bReplay) { phasesToolbar = new PhasesToolbar; - if (!bReplay) { + if (!bReplay) 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(scene, &GameScene::arrowDeletionRequested, game->getGameEventHandler(), - &GameEventHandler::handleArrowDeletion); - connect(game->getGameEventHandler(), &GameEventHandler::arrowDeleted, scene, &GameScene::deleteArrow); gameView = new GameView(scene); auto gamePlayAreaVBox = new QVBoxLayout; @@ -1177,11 +1154,6 @@ void TabGame::createReplayDock(GameReplay *replay) QDockWidget::DockWidgetMovable); replayDock->setWidget(replayManager); replayDock->setFloating(false); - - connect(replayManager, &ReplayManager::eventReplayed, game->getGameEventHandler(), - [this](const auto &event, auto options) { - game->getGameEventHandler()->processGameEventContainer(event, nullptr, options); - }); } 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 b9289432d..d8746ccc9 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_game.h +++ b/cockatrice/src/interface/widgets/tabs/tab_game.h @@ -3,15 +3,15 @@ * @ingroup Tabs * @ingroup GameWidgets * @ingroup Lobby + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TAB_GAME_H #define TAB_GAME_H #include "../game/abstract_game.h" -#include "../game/player/player_logic.h" -#include "../game_graphics/log/message_log_widget.h" +#include "../game/log/message_log_widget.h" +#include "../game/player/player.h" #include "../interface/widgets/menus/tearoff_menu.h" #include "../interface/widgets/replay/replay_manager.h" #include "tab.h" @@ -20,7 +20,6 @@ #include #include -class CardMenu; class ServerInfo_PlayerProperties; class TabbedDeckViewContainer; inline Q_LOGGING_CATEGORY(TabGameLog, "tab_game"); @@ -100,21 +99,21 @@ private: QMap dockToActions; - PlayerLogic *addPlayer(PlayerLogic *newPlayer); - void addLocalPlayer(PlayerLogic *newPlayer, int playerId); + Player *addPlayer(Player *newPlayer); + void addLocalPlayer(Player *newPlayer, int playerId); void processRemotePlayerDeckSelect(QString deckList, int playerId, QString playerName); void processMultipleRemotePlayerDeckSelect(QVector>> playerIdDeckMap); - void processLocalPlayerDeckSelect(PlayerLogic *localPlayer, int playerId, ServerInfo_Player playerInfo); - void loadDeckForLocalPlayer(PlayerLogic *localPlayer, int playerId, ServerInfo_Player playerInfo); + void processLocalPlayerDeckSelect(Player *localPlayer, int playerId, ServerInfo_Player playerInfo); + void loadDeckForLocalPlayer(Player *localPlayer, int playerId, ServerInfo_Player playerInfo); void processLocalPlayerReady(int playerId, ServerInfo_Player playerInfo); - void createZoneForPlayer(PlayerLogic *newPlayer, int playerId); + void createZoneForPlayer(Player *newPlayer, int playerId); void startGame(bool resuming); void stopGame(); void closeGame(); bool leaveGame(); - PlayerLogic *setActivePlayer(int id); + Player *setActivePlayer(int id); void setActivePhase(int phase); void createMenuItems(); void createReplayMenuItems(); @@ -138,11 +137,12 @@ signals: void gameLeft(); void chatMessageSent(QString chatMessage); void turnAdvanced(); + void arrowDeletionRequested(int arrowId); private slots: void adminLockChanged(bool lock); void newCardAdded(AbstractCardItem *card); - void setCardMenu(CardMenu *menu); + void setCardMenu(QMenu *menu); void actGameInfo(); void actConcede(); @@ -163,7 +163,7 @@ private slots: void actCompleterChanged(); void notifyPlayerJoin(QString playerName); void notifyPlayerKicked(); - void processPlayerLeave(PlayerLogic *leavingPlayer); + void processPlayerLeave(Player *leavingPlayer); void actResetLayout(); void hideEvent(QHideEvent *event) override; diff --git a/cockatrice/src/interface/widgets/tabs/tab_home.h b/cockatrice/src/interface/widgets/tabs/tab_home.h index 3aae19c2b..c40dfc269 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_home.h +++ b/cockatrice/src/interface/widgets/tabs/tab_home.h @@ -1,8 +1,8 @@ /** * @file tab_home.h * @ingroup Tabs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TAB_HOME_H #define TAB_HOME_H diff --git a/cockatrice/src/interface/widgets/tabs/tab_logs.cpp b/cockatrice/src/interface/widgets/tabs/tab_logs.cpp index e3678a903..e4f699160 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_logs.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_logs.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client) { @@ -83,22 +83,18 @@ void TabLog::getClicked() privateChat->setChecked(true); } - if (maximumResults->value() == 0) { + if (maximumResults->value() == 0) maximumResults->setValue(1000); - } int dateRange = 0; - if (lastHour->isChecked()) { + if (lastHour->isChecked()) dateRange = 1; - } - if (today->isChecked()) { + if (today->isChecked()) dateRange = 24; - } - if (pastDays->isChecked()) { + if (pastDays->isChecked()) dateRange = pastXDays->value() * 24; - } Command_ViewLogHistory cmd; cmd.set_user_name(findUsername->text().toStdString()); diff --git a/cockatrice/src/interface/widgets/tabs/tab_logs.h b/cockatrice/src/interface/widgets/tabs/tab_logs.h index 5d164dc92..a73af651b 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_logs.h +++ b/cockatrice/src/interface/widgets/tabs/tab_logs.h @@ -1,8 +1,8 @@ /** * @file tab_logs.h * @ingroup ServerTabs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TAB_LOG_H #define TAB_LOG_H diff --git a/cockatrice/src/interface/widgets/tabs/tab_message.cpp b/cockatrice/src/interface/widgets/tabs/tab_message.cpp index 2cacab731..bd0457990 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_message.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_message.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include TabMessage::TabMessage(TabSupervisor *_tabSupervisor, AbstractClient *_client, @@ -72,9 +72,8 @@ void TabMessage::retranslateUi() void TabMessage::tabActivated() { - if (!sayEdit->hasFocus()) { + if (!sayEdit->hasFocus()) sayEdit->setFocus(); - } } QString TabMessage::getUserName() const @@ -95,9 +94,8 @@ void TabMessage::closeEvent(QCloseEvent *event) void TabMessage::sendMessage() { - if (sayEdit->text().isEmpty() || !userOnline) { + if (sayEdit->text().isEmpty() || !userOnline) return; - } Command_Message cmd; cmd.set_user_name(otherUserInfo->name()); @@ -112,10 +110,9 @@ void TabMessage::sendMessage() void TabMessage::messageSent(const Response &response) { - if (response.response_code() == Response::RespInIgnoreList) { + if (response.response_code() == Response::RespInIgnoreList) chatView->appendMessage(tr( "This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.")); - } } void TabMessage::processUserMessageEvent(const Event_UserMessage &event) @@ -123,15 +120,12 @@ void TabMessage::processUserMessageEvent(const Event_UserMessage &event) auto userInfo = event.sender_name() == otherUserInfo->name() ? otherUserInfo : ownUserInfo; chatView->appendMessage(QString::fromStdString(event.message()), {}, *userInfo, true); - if (tabSupervisor->currentIndex() != tabSupervisor->indexOf(this)) { + if (tabSupervisor->currentIndex() != tabSupervisor->indexOf(this)) soundEngine->playSound("private_message"); - } - if (SettingsCache::instance().getShowMessagePopup() && shouldShowSystemPopup(event)) { + if (SettingsCache::instance().getShowMessagePopup() && shouldShowSystemPopup(event)) showSystemPopup(event); - } - if (QString::fromStdString(event.sender_name()).toLower().simplified() == "servatrice") { + if (QString::fromStdString(event.sender_name()).toLower().simplified() == "servatrice") sayEdit->setDisabled(true); - } emit userEvent(); } diff --git a/cockatrice/src/interface/widgets/tabs/tab_message.h b/cockatrice/src/interface/widgets/tabs/tab_message.h index 0472bb061..36a0b5f78 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_message.h +++ b/cockatrice/src/interface/widgets/tabs/tab_message.h @@ -1,8 +1,8 @@ /** * @file tab_message.h * @ingroup MessagingTabs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TAB_MESSAGE_H #define TAB_MESSAGE_H diff --git a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp index af52c038f..570677ada 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp @@ -256,15 +256,13 @@ void TabReplays::actOpenLocalReplay() { QModelIndexList curLefts = localDirView->selectionModel()->selectedRows(); for (const auto &curLeft : curLefts) { - if (localDirModel->isDir(curLeft)) { + if (localDirModel->isDir(curLeft)) continue; - } QString filePath = localDirModel->filePath(curLeft); QFile f(filePath); - if (!f.open(QIODevice::ReadOnly)) { + if (!f.open(QIODevice::ReadOnly)) continue; - } QByteArray _data = f.readAll(); f.close(); @@ -321,9 +319,8 @@ void TabReplays::actNewLocalFolder() bool ok; QString folderName = QInputDialog::getText(this, tr("New folder"), tr("Name of new folder:"), QLineEdit::Normal, "", &ok); - if (!ok || folderName.isEmpty()) { + if (!ok || folderName.isEmpty()) return; - } localDirModel->mkdir(dirIndex, folderName); } @@ -381,9 +378,8 @@ void TabReplays::actOpenRemoteReplay() void TabReplays::openRemoteReplayFinished(const Response &r) { - if (r.response_code() != Response::RespOk) { + if (r.response_code() != Response::RespOk) return; - } const Response_ReplayDownload &resp = r.GetExtension(Response_ReplayDownload::ext); GameReplay *replay = new GameReplay; @@ -442,9 +438,8 @@ void TabReplays::downloadFinished(const Response &r, const CommandContainer & /* commandContainer */, const QVariant &extraData) { - if (r.response_code() != Response::RespOk) { + if (r.response_code() != Response::RespOk) return; - } const Response_ReplayDownload &resp = r.GetExtension(Response_ReplayDownload::ext); QString filePath = extraData.toString(); @@ -480,9 +475,8 @@ void TabReplays::actKeepRemoteReplay() void TabReplays::keepRemoteReplayFinished(const Response &r, const CommandContainer &commandContainer) { - if (r.response_code() != Response::RespOk) { + if (r.response_code() != Response::RespOk) return; - } const Command_ReplayModifyMatch &cmd = commandContainer.session_command(0).GetExtension(Command_ReplayModifyMatch::ext); @@ -519,9 +513,8 @@ void TabReplays::actDeleteRemoteReplay() void TabReplays::deleteRemoteReplayFinished(const Response &r, const CommandContainer &commandContainer) { - if (r.response_code() != Response::RespOk) { + if (r.response_code() != Response::RespOk) return; - } const Command_ReplayDeleteMatch &cmd = commandContainer.session_command(0).GetExtension(Command_ReplayDeleteMatch::ext); diff --git a/cockatrice/src/interface/widgets/tabs/tab_replays.h b/cockatrice/src/interface/widgets/tabs/tab_replays.h index aa4ec039c..fa1131cd5 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_replays.h +++ b/cockatrice/src/interface/widgets/tabs/tab_replays.h @@ -2,8 +2,8 @@ * @file tab_replays.h * @ingroup Replays * @ingroup Tabs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TAB_REPLAYS_H #define TAB_REPLAYS_H diff --git a/cockatrice/src/interface/widgets/tabs/tab_room.cpp b/cockatrice/src/interface/widgets/tabs/tab_room.cpp index ec05e9ff6..92e38662b 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_room.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_room.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include TabRoom::TabRoom(TabSupervisor *_tabSupervisor, AbstractClient *_client, @@ -41,33 +41,17 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor, ownUser(_ownUser), userListProxy(_tabSupervisor->getUserListManager()) { const int gameTypeListSize = info.gametype_list_size(); - for (int i = 0; i < gameTypeListSize; ++i) { + for (int i = 0; i < gameTypeListSize; ++i) gameTypes.insert(info.gametype_list(i).game_type_id(), QString::fromStdString(info.gametype_list(i).description())); - } QMap tempMap; tempMap.insert(info.room_id(), gameTypes); gameSelector = new GameSelector(client, tabSupervisor, this, QMap(), tempMap, true, true); - - auto *tabs = new QTabWidget(this); - - friendsList = new UserListWidget(tabSupervisor, client, UserListWidget::BuddyList); - friendsList->bind(tabSupervisor->getUserListManager()); userList = new UserListWidget(tabSupervisor, client, UserListWidget::RoomList); - userList->bind(tabSupervisor->getUserListManager()); - ignoreList = new UserListWidget(tabSupervisor, client, UserListWidget::IgnoreList); - ignoreList->bind(tabSupervisor->getUserListManager()); - - connect(friendsList, SIGNAL(openMessageDialog(const QString &, bool)), this, - SIGNAL(openMessageDialog(const QString &, bool))); connect(userList, SIGNAL(openMessageDialog(const QString &, bool)), this, SIGNAL(openMessageDialog(const QString &, bool))); - tabs->addTab(friendsList, tr("Friends")); - tabs->addTab(userList, tr("Online")); - tabs->addTab(ignoreList, tr("Ignored")); - chatView = new ChatView(tabSupervisor, nullptr, true, this); connect(chatView, &ChatView::showMentionPopup, this, &TabRoom::actShowMentionPopup); connect(chatView, &ChatView::messageClickedSignal, this, &TabRoom::focusTab); @@ -116,7 +100,7 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor, auto *hbox = new QHBoxLayout; hbox->addWidget(splitter, 3); - hbox->addWidget(tabs, 1); + hbox->addWidget(userList, 1); aLeaveRoom = new QAction(this); connect(aLeaveRoom, &QAction::triggered, this, &TabRoom::closeRequest); @@ -127,13 +111,14 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor, const int userListSize = info.user_list_size(); for (int i = 0; i < userListSize; ++i) { + userList->processUserInfo(info.user_list(i), true); autocompleteUserList.append("@" + QString::fromStdString(info.user_list(i).name())); } + userList->sortItems(); const int gameListSize = info.game_list_size(); - for (int i = 0; i < gameListSize; ++i) { + for (int i = 0; i < gameListSize; ++i) gameSelector->processGameInfo(info.game_list(i)); - } completer = new QCompleter(autocompleteUserList, sayEdit); completer->setCaseSensitivity(Qt::CaseInsensitive); @@ -197,9 +182,8 @@ void TabRoom::closeEvent(QCloseEvent *event) void TabRoom::tabActivated() { - if (!sayEdit->hasFocus()) { + if (!sayEdit->hasFocus()) sayEdit->setFocus(); - } } QString TabRoom::sanitizeHtml(QString dirty) const @@ -227,9 +211,8 @@ void TabRoom::sendMessage() void TabRoom::sayFinished(const Response &response) { - if (response.response_code() == Response::RespChatFlood) { + if (response.response_code() == Response::RespChatFlood) chatView->appendMessage(tr("You are flooding the chat. Please wait a couple of seconds.")); - } } void TabRoom::actClearChat() @@ -275,13 +258,14 @@ void TabRoom::processRoomEvent(const RoomEvent &event) void TabRoom::processListGamesEvent(const Event_ListGames &event) { const int gameListSize = event.game_list_size(); - for (int i = 0; i < gameListSize; ++i) { + for (int i = 0; i < gameListSize; ++i) gameSelector->processGameInfo(event.game_list(i)); - } } void TabRoom::processJoinRoomEvent(const Event_JoinRoom &event) { + userList->processUserInfo(event.user_info(), true); + userList->sortItems(); if (!autocompleteUserList.contains("@" + QString::fromStdString(event.user_info().name()))) { autocompleteUserList << "@" + QString::fromStdString(event.user_info().name()); sayEdit->setCompletionList(autocompleteUserList); @@ -290,6 +274,7 @@ void TabRoom::processJoinRoomEvent(const Event_JoinRoom &event) void TabRoom::processLeaveRoomEvent(const Event_LeaveRoom &event) { + userList->deleteUser(QString::fromStdString(event.name())); autocompleteUserList.removeOne("@" + QString::fromStdString(event.name())); sayEdit->setCompletionList(autocompleteUserList); } @@ -299,30 +284,26 @@ void TabRoom::processRoomSayEvent(const Event_RoomSay &event) QString senderName = QString::fromStdString(event.name()); QString message = QString::fromStdString(event.message()); - if (userListProxy->isUserIgnored(senderName)) { + if (userListProxy->isUserIgnored(senderName)) return; - } UserListTWI *twi = userList->getUsers().value(senderName); ServerInfo_User userInfo = {}; if (twi) { userInfo = twi->getUserInfo(); if (SettingsCache::instance().getIgnoreUnregisteredUsers() && - !UserLevelFlags(userInfo.user_level()).testFlag(ServerInfo_User::IsRegistered)) { + !UserLevelFlags(userInfo.user_level()).testFlag(ServerInfo_User::IsRegistered)) return; - } } - if (event.message_type() == Event_RoomSay::ChatHistory && !SettingsCache::instance().getRoomHistory()) { + if (event.message_type() == Event_RoomSay::ChatHistory && !SettingsCache::instance().getRoomHistory()) return; - } - if (event.message_type() == Event_RoomSay::ChatHistory) { + if (event.message_type() == Event_RoomSay::ChatHistory) message = "[" + QString(QDateTime::fromMSecsSinceEpoch(event.time_of()).toLocalTime().toString("d MMM yyyy HH:mm:ss")) + "] " + message; - } chatView->appendMessage(message, event.message_type(), userInfo, true); emit userEvent(false); diff --git a/cockatrice/src/interface/widgets/tabs/tab_room.h b/cockatrice/src/interface/widgets/tabs/tab_room.h index d669b6107..67d9afc86 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_room.h +++ b/cockatrice/src/interface/widgets/tabs/tab_room.h @@ -2,8 +2,8 @@ * @file tab_room.h * @ingroup RoomTabs * @ingroup Lobby + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TAB_ROOM_H #define TAB_ROOM_H @@ -56,9 +56,7 @@ private: QMap gameTypes; GameSelector *gameSelector; - UserListWidget *friendsList; UserListWidget *userList; - UserListWidget *ignoreList; const UserListProxy *userListProxy; ChatView *chatView; QLabel *sayLabel; diff --git a/cockatrice/src/interface/widgets/tabs/tab_server.cpp b/cockatrice/src/interface/widgets/tabs/tab_server.cpp index 2fce5c1fa..aa52b4b1a 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_server.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_server.cpp @@ -69,35 +69,27 @@ void RoomSelector::processListRoomsEvent(const Event_ListRooms &event) for (int j = 0; j < roomList->topLevelItemCount(); ++j) { QTreeWidgetItem *twi = roomList->topLevelItem(j); if (twi->data(0, Qt::UserRole).toInt() == room.room_id()) { - if (room.has_name()) { + if (room.has_name()) twi->setData(0, Qt::DisplayRole, QString::fromStdString(room.name())); - } - if (room.has_description()) { + if (room.has_description()) twi->setData(1, Qt::DisplayRole, QString::fromStdString(room.description())); - } - if (room.has_permissionlevel()) { + if (room.has_permissionlevel()) twi->setData(2, Qt::DisplayRole, getRoomPermissionDisplay(room)); - } - if (room.has_player_count()) { + if (room.has_player_count()) twi->setData(3, Qt::DisplayRole, room.player_count()); - } - if (room.has_game_count()) { + if (room.has_game_count()) twi->setData(4, Qt::DisplayRole, room.game_count()); - } return; } } QTreeWidgetItem *twi = new QTreeWidgetItem; twi->setData(0, Qt::UserRole, room.room_id()); - if (room.has_name()) { + if (room.has_name()) twi->setData(0, Qt::DisplayRole, QString::fromStdString(room.name())); - } - if (room.has_description()) { + if (room.has_description()) twi->setData(1, Qt::DisplayRole, QString::fromStdString(room.description())); - } - if (room.has_permissionlevel()) { + if (room.has_permissionlevel()) twi->setData(2, Qt::DisplayRole, getRoomPermissionDisplay(room)); - } twi->setData(3, Qt::DisplayRole, room.player_count()); twi->setData(4, Qt::DisplayRole, room.game_count()); twi->setTextAlignment(2, Qt::AlignRight); @@ -105,11 +97,9 @@ void RoomSelector::processListRoomsEvent(const Event_ListRooms &event) twi->setTextAlignment(4, Qt::AlignRight); roomList->addTopLevelItem(twi); - if (room.has_auto_join()) { - if (room.auto_join()) { + if (room.has_auto_join()) + if (room.auto_join()) emit joinRoomRequest(room.room_id(), false); - } - } } } @@ -123,12 +113,10 @@ QString RoomSelector::getRoomPermissionDisplay(const ServerInfo_Room &room) */ QString roomPermissionDisplay = QString::fromStdString(room.privilegelevel()).toLower(); - if (QString::fromStdString(room.permissionlevel()).toLower() != "none") { + if (QString::fromStdString(room.permissionlevel()).toLower() != "none") roomPermissionDisplay = QString::fromStdString(room.permissionlevel()).toLower(); - } - if (roomPermissionDisplay == "") { // catch all for misconfigured .ini room definitions + if (roomPermissionDisplay == "") // catch all for misconfigured .ini room definitions roomPermissionDisplay = "none"; - } return roomPermissionDisplay; } @@ -136,9 +124,8 @@ QString RoomSelector::getRoomPermissionDisplay(const ServerInfo_Room &room) void RoomSelector::joinClicked() { QTreeWidgetItem *twi = roomList->currentItem(); - if (!twi) { + if (!twi) return; - } int id = twi->data(0, Qt::UserRole).toInt(); @@ -198,9 +185,8 @@ void TabServer::joinRoom(int id, bool setCurrent) return; } - if (setCurrent) { + if (setCurrent) tabSupervisor->setCurrentWidget((QWidget *)room); - } } void TabServer::joinRoomFinished(const Response &r, diff --git a/cockatrice/src/interface/widgets/tabs/tab_server.h b/cockatrice/src/interface/widgets/tabs/tab_server.h index 137823592..f2dd8f0a2 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_server.h +++ b/cockatrice/src/interface/widgets/tabs/tab_server.h @@ -1,8 +1,8 @@ /** * @file tab_server.h * @ingroup ServerTabs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TAB_SERVER_H #define TAB_SERVER_H diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp index 52309d94b..b10d615ff 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp @@ -9,7 +9,6 @@ #include "api/edhrec/tab_edhrec_main.h" #include "tab_account.h" #include "tab_admin.h" -#include "tab_card_art_rules.h" #include "tab_deck_editor.h" #include "tab_deck_storage.h" #include "tab_game.h" @@ -87,22 +86,18 @@ void CloseButton::paintEvent(QPaintEvent * /*event*/) QStyleOption opt; opt.initFrom(this); opt.state |= QStyle::State_AutoRaise; - if (isEnabled() && underMouse() && !isChecked() && !isDown()) { + if (isEnabled() && underMouse() && !isChecked() && !isDown()) opt.state |= QStyle::State_Raised; - } - if (isChecked()) { + if (isChecked()) opt.state |= QStyle::State_On; - } - if (isDown()) { + if (isDown()) opt.state |= QStyle::State_Sunken; - } if (const auto *tb = qobject_cast(parent())) { int index = tb->currentIndex(); auto position = (QTabBar::ButtonPosition)style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, nullptr, tb); - if (tb->tabButton(index, position) == this) { + if (tb->tabButton(index, position) == this) opt.state |= QStyle::State_Selected; - } } style()->drawPrimitive(QStyle::PE_IndicatorTabClose, &opt, &p, this); @@ -180,10 +175,6 @@ TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget * aTabAdmin->setCheckable(true); connect(aTabAdmin, &QAction::triggered, this, &TabSupervisor::actTabAdmin); - aTabCardArtRules = new QAction(this); - aTabCardArtRules->setCheckable(true); - connect(aTabCardArtRules, &QAction::triggered, this, &TabSupervisor::actTabCardArtRules); - aTabLog = new QAction(this); aTabLog->setCheckable(true); connect(aTabLog, &QAction::triggered, this, &TabSupervisor::actTabLog); @@ -237,25 +228,20 @@ void TabSupervisor::retranslateUi() tabs.append(tabAccount); tabs.append(tabLog); QMapIterator roomIterator(roomTabs); - while (roomIterator.hasNext()) { + while (roomIterator.hasNext()) tabs.append(roomIterator.next().value()); - } QMapIterator gameIterator(gameTabs); - while (gameIterator.hasNext()) { + while (gameIterator.hasNext()) tabs.append(gameIterator.next().value()); - } QListIterator replayIterator(replayTabs); - while (replayIterator.hasNext()) { + while (replayIterator.hasNext()) tabs.append(replayIterator.next()); - } QListIterator deckEditorIterator(deckEditorTabs); - while (deckEditorIterator.hasNext()) { + while (deckEditorIterator.hasNext()) tabs.append(deckEditorIterator.next()); - } QMapIterator messageIterator(messageTabs); - while (messageIterator.hasNext()) { + while (messageIterator.hasNext()) tabs.append(messageIterator.next().value()); - } for (auto &tab : tabs) { if (tab) { @@ -440,7 +426,6 @@ void TabSupervisor::start(const ServerInfo_User &_userInfo) tabsMenu->addSeparator(); tabsMenu->addAction(aTabAdmin); tabsMenu->addAction(aTabLog); - tabsMenu->addAction(aTabCardArtRules); if (SettingsCache::instance().getTabAdminOpen()) { openTabAdmin(); @@ -448,7 +433,6 @@ void TabSupervisor::start(const ServerInfo_User &_userInfo) if (SettingsCache::instance().getTabLogOpen()) { openTabLog(); } - openTabCardArtRules(); } retranslateUi(); @@ -464,10 +448,9 @@ void TabSupervisor::startLocal(const QList &_clients) isLocalGame = true; userInfo = new ServerInfo_User; localClients = _clients; - for (int i = 0; i < localClients.size(); ++i) { + for (int i = 0; i < localClients.size(); ++i) connect(localClients[i], &AbstractClient::gameEventContainerReceived, this, &TabSupervisor::processGameEventContainer); - } connect(localClients.first(), &AbstractClient::gameJoinedEventReceived, this, &TabSupervisor::localGameJoined); } @@ -476,9 +459,8 @@ void TabSupervisor::startLocal(const QList &_clients) */ void TabSupervisor::stop() { - if ((!client) && localClients.isEmpty()) { + if ((!client) && localClients.isEmpty()) return; - } resetTabsMenu(); @@ -688,30 +670,6 @@ void TabSupervisor::openTabAdmin() aTabAdmin->setChecked(true); } -void TabSupervisor::actTabCardArtRules(bool checked) -{ - if (checked && !tabCardArtRules) { - openTabCardArtRules(); - setCurrentWidget(tabCardArtRules); - } else if (!checked && tabCardArtRules) { - tabCardArtRules->closeRequest(); - } -} - -void TabSupervisor::openTabCardArtRules() -{ - tabCardArtRules = new TabCardArtRules(this, client); - - myAddTab(tabCardArtRules, aTabCardArtRules); - - connect(tabCardArtRules, &QObject::destroyed, this, [this] { - tabCardArtRules = nullptr; - aTabCardArtRules->setChecked(false); - }); - - aTabCardArtRules->setChecked(true); -} - void TabSupervisor::actTabLog(bool checked) { SettingsCache::instance().setTabLogOpen(checked); @@ -736,12 +694,10 @@ void TabSupervisor::openTabLog() void TabSupervisor::updatePingTime(int value, int max) { - if (!tabServer) { + if (!tabServer) return; - } - if (tabServer->getContentsChanged()) { + if (tabServer->getContentsChanged()) return; - } setTabIcon(indexOf(tabServer), QIcon(PingPixmapGenerator::generatePixmap(15, value, max))); } @@ -750,14 +706,12 @@ void TabSupervisor::gameJoined(const Event_GameJoined &event) { QMap roomGameTypes; TabRoom *room = roomTabs.value(event.game_info().room_id()); - if (room) { + if (room) roomGameTypes = room->getGameTypes(); - } else { - for (int i = 0; i < event.game_types_size(); ++i) { + else + for (int i = 0; i < event.game_types_size(); ++i) roomGameTypes.insert(event.game_types(i).game_type_id(), QString::fromStdString(event.game_types(i).description())); - } - } auto *tab = new TabGame(this, QList() << client, event, roomGameTypes); connect(tab, &TabGame::gameClosing, this, &TabSupervisor::gameLeft); @@ -786,16 +740,14 @@ void TabSupervisor::localGameJoined(const Event_GameJoined &event) void TabSupervisor::gameLeft(TabGame *tab) { - if (tab == currentWidget()) { + if (tab == currentWidget()) emit setMenu(); - } gameTabs.remove(tab->getGame()->getGameMetaInfo()->gameId()); removeTab(indexOf(tab)); - if (!localClients.isEmpty()) { + if (!localClients.isEmpty()) stop(); - } } void TabSupervisor::addRoomTab(const ServerInfo_Room &info, bool setCurrent) @@ -806,16 +758,14 @@ void TabSupervisor::addRoomTab(const ServerInfo_Room &info, bool setCurrent) connect(tab, &TabRoom::openMessageDialog, this, &TabSupervisor::addMessageTab); myAddTab(tab); roomTabs.insert(info.room_id(), tab); - if (setCurrent) { + if (setCurrent) setCurrentWidget(tab); - } } void TabSupervisor::roomLeft(TabRoom *tab) { - if (tab == currentWidget()) { + if (tab == currentWidget()) emit setMenu(); - } roomTabs.remove(tab->getRoomId()); removeTab(indexOf(tab)); @@ -843,18 +793,16 @@ void TabSupervisor::openReplay(GameReplay *replay) void TabSupervisor::replayLeft(TabGame *tab) { - if (tab == currentWidget()) { + if (tab == currentWidget()) emit setMenu(); - } replayTabs.removeOne(tab); } TabMessage *TabSupervisor::addMessageTab(const QString &receiverName, bool focus) { - if (receiverName == QString::fromStdString(userInfo->name())) { + if (receiverName == QString::fromStdString(userInfo->name())) return nullptr; - } ServerInfo_User otherUser; if (auto user = userListManager->getOnlineUser(receiverName)) { @@ -866,9 +814,8 @@ TabMessage *TabSupervisor::addMessageTab(const QString &receiverName, bool focus TabMessage *tab; tab = messageTabs.value(QString::fromStdString(otherUser.name())); if (tab) { - if (focus) { + if (focus) setCurrentWidget(tab); - } return tab; } @@ -877,9 +824,8 @@ TabMessage *TabSupervisor::addMessageTab(const QString &receiverName, bool focus connect(tab, &TabMessage::maximizeClient, this, &TabSupervisor::maximizeMainWindow); myAddTab(tab); messageTabs.insert(receiverName, tab); - if (focus) { + if (focus) setCurrentWidget(tab); - } return tab; } @@ -890,9 +836,8 @@ void TabSupervisor::maximizeMainWindow() void TabSupervisor::talkLeft(TabMessage *tab) { - if (tab == currentWidget()) { + if (tab == currentWidget()) emit setMenu(); - } messageTabs.remove(tab->getUserName()); removeTab(indexOf(tab)); @@ -989,9 +934,8 @@ TabEdhRec *TabSupervisor::addEdhrecTab(const CardInfoPtr &cardToQuery, bool isCo void TabSupervisor::deckEditorClosed(AbstractTabDeckEditor *tab) { - if (tab == currentWidget()) { + if (tab == currentWidget()) emit setMenu(); - } deckEditorTabs.removeOne(tab); removeTab(indexOf(tab)); @@ -1004,9 +948,8 @@ void TabSupervisor::tabUserEvent(bool globalEvent) tab->setContentsChanged(true); setTabIcon(indexOf(tab), QPixmap("theme:icons/tab_changed")); } - if (globalEvent && SettingsCache::instance().getNotificationsEnabled()) { + if (globalEvent && SettingsCache::instance().getNotificationsEnabled()) QApplication::alert(this); - } } void TabSupervisor::updateTabText(Tab *tab, const QString &newTabText) @@ -1019,50 +962,39 @@ void TabSupervisor::updateTabText(Tab *tab, const QString &newTabText) void TabSupervisor::processRoomEvent(const RoomEvent &event) { TabRoom *tab = roomTabs.value(event.room_id(), 0); - if (tab) { + if (tab) tab->processRoomEvent(event); - } } void TabSupervisor::processGameEventContainer(const GameEventContainer &cont) { TabGame *tab = gameTabs.value(cont.game_id()); - if (tab) { + if (tab) tab->getGame()->getGameEventHandler()->processGameEventContainer(cont, qobject_cast(sender()), {}); - } else { + else qCInfo(TabSupervisorLog) << "gameEvent: invalid gameId" << cont.game_id(); - } } void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event) { QString senderName = QString::fromStdString(event.sender_name()); TabMessage *tab = messageTabs.value(senderName); - if (!tab) { + if (!tab) tab = messageTabs.value(QString::fromStdString(event.receiver_name())); - } if (!tab) { const ServerInfo_User *onlineUserInfo = userListManager->getOnlineUser(senderName); if (onlineUserInfo) { auto userLevel = UserLevelFlags(onlineUserInfo->user_level()); if (SettingsCache::instance().getIgnoreUnregisteredUserMessages() && - !userLevel.testFlag(ServerInfo_User::IsRegistered)) { + !userLevel.testFlag(ServerInfo_User::IsRegistered)) // Flags are additive, so reg/mod/admin are all IsRegistered return; - } else if (SettingsCache::instance().getIgnoreNonBuddyUserMessages() && - !userListManager->isUserBuddy(senderName) && !userLevel.testFlag(ServerInfo_User::IsModerator) && - !userLevel.testFlag(ServerInfo_User::IsAdmin)) { - // Ignore private messages from non-buddies - // Moderator/Admin messages are exempt to ensure warnings reach users - return; - } } tab = addMessageTab(QString::fromStdString(event.sender_name()), false); } - if (!tab) { + if (!tab) return; - } tab->processUserMessageEvent(event); } @@ -1080,9 +1012,8 @@ void TabSupervisor::actShowPopup(const QString &message) void TabSupervisor::processUserLeft(const QString &userName) { TabMessage *tab = messageTabs.value(userName); - if (tab) { + if (tab) tab->processUserLeft(); - } } void TabSupervisor::processUserJoined(const ServerInfo_User &userInfoJoined) @@ -1106,9 +1037,8 @@ void TabSupervisor::processUserJoined(const ServerInfo_User &userInfoJoined) } TabMessage *tab = messageTabs.value(userName); - if (tab) { + if (tab) tab->processUserJoined(userInfoJoined); - } } void TabSupervisor::updateCurrent(int index) @@ -1121,9 +1051,8 @@ void TabSupervisor::updateCurrent(int index) } emit setMenu(static_cast(widget(index))->getTabMenus()); tab->tabActivated(); - } else { + } else emit setMenu(); - } } /** @@ -1133,9 +1062,8 @@ void TabSupervisor::updateCurrent(int index) */ bool TabSupervisor::getAdminLocked() const { - if (!tabAdmin) { + if (!tabAdmin) return true; - } return tabAdmin->getLocked(); } @@ -1159,13 +1087,12 @@ void TabSupervisor::processNotifyUserEvent(const Event_NotifyUser &event) tr("You have been promoted. Please log out and back in for changes to take effect.")); break; case Event_NotifyUser::WARNING: { - if (!QString::fromStdString(event.warning_reason()).simplified().isEmpty()) { + if (!QString::fromStdString(event.warning_reason()).simplified().isEmpty()) QMessageBox::warning(this, tr("Warned"), tr("You have received a warning due to %1.\nPlease refrain from engaging in this " "activity or further actions may be taken against you. If you have any " "questions, please private message a moderator.") .arg(QString::fromStdString(event.warning_reason()).simplified())); - } break; } case Event_NotifyUser::CUSTOM: { diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h index 3eac144b7..0c4428f83 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h +++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h @@ -2,8 +2,8 @@ * @file tab_supervisor.h * @ingroup Core * @ingroup Tabs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TAB_SUPERVISOR_H #define TAB_SUPERVISOR_H @@ -24,7 +24,6 @@ #include #include -class TabCardArtRules; inline Q_LOGGING_CATEGORY(TabSupervisorLog, "tab_supervisor"); class UserListManager; @@ -104,7 +103,6 @@ private: TabDeckStorage *tabDeckStorage; TabReplays *tabReplays; TabAdmin *tabAdmin; - TabCardArtRules *tabCardArtRules; TabLog *tabLog; QMap roomTabs; QMap gameTabs; @@ -114,8 +112,7 @@ private: bool isLocalGame; QAction *aTabHome, *aTabDeckEditor, *aTabVisualDeckEditor, *aTabEdhRec, *aTabArchidekt, *aTabVisualDeckStorage, - *aTabVisualDatabaseDisplay, *aTabServer, *aTabAccount, *aTabDeckStorage, *aTabReplays, *aTabAdmin, - *aTabCardArtRules, *aTabLog; + *aTabVisualDatabaseDisplay, *aTabServer, *aTabAccount, *aTabDeckStorage, *aTabReplays, *aTabAdmin, *aTabLog; int myAddTab(Tab *tab, QAction *manager = nullptr); void addCloseButtonToTab(Tab *tab, int tabIndex, QAction *manager); @@ -148,7 +145,7 @@ public: return userInfo; } [[nodiscard]] AbstractClient *getClient() const; - [[nodiscard]] UserListManager *getUserListManager() const + [[nodiscard]] const UserListManager *getUserListManager() const { return userListManager; } @@ -200,8 +197,6 @@ private slots: void openTabDeckStorage(); void openTabReplays(); void openTabAdmin(); - void actTabCardArtRules(bool checked); - void openTabCardArtRules(); void openTabLog(); void updateCurrent(int index); diff --git a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp index 3112e7ada..5e8fb8670 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp @@ -1,19 +1,14 @@ #include "tab_visual_database_display.h" #include "tab_deck_editor.h" -#include "tab_supervisor.h" - -#include TabVisualDatabaseDisplay::TabVisualDatabaseDisplay(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor) { - auto databaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), true, this); - databaseModel->setObjectName("databaseModel"); - - visualDatabaseDisplayWidget = new VisualDatabaseDisplayWidget(this, databaseModel); - - connect(visualDatabaseDisplayWidget, &VisualDatabaseDisplayWidget::edhrecRequested, this, - &TabVisualDatabaseDisplay::openEdhrecTab); + deckEditor = new TabDeckEditor(_tabSupervisor); + deckEditor->setHidden(true); + visualDatabaseDisplayWidget = new VisualDatabaseDisplayWidget( + this, deckEditor, deckEditor->cardDatabaseDockWidget->databaseDisplayWidget->databaseModel, + deckEditor->cardDatabaseDockWidget->databaseDisplayWidget->databaseDisplayModel); setCentralWidget(visualDatabaseDisplayWidget); @@ -23,8 +18,3 @@ TabVisualDatabaseDisplay::TabVisualDatabaseDisplay(TabSupervisor *_tabSupervisor void TabVisualDatabaseDisplay::retranslateUi() { } - -void TabVisualDatabaseDisplay::openEdhrecTab(const CardInfoPtr &info, bool isCommander) const -{ - getTabSupervisor()->addEdhrecTab(info, isCommander); -} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h index 3a4bcd6ea..66f38fb3d 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h +++ b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h @@ -1,8 +1,8 @@ /** * @file tab_visual_database_display.h * @ingroup Tabs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TAB_VISUAL_DATABASE_DISPLAY_H #define TAB_VISUAL_DATABASE_DISPLAY_H @@ -15,18 +15,16 @@ class TabVisualDatabaseDisplay : public Tab Q_OBJECT private: + TabDeckEditor *deckEditor; VisualDatabaseDisplayWidget *visualDatabaseDisplayWidget; -private slots: - void openEdhrecTab(const CardInfoPtr &info, bool isCommander) const; - public: TabVisualDatabaseDisplay(TabSupervisor *_tabSupervisor); void retranslateUi() override; [[nodiscard]] QString getTabText() const override { - return visualDatabaseDisplayWidget->isVisualDisplayMode() ? tr("Visual Database Display") - : tr("Database Display"); + return visualDatabaseDisplayWidget->displayModeButton->isChecked() ? tr("Database Display") + : tr("Visual Database Display"); } }; 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 fd465ec21..d03ac483b 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 @@ -1,7 +1,6 @@ #include "tab_deck_editor_visual.h" #include "../../../../client/settings/cache_settings.h" -#include "../../cards/card_info_display_widget.h" #include "../../deck_editor/deck_state_manager.h" #include "../../filters/filter_builder.h" #include "../../interface/pixel_map_generator.h" @@ -26,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -52,7 +50,6 @@ TabDeckEditorVisual::TabDeckEditorVisual(TabSupervisor *_tabSupervisor) : Abstra refreshShortcuts(); loadLayout(); - filterDockWidget->setHidden(true); cardDatabaseDockWidget->setHidden(true); } @@ -65,10 +62,9 @@ void TabDeckEditorVisual::createCentralFrame() centralFrame = new QVBoxLayout; centralWidget->setLayout(centralFrame); - auto databaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), true, this); - databaseModel->setObjectName("databaseModel"); - - tabContainer = new TabDeckEditorVisualTabWidget(centralWidget, this, deckStateManager->getModel(), databaseModel); + tabContainer = new TabDeckEditorVisualTabWidget( + centralWidget, this, deckStateManager->getModel(), cardDatabaseDockWidget->databaseDisplayWidget->databaseModel, + cardDatabaseDockWidget->databaseDisplayWidget->databaseDisplayModel); connect(tabContainer, &TabDeckEditorVisualTabWidget::cardChanged, this, &TabDeckEditorVisual::changeModelIndexAndCardInfo); @@ -77,14 +73,7 @@ void TabDeckEditorVisual::createCentralFrame() connect(tabContainer, &TabDeckEditorVisualTabWidget::cardClicked, this, &TabDeckEditorVisual::processMainboardCardClick); connect(tabContainer, &TabDeckEditorVisualTabWidget::cardClickedDatabaseDisplay, this, - &TabDeckEditorVisual::processDatabaseCardClick); - - connect(tabContainer, &TabDeckEditorVisualTabWidget::cardAdded, this, &TabDeckEditorVisual::addCard); - connect(tabContainer, &TabDeckEditorVisualTabWidget::cardDecremented, this, &TabDeckEditorVisual::decrementCard); - connect(tabContainer, &TabDeckEditorVisualTabWidget::edhrecRequested, this, &TabDeckEditorVisual::openEdhrecTab); - connect(tabContainer, &TabDeckEditorVisualTabWidget::printingSelectorRequested, this, - &TabDeckEditorVisual::showPrintingSelector); - connect(tabContainer, &TabDeckEditorVisualTabWidget::cardInfoRequested, this, &TabDeckEditorVisual::updateCardInfo); + &TabDeckEditorVisual::processCardClickDatabaseDisplay); centralFrame->addWidget(tabContainer); setCentralWidget(centralWidget); @@ -110,7 +99,7 @@ void TabDeckEditorVisual::createMenus() registerDockWidget(viewMenu, cardInfoDockWidget, {250, 500}); registerDockWidget(viewMenu, deckDockWidget, {250, 360}); - // registerDockWidget(viewMenu, filterDockWidget, {250, 250}); + registerDockWidget(viewMenu, filterDockWidget, {250, 250}); registerDockWidget(viewMenu, printingSelectorDockWidget, {525, 250}); viewMenu->addSeparator(); @@ -127,9 +116,8 @@ void TabDeckEditorVisual::createMenus() QString TabDeckEditorVisual::getTabText() const { QString result = tr("Visual Deck: %1").arg(deckStateManager->getSimpleDeckName()); - if (deckStateManager->isModified()) { + if (deckStateManager->isModified()) result.prepend("* "); - } return result; } @@ -153,10 +141,12 @@ void TabDeckEditorVisual::changeModelIndexToCard(const ExactCard &activeCard) } } -void TabDeckEditorVisual::processMainboardCardClick(const QMouseEvent *event, - const ExactCard &card, +void TabDeckEditorVisual::processMainboardCardClick(QMouseEvent *event, + CardInfoPictureWithTextOverlayWidget *instance, const QString &zoneName) { + auto card = instance->getCard(); + // Get the model index for the card QModelIndex idx = deckStateManager->getModel()->findCard(card.getName(), zoneName); if (!idx.isValid()) { @@ -176,14 +166,22 @@ void TabDeckEditorVisual::processMainboardCardClick(const QMouseEvent *event, // Alt + Right-click = decrement if (event->button() == Qt::RightButton && event->modifiers().testFlag(Qt::AltModifier)) { - decrementCard(card, zoneName); + if (zoneName == DECK_ZONE_MAIN) { + actDecrementCard(card); + } else { + actDecrementCardFromSideboard(card); + } // Keep selection intact. return; } // Alt + Left click = increment if (event->button() == Qt::LeftButton && event->modifiers().testFlag(Qt::AltModifier)) { - addCard(card, zoneName); + if (zoneName == DECK_ZONE_MAIN) { + actAddCard(card); + } else { + actAddCardToSideboard(card); + } // Keep selection intact. return; } @@ -219,16 +217,13 @@ void TabDeckEditorVisual::processMainboardCardClick(const QMouseEvent *event, } /** @brief Handles clicks on cards in the database display. */ -void TabDeckEditorVisual::processDatabaseCardClick(const QMouseEvent *event, const ExactCard &card) +void TabDeckEditorVisual::processCardClickDatabaseDisplay(QMouseEvent *event, + CardInfoPictureWithTextOverlayWidget *instance) { if (event->button() == Qt::LeftButton) { - if (QApplication::keyboardModifiers() & Qt::ControlModifier) { - addCard(card, DECK_ZONE_SIDE); - } else { - addCard(card, DECK_ZONE_MAIN); - } + actAddCard(instance->getCard()); } else if (event->button() == Qt::RightButton) { - decrementCard(card, DECK_ZONE_MAIN); + actDecrementCard(instance->getCard()); } else if (event->button() == Qt::MiddleButton) { deckDockWidget->actRemoveCard(); } @@ -243,6 +238,14 @@ bool TabDeckEditorVisual::actSaveDeckAs() return result; } +/** @brief Shows the printing selector dock and updates it with the current card. */ +void TabDeckEditorVisual::showPrintingSelector() +{ + printingSelectorDockWidget->printingSelector->setCard(cardInfoDockWidget->cardInfo->getCard().getCardPtr()); + printingSelectorDockWidget->printingSelector->updateDisplay(); + printingSelectorDockWidget->setVisible(true); +} + /** @brief Refreshes keyboard shortcuts for this tab from settings. */ void TabDeckEditorVisual::refreshShortcuts() { @@ -272,18 +275,18 @@ void TabDeckEditorVisual::restartLayout() deckDockWidget->setVisible(true); cardInfoDockWidget->setVisible(true); - // filterDockWidget->setVisible(false); + filterDockWidget->setVisible(false); printingSelectorDockWidget->setVisible(true); setCentralWidget(centralWidget); addDockWidget(Qt::RightDockWidgetArea, deckDockWidget); addDockWidget(Qt::RightDockWidgetArea, cardInfoDockWidget); - // addDockWidget(Qt::RightDockWidgetArea, filterDockWidget); + addDockWidget(Qt::RightDockWidgetArea, filterDockWidget); addDockWidget(Qt::RightDockWidgetArea, printingSelectorDockWidget); splitDockWidget(cardInfoDockWidget, printingSelectorDockWidget, Qt::Vertical); splitDockWidget(cardInfoDockWidget, deckDockWidget, Qt::Horizontal); - // splitDockWidget(cardInfoDockWidget, filterDockWidget, Qt::Horizontal); + splitDockWidget(cardInfoDockWidget, filterDockWidget, Qt::Horizontal); QTimer::singleShot(100, this, SLOT(freeDocksSize())); } @@ -295,13 +298,13 @@ void TabDeckEditorVisual::retranslateUi() cardInfoDockWidget->setWindowTitle(tr("Card Info")); deckDockWidget->setWindowTitle(tr("Deck")); - // filterDockWidget->setWindowTitle(tr("Filters")); + filterDockWidget->setWindowTitle(tr("Filters")); viewMenu->setTitle(tr("&View")); dockToActions[cardInfoDockWidget].menu->setTitle(tr("Card Info")); dockToActions[deckDockWidget].menu->setTitle(tr("Deck")); - // dockToActions[filterDockWidget].menu->setTitle(tr("Filters")); + dockToActions[filterDockWidget].menu->setTitle(tr("Filters")); dockToActions[printingSelectorDockWidget].menu->setTitle(tr("Printing")); for (auto &actions : dockToActions.values()) { diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h index 7d7a3f3a2..8a0677c9d 100644 --- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h +++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h @@ -41,7 +41,7 @@ * - changeModelIndexAndCardInfo(const ExactCard &card) — Updates deck model selection and card info. * - changeModelIndexToCard(const ExactCard &card) — Selects the card in the deck view. * - processMainboardCardClick(QMouseEvent *event, ...) — Handles clicks on mainboard cards. - * - processDatabaseCardClick(QMouseEvent *event, ...) — Handles clicks on database cards. + * - processCardClickDatabaseDisplay(QMouseEvent *event, ...) — Handles clicks on database cards. * - actSaveDeckAs() — Overrides save action with temporary UI adjustments. * - showPrintingSelector() — Opens the printing selector dock for the current card. * - freeDocksSize() — Frees constraints on dock widget sizes. @@ -144,20 +144,27 @@ public slots: */ void onDeckChanged() override; + /** + * @brief Show the printing selector dock for the currently active card. + */ + void showPrintingSelector() override; + /** * @brief Handle card clicks in the mainboard visual deck. * @param event Mouse event triggering the action. - * @param card The clicked card. + * @param instance Widget representing the clicked card. * @param zoneName Deck zone of the card. */ - void processMainboardCardClick(const QMouseEvent *event, const ExactCard &card, const QString &zoneName); + void processMainboardCardClick(QMouseEvent *event, + CardInfoPictureWithTextOverlayWidget *instance, + const QString &zoneName); /** * @brief Handle card clicks in the database visual display. * @param event Mouse event triggering the action. - * @param card The clicked card. + * @param instance Widget representing the clicked card. */ - void processDatabaseCardClick(const QMouseEvent *event, const ExactCard &card); + void processCardClickDatabaseDisplay(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance); /** * @brief Save the deck under a new name. diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp index 2ee560859..8a4d5903d 100644 --- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp +++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp @@ -9,6 +9,7 @@ * @param _deckEditor Pointer to the associated deck editor. * @param _deckModel Pointer to the deck list model. * @param _cardDatabaseModel Pointer to the card database model. + * @param _cardDatabaseDisplayModel Pointer to the card database display model. * * Initializes all sub-widgets (visual deck view, database display, deck analytics, * sample hand) and sets up the tab layout and signal connections. @@ -16,8 +17,10 @@ TabDeckEditorVisualTabWidget::TabDeckEditorVisualTabWidget(QWidget *parent, AbstractTabDeckEditor *_deckEditor, DeckListModel *_deckModel, - CardDatabaseModel *_cardDatabaseModel) - : QTabWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), cardDatabaseModel(_cardDatabaseModel) + CardDatabaseModel *_cardDatabaseModel, + CardDatabaseDisplayModel *_cardDatabaseDisplayModel) + : QTabWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), cardDatabaseModel(_cardDatabaseModel), + cardDatabaseDisplayModel(_cardDatabaseDisplayModel) { this->setTabsClosable(true); // Enable tab closing connect(this, &QTabWidget::tabCloseRequested, this, &TabDeckEditorVisualTabWidget::handleTabClose); @@ -31,25 +34,16 @@ TabDeckEditorVisualTabWidget::TabDeckEditorVisualTabWidget(QWidget *parent, &TabDeckEditorVisualTabWidget::onCardChanged); connect(visualDeckView, &VisualDeckEditorWidget::cardClicked, this, &TabDeckEditorVisualTabWidget::onCardClickedDeckEditor); - connect(visualDeckView, &VisualDeckEditorWidget::cardAdditionRequested, this, - &TabDeckEditorVisualTabWidget::actAddCard); + connect(visualDeckView, &VisualDeckEditorWidget::cardAdditionRequested, deckEditor, + &AbstractTabDeckEditor::actAddCard); - visualDatabaseDisplay = new VisualDatabaseDisplayWidget(this, _cardDatabaseModel, deckModel); + visualDatabaseDisplay = + new VisualDatabaseDisplayWidget(this, deckEditor, _cardDatabaseModel, _cardDatabaseDisplayModel); visualDatabaseDisplay->setObjectName("visualDatabaseView"); connect(visualDatabaseDisplay, &VisualDatabaseDisplayWidget::cardHoveredDatabaseDisplay, this, &TabDeckEditorVisualTabWidget::onCardChangedDatabaseDisplay); connect(visualDatabaseDisplay, &VisualDatabaseDisplayWidget::cardClickedDatabaseDisplay, this, &TabDeckEditorVisualTabWidget::onCardClickedDatabaseDisplay); - connect(visualDatabaseDisplay, &VisualDatabaseDisplayWidget::cardAdded, this, - &TabDeckEditorVisualTabWidget::cardAdded); - connect(visualDatabaseDisplay, &VisualDatabaseDisplayWidget::cardDecremented, this, - &TabDeckEditorVisualTabWidget::cardDecremented); - connect(visualDatabaseDisplay, &VisualDatabaseDisplayWidget::edhrecRequested, this, - &TabDeckEditorVisualTabWidget::edhrecRequested); - connect(visualDatabaseDisplay, &VisualDatabaseDisplayWidget::printingSelectorRequested, this, - &TabDeckEditorVisualTabWidget::printingSelectorRequested); - connect(visualDatabaseDisplay, &VisualDatabaseDisplayWidget::cardInfoRequested, this, - &TabDeckEditorVisualTabWidget::cardInfoRequested); statsAnalyzer = new DeckListStatisticsAnalyzer(this, deckModel); statsAnalyzer->analyze(); @@ -88,24 +82,25 @@ void TabDeckEditorVisualTabWidget::onCardChangedDatabaseDisplay(const ExactCard /** * @brief Emits the cardClicked signal when a card is clicked in the visual deck view. * @param event The mouse event. - * @param card The clicked card. + * @param instance The widget instance of the clicked card. * @param zoneName The zone of the deck where the card is located. */ void TabDeckEditorVisualTabWidget::onCardClickedDeckEditor(QMouseEvent *event, - const ExactCard &card, - const QString &zoneName) + CardInfoPictureWithTextOverlayWidget *instance, + QString zoneName) { - emit cardClicked(event, card, zoneName); + emit cardClicked(event, instance, zoneName); } /** * @brief Emits the cardClickedDatabaseDisplay signal when a card is clicked in the database display. * @param event The mouse event. - * @param card The clicked card. + * @param instance The widget instance of the clicked card. */ -void TabDeckEditorVisualTabWidget::onCardClickedDatabaseDisplay(QMouseEvent *event, const ExactCard &card) +void TabDeckEditorVisualTabWidget::onCardClickedDatabaseDisplay(QMouseEvent *event, + CardInfoPictureWithTextOverlayWidget *instance) { - emit cardClickedDatabaseDisplay(event, card); + emit cardClickedDatabaseDisplay(event, instance); } /** @@ -171,15 +166,3 @@ void TabDeckEditorVisualTabWidget::handleTabClose(int index) this->removeTab(index); delete tab; } - -void TabDeckEditorVisualTabWidget::actAddCard(const ExactCard &card) -{ - QString zoneName; - if (QApplication::keyboardModifiers() & Qt::ControlModifier) { - zoneName = DECK_ZONE_SIDE; - } else { - zoneName = DECK_ZONE_MAIN; - } - - deckEditor->addCard(card, zoneName); -} diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h index 2aabbb26a..9468df425 100644 --- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h +++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h @@ -55,25 +55,27 @@ public: * @param _deckEditor Pointer to the deck editor instance. * @param _deckModel Deck list model. * @param _cardDatabaseModel Card database model. + * @param _cardDatabaseDisplayModel Database display model. */ explicit TabDeckEditorVisualTabWidget(QWidget *parent, AbstractTabDeckEditor *_deckEditor, DeckListModel *_deckModel, - CardDatabaseModel *_cardDatabaseModel); + CardDatabaseModel *_cardDatabaseModel, + CardDatabaseDisplayModel *_cardDatabaseDisplayModel); - /** @brief Add a new tab with a widget and title. */ + /// Add a new tab with a widget and title. void addNewTab(QWidget *widget, const QString &title); - /** @brief Remove the currently active tab. */ + /// Remove the currently active tab. void removeCurrentTab(); - /** @brief Set the title of a specific tab. */ + /// Set the title of a specific tab. void setTabTitle(int index, const QString &title); - /** @brief Get the currently active tab widget. */ + /// Get the currently active tab widget. [[nodiscard]] QWidget *getCurrentTab() const; - /** @brief Get the total number of tabs. */ + /// Get the total number of tabs. [[nodiscard]] int getTabCount() const; VisualDeckEditorWidget *visualDeckView; ///< Visual deck editor widget. @@ -99,35 +101,30 @@ public slots: /** * @brief Emitted when a card is clicked in the deck view. * @param event Mouse event. - * @param card The clicked card. + * @param instance Widget representing the clicked card. * @param zoneName Deck zone of the card. */ - void onCardClickedDeckEditor(QMouseEvent *event, const ExactCard &card, const QString &zoneName); + void onCardClickedDeckEditor(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName); /** * @brief Emitted when a card is clicked in the database display. * @param event Mouse event. - * @param card The clicked card. + * @param instance Widget representing the clicked card. */ - void onCardClickedDatabaseDisplay(QMouseEvent *event, const ExactCard &card); + void onCardClickedDatabaseDisplay(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance); signals: void cardChanged(const ExactCard &activeCard); void cardChangedDatabaseDisplay(const ExactCard &activeCard); - void cardClicked(QMouseEvent *event, const ExactCard &card, const QString &zoneName); - void cardClickedDatabaseDisplay(QMouseEvent *event, const ExactCard &card); - - void cardAdded(const ExactCard &card, const QString &zoneName); - void cardDecremented(const ExactCard &card, const QString &zoneName); - void edhrecRequested(const CardInfoPtr &cardInfo, bool isCommander); - void printingSelectorRequested(); - void cardInfoRequested(const ExactCard &cardName); + void cardClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName); + void cardClickedDatabaseDisplay(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance); private: - QVBoxLayout *layout; ///< Layout for tabs and controls. - AbstractTabDeckEditor *deckEditor; ///< Reference to the deck editor. - DeckListModel *deckModel; ///< Deck list model. - CardDatabaseModel *cardDatabaseModel; ///< Card database model. + QVBoxLayout *layout; ///< Layout for tabs and controls. + AbstractTabDeckEditor *deckEditor; ///< Reference to the deck editor. + DeckListModel *deckModel; ///< Deck list model. + CardDatabaseModel *cardDatabaseModel; ///< Card database model. + CardDatabaseDisplayModel *cardDatabaseDisplayModel; ///< Card database display model. private slots: /** @@ -135,12 +132,6 @@ private slots: * @param index Index of the tab to close. */ void handleTabClose(int index); - - /** - * @brief Adds card to maindeck or side depending on whether ctrl is held - * @param card - */ - void actAddCard(const ExactCard &card); }; #endif // TAB_DECK_EDITOR_VISUAL_TAB_WIDGET_H \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h index d3f64e23d..ccf752e67 100644 --- a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h +++ b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h @@ -1,8 +1,8 @@ /** * @file tab_deck_storage_visual.h * @ingroup Tabs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef TAB_DECK_STORAGE_VISUAL_H #define TAB_DECK_STORAGE_VISUAL_H diff --git a/cockatrice/src/interface/widgets/utility/compact_push_button.cpp b/cockatrice/src/interface/widgets/utility/compact_push_button.cpp deleted file mode 100644 index cf98bfede..000000000 --- a/cockatrice/src/interface/widgets/utility/compact_push_button.cpp +++ /dev/null @@ -1,73 +0,0 @@ -#include "compact_push_button.h" - -CompactPushButton::CompactPushButton(QWidget *parent) : QPushButton(parent) -{ - setCheckable(true); - setFixedHeight(32); - - // default sizing - setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); - - connect(this, &QPushButton::clicked, this, [] { - // your popup logic here - }); -} - -void CompactPushButton::setButtonText(const QString &text) -{ - fullText = text; - - if (!compact) { - setText(fullText); - } - - updateGeometryState(); -} - -void CompactPushButton::setButtonIcon(const QIcon &icon) -{ - setIcon(icon); -} - -void CompactPushButton::setCompact(bool enabled) -{ - compact = enabled; - - if (compact) { - setText(QString()); // icon only - } else { - setText(fullText); - } - - updateGeometryState(); -} - -void CompactPushButton::updateGeometryState() -{ - const int buttonHeight = 32; - - setMinimumHeight(buttonHeight); - setMaximumHeight(buttonHeight); - - if (compact) { - setMinimumWidth(buttonHeight); - setMaximumWidth(buttonHeight); - } else { - setMinimumWidth(0); - setMaximumWidth(QWIDGETSIZE_MAX); - } - - updateGeometry(); -} - -int CompactPushButton::expandedWidth() const -{ - QFontMetrics fm(font()); - - return fm.horizontalAdvance(fullText) + 48; // icon + padding -} - -int CompactPushButton::compactWidth() const -{ - return 32; -} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/utility/compact_push_button.h b/cockatrice/src/interface/widgets/utility/compact_push_button.h deleted file mode 100644 index b0017beee..000000000 --- a/cockatrice/src/interface/widgets/utility/compact_push_button.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef COCKATRICE_COMPACT_PUSH_BUTTON_H -#define COCKATRICE_COMPACT_PUSH_BUTTON_H - -#include - -class CompactPushButton : public QPushButton -{ - Q_OBJECT - -public: - explicit CompactPushButton(QWidget *parent = nullptr); - - void setButtonText(const QString &text); - - void setButtonIcon(const QIcon &icon); - - void setCompact(bool enabled); - - int expandedWidth() const; - - int compactWidth() const; - -private: - void updateGeometryState(); - -private: - QString fullText; - bool compact = false; -}; - -#endif // COCKATRICE_COMPACT_PUSH_BUTTON_H diff --git a/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp b/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp index 05f56c275..c137b4f35 100644 --- a/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp +++ b/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp @@ -24,18 +24,14 @@ bool LineEditUnfocusable::isUnfocusShortcut(QKeyEvent *event) QString modifier; QString keyNoMod; - if (event->modifiers() & Qt::ShiftModifier) { + if (event->modifiers() & Qt::ShiftModifier) modifier += "Shift+"; - } - if (event->modifiers() & Qt::ControlModifier) { + if (event->modifiers() & Qt::ControlModifier) modifier += "Ctrl+"; - } - if (event->modifiers() & Qt::AltModifier) { + if (event->modifiers() & Qt::AltModifier) modifier += "Alt+"; - } - if (event->modifiers() & Qt::MetaModifier) { + if (event->modifiers() & Qt::MetaModifier) modifier += "Meta+"; - } keyNoMod = QKeySequence(event->key()).toString(); @@ -43,9 +39,8 @@ bool LineEditUnfocusable::isUnfocusShortcut(QKeyEvent *event) QList unfocusShortcut = SettingsCache::instance().shortcuts().getShortcut("Player/unfocusTextBox"); for (const auto &unfocusKey : unfocusShortcut) { - if (key.matches(unfocusKey) == QKeySequence::ExactMatch) { + if (key.matches(unfocusKey) == QKeySequence::ExactMatch) return true; - } } return false; } @@ -84,12 +79,10 @@ void SearchLineEdit::keyPressEvent(QKeyEvent *event) static const QVector forwardWhenEmpty = {Qt::Key_Home, Qt::Key_End}; Qt::Key key = static_cast(event->key()); if (treeView) { - if (forwardToTreeView.contains(key)) { + if (forwardToTreeView.contains(key)) QCoreApplication::sendEvent(treeView, event); - } - if (text().isEmpty() && forwardWhenEmpty.contains(key)) { + if (text().isEmpty() && forwardWhenEmpty.contains(key)) QCoreApplication::sendEvent(treeView, event); - } } LineEditUnfocusable::keyPressEvent(event); } \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/utility/custom_line_edit.h b/cockatrice/src/interface/widgets/utility/custom_line_edit.h index 8c389b797..2026c1c1c 100644 --- a/cockatrice/src/interface/widgets/utility/custom_line_edit.h +++ b/cockatrice/src/interface/widgets/utility/custom_line_edit.h @@ -1,8 +1,8 @@ /** * @file custom_line_edit.h * @ingroup UI + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CUSTOMLINEEDIT_H #define CUSTOMLINEEDIT_H diff --git a/cockatrice/src/interface/widgets/utility/get_text_with_max.h b/cockatrice/src/interface/widgets/utility/get_text_with_max.h index 424bb0c6a..923d6f427 100644 --- a/cockatrice/src/interface/widgets/utility/get_text_with_max.h +++ b/cockatrice/src/interface/widgets/utility/get_text_with_max.h @@ -9,7 +9,7 @@ #include #include -#include +#include QString getTextWithMax(QWidget *parent, const QString &title, diff --git a/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp b/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp index 13f475a61..389e69d57 100644 --- a/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp +++ b/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp @@ -46,9 +46,8 @@ void LineEditCompleter::keyPressEvent(QKeyEvent *event) int lastIndexof = qMax(0, textValue.lastIndexOf(" ")); QString finalString = textValue.left(lastIndexof); // Add a space if there's a word - if (finalString != "") { + if (finalString != "") finalString += " "; - } setText(finalString); return; } @@ -122,14 +121,12 @@ void LineEditCompleter::setCompleter(QCompleter *completer) void LineEditCompleter::setCompletionList(QStringList completionList) { - if (!c || c->popup()->isVisible()) { + if (!c || c->popup()->isVisible()) return; - } QStringListModel *model; model = (QStringListModel *)(c->model()); - if (model == NULL) { + if (model == NULL) model = new QStringListModel(); - } model->setStringList(completionList); } diff --git a/cockatrice/src/interface/widgets/utility/line_edit_completer.h b/cockatrice/src/interface/widgets/utility/line_edit_completer.h index 65fa382ac..7b3756e3c 100644 --- a/cockatrice/src/interface/widgets/utility/line_edit_completer.h +++ b/cockatrice/src/interface/widgets/utility/line_edit_completer.h @@ -1,8 +1,8 @@ /** * @file line_edit_completer.h * @ingroup UI + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef LINEEDITCOMPLETER_H #define LINEEDITCOMPLETER_H diff --git a/cockatrice/src/interface/widgets/utility/sequence_edit.h b/cockatrice/src/interface/widgets/utility/sequence_edit.h index 28e18d42f..a5fe1a1c6 100644 --- a/cockatrice/src/interface/widgets/utility/sequence_edit.h +++ b/cockatrice/src/interface/widgets/utility/sequence_edit.h @@ -1,8 +1,8 @@ /** * @file sequence_edit.h * @ingroup UI + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef SEQUENCEEDIT_H #define SEQUENCEEDIT_H 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 497d25fce..698ea9e97 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 @@ -1,8 +1,8 @@ /** * @file visual_database_display_color_filter_widget.h * @ingroup VisualCardDatabaseWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef VISUAL_DATABASE_DISPLAY_COLOR_FILTER_WIDGET_H #define VISUAL_DATABASE_DISPLAY_COLOR_FILTER_WIDGET_H diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp index 7ee57b1e9..44b275afd 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp @@ -57,9 +57,8 @@ void VisualDatabaseDisplayFilterSaveLoadWidget::retranslateUi() void VisualDatabaseDisplayFilterSaveLoadWidget::saveFilter() { QString filename = filenameInput->text().trimmed(); - if (filename.isEmpty()) { + if (filename.isEmpty()) return; - } QString filePath = SettingsCache::instance().getFiltersPath() + QDir::separator() + filename + ".json"; @@ -89,22 +88,19 @@ void VisualDatabaseDisplayFilterSaveLoadWidget::loadFilter(const QString &filena QString filePath = SettingsCache::instance().getFiltersPath() + QDir::separator() + filename; QFile file(filePath); - if (!file.open(QIODevice::ReadOnly)) { + if (!file.open(QIODevice::ReadOnly)) return; - } QByteArray jsonData = file.readAll(); file.close(); QJsonDocument doc = QJsonDocument::fromJson(jsonData); - if (!doc.isObject()) { + if (!doc.isObject()) return; - } QJsonObject root = doc.object(); - if (!root.contains("filters") || !root["filters"].isArray()) { + if (!root.contains("filters") || !root["filters"].isArray()) return; - } QJsonArray filtersArray = root["filters"].toArray(); diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h index 459633e42..bb5921a02 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h @@ -1,8 +1,8 @@ /** * @file visual_database_display_filter_save_load_widget.h * @ingroup VisualCardDatabaseWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef VISUAL_DATABASE_DISPLAY_FILTER_SAVE_LOAD_WIDGET_H #define VISUAL_DATABASE_DISPLAY_FILTER_SAVE_LOAD_WIDGET_H 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 62e1bf5ba..3cc1bf23b 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,15 +1,20 @@ #include "visual_database_display_filter_toolbar_widget.h" -#include "../deck_editor/card_database_view.h" #include "visual_database_display_widget.h" #include -VisualDatabaseDisplayFilterToolbarWidget::VisualDatabaseDisplayFilterToolbarWidget(VisualDatabaseDisplayWidget *_parent, - DeckListModel *deckListModel) - : FlowWidget(_parent, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff), - visualDatabaseDisplay(_parent), deckListModel(deckListModel) +VisualDatabaseDisplayFilterToolbarWidget::VisualDatabaseDisplayFilterToolbarWidget(VisualDatabaseDisplayWidget *_parent) + : QWidget(_parent), visualDatabaseDisplay(_parent) { + filterContainerLayout = new QHBoxLayout(this); + filterContainerLayout->setContentsMargins(11, 0, 11, 0); + filterContainerLayout->setSpacing(2); + setLayout(filterContainerLayout); + filterContainerLayout->setAlignment(Qt::AlignLeft); + + setMaximumHeight(80); + connect(this, &VisualDatabaseDisplayFilterToolbarWidget::searchModelChanged, visualDatabaseDisplay, &VisualDatabaseDisplayWidget::onSearchModelChanged); @@ -96,10 +101,11 @@ void VisualDatabaseDisplayFilterToolbarWidget::initialize() filterLayout->setAlignment(Qt::AlignLeft); // create settings widgets - auto filterModel = visualDatabaseDisplay->getFilterModel(); + auto filterModel = visualDatabaseDisplay->filterModel; saveLoadWidget = new VisualDatabaseDisplayFilterSaveLoadWidget(this, filterModel); - nameFilterWidget = new VisualDatabaseDisplayNameFilterWidget(this, filterModel, deckListModel); + nameFilterWidget = + new VisualDatabaseDisplayNameFilterWidget(this, visualDatabaseDisplay->getDeckEditor(), filterModel); mainTypeFilterWidget = new VisualDatabaseDisplayMainTypeFilterWidget(this, filterModel); formatLegalityWidget = new VisualDatabaseDisplayFormatLegalityFilterWidget(this, filterModel); subTypeFilterWidget = new VisualDatabaseDisplaySubTypeFilterWidget(this, filterModel); @@ -125,18 +131,10 @@ void VisualDatabaseDisplayFilterToolbarWidget::initialize() filterLayout->addWidget(quickFilterFormatLegalityWidget); // put everything into main layout - addWidget(sortGroupBox); - addWidget(filterGroupBox); - auto *spacer = new QWidget(this); - spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); - spacer->setAttribute(Qt::WA_TransparentForMouseEvents); - addWidget(spacer); - addWidget(quickFilterSaveLoadWidget); - addWidget(quickFilterSaveLoadWidget); - - // Force a layout pass so sizeHint() is accurate - layout()->activate(); - fullWidthHint = sizeHint().width(); + filterContainerLayout->addWidget(sortGroupBox); + filterContainerLayout->addWidget(filterGroupBox); + filterContainerLayout->addStretch(); + filterContainerLayout->addWidget(quickFilterSaveLoadWidget); } void VisualDatabaseDisplayFilterToolbarWidget::retranslateUi() @@ -157,26 +155,4 @@ void VisualDatabaseDisplayFilterToolbarWidget::retranslateUi() quickFilterSubTypeWidget->setButtonText(tr("Sub Type")); quickFilterSetWidget->setButtonText(tr("Sets")); quickFilterFormatLegalityWidget->setButtonText(tr("Formats")); -} - -void VisualDatabaseDisplayFilterToolbarWidget::resizeEvent(QResizeEvent *event) -{ - QWidget::resizeEvent(event); - updateCompactMode(event->size().width()); -} - -void VisualDatabaseDisplayFilterToolbarWidget::updateCompactMode(int availableWidth) -{ - const bool compact = availableWidth < fullWidthHint; - - const QList filterButtons = { - quickFilterSaveLoadWidget, quickFilterNameWidget, quickFilterMainTypeWidget, - quickFilterSubTypeWidget, quickFilterSetWidget, quickFilterFormatLegalityWidget, - }; - - for (auto *btn : filterButtons) { - if (btn->isCompact() != compact) { // only act on transitions - btn->setCompact(compact); - } - } } \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.h index 8a3555455..5cca5187a 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.h @@ -10,7 +10,7 @@ class VisualDatabaseDisplayWidget; -class VisualDatabaseDisplayFilterToolbarWidget : public FlowWidget +class VisualDatabaseDisplayFilterToolbarWidget : public QWidget { Q_OBJECT @@ -18,14 +18,12 @@ signals: void searchModelChanged(); public: - explicit VisualDatabaseDisplayFilterToolbarWidget(VisualDatabaseDisplayWidget *parent, - DeckListModel *deckListModel = nullptr); + explicit VisualDatabaseDisplayFilterToolbarWidget(VisualDatabaseDisplayWidget *parent); void initialize(); void retranslateUi(); private: VisualDatabaseDisplayWidget *visualDatabaseDisplay; - DeckListModel *deckListModel; QGroupBox *sortGroupBox; QLabel *sortByLabel; @@ -34,6 +32,7 @@ private: QGroupBox *filterGroupBox; QLabel *filterByLabel; + QHBoxLayout *filterContainerLayout; SettingsButtonWidget *quickFilterSaveLoadWidget; VisualDatabaseDisplayFilterSaveLoadWidget *saveLoadWidget; SettingsButtonWidget *quickFilterNameWidget; @@ -46,12 +45,6 @@ private: VisualDatabaseDisplaySetFilterWidget *setFilterWidget; SettingsButtonWidget *quickFilterFormatLegalityWidget; VisualDatabaseDisplayFormatLegalityFilterWidget *formatLegalityWidget; - - int fullWidthHint = 0; - void updateCompactMode(int availableWidth); - -protected: - void resizeEvent(QResizeEvent *event) override; }; #endif // COCKATRICE_VISUAL_DATABASE_DISPLAY_FILTER_TOOLBAR_WIDGET_H diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h index 6dec58319..9145812a7 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h @@ -1,8 +1,8 @@ /** * @file visual_database_display_main_type_filter_widget.h * @ingroup VisualCardDatabaseWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef VISUAL_DATABASE_DISPLAY_MAIN_TYPE_FILTER_WIDGET_H #define VISUAL_DATABASE_DISPLAY_MAIN_TYPE_FILTER_WIDGET_H diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp index 3fa1a782a..2751ee971 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp @@ -8,9 +8,9 @@ #include VisualDatabaseDisplayNameFilterWidget::VisualDatabaseDisplayNameFilterWidget(QWidget *parent, - FilterTreeModel *_filterModel, - DeckListModel *deckListModel) - : QWidget(parent), filterModel(_filterModel), deckListModel(deckListModel) + AbstractTabDeckEditor *_deckEditor, + FilterTreeModel *_filterModel) + : QWidget(parent), deckEditor(_deckEditor), filterModel(_filterModel) { setMinimumWidth(300); setMaximumHeight(300); @@ -62,9 +62,10 @@ void VisualDatabaseDisplayNameFilterWidget::retranslateUi() void VisualDatabaseDisplayNameFilterWidget::actLoadFromDeck() { - if (!deckListModel) { + DeckListModel *deckListModel = deckEditor->deckStateManager->getModel(); + + if (!deckListModel) return; - } QList cardNames = deckListModel->getCardNames(); for (auto cardName : cardNames) { @@ -77,9 +78,8 @@ void VisualDatabaseDisplayNameFilterWidget::actLoadFromDeck() void VisualDatabaseDisplayNameFilterWidget::actLoadFromClipboard() { DlgLoadDeckFromClipboard dlg(this); - if (!dlg.exec()) { + if (!dlg.exec()) return; - } QStringList cardsInClipboard = dlg.getDeckList().getCardList(); for (QString cardName : cardsInClipboard) { @@ -91,9 +91,8 @@ void VisualDatabaseDisplayNameFilterWidget::actLoadFromClipboard() void VisualDatabaseDisplayNameFilterWidget::createNameFilter(const QString &name) { - if (activeFilters.contains(name)) { + if (activeFilters.contains(name)) return; - } // Create a button for the filter auto *button = new QPushButton(name, flowWidget); diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.h index 0c10408ae..76d3ec29e 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.h @@ -1,8 +1,8 @@ /** * @file visual_database_display_name_filter_widget.h * @ingroup VisualCardDatabaseWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef VISUAL_DATABASE_DISPLAY_NAME_FILTER_WIDGET_H #define VISUAL_DATABASE_DISPLAY_NAME_FILTER_WIDGET_H @@ -21,8 +21,8 @@ class VisualDatabaseDisplayNameFilterWidget : public QWidget Q_OBJECT public: explicit VisualDatabaseDisplayNameFilterWidget(QWidget *parent, - FilterTreeModel *filterModel, - DeckListModel *deckListModel = nullptr); + AbstractTabDeckEditor *deckEditor, + FilterTreeModel *filterModel); void createNameFilter(const QString &name); void removeNameFilter(const QString &name); @@ -34,8 +34,8 @@ public slots: void retranslateUi(); private: + AbstractTabDeckEditor *deckEditor; FilterTreeModel *filterModel; - DeckListModel *deckListModel; QVBoxLayout *layout; QLineEdit *searchBox; FlowWidget *flowWidget; diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.h index bcc5e93c2..dc7fd0e92 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.h @@ -1,8 +1,8 @@ /** * @file visual_database_display_set_filter_widget.h * @ingroup VisualCardDatabaseWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef VISUAL_DATABASE_DISPLAY_SET_FILTER_WIDGET_H #define VISUAL_DATABASE_DISPLAY_SET_FILTER_WIDGET_H diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h index d713c7f99..ce5546fc8 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h @@ -1,8 +1,8 @@ /** * @file visual_database_display_sub_type_filter_widget.h * @ingroup VisualCardDatabaseWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef VISUAL_DATABASE_DISPLAY_SUB_TYPE_FILTER_WIDGET_H #define VISUAL_DATABASE_DISPLAY_SUB_TYPE_FILTER_WIDGET_H 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 cc4cce496..b9f8dab51 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 @@ -5,7 +5,7 @@ #include "../../../filters/syntax_help.h" #include "../../pixel_map_generator.h" #include "../cards/card_info_picture_with_text_overlay_widget.h" -#include "../deck_editor/card_database_view.h" +#include "../quick_settings/settings_button_widget.h" #include "../utility/custom_line_edit.h" #include "visual_database_display_color_filter_widget.h" #include "visual_database_display_filter_save_load_widget.h" @@ -23,21 +23,17 @@ #include VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent, + AbstractTabDeckEditor *_deckEditor, CardDatabaseModel *database_model, - DeckListModel *deckListModel) - : QWidget(parent) + CardDatabaseDisplayModel *database_display_model) + : QWidget(parent), deckEditor(_deckEditor), databaseModel(database_model), + databaseDisplayModel(database_display_model) { 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"); - databaseDisplayModel->setSourceModel(database_model); - databaseDisplayModel->setFilterKeyColumn(0); - cards = new QList; connect(databaseDisplayModel, &CardDatabaseDisplayModel::modelDirty, this, &VisualDatabaseDisplayWidget::modelDirty); @@ -55,7 +51,9 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent, connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance(), &SettingsCache::setVisualDatabaseDisplayCardSize); - searchContainer = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff); + searchContainer = new QWidget(this); + searchLayout = new QHBoxLayout(searchContainer); + searchContainer->setLayout(searchLayout); searchEdit = new SearchLineEdit(); searchEdit->setObjectName("searchEdit"); @@ -64,6 +62,7 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent, searchEdit->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition); auto help = searchEdit->addAction(QPixmap("theme:icons/info"), QLineEdit::TrailingPosition); connect(help, &QAction::triggered, this, [this] { createSearchSyntaxHelpWindow(searchEdit); }); + searchEdit->installEventFilter(&searchKeySignals); setFocusProxy(searchEdit); setFocusPolicy(Qt::ClickFocus); @@ -78,29 +77,38 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent, filterModel = new FilterTreeModel(); filterModel->setObjectName("filterModel"); - connect(searchEdit, &SearchLineEdit::textChanged, databaseDisplayModel, &CardDatabaseDisplayModel::setStringFilter); + searchKeySignals.setObjectName("searchKeySignals"); + connect(searchEdit, &SearchLineEdit::textChanged, this, &VisualDatabaseDisplayWidget::updateSearch); - databaseView = new CardDatabaseView(this, databaseDisplayModel); - databaseView->setObjectName("databaseView"); + DeckEditorDatabaseDisplayWidget *databaseDisplayWidget = deckEditor->cardDatabaseDockWidget->databaseDisplayWidget; + connect(&searchKeySignals, &KeySignals::onEnter, databaseDisplayWidget, + &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck); + connect(&searchKeySignals, &KeySignals::onCtrlAltEqual, databaseDisplayWidget, + &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck); + connect(&searchKeySignals, &KeySignals::onCtrlAltRBracket, databaseDisplayWidget, + &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard); + connect(&searchKeySignals, &KeySignals::onCtrlAltMinus, databaseDisplayWidget, + &DeckEditorDatabaseDisplayWidget::actDecrementCardFromMainDeck); + connect(&searchKeySignals, &KeySignals::onCtrlAltLBracket, databaseDisplayWidget, + &DeckEditorDatabaseDisplayWidget::actDecrementCardFromSideboard); + connect(&searchKeySignals, &KeySignals::onCtrlAltEnter, databaseDisplayWidget, + &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard); + connect(&searchKeySignals, &KeySignals::onCtrlEnter, databaseDisplayWidget, + &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard); + connect(&searchKeySignals, &KeySignals::onCtrlC, databaseDisplayWidget, + &DeckEditorDatabaseDisplayWidget::copyDatabaseCellContents); + connect(help, &QAction::triggered, this, [this] { createSearchSyntaxHelpWindow(searchEdit); }); + + databaseView = databaseDisplayWidget->getDatabaseView(); databaseView->setFocusProxy(searchEdit); databaseView->setItemDelegate(nullptr); databaseView->setVisible(false); searchEdit->setTreeView(databaseView); - searchEdit->installEventFilter(databaseView->getKeySignals()); - - connect(databaseView, &CardDatabaseView::cardChanged, this, &VisualDatabaseDisplayWidget::onSelectedCardChanged); - connect(databaseView, &CardDatabaseView::cardAdded, this, &VisualDatabaseDisplayWidget::actAddCard); - connect(databaseView, &CardDatabaseView::cardDecremented, this, &VisualDatabaseDisplayWidget::actDecrementCard); - connect(databaseView, &CardDatabaseView::edhrecClicked, this, &VisualDatabaseDisplayWidget::edhrecRequested); - connect(databaseView, &CardDatabaseView::selectPrintingClicked, this, - &VisualDatabaseDisplayWidget::printingSelectorRequested); - connect(databaseView, &CardDatabaseView::relatedCardClicked, this, - &VisualDatabaseDisplayWidget::onRelatedCardClicked); colorFilterWidget = new VisualDatabaseDisplayColorFilterWidget(this, filterModel); - filterContainer = new VisualDatabaseDisplayFilterToolbarWidget(this, deckListModel); + filterContainer = new VisualDatabaseDisplayFilterToolbarWidget(this); clearFilterWidget = new QToolButton(); clearFilterWidget->setFixedSize(32, 32); @@ -129,8 +137,6 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent, databaseLoadIndicator->setVisible(false); } - QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar(); - connect(scrollBar, &QScrollBar::valueChanged, [this](int /*value*/) { loadCurrentPage(); }); retranslateUi(); } @@ -141,10 +147,10 @@ void VisualDatabaseDisplayWidget::initialize() filterContainer->initialize(); filterContainer->setVisible(true); - searchContainer->addWidget(colorFilterWidget); - searchContainer->addWidget(clearFilterWidget); - searchContainer->addWidget(searchEdit); - searchContainer->addWidget(displayModeButton); + searchLayout->addWidget(colorFilterWidget); + searchLayout->addWidget(clearFilterWidget); + searchLayout->addWidget(searchEdit); + searchLayout->addWidget(displayModeButton); mainLayout->addWidget(searchContainer); @@ -175,11 +181,6 @@ void VisualDatabaseDisplayWidget::retranslateUi() clearFilterWidget->setToolTip(tr("Clear all filters")); } -void VisualDatabaseDisplayWidget::highlightAllSearchEdit() -{ - searchEdit->setSelection(0, searchEdit->text().length()); -} - void VisualDatabaseDisplayWidget::resizeEvent(QResizeEvent *event) { QWidget::resizeEvent(event); @@ -205,9 +206,9 @@ void VisualDatabaseDisplayWidget::onDisplayModeChanged(bool checked) } } -void VisualDatabaseDisplayWidget::onClick(QMouseEvent *event, const ExactCard &card) +void VisualDatabaseDisplayWidget::onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance) { - emit cardClickedDatabaseDisplay(event, card); + emit cardClickedDatabaseDisplay(event, instance); } void VisualDatabaseDisplayWidget::onHover(const ExactCard &hoveredCard) @@ -215,21 +216,25 @@ void VisualDatabaseDisplayWidget::onHover(const ExactCard &hoveredCard) emit cardHoveredDatabaseDisplay(hoveredCard); } -void VisualDatabaseDisplayWidget::addCardToDisplay(const ExactCard &cardToAdd) +void VisualDatabaseDisplayWidget::addCard(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::imageClicked, this, &VisualDatabaseDisplayWidget::onClick); connect(display, &CardInfoPictureWithTextOverlayWidget::hoveredOnCard, this, &VisualDatabaseDisplayWidget::onHover); connect(cardSizeWidget->getSlider(), &QSlider::valueChanged, display, &CardInfoPictureWidget::setScaleFactor); } -bool VisualDatabaseDisplayWidget::isVisualDisplayMode() const +void VisualDatabaseDisplayWidget::updateSearch(const QString &search) const { - return !displayModeButton->isChecked(); + databaseDisplayModel->setStringFilter(search); + QModelIndexList sel = databaseView->selectionModel()->selectedRows(); + if (sel.isEmpty() && databaseDisplayModel->rowCount()) + databaseView->selectionModel()->setCurrentIndex(databaseDisplayModel->index(0, 0), + QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); } void VisualDatabaseDisplayWidget::onSearchModelChanged() @@ -239,8 +244,9 @@ void VisualDatabaseDisplayWidget::onSearchModelChanged() 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 + if (QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar()) { + scrollBar->setValue(0); // Reset scrollbar to top + } currentPage = 0; loadCurrentPage(); @@ -248,44 +254,6 @@ void VisualDatabaseDisplayWidget::onSearchModelChanged() } } -void VisualDatabaseDisplayWidget::onSelectedCardChanged(const QString &cardName) -{ - emit cardHoveredDatabaseDisplay(CardDatabaseManager::query()->getPreferredCard(cardName)); -} - -void VisualDatabaseDisplayWidget::actAddCard(const QString &cardName, const QString &zoneName) -{ - highlightAllSearchEdit(); - ExactCard exactCard = CardDatabaseManager::query()->getPreferredCard(cardName); - emit cardAdded(exactCard, zoneName); -} - -void VisualDatabaseDisplayWidget::actDecrementCard(const QString &cardName, const QString &zoneName) -{ - ExactCard exactCard = CardDatabaseManager::query()->getPreferredCard(cardName); - emit cardDecremented(exactCard, zoneName); -} - -void VisualDatabaseDisplayWidget::onRelatedCardClicked(const QString &relatedCard) -{ - 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 @@ -293,7 +261,7 @@ void VisualDatabaseDisplayWidget::loadCurrentPage() // Only load the first page initially qCDebug(VisualDatabaseDisplayLog) << "Loading the first page"; populateCards(); - } else if (nearEndOfPage()) { + } else { // If not the first page, just load the next page and append to the flow widget loadNextPage(); } @@ -338,12 +306,12 @@ void VisualDatabaseDisplayWidget::loadPage(int start, int end) for (const CardFilter *setFilter : setFilters) { if (setMap.contains(setFilter->term())) { for (PrintingInfo printing : setMap[setFilter->term()]) { - addCardToDisplay(ExactCard(info, printing)); + addCard(ExactCard(info, printing)); } } } } else { - addCardToDisplay(CardDatabaseManager::query()->getPreferredCard(info)); + addCard(CardDatabaseManager::query()->getPreferredCard(info)); } } else { qCDebug(VisualDatabaseDisplayLog) << "Card not found in database!"; @@ -372,3 +340,23 @@ void VisualDatabaseDisplayWidget::databaseDataChanged(const QModelIndex &topLeft (void)bottomRight; qCDebug(VisualDatabaseDisplayLog) << "Database Data changed"; } + +void VisualDatabaseDisplayWidget::wheelEvent(QWheelEvent *event) +{ + int totalCards = databaseDisplayModel->rowCount(); // Total number of cards + int loadedCards = currentPage * cardsPerPage; + + // Handle scrolling down + if (event->angleDelta().y() < 0) { + // Check if the next page has any cards to load + if (loadedCards < totalCards) { + loadCurrentPage(); // Load the next page + event->accept(); // Accept the event as valid + return; + } + qCDebug(VisualDatabaseDisplayLog) << loadedCards << ":" << totalCards; + } + + // Prevent overscrolling when there's no more data to load + event->ignore(); +} 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 a383e8ead..3aa8d7f8e 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 @@ -1,8 +1,8 @@ /** * @file visual_database_display_widget.h * @ingroup VisualCardDatabaseWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef VISUAL_DATABASE_DISPLAY_WIDGET_H #define VISUAL_DATABASE_DISPLAY_WIDGET_H @@ -34,8 +34,9 @@ class VisualDatabaseDisplayWidget : public QWidget public: explicit VisualDatabaseDisplayWidget(QWidget *parent, + AbstractTabDeckEditor *deckEditor, CardDatabaseModel *database_model, - DeckListModel *deckListModel = nullptr); + CardDatabaseDisplayModel *database_display_model); void retranslateUi(); void adjustCardsPerPage(); @@ -46,66 +47,56 @@ public: void sortCardList(const QStringList &properties, Qt::SortOrder order) const; void setDeckList(const DeckList &new_deck_list_model); + AbstractTabDeckEditor *getDeckEditor() + { + return deckEditor; + } + CardDatabaseDisplayModel *getDatabaseDisplayModel() { return databaseDisplayModel; } - CardDatabaseView *getDatabaseView() + QTreeView *getDatabaseView() { return databaseView; } - FilterTreeModel *getFilterModel() - { - return filterModel; - } - - /** - * @return False if the widget is in database display mode and true if it's in visual display mode - */ - bool isVisualDisplayMode() const; - -public slots: - void onSearchModelChanged(); - -signals: - void cardClickedDatabaseDisplay(QMouseEvent *event, const ExactCard &card); - void cardHoveredDatabaseDisplay(const ExactCard &hoveredCard); - - void cardAdded(const ExactCard &card, const QString &zoneName); - void cardDecremented(const ExactCard &card, const QString &zoneName); - void edhrecRequested(const CardInfoPtr &cardInfo, bool isCommander); - void printingSelectorRequested(); - void cardInfoRequested(const ExactCard &cardName); - -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); - void actAddCard(const QString &cardName, const QString &zoneName); - void actDecrementCard(const QString &cardName, const QString &zoneName); - void onRelatedCardClicked(const QString &relatedCard); - -private: - FlowWidget *searchContainer; + QWidget *searchContainer; + QHBoxLayout *searchLayout; SearchLineEdit *searchEdit; QPushButton *displayModeButton; FilterTreeModel *filterModel; VisualDatabaseDisplayColorFilterWidget *colorFilterWidget; +public slots: + void onSearchModelChanged(); + +signals: + void cardClickedDatabaseDisplay(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance); + void cardHoveredDatabaseDisplay(const ExactCard &hoveredCard); + +protected slots: + void initialize(); + void onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance); + void onHover(const ExactCard &hoveredCard); + void addCard(const ExactCard &cardToAdd); + void databaseDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); + void wheelEvent(QWheelEvent *event) override; + void modelDirty() const; + void updateSearch(const QString &search) const; + void onDisplayModeChanged(bool checked); + +private: QLabel *databaseLoadIndicator; QToolButton *clearFilterWidget; VisualDatabaseDisplayFilterToolbarWidget *filterContainer; + KeySignals searchKeySignals; + AbstractTabDeckEditor *deckEditor; + CardDatabaseModel *databaseModel; CardDatabaseDisplayModel *databaseDisplayModel; - CardDatabaseView *databaseView; + QTreeView *databaseView; QList *cards; QVBoxLayout *mainLayout; QScrollArea *scrollArea; @@ -121,9 +112,6 @@ private: int currentPage = 0; // Current page index int cardsPerPage = 100; // Number of cards per page - void highlightAllSearchEdit(); - bool nearEndOfPage() const; - protected: void resizeEvent(QResizeEvent *event) override; }; diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.h index 5fe29fa2d..05bf43118 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.h @@ -1,8 +1,8 @@ /** * @file visual_database_filter_display_widget.h * @ingroup VisualCardDatabaseWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef VISUAL_DATABASE_FILTER_DISPLAY_WIDGET_H #define VISUAL_DATABASE_FILTER_DISPLAY_WIDGET_H 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 f44c9c3ef..79a98fda6 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 @@ -72,7 +72,7 @@ VisualDeckDisplayOptionsWidget::VisualDeckDisplayOptionsWidget(QWidget *parent) sortCriteriaButton->addSettingsWidget(sortLabel); sortCriteriaButton->addSettingsWidget(sortByListWidget); - displayTypeButton = new CompactPushButton(this); + displayTypeButton = new QPushButton(this); connect(displayTypeButton, &QPushButton::clicked, this, &VisualDeckDisplayOptionsWidget::updateDisplayType); groupAndSortLayout->addWidget(groupByLabel); @@ -91,8 +91,7 @@ void VisualDeckDisplayOptionsWidget::retranslateUi() sortByLabel->setText(tr("Sort by:")); sortLabel->setText(tr("Click and drag to change the sort order within the groups")); sortCriteriaButton->setToolTip(tr("Configure how cards are sorted within their groups")); - displayTypeButton->setButtonText(tr("Toggle Layout: Overlap")); - displayTypeButton->setButtonIcon(QPixmap("theme:icons/scales")); + displayTypeButton->setText(tr("Toggle Layout: Overlap")); displayTypeButton->setToolTip( tr("Change how cards are displayed within zones (i.e. overlapped or fully visible.)")); } @@ -116,32 +115,11 @@ void VisualDeckDisplayOptionsWidget::updateDisplayType() // Update UI and emit signal switch (currentDisplayType) { case DisplayType::Flat: - displayTypeButton->setButtonText(tr("Toggle Layout: Flat")); - displayTypeButton->setButtonIcon(QPixmap("theme:icons/scroll")); + displayTypeButton->setText(tr("Toggle Layout: Flat")); break; case DisplayType::Overlap: - displayTypeButton->setButtonText(tr("Toggle Layout: Overlap")); - displayTypeButton->setButtonIcon(QPixmap("theme:icons/scales")); + displayTypeButton->setText(tr("Toggle Layout: Overlap")); break; } emit displayTypeChanged(currentDisplayType); } - -void VisualDeckDisplayOptionsWidget::updateCompactMode(bool mode) -{ - displayTypeButton->setCompact(mode); -} - -int VisualDeckDisplayOptionsWidget::expandedWidth() const -{ - return groupByLabel->sizeHint().width() + groupByComboBox->sizeHint().width() + sortByLabel->sizeHint().width() + - sortCriteriaButton->sizeHint().width() + displayTypeButton->expandedWidth() + - (groupAndSortLayout->spacing() * 4); -} - -int VisualDeckDisplayOptionsWidget::compactWidth() const -{ - return groupByLabel->sizeHint().width() + groupByComboBox->sizeHint().width() + sortByLabel->sizeHint().width() + - sortCriteriaButton->sizeHint().width() + displayTypeButton->compactWidth() + - (groupAndSortLayout->spacing() * 4); -} diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.h index bc11884df..7a447753f 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.h @@ -53,9 +53,6 @@ public slots: * Called when the application language changes. */ void retranslateUi(); - void updateCompactMode(bool mode); - int expandedWidth() const; - int compactWidth() const; public: /** @@ -104,37 +101,37 @@ private slots: void updateDisplayType(); private: - /** @brief Layout for grouping and sorting UI elements. */ + /// Layout for grouping and sorting UI elements. QHBoxLayout *groupAndSortLayout; - /** @brief Current deck display type. */ + /// Current deck display type. DisplayType currentDisplayType = DisplayType::Overlap; - /** @brief Button used to toggle the display layout. */ - CompactPushButton *displayTypeButton; + /// Button used to toggle the display layout. + QPushButton *displayTypeButton; - /** @brief Label for the group-by selector. */ + /// Label for the group-by selector. QLabel *groupByLabel; - /** @brief Combo box listing group-by criteria. */ + /// Combo box listing group-by criteria. QComboBox *groupByComboBox; - /** @brief Currently active group-by criterion. */ + /// Currently active group-by criterion. QString activeGroupCriteria = "maintype"; - /** @brief Encapsulates the sort settings widgets (label + list). */ + /// Encapsulates the sort settings widgets (label + list). SettingsButtonWidget *sortCriteriaButton; - /** @brief Label for "Sort by". */ + /// Label for “Sort by”. QLabel *sortByLabel; - /** @brief Descriptive label inside the sort criteria button. */ + /// Descriptive label inside the sort criteria button. QLabel *sortLabel; - /** @brief Draggable list of sort criteria. */ + /// Draggable list of sort criteria. QListWidget *sortByListWidget; - /** @brief Ordered list of current sort criteria. */ + /// Ordered list of current sort criteria. QStringList activeSortCriteria = {"name", "cmc", "colors", "maintype"}; }; diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp index 8417ffa34..cc35372b0 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp @@ -112,15 +112,13 @@ static QList cardNodesToExactCards(QList no QList VisualDeckEditorSampleHandWidget::getRandomCards(int amountToGet) { QList randomCards; - if (!deckListModel) { + if (!deckListModel) return randomCards; - } QList mainDeckCards = cardNodesToExactCards(deckListModel->getCardNodesForZone(DECK_ZONE_MAIN)); - if (mainDeckCards.isEmpty()) { + if (mainDeckCards.isEmpty()) return randomCards; - } // Shuffle the deck std::random_device rd; diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h index c6c07dd55..c63c74a4d 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h @@ -1,8 +1,8 @@ /** * @file visual_deck_editor_sample_hand_widget.h * @ingroup DeckEditorAnalyticsWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef VISUAL_DECK_EDITOR_SAMPLE_HAND_WIDGET_H #define VISUAL_DECK_EDITOR_SAMPLE_HAND_WIDGET_H 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 815892f4c..e957eb304 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 @@ -9,7 +9,6 @@ #include "../general/layout_containers/flow_widget.h" #include "../tabs/visual_deck_editor/tab_deck_editor_visual.h" #include "../tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h" -#include "../utility/compact_push_button.h" #include "visual_deck_display_options_widget.h" #include @@ -70,17 +69,10 @@ VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent, void VisualDeckEditorWidget::initializeSearchBarAndCompleter() { - searchContainer = new QWidget(this); - searchContainer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); - searchLayout = new QHBoxLayout(searchContainer); - searchContainer->setLayout(searchLayout); - - searchBar = new QLineEdit(searchContainer); - searchContainer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + searchBar = new QLineEdit(this); connect(searchBar, &QLineEdit::returnPressed, this, [=, this]() { - if (!searchBar->hasFocus()) { + if (!searchBar->hasFocus()) return; - } ExactCard card = CardDatabaseManager::query()->getCard({searchBar->text()}); if (card) { @@ -88,8 +80,6 @@ void VisualDeckEditorWidget::initializeSearchBarAndCompleter() } }); - searchLayout->addWidget(searchBar); - setFocusProxy(searchBar); setFocusPolicy(Qt::ClickFocus); @@ -143,16 +133,13 @@ void VisualDeckEditorWidget::initializeSearchBarAndCompleter() }); // Search button functionality - searchPushButton = new CompactPushButton(searchContainer); - searchPushButton->setButtonIcon(QPixmap("theme:icons/search")); + searchPushButton = new QPushButton(this); connect(searchPushButton, &QPushButton::clicked, this, [=, this]() { ExactCard card = CardDatabaseManager::query()->getCard({searchBar->text()}); if (card) { emit cardAdditionRequested(card); } }); - - searchLayout->addWidget(searchPushButton); } void VisualDeckEditorWidget::initializeDisplayOptionsWidget() @@ -169,14 +156,18 @@ void VisualDeckEditorWidget::initializeDisplayOptionsWidget() void VisualDeckEditorWidget::initializeDisplayOptionsAndSearchWidget() { initializeSearchBarAndCompleter(); + initializeDisplayOptionsWidget(); - displayOptionsAndSearch = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff); + displayOptionsAndSearch = new QWidget(this); + displayOptionsAndSearchLayout = new QHBoxLayout(displayOptionsAndSearch); + displayOptionsAndSearchLayout->setContentsMargins(0, 0, 0, 0); + displayOptionsAndSearchLayout->setAlignment(Qt::AlignLeft); + displayOptionsAndSearch->setLayout(displayOptionsAndSearchLayout); - // We split into two sub-widgets here so that the searchBar and button wrap together. At this point, we've done - // pretty much all we can and have reached our minimum size. - displayOptionsAndSearch->addWidget(displayOptionsWidget); - displayOptionsAndSearch->addWidget(searchContainer); // Expanding — fills remainder of its row + displayOptionsAndSearchLayout->addWidget(displayOptionsWidget); + displayOptionsAndSearchLayout->addWidget(searchBar); + displayOptionsAndSearchLayout->addWidget(searchPushButton); } void VisualDeckEditorWidget::initializeScrollAreaAndZoneContainer() @@ -214,7 +205,7 @@ void VisualDeckEditorWidget::connectDeckListModel() void VisualDeckEditorWidget::retranslateUi() { searchBar->setPlaceholderText(tr("Type a card name here for suggestions from the database...")); - searchPushButton->setButtonText(tr("Quick search and add card")); + searchPushButton->setText(tr("Quick search and add card")); searchPushButton->setToolTip(tr("Search for closest match in the database (with auto-suggestions) and add " "preferred printing to the deck on pressing enter")); @@ -223,44 +214,6 @@ void VisualDeckEditorWidget::retranslateUi() } } -void VisualDeckEditorWidget::resizeEvent(QResizeEvent *event) -{ - QWidget::resizeEvent(event); - updateCompactMode(); -} - -void VisualDeckEditorWidget::updateCompactMode() -{ - const int spacing = displayOptionsAndSearch->layout()->spacing(); - - const int available = displayOptionsAndSearch->width(); - - const int searchExpanded = - searchBar->sizeHint().width() + searchPushButton->expandedWidth() + searchLayout->spacing(); - - const int fullWidth = displayOptionsWidget->expandedWidth() + spacing + searchExpanded; - - const int displayCompactWidth = displayOptionsWidget->compactWidth() + spacing + searchExpanded; - - // everything expanded - if (available >= fullWidth) { - displayOptionsWidget->updateCompactMode(false); - searchPushButton->setCompact(false); - return; - } - - // only display compact - if (available >= displayCompactWidth) { - displayOptionsWidget->updateCompactMode(true); - searchPushButton->setCompact(false); - return; - } - - // both compact - displayOptionsWidget->updateCompactMode(true); - searchPushButton->setCompact(true); -} - void VisualDeckEditorWidget::updatePlaceholderVisibility() { if (placeholderWidget) { @@ -281,7 +234,7 @@ void VisualDeckEditorWidget::constructZoneWidgetForIndex(QPersistentModelIndex p displayOptionsWidget->getActiveGroupCriteria(), displayOptionsWidget->getActiveSortCriteria(), displayOptionsWidget->getDisplayType(), 20, 10, cardSizeWidget); connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardHovered, this, &VisualDeckEditorWidget::onHover); - connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardClicked, this, &VisualDeckEditorWidget::cardClicked); + connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardClicked, this, &VisualDeckEditorWidget::onCardClick); connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::requestCleanup, this, &VisualDeckEditorWidget::cleanupInvalidZones); connect(this, &VisualDeckEditorWidget::activeSortCriteriaChanged, zoneDisplayWidget, @@ -401,6 +354,13 @@ void VisualDeckEditorWidget::decklistDataChanged(QModelIndex topLeft, QModelInde // User Interaction // ===================================================================================================================== +void VisualDeckEditorWidget::onCardClick(QMouseEvent *event, + CardInfoPictureWithTextOverlayWidget *instance, + QString zoneName) +{ + emit cardClicked(event, instance, zoneName); +} + void VisualDeckEditorWidget::onHover(const ExactCard &hoveredCard) { // If user has any card selected, ignore hover @@ -411,7 +371,7 @@ void VisualDeckEditorWidget::onHover(const ExactCard &hoveredCard) // If nothing is selected -> this is our "active/preview" card emit activeCardChanged(hoveredCard); - //! \todo Highlight hovered card visually. + // TODO: highlight hovered card visually: // highlightHoveredCard(hoveredCard); } @@ -422,7 +382,7 @@ void VisualDeckEditorWidget::setSelectionModel(QItemSelectionModel *model) } if (selectionModel) { - //! \todo Possibly disconnect old signal connections. + // TODO: Possibly disconnect old ones? } selectionModel = model; diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h index da02b5c1f..13065d623 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h @@ -1,8 +1,8 @@ /** * @file visual_deck_editor_widget.h * @ingroup DeckEditors + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef VISUAL_DECK_EDITOR_H #define VISUAL_DECK_EDITOR_H @@ -11,7 +11,6 @@ #include "../cards/card_size_widget.h" #include "../general/layout_containers/overlap_control_widget.h" #include "../quick_settings/settings_button_widget.h" -#include "../utility/compact_push_button.h" #include "visual_deck_editor_placeholder_widget.h" #include @@ -40,7 +39,6 @@ class VisualDeckEditorWidget : public QWidget public: explicit VisualDeckEditorWidget(QWidget *parent, DeckListModel *deckListModel, QItemSelectionModel *selectionModel); void retranslateUi(); - void updateCompactMode(); void clearAllDisplayWidgets(); void setDeckList(const DeckList &_deckListModel); @@ -69,7 +67,7 @@ signals: void activeCardChanged(const ExactCard &activeCard); void activeGroupCriteriaChanged(QString activeGroupCriteria); void activeSortCriteriaChanged(QStringList activeSortCriteria); - void cardClicked(QMouseEvent *event, const ExactCard &card, const QString &zoneName); + void cardClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName); void cardAdditionRequested(const ExactCard &card); void displayTypeChanged(DisplayType displayType); @@ -82,24 +80,21 @@ protected: protected slots: void onHover(const ExactCard &hoveredCard); + void onCardClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName); void decklistModelReset(); - void resizeEvent(QResizeEvent *event) override; private: - int expandedWidthAll = -1; - int expandedWidthDisplayCompact = -1; DeckListModel *deckListModel; QItemSelectionModel *selectionModel; QVBoxLayout *mainLayout; CardDatabaseModel *cardDatabaseModel; CardDatabaseDisplayModel *cardDatabaseDisplayModel; CardCompleterProxyModel *proxyModel; - QWidget *searchContainer; - QHBoxLayout *searchLayout; QCompleter *completer; - FlowWidget *displayOptionsAndSearch; + QWidget *displayOptionsAndSearch; + QHBoxLayout *displayOptionsAndSearchLayout; VisualDeckDisplayOptionsWidget *displayOptionsWidget; - CompactPushButton *searchPushButton; + QPushButton *searchPushButton; QScrollArea *scrollArea; QWidget *zoneContainer; QVBoxLayout *zoneContainerLayout; diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h index 0207e2ee2..551dbb35c 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h @@ -1,8 +1,8 @@ /** * @file deck_preview_color_identity_filter_widget.h * @ingroup VisualDeckPreviewWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DECK_PREVIEW_COLOR_IDENTITY_FILTER_WIDGET_H #define DECK_PREVIEW_COLOR_IDENTITY_FILTER_WIDGET_H diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h index 4bd7915cd..bfd0a170d 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h @@ -1,8 +1,8 @@ /** * @file deck_preview_deck_tags_display_widget.h * @ingroup VisualDeckPreviewWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H #define DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h index 7a3a735a2..c0fa86d19 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h @@ -1,8 +1,8 @@ /** * @file deck_preview_tag_addition_widget.h * @ingroup VisualDeckPreviewWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DECK_PREVIEW_TAG_ADDITION_WIDGET_H #define DECK_PREVIEW_TAG_ADDITION_WIDGET_H diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.h index 4d9040af4..59b330a65 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.h @@ -2,8 +2,8 @@ * @file deck_preview_tag_dialog.h * @ingroup VisualDeckPreviewWidgets * @ingroup Dialogs + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DECK_PREVIEW_TAG_DIALOG_H #define DECK_PREVIEW_TAG_DIALOG_H diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h index 980741c5d..a868aa4f1 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h @@ -1,8 +1,8 @@ /** * @file deck_preview_tag_display_widget.h * @ingroup VisualDeckPreviewWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DECK_PREVIEW_TAG_DISPLAY_WIDGET_H #define DECK_PREVIEW_TAG_DISPLAY_WIDGET_H diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.h index a3301799a..5caae90a1 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.h @@ -1,8 +1,8 @@ /** * @file deck_preview_tag_item_widget.h * @ingroup VisualDeckPreviewWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DECK_PREVIEW_TAG_ITEM_WIDGET_H #define DECK_PREVIEW_TAG_ITEM_WIDGET_H 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 06dc9dd84..77ea8f865 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 @@ -28,8 +28,8 @@ DeckPreviewWidget::DeckPreviewWidget(QWidget *_parent, deckLoader = new DeckLoader(this); connect(deckLoader, &DeckLoader::loadFinished, this, &DeckPreviewWidget::initializeUi); - //! \todo Batch tag refresh: count finished deck loads and refresh tags once all decks are loaded. - // Currently expensive: refreshes on each individual deck load instead of once at the end. + /* TODO: We shouldn't update the tags on *every* deck load, since it's kinda expensive. We should instead count how + many deck loads have finished already and if we've loaded all decks and THEN load all the tags at once. */ connect(deckLoader, &DeckLoader::loadFinished, visualDeckStorageWidget->tagFilterWidget, &VisualDeckStorageTagFilterWidget::refreshTags); deckLoader->loadFromFileAsync(filePath, DeckFileFormat::getFormatFromName(filePath), false); diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h index 0ed64e9e2..98116cabe 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h @@ -1,8 +1,8 @@ /** * @file deck_preview_widget.h * @ingroup VisualDeckPreviewWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DECK_PREVIEW_WIDGET_H #define DECK_PREVIEW_WIDGET_H diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h index a5e3be212..d76fb0497 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h @@ -1,8 +1,8 @@ /** * @file visual_deck_storage_folder_display_widget.h * @ingroup VisualDeckStorageWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef VISUAL_DECK_STORAGE_FOLDER_DISPLAY_WIDGET_H #define VISUAL_DECK_STORAGE_FOLDER_DISPLAY_WIDGET_H diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.h index 2f3d81aeb..67d260b21 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.h @@ -1,8 +1,8 @@ /** * @file visual_deck_storage_search_widget.h * @ingroup VisualDeckStorageWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef VISUAL_DECK_STORAGE_SEARCH_WIDGET_H #define VISUAL_DECK_STORAGE_SEARCH_WIDGET_H diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h index 24eddba33..1ea06aba4 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h @@ -1,8 +1,8 @@ /** * @file visual_deck_storage_sort_widget.h * @ingroup VisualDeckStorageWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef VISUAL_DECK_STORAGE_SORT_WIDGET_H #define VISUAL_DECK_STORAGE_SORT_WIDGET_H diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp index c4c8d18a8..28fd7a5ca 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp @@ -126,9 +126,8 @@ void VisualDeckStorageTagFilterWidget::addTagIfNotPresent(const QString &tag) void VisualDeckStorageTagFilterWidget::sortTags() { auto *flowWidget = findChild(); - if (!flowWidget) { + if (!flowWidget) return; - } // Get all tag widgets QList tagWidgets = findChildren(); diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h index 3290c9e9a..ada94a244 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h @@ -1,8 +1,8 @@ /** * @file visual_deck_storage_tag_filter_widget.h * @ingroup VisualDeckStorageWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef VISUAL_DECK_STORAGE_TAG_FILTER_WIDGET_H #define VISUAL_DECK_STORAGE_TAG_FILTER_WIDGET_H diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h index c3c0ae91b..b13c51700 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h @@ -1,8 +1,8 @@ /** * @file visual_deck_storage_widget.h * @ingroup VisualDeckStorageWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef VISUAL_DECK_STORAGE_WIDGET_H #define VISUAL_DECK_STORAGE_WIDGET_H diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp index 69d3260bc..50375eea6 100644 --- a/cockatrice/src/interface/window_main.cpp +++ b/cockatrice/src/interface/window_main.cpp @@ -22,9 +22,14 @@ #include "../client/network/update/client/client_update_checker.h" #include "../client/network/update/client/release_channel.h" #include "../client/settings/cache_settings.h" +#include "../interface/widgets/dialogs/dlg_connect.h" #include "../interface/widgets/dialogs/dlg_edit_tokens.h" +#include "../interface/widgets/dialogs/dlg_forgot_password_challenge.h" +#include "../interface/widgets/dialogs/dlg_forgot_password_request.h" +#include "../interface/widgets/dialogs/dlg_forgot_password_reset.h" #include "../interface/widgets/dialogs/dlg_local_game_options.h" #include "../interface/widgets/dialogs/dlg_manage_sets.h" +#include "../interface/widgets/dialogs/dlg_register.h" #include "../interface/widgets/dialogs/dlg_settings.h" #include "../interface/widgets/dialogs/dlg_startup_card_check.h" #include "../interface/widgets/dialogs/dlg_tip_of_the_day.h" @@ -35,8 +40,6 @@ #include "../main.h" #include "logger.h" #include "version_string.h" -#include "widgets/dialogs/dlg_connect.h" -#include "widgets/server/handle_public_servers.h" #include "widgets/utility/get_text_with_max.h" #include @@ -64,6 +67,8 @@ #include #include #include +#include +#include #include #include @@ -88,18 +93,66 @@ inline Q_LOGGING_CATEGORY(MainWindowLog, "main_window"); */ void MainWindow::updateTabMenu(const QList &newMenuList) { - for (auto &tabMenu : tabMenus) { + for (auto &tabMenu : tabMenus) menuBar()->removeAction(tabMenu->menuAction()); - } tabMenus = newMenuList; - for (auto &tabMenu : tabMenus) { + for (auto &tabMenu : tabMenus) menuBar()->insertMenu(helpMenu->menuAction(), tabMenu); +} + +void MainWindow::processConnectionClosedEvent(const Event_ConnectionClosed &event) +{ + client->disconnectFromServer(); + QString reasonStr; + switch (event.reason()) { + case Event_ConnectionClosed::USER_LIMIT_REACHED: + reasonStr = tr("The server has reached its maximum user capacity, please check back later."); + break; + case Event_ConnectionClosed::TOO_MANY_CONNECTIONS: + reasonStr = tr("There are too many concurrent connections from your address."); + break; + case Event_ConnectionClosed::BANNED: { + reasonStr = tr("Banned by moderator"); + if (event.has_end_time()) + reasonStr.append( + "\n" + tr("Expected end time: %1").arg(QDateTime::fromSecsSinceEpoch(event.end_time()).toString())); + else + reasonStr.append("\n" + tr("This ban lasts indefinitely.")); + if (event.has_reason_str()) + reasonStr.append("\n\n" + QString::fromStdString(event.reason_str())); + break; + } + case Event_ConnectionClosed::SERVER_SHUTDOWN: + reasonStr = tr("Scheduled server shutdown."); + break; + case Event_ConnectionClosed::USERNAMEINVALID: + reasonStr = tr("Invalid username."); + break; + case Event_ConnectionClosed::LOGGEDINELSEWERE: + reasonStr = tr("You have been logged out due to logging in at another location."); + break; + default: + reasonStr = QString::fromStdString(event.reason_str()); } + QMessageBox::critical(this, tr("Connection closed"), + tr("The server has terminated your connection.\nReason: %1").arg(reasonStr)); +} + +void MainWindow::processServerShutdownEvent(const Event_ServerShutdown &event) +{ + serverShutdownMessageBox.setInformativeText(tr("The server is going to be restarted in %n minute(s).\nAll running " + "games will be lost.\nReason for shutdown: %1", + "", event.minutes()) + .arg(QString::fromStdString(event.reason()))); + serverShutdownMessageBox.setIconPixmap(QPixmap("theme:cockatrice").scaled(64, 64)); + serverShutdownMessageBox.setText(tr("Scheduled server shutdown")); + serverShutdownMessageBox.setWindowModality(Qt::ApplicationModal); + serverShutdownMessageBox.setVisible(true); } void MainWindow::statusChanged(ClientStatus _status) { - connectionController->refreshWindowTitle(); + setClientStatusTitle(); switch (_status) { case StatusDisconnected: tabSupervisor->stop(); @@ -124,16 +177,51 @@ void MainWindow::statusChanged(ClientStatus _status) } } +void MainWindow::userInfoReceived(const ServerInfo_User &info) +{ + tabSupervisor->start(info); +} + +void MainWindow::registerAccepted() +{ + QMessageBox::information(this, tr("Success"), tr("Registration accepted.\nWill now login.")); +} + +void MainWindow::registerAcceptedNeedsActivate() +{ + // nothing +} + +void MainWindow::activateAccepted() +{ + QMessageBox::information(this, tr("Success"), tr("Account activation accepted.\nWill now login.")); +} + // Actions void MainWindow::actConnect() { - connectionController->connectToServer(); + dlgConnect = new DlgConnect(this); + connect(dlgConnect, &DlgConnect::sigStartForgotPasswordRequest, this, &MainWindow::actForgotPasswordRequest); + + if (dlgConnect->exec()) { + client->connectToServer(dlgConnect->getHost(), static_cast(dlgConnect->getPort()), + dlgConnect->getPlayerName(), dlgConnect->getPassword()); + } +} + +void MainWindow::actRegister() +{ + DlgRegister dlg(this); + if (dlg.exec()) { + client->registerToServer(dlg.getHost(), static_cast(dlg.getPort()), dlg.getPlayerName(), + dlg.getPassword(), dlg.getEmail(), dlg.getCountry(), dlg.getRealName()); + } } void MainWindow::actDisconnect() { - connectionController->disconnectFromServer(); + client->disconnectFromServer(); } void MainWindow::actSinglePlayer() @@ -179,15 +267,13 @@ void MainWindow::actWatchReplay() QFileDialog dlg(this, tr("Load replay")); dlg.setDirectory(SettingsCache::instance().getReplaysPath()); dlg.setNameFilters(QStringList() << QObject::tr("Cockatrice replays (*.cor)")); - if (!dlg.exec()) { + if (!dlg.exec()) return; - } QString fileName = dlg.selectedFiles().at(0); QFile file(fileName); - if (!file.open(QIODevice::ReadOnly)) { + if (!file.open(QIODevice::ReadOnly)) return; - } QByteArray buf = file.readAll(); file.close(); @@ -212,11 +298,10 @@ void MainWindow::localGameEnded() void MainWindow::actFullScreen(bool checked) { - if (checked) { + if (checked) setWindowState(windowState() | Qt::WindowFullScreen); - } else { + else setWindowState(windowState() & ~Qt::WindowFullScreen); - } } void MainWindow::actSettings() @@ -288,9 +373,292 @@ void MainWindow::actOpenSettingsFolder() QDesktopServices::openUrl(QUrl::fromLocalFile(dir)); } +void MainWindow::serverTimeout() +{ + QMessageBox::critical(this, tr("Error"), tr("Server timeout")); + actConnect(); +} + +void MainWindow::loginError(Response::ResponseCode r, + QString reasonStr, + quint32 endTime, + QList missingFeatures) +{ + switch (r) { + case Response::RespClientUpdateRequired: { + QString formattedMissingFeatures; + formattedMissingFeatures = "Missing Features: "; + for (int i = 0; i < missingFeatures.size(); ++i) + formattedMissingFeatures.append(QString("\n %1").arg(QChar(0x2022)) + " " + + missingFeatures.value(i)); + + QMessageBox msgBox; + msgBox.setIcon(QMessageBox::Critical); + msgBox.setWindowTitle(tr("Failed Login")); + msgBox.setText(tr("Your client seems to be missing features this server requires for connection.") + + "\n\n" + tr("To update your client, go to 'Help -> Check for Client Updates'.")); + msgBox.setDetailedText(formattedMissingFeatures); + msgBox.exec(); + break; + } + case Response::RespWrongPassword: + QMessageBox::critical( + this, tr("Error"), + tr("Incorrect username or password. Please check your authentication information and try again.")); + break; + case Response::RespWouldOverwriteOldSession: + QMessageBox::critical(this, tr("Error"), + tr("There is already an active session using this user name.\nPlease close that " + "session first and re-login.")); + break; + case Response::RespUserIsBanned: { + QString bannedStr; + if (endTime) + bannedStr = tr("You are banned until %1.").arg(QDateTime::fromSecsSinceEpoch(endTime).toString()); + else + bannedStr = tr("You are banned indefinitely."); + if (!reasonStr.isEmpty()) + bannedStr.append("\n\n" + reasonStr); + + QMessageBox::critical(this, tr("Error"), bannedStr); + break; + } + case Response::RespUsernameInvalid: { + QMessageBox::critical(this, tr("Error"), extractInvalidUsernameMessage(reasonStr)); + break; + } + case Response::RespRegistrationRequired: + if (QMessageBox::question(this, tr("Error"), + tr("This server requires user registration. Do you want to register now?"), + QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) { + actRegister(); + } + break; + case Response::RespClientIdRequired: + QMessageBox::critical( + this, tr("Error"), + tr("This server requires client IDs. Your client is either failing to generate an ID or you are " + "running a modified client.\nPlease close and reopen your client to try again.")); + break; + case Response::RespContextError: + QMessageBox::critical(this, tr("Error"), + tr("An internal error has occurred, please close and reopen Cockatrice before trying " + "again.\nIf the error persists, ensure you are running the latest version of the " + "software and if needed contact the software developers.")); + break; + case Response::RespAccountNotActivated: { + bool ok = false; + QString token = getTextWithMax(this, tr("Account activation"), + tr("Your account has not been activated yet.\nYou need to provide " + "the activation token received in the activation email."), + QLineEdit::Normal, QString(), &ok); + if (ok && !token.isEmpty()) { + client->activateToServer(token); + return; + } + client->disconnectFromServer(); + break; + } + case Response::RespServerFull: { + QMessageBox::critical(this, tr("Server Full"), + tr("The server has reached its maximum user capacity, please check back later.")); + break; + } + default: + QMessageBox::critical(this, tr("Error"), + tr("Unknown login error: %1").arg(static_cast(r)) + + tr("\nThis usually means that your client version is out of date, and the server " + "sent a reply your client doesn't understand.")); + break; + } + actConnect(); +} + +QString MainWindow::extractInvalidUsernameMessage(QString &in) +{ + QString out = tr("Invalid username.") + "
"; + QStringList rules = in.split(QChar('|')); + if (rules.size() == 7 || rules.size() == 9) { + out += tr("Your username must respect these rules:") + "
    "; + + out += "
  • " + tr("is %1 - %2 characters long").arg(rules.at(0)).arg(rules.at(1)) + "
    • "; + out += "
  • " + tr("can %1 contain lowercase characters").arg((rules.at(2).toInt() > 0) ? "" : tr("NOT")) + + "
    • "; + out += "
  • " + tr("can %1 contain uppercase characters").arg((rules.at(3).toInt() > 0) ? "" : tr("NOT")) + + "
    • "; + out += + "
  • " + tr("can %1 contain numeric characters").arg((rules.at(4).toInt() > 0) ? "" : tr("NOT")) + "
    • "; + + if (rules.at(6).size() > 0) + out += "
  • " + tr("can contain the following punctuation: %1").arg(rules.at(6).toHtmlEscaped()) + "
    • "; + + out += "
  • " + + tr("first character can %1 be a punctuation mark").arg((rules.at(5).toInt() > 0) ? "" : tr("NOT")) + + "
    • "; + + if (rules.size() == 9) { + if (rules.at(7).size() > 0) { + QString words = rules.at(7).toHtmlEscaped(); + if (words.startsWith("\n")) { + out += tr("no unacceptable language as specified by these server rules:", + "note that the following lines will not be translated"); + for (QString &line : words.split("\n", Qt::SkipEmptyParts)) { + out += "
  • " + line + "
    • "; + } + } else { + out += "
  • " + tr("can not contain any of the following words: %1").arg(words) + "
    • "; + } + } + + if (rules.at(8).size() > 0) + out += "
  • " + + tr("can not match any of the following expressions: %1").arg(rules.at(8).toHtmlEscaped()) + + "
    • "; + } + + out += "
"; + } else { + out += tr("You may only use A-Z, a-z, 0-9, _, ., and - in your username."); + } + + return out; +} + +void MainWindow::registerError(Response::ResponseCode r, QString reasonStr, quint32 endTime) +{ + switch (r) { + case Response::RespRegistrationDisabled: + QMessageBox::critical(this, tr("Registration denied"), + tr("Registration is currently disabled on this server")); + break; + case Response::RespUserAlreadyExists: + QMessageBox::critical(this, tr("Registration denied"), + tr("There is already an existing account with the same user name.")); + break; + case Response::RespEmailRequiredToRegister: + QMessageBox::critical(this, tr("Registration denied"), + tr("It's mandatory to specify a valid email address when registering.")); + break; + case Response::RespEmailBlackListed: + if (reasonStr.isEmpty()) { + reasonStr = + "The email address provider used during registration has been blocked from use on this server."; + } + QMessageBox::critical(this, tr("Registration denied"), reasonStr); + break; + case Response::RespTooManyRequests: + QMessageBox::critical( + this, tr("Registration denied"), + tr("It appears you are attempting to register a new account on this server yet you already have an " + "account registered with the email provided. This server restricts the number of accounts a user " + "can register per address. Please contact the server operator for further assistance or to obtain " + "your credential information.")); + break; + case Response::RespPasswordTooShort: + QMessageBox::critical(this, tr("Registration denied"), tr("Password too short.")); + break; + case Response::RespUserIsBanned: { + QString bannedStr; + if (endTime) + bannedStr = tr("You are banned until %1.").arg(QDateTime::fromSecsSinceEpoch(endTime).toString()); + else + bannedStr = tr("You are banned indefinitely."); + if (!reasonStr.isEmpty()) + bannedStr.append("\n\n" + reasonStr); + + QMessageBox::critical(this, tr("Error"), bannedStr); + break; + } + case Response::RespUsernameInvalid: { + QMessageBox::critical(this, tr("Error"), extractInvalidUsernameMessage(reasonStr)); + break; + } + case Response::RespRegistrationFailed: + QMessageBox::critical(this, tr("Error"), tr("Registration failed for a technical problem on the server.")); + break; + case Response::RespNotConnected: + QMessageBox::critical(this, tr("Error"), tr("The connection to the server has been lost.")); + break; + default: + QMessageBox::critical(this, tr("Error"), + tr("Unknown registration error: %1").arg(static_cast(r)) + + tr("\nThis usually means that your client version is out of date, and the server " + "sent a reply your client doesn't understand.")); + } + actRegister(); +} + +void MainWindow::activateError() +{ + QMessageBox::critical(this, tr("Error"), tr("Account activation failed")); + client->disconnectFromServer(); + actConnect(); +} + +void MainWindow::socketError(const QString &errorStr) +{ + QMessageBox::critical(this, tr("Error"), tr("Socket error: %1").arg(errorStr)); + actConnect(); +} + +void MainWindow::protocolVersionMismatch(int localVersion, int remoteVersion) +{ + if (localVersion > remoteVersion) + QMessageBox::critical(this, tr("Error"), + tr("You are trying to connect to an obsolete server. Please downgrade your Cockatrice " + "version or connect to a suitable server.\nLocal version is %1, remote version is %2.") + .arg(localVersion) + .arg(remoteVersion)); + else + QMessageBox::critical(this, tr("Error"), + tr("Your Cockatrice client is obsolete. Please update your Cockatrice version.\nLocal " + "version is %1, remote version is %2.") + .arg(localVersion) + .arg(remoteVersion)); +} + +void MainWindow::setClientStatusTitle() +{ + switch (client->getStatus()) { + case StatusConnecting: + setWindowTitle(appName + " - " + tr("Connecting to %1...").arg(client->peerName())); + break; + case StatusRegistering: + setWindowTitle(appName + " - " + + tr("Registering to %1 as %2...").arg(client->peerName()).arg(client->getUserName())); + break; + case StatusDisconnected: + setWindowTitle(appName + " - " + tr("Disconnected")); + break; + case StatusLoggingIn: + setWindowTitle(appName + " - " + tr("Connected, logging in at %1").arg(client->peerName())); + break; + case StatusLoggedIn: + setWindowTitle(client->getUserName() + "@" + client->peerName()); + break; + case StatusRequestingForgotPassword: + setWindowTitle( + appName + " - " + + tr("Requesting forgotten password to %1 as %2...").arg(client->peerName()).arg(client->getUserName())); + break; + case StatusSubmitForgotPasswordChallenge: + setWindowTitle( + appName + " - " + + tr("Requesting forgotten password to %1 as %2...").arg(client->peerName()).arg(client->getUserName())); + break; + case StatusSubmitForgotPasswordReset: + setWindowTitle( + appName + " - " + + tr("Requesting forgotten password to %1 as %2...").arg(client->peerName()).arg(client->getUserName())); + break; + default: + setWindowTitle(appName); + } +} + void MainWindow::retranslateUi() { - connectionController->refreshWindowTitle(); + setClientStatusTitle(); aConnect->setText(tr("&Connect...")); aDisconnect->setText(tr("&Disconnect")); @@ -349,9 +717,9 @@ void MainWindow::createActions() aFullScreen->setCheckable(true); connect(aFullScreen, &QAction::toggled, this, &MainWindow::actFullScreen); aRegister = new QAction(this); - connect(aRegister, &QAction::triggered, connectionController, &ConnectionController::registerToServer); + connect(aRegister, &QAction::triggered, this, &MainWindow::actRegister); aForgotPassword = new QAction(this); - connect(aForgotPassword, &QAction::triggered, connectionController, &ConnectionController::forgotPasswordRequest); + connect(aForgotPassword, &QAction::triggered, this, &MainWindow::actForgotPasswordRequest); aSettings = new QAction(this); connect(aSettings, &QAction::triggered, this, &MainWindow::actSettings); aExit = new QAction(this); @@ -476,22 +844,38 @@ MainWindow::MainWindow(QWidget *parent) &MainWindow::pixmapCacheSizeChanged); pixmapCacheSizeChanged(SettingsCache::instance().getPixmapCacheSize()); - connectionController = new ConnectionController(this, this); + client = new RemoteClient(nullptr, &SettingsCache::instance()); + connect(client, &RemoteClient::connectionClosedEventReceived, this, &MainWindow::processConnectionClosedEvent); + connect(client, &RemoteClient::serverShutdownEventReceived, this, &MainWindow::processServerShutdownEvent); + connect(client, &RemoteClient::loginError, this, &MainWindow::loginError); + connect(client, &RemoteClient::socketError, this, &MainWindow::socketError); + connect(client, &RemoteClient::serverTimeout, this, &MainWindow::serverTimeout); + connect(client, &RemoteClient::statusChanged, this, &MainWindow::statusChanged); + connect(client, &RemoteClient::protocolVersionMismatch, this, &MainWindow::protocolVersionMismatch); + connect(client, &RemoteClient::userInfoChanged, this, &MainWindow::userInfoReceived, Qt::BlockingQueuedConnection); + connect(client, &RemoteClient::notifyUserAboutUpdate, this, &MainWindow::notifyUserAboutUpdate); + connect(client, &RemoteClient::registerAccepted, this, &MainWindow::registerAccepted); + connect(client, &RemoteClient::registerAcceptedNeedsActivate, this, &MainWindow::registerAcceptedNeedsActivate); + connect(client, &RemoteClient::registerError, this, &MainWindow::registerError); + connect(client, &RemoteClient::activateAccepted, this, &MainWindow::activateAccepted); + connect(client, &RemoteClient::activateError, this, &MainWindow::activateError); + connect(client, &RemoteClient::sigForgotPasswordSuccess, this, &MainWindow::forgotPasswordSuccess); + connect(client, &RemoteClient::sigForgotPasswordError, this, &MainWindow::forgotPasswordError); + connect(client, &RemoteClient::sigPromptForForgotPasswordReset, this, &MainWindow::promptForgotPasswordReset); + connect(client, &RemoteClient::sigPromptForForgotPasswordChallenge, this, + &MainWindow::promptForgotPasswordChallenge); + + clientThread = new QThread(this); + client->moveToThread(clientThread); + clientThread->start(); createActions(); createMenus(); - connect(connectionController, &ConnectionController::windowTitleChanged, this, &MainWindow::setWindowTitle); - connect(connectionController, &ConnectionController::statusChanged, this, &MainWindow::statusChanged); - - tabSupervisor = new TabSupervisor(connectionController->client(), tabsMenu, this); + tabSupervisor = new TabSupervisor(client, tabsMenu, this); connect(tabSupervisor, &TabSupervisor::setMenu, this, &MainWindow::updateTabMenu); connect(tabSupervisor, &TabSupervisor::localGameEnded, this, &MainWindow::localGameEnded); connect(tabSupervisor, &TabSupervisor::showWindowIfHidden, this, &MainWindow::showWindowIfHidden); - connect(connectionController, &ConnectionController::tabSupervisorStartRequested, tabSupervisor, - &TabSupervisor::start); - connect(connectionController, &ConnectionController::tabSupervisorStopRequested, tabSupervisor, - &TabSupervisor::stop); tabSupervisor->initStartupTabs(); setCentralWidget(tabSupervisor); @@ -659,6 +1043,9 @@ MainWindow::~MainWindow() cardUpdateProcess->waitForFinished(1000); cardUpdateProcess = nullptr; } + + client->deleteLater(); + clientThread->wait(); } void MainWindow::createTrayIcon() @@ -692,13 +1079,20 @@ void MainWindow::actShow() }); } +void MainWindow::promptForgotPasswordChallenge() +{ + DlgForgotPasswordChallenge dlg(this); + if (dlg.exec()) + client->submitForgotPasswordChallengeToServer(dlg.getHost(), static_cast(dlg.getPort()), + dlg.getPlayerName(), dlg.getEmail()); +} + void MainWindow::closeEvent(QCloseEvent *event) { // workaround Qt bug where closeEvent gets called twice static bool bClosingDown = false; - if (bClosingDown) { + if (bClosingDown) return; - } bClosingDown = true; if (!tabSupervisor->close()) { @@ -715,21 +1109,20 @@ void MainWindow::closeEvent(QCloseEvent *event) void MainWindow::changeEvent(QEvent *event) { - if (event->type() == QEvent::LanguageChange) { + if (event->type() == QEvent::LanguageChange) retranslateUi(); - } else if (event->type() == QEvent::ActivationChange) { + else if (event->type() == QEvent::ActivationChange) { if (isActiveWindow() && !bHasActivated) { bHasActivated = true; if (!connectTo.isEmpty()) { qCInfo(WindowMainStartupAutoconnectLog) << "Command line connect to " << connectTo; - connectionController->connectToServerDirect(connectTo.host(), connectTo.port(), connectTo.userName(), - connectTo.password()); + client->connectToServer(connectTo.host(), connectTo.port(), connectTo.userName(), connectTo.password()); } else if (SettingsCache::instance().servers().getAutoConnect() && !SettingsCache::instance().debug().getLocalGameOnStartup()) { qCInfo(WindowMainStartupAutoconnectLog) << "Attempting auto-connect..."; DlgConnect dlg(this); - connectionController->connectToServerDirect(dlg.getHost(), static_cast(dlg.getPort()), - dlg.getPlayerName(), dlg.getPassword()); + client->connectToServer(dlg.getHost(), static_cast(dlg.getPort()), dlg.getPlayerName(), + dlg.getPassword()); } } } @@ -1002,6 +1395,15 @@ void MainWindow::refreshShortcuts() aStatusBar->setShortcuts(shortcuts.getShortcut("MainWindow/aStatusBar")); } +void MainWindow::notifyUserAboutUpdate() +{ + QMessageBox::information( + this, tr("Information"), + tr("This server supports additional features that your client doesn't have.\nThis is most likely not a " + "problem, but this message might mean there is a new version of Cockatrice available or this server is " + "running a custom or pre-release version.\n\nTo update your client, go to Help -> Check for Updates.")); +} + void MainWindow::actOpenCustomFolder() { QString dir = SettingsCache::instance().getCustomPicsPath(); @@ -1075,9 +1477,8 @@ int MainWindow::getNextCustomSetPrefix(QDir dataDir) QStringList::const_iterator filesIterator; for (filesIterator = files.constBegin(); filesIterator != files.constEnd(); ++filesIterator) { int fileIndex = (*filesIterator).split(".").at(0).toInt(); - if (fileIndex > maxIndex) { + if (fileIndex > maxIndex) maxIndex = fileIndex; - } } return maxIndex + 1; @@ -1103,3 +1504,42 @@ void MainWindow::actEditTokens() dlg.exec(); CardDatabaseManager::getInstance()->saveCustomTokensToFile(); } + +void MainWindow::actForgotPasswordRequest() +{ + DlgForgotPasswordRequest dlg(this); + if (dlg.exec()) + client->requestForgotPasswordToServer(dlg.getHost(), static_cast(dlg.getPort()), + dlg.getPlayerName()); +} + +void MainWindow::forgotPasswordSuccess() +{ + QMessageBox::information( + this, tr("Reset Password"), + tr("Your password has been reset successfully, you can now log in using the new credentials.")); + SettingsCache::instance().servers().setFPHostName(""); + SettingsCache::instance().servers().setFPPort(""); + SettingsCache::instance().servers().setFPPlayerName(""); +} + +void MainWindow::forgotPasswordError() +{ + QMessageBox::warning( + this, tr("Reset Password"), + tr("Failed to reset user account password, please contact the server operator to reset your password.")); + SettingsCache::instance().servers().setFPHostName(""); + SettingsCache::instance().servers().setFPPort(""); + SettingsCache::instance().servers().setFPPlayerName(""); +} + +void MainWindow::promptForgotPasswordReset() +{ + QMessageBox::information(this, tr("Reset Password"), + tr("Activation request received, please check your email for an activation token.")); + DlgForgotPasswordReset dlg(this); + if (dlg.exec()) { + client->submitForgotPasswordResetToServer(dlg.getHost(), static_cast(dlg.getPort()), + dlg.getPlayerName(), dlg.getToken(), dlg.getPassword()); + } +} diff --git a/cockatrice/src/interface/window_main.h b/cockatrice/src/interface/window_main.h index 5f631ddc3..ed6de5b0d 100644 --- a/cockatrice/src/interface/window_main.h +++ b/cockatrice/src/interface/window_main.h @@ -20,12 +20,11 @@ /** * @file window_main.h * @ingroup Core + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef WINDOW_H #define WINDOW_H -#include "connection_controller/remote_connection_controller.h" #include "widgets/dialogs/dlg_local_game_options.h" #include @@ -69,19 +68,38 @@ public slots: private slots: void updateTabMenu(const QList &newMenuList); void statusChanged(ClientStatus _status); + void processConnectionClosedEvent(const Event_ConnectionClosed &event); + void processServerShutdownEvent(const Event_ServerShutdown &event); + void serverTimeout(); + void loginError(Response::ResponseCode r, QString reasonStr, quint32 endTime, QList missingFeatures); + void registerError(Response::ResponseCode r, QString reasonStr, quint32 endTime); + void activateError(); + void socketError(const QString &errorStr); + void protocolVersionMismatch(int localVersion, int remoteVersion); + void userInfoReceived(const ServerInfo_User &userInfo); + void registerAccepted(); + void registerAcceptedNeedsActivate(); + void activateAccepted(); void localGameEnded(); void pixmapCacheSizeChanged(int newSizeInMBs); + void notifyUserAboutUpdate(); void actDisconnect(); void actSinglePlayer(); void actWatchReplay(); void actFullScreen(bool checked); + void actRegister(); void actSettings(); + void actForgotPasswordRequest(); void actAbout(); void actTips(); void actUpdate(); void actViewLog(); void actOpenSettingsFolder(); + void forgotPasswordSuccess(); + void forgotPasswordError(); + void promptForgotPasswordReset(); void actShow(); + void promptForgotPasswordChallenge(); void showWindowIfHidden(); void cardUpdateError(QProcess::ProcessError err); @@ -107,6 +125,7 @@ private slots: private: static const QString appName; static const QStringList fileNameFilters; + void setClientStatusTitle(); void retranslateUi(); void createActions(); void createMenus(); @@ -133,11 +152,14 @@ private: TabSupervisor *tabSupervisor; WndSets *wndSets; - ConnectionController *connectionController; + RemoteClient *client; + QThread *clientThread; LocalServer *localServer; bool bHasActivated, askedForDbUpdater; + QMessageBox serverShutdownMessageBox; QProcess *cardUpdateProcess; DlgViewLog *logviewDialog; + DlgConnect *dlgConnect; GameReplay *replay; DlgTipOfTheDay *tip; QUrl connectTo; @@ -158,6 +180,7 @@ public: protected: void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; + QString extractInvalidUsernameMessage(QString &in); }; #endif diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index ad68d4be9..7092a3fd7 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -158,11 +158,9 @@ QString const generateClientID() { QString macList; for (const QNetworkInterface &networkInterface : QNetworkInterface::allInterfaces()) { - if (networkInterface.hardwareAddress() != "") { - if (networkInterface.hardwareAddress() != "00:00:00:00:00:00:00:E0") { + if (networkInterface.hardwareAddress() != "") + if (networkInterface.hardwareAddress() != "00:00:00:00:00:00:00:E0") macList += networkInterface.hardwareAddress() + "."; - } - } } QString strClientID = QCryptographicHash::hash(macList.toUtf8(), QCryptographicHash::Sha1).toHex().right(15); return strClientID; diff --git a/cockatrice/src/main.h b/cockatrice/src/main.h index ef75a41f4..b6e086744 100644 --- a/cockatrice/src/main.h +++ b/cockatrice/src/main.h @@ -1,8 +1,8 @@ /** * @file main.h * @ingroup Core + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef MAIN_H #define MAIN_H diff --git a/cockatrice/themes/CMakeLists.txt b/cockatrice/themes/CMakeLists.txt index 577977551..3e07c54dd 100644 --- a/cockatrice/themes/CMakeLists.txt +++ b/cockatrice/themes/CMakeLists.txt @@ -2,7 +2,7 @@ # # add themes subfolders -set(defthemes Default Fabric Fusion Leather Plasma VelvetMarble) +set(defthemes Fabric Leather Plasma VelvetMarble) if(UNIX) if(APPLE) diff --git a/cockatrice/themes/Default/palette-default-dark.toml b/cockatrice/themes/Default/palette-default-dark.toml deleted file mode 100644 index 3ee174a2f..000000000 --- a/cockatrice/themes/Default/palette-default-dark.toml +++ /dev/null @@ -1,63 +0,0 @@ -[Palette] -WindowText = #ffffffff -Button = #ff383838 -Light = #ff737373 -Midlight = #ff525252 -Dark = #ff161616 -Mid = #ff252525 -Text = #ffffffff -BrightText = #ffb4dd8b -ButtonText = #ffffffff -Base = #ff2b2b2b -Window = #ff1c1c1c -Shadow = #ff000000 -HighlightedText = #ff000000 -Link = #ffcde4b6 -LinkVisited = #ff99d999 -AlternateBase = #ff242424 -ToolTipBase = #ffffffdc -ToolTipText = #ff000000 -PlaceholderText = #6effffff - -[Palette.Disabled] -WindowText = #ff9d9d9d -Button = #ff1c1c1c -Light = #ff737373 -Midlight = #ff525252 -Dark = #ff161616 -Mid = #ff252525 -Text = #ff9d9d9d -BrightText = #ffb4dd8b -ButtonText = #ff787878 -Base = #ff1c1c1c -Window = #ff1c1c1c -Shadow = #ff000000 -HighlightedText = #ff9d9d9d -Link = #ff308cc6 -LinkVisited = #ffb450ff -AlternateBase = #ff242424 -ToolTipBase = #ffffffdc -ToolTipText = #ff000000 -PlaceholderText = #46ffffff - -[Palette.Inactive] -WindowText = #ffffffff -Button = #ff383838 -Light = #ff737373 -Midlight = #ff525252 -Dark = #ff161616 -Mid = #ff252525 -Text = #ffffffff -BrightText = #ffb4dd8b -ButtonText = #ffffffff -Base = #ff2b2b2b -Window = #ff1c1c1c -Shadow = #ff000000 -HighlightedText = #ffffffff -Link = #ffcde4b6 -LinkVisited = #ff99d999 -AlternateBase = #ff242424 -ToolTipBase = #ffffffdc -ToolTipText = #ff000000 -PlaceholderText = #6effffff - diff --git a/cockatrice/themes/Default/theme.cfg b/cockatrice/themes/Default/theme.cfg deleted file mode 100644 index d2016a238..000000000 --- a/cockatrice/themes/Default/theme.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[Appearance] -ColorScheme = Light - -[Style] -Name = Default diff --git a/cockatrice/themes/Fusion/palette-default-dark.toml b/cockatrice/themes/Fusion/palette-default-dark.toml deleted file mode 100644 index c1d83a4cd..000000000 --- a/cockatrice/themes/Fusion/palette-default-dark.toml +++ /dev/null @@ -1,69 +0,0 @@ -[Palette] -WindowText = #ffffffff -Button = #ff3c3c3c -Light = #ff787878 -Midlight = #ff5a5a5a -Dark = #ff1e1e1e -Mid = #ff282828 -Text = #ffffffff -BrightText = #ff00f652 -ButtonText = #ffffffff -Base = #ff2d2d2d -Window = #ff1e1e1e -Shadow = #ff000000 -Highlight = #ff148c3c -HighlightedText = #ffffffff -Link = #ff00f652 -LinkVisited = #ff00d346 -AlternateBase = #ff353535 -ToolTipBase = #ff3c3c3c -ToolTipText = #ffd4d4d4 -PlaceholderText = #80ffffff -Accent = #ff00d346 - -[Palette.Disabled] -WindowText = #ff9d9d9d -Button = #ff3c3c3c -Light = #ff787878 -Midlight = #ff5a5a5a -Dark = #ff1e1e1e -Mid = #ff282828 -Text = #ff9d9d9d -BrightText = #ff00f652 -ButtonText = #ff9d9d9d -Base = #ff1e1e1e -Window = #ff1e1e1e -Shadow = #ff000000 -Highlight = #ff148c3c -HighlightedText = #ffffffff -Link = #ff308cc6 -LinkVisited = #ffff00ff -AlternateBase = #ff353535 -ToolTipBase = #ffffffdc -ToolTipText = #ff000000 -PlaceholderText = #80ffffff -Accent = #ff9d9d9d - -[Palette.Inactive] -WindowText = #ffffffff -Button = #ff3c3c3c -Light = #ff787878 -Midlight = #ff5a5a5a -Dark = #ff1e1e1e -Mid = #ff282828 -Text = #ffffffff -BrightText = #ff00f652 -ButtonText = #ffffffff -Base = #ff2d2d2d -Window = #ff1e1e1e -Shadow = #ff000000 -Highlight = #ff1e1e1e -HighlightedText = #ffffffff -Link = #ff00f652 -LinkVisited = #ff00d346 -AlternateBase = #ff353535 -ToolTipBase = #ff3c3c3c -ToolTipText = #ffd4d4d4 -PlaceholderText = #80ffffff -Accent = #ff1e1e1e - diff --git a/cockatrice/themes/Fusion/palette-default-light.toml b/cockatrice/themes/Fusion/palette-default-light.toml deleted file mode 100644 index 86c41be78..000000000 --- a/cockatrice/themes/Fusion/palette-default-light.toml +++ /dev/null @@ -1,69 +0,0 @@ -[Palette] -WindowText = #ff000000 -Button = #fff0f0f0 -Light = #ffffffff -Midlight = #ffe3e3e3 -Dark = #ffa0a0a0 -Mid = #ffa0a0a0 -Text = #ff000000 -BrightText = #ffffffff -ButtonText = #ff000000 -Base = #ffffffff -Window = #fff0f0f0 -Shadow = #ff696969 -Highlight = #ff148c3c -HighlightedText = #ffffffff -Link = #ff0d5f28 -LinkVisited = #ff08401b -AlternateBase = #ffe9e7e3 -ToolTipBase = #ffffffdc -ToolTipText = #ff000000 -PlaceholderText = #80000000 -Accent = #ff107532 - -[Palette.Disabled] -WindowText = #ff787878 -Button = #fff0f0f0 -Light = #ffffffff -Midlight = #fff7f7f7 -Dark = #ffa0a0a0 -Mid = #ffa0a0a0 -Text = #ff787878 -BrightText = #ffffffff -ButtonText = #ff787878 -Base = #fff0f0f0 -Window = #fff0f0f0 -Shadow = #ff000000 -Highlight = #ff148c3c -HighlightedText = #ffffffff -Link = #ff0000ff -LinkVisited = #ffff00ff -AlternateBase = #fff7f7f7 -ToolTipBase = #ffffffdc -ToolTipText = #ff000000 -PlaceholderText = #80000000 -Accent = #ff787878 - -[Palette.Inactive] -WindowText = #ff000000 -Button = #fff0f0f0 -Light = #ffffffff -Midlight = #ffe3e3e3 -Dark = #ffa0a0a0 -Mid = #ffa0a0a0 -Text = #ff000000 -BrightText = #ffffffff -ButtonText = #ff000000 -Base = #ffffffff -Window = #fff0f0f0 -Shadow = #ff696969 -Highlight = #fff0f0f0 -HighlightedText = #ff000000 -Link = #ff0d5f28 -LinkVisited = #ff08401b -AlternateBase = #ffe9e7e3 -ToolTipBase = #ffffffdc -ToolTipText = #ff000000 -PlaceholderText = #80000000 -Accent = #fff0f0f0 - diff --git a/cockatrice/themes/Fusion/theme.cfg b/cockatrice/themes/Fusion/theme.cfg deleted file mode 100644 index 9b38e505e..000000000 --- a/cockatrice/themes/Fusion/theme.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[Appearance] -ColorScheme = Dark - -[Style] -Name = Fusion diff --git a/cockatrice/translations/cockatrice_cs.ts b/cockatrice/translations/cockatrice_cs.ts index aa15c6fcc..c210315c7 100644 --- a/cockatrice/translations/cockatrice_cs.ts +++ b/cockatrice/translations/cockatrice_cs.ts @@ -2,7 +2,7 @@ AbstractCounter - + &Set counter... &Nastavit žeton... @@ -10,12 +10,12 @@ AbstractCounterDialog - + Set counter - + New value for counter '%1': Nová hodnota pro žeton '%1': @@ -36,60 +36,60 @@ AbstractTabDeckEditor - + Open in new tab - + Are you sure? - + The decklist has been modified. Do you want to save the changes? - - - - - - + + + + + + Error - + Could not open deck at %1 - + Could not save remote deck - - + + The deck could not be saved. Please check that the directory is writable and try again. - + Save deck - + The deck could not be saved. - + There are no cards in your deck to be exported @@ -105,12 +105,12 @@ Please check that the directory is writable and try again. AdminNotesDialog - + Update Notes - + Admin Notes for %1 @@ -127,227 +127,172 @@ Please check that the directory is writable and try again. Sideboard - - - Tokens - - AppearanceSettingsPage - + seconds - + Error Chyba - + Could not create themes directory at '%1'. - + Theme settings Nastavení vzhledu - + Current theme: Aktuální vzhled - + Open themes folder - + Home tab background source: - + Home tab background shuffle frequency: - + Disabled - + + Display card name of background in bottom right: + + + + Menu settings - + Show keyboard shortcuts in right-click menus - + Show game filter toolbar above list in room tab - + Card rendering Vykreslování karet - + Display card names on cards having a picture Zobrazit jména karet na kartách s obrázky - + Auto-Rotate cards with sideways layout - + Override all card art with personal set preference (Pre-ProviderID change behavior) - - Light - - - - - Dark - - - - - System - - - - - Active theme palette: - - - - - Edit theme palette - - - - - Home tab settings - - - - - Display card name of background in bottom right - - - - - Styling settings - - - - - Style user list - - - - - Card printings - - - - + Bump sets that the deck contains cards from to the top in the printing selector - + Scale cards on mouse over Zvětšovat karty při najetí myši - + Use rounded card corners - - Card layout - - - - + Minimum overlap percentage of cards on the stack and in vertical hand - + Maximum initial height for card view window: - - + + rows - + Maximum expanded height for card view window: - + Card counters - + Counter %1 - + Hand layout Rozvržení ruky - + Display hand horizontally (wastes space) Zobrazit ruku horizontálně (plýtvá místem) - + Enable left justification Zapnout - + Table grid layout Rozložení herní mřížky - + Invert vertical coordinate Převrátit vertikální souřadnice - + Minimum player count for multi-column layout: Minimální počet hráčů pro víceřádkové rozvržení: - + Maximum font size for information displayed on cards: Maximální velikost písma pro informace na kartách @@ -355,12 +300,12 @@ Please check that the directory is writable and try again. ArchidektApiResponseDeckDisplayWidget - + Back to results - + Open Deck in Deck Editor @@ -386,112 +331,112 @@ Please check that the directory is writable and try again. BanDialog - + ban &user name Blokovat & Uživatelské jméno - + ban &IP address Blokovat & IP Adresu - + ban client I&D Banovat I&D klienta - + Ban type Typ banu - + &permanent ban &trvalý ban - + &temporary ban &dočasný ban - + &Days: &Dní: - + &Hours: &Hodin: - + &Minutes: &Minut: - + Duration of the ban Trvání banu - + Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. Uveďte prosím důvod pro ban. Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí. - + Please enter the reason for the ban that will be visible to the banned person. Uveďte prosám důvod pro ban, který uvidí banovaná osoba. - + Redact all messages from this user in all rooms - + &OK &OK - + &Cancel &Zrušit - + Ban user from server Zabanovat uživatele ze serveru - - - - + + + + Error Chyba - + You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. - + You must have a value in the name ban when selecting the name ban checkbox. - + You must have a value in the ip ban when selecting the ip ban checkbox. - + You must have a value in the clientid ban when selecting the clientid ban checkbox. @@ -499,123 +444,59 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí. BetaReleaseChannel - + Beta - + No reply received from the release update server. - + Invalid reply received from the release update server. - + No reply received from the file update server. - - CardArtPreviewWidget - - - No card selected - - - - - CardArtRulesModel - - - Card - - - - - ProviderId - - - - - Mode - - - - - Reason - - - CardDatabaseModel - + Name Jméno - + Sets Edice - + Mana cost Sesílací cena - + Card type Typ karty - + P/T S/O - + Color(s) Barva(y) - - CardDatabaseView - - - Add to Deck - - - - - Add to Sideboard - - - - - Select Printing - - - - - Show on EDHRec (Commander) - - - - - Show on EDHRec (Card) - - - - - Show Related cards - - - CardFilter @@ -744,22 +625,22 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí. CardInfoPictureWidget - + View related cards - + Add card to deck - + Mainboard - + Sideboard @@ -782,12 +663,12 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí. - + Related cards: - + Unknown card: @@ -795,146 +676,128 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí. CardMenu - + Re&veal to... - + &All players - + View related cards - + Token: - + All tokens - + &Select All - + S&elect Row - + S&elect Column - + &Play - + &Hide - + Play &Face Down - + &Tap / Untap Turn sideways or back again - + Skip &untapping - + T&urn Over Turn face up/face down - + &Peek at card face - + &Clone - + Attac&h to card... - + Unattac&h - + &Draw arrow... - + &Set annotation... - - Reduce life by power - - - - + Ca&rd counters - + &Add counter (%1) - + &Remove counter (%1) - + &Set counters (%1)... - - CardPictureLoaderCacheMethod - - - Network Cache - - - - - Filesystem - - - CardSizeWidget @@ -946,133 +809,133 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí. CardZoneLogic - + their hand nominative - + %1's hand nominative - + their library look at zone - + %1's library look at zone - + of their library top cards of zone, - + of %1's library top cards of zone - + their library reveal zone - + %1's library reveal zone - + their library shuffle - + %1's library shuffle - + their library nominative - + %1's library nominative - + their graveyard nominative - + %1's graveyard nominative - + their exile nominative - + %1's exile nominative - + their sideboard look at zone - + %1's sideboard look at zone - + their sideboard nominative - + %1's sideboard nominative - + their custom zone '%1' nominative - + %1's custom zone '%2' nominative @@ -1094,421 +957,16 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí. - - ColorButton - - - Click to pick a color - - - - - Pick colour - - - - - ConnectionController - - - - The server has reached its maximum user capacity, please check back later. - - - - - There are too many concurrent connections from your address. - - - - - Banned by moderator - - - - - Expected end time: %1 - - - - - This ban lasts indefinitely. - - - - - Scheduled server shutdown. - - - - - - Invalid username. - - - - - You have been logged out due to logging in at another location. - - - - - Connection closed - - - - - The server has terminated your connection. -Reason: %1 - - - - - The server is going to be restarted in %n minute(s). -All running games will be lost. -Reason for shutdown: %1 - - - - - Scheduled server shutdown - - - - - Failed Login - - - - - Your client seems to be missing features this server requires for connection. - - - - - To update your client, go to 'Help -> Check for Client Updates'. - - - - - - - - - - - - - - - - - - - - - - Error - - - - - Incorrect username or password. Please check your authentication information and try again. - - - - - There is already an active session using this user name. -Please close that session first and re-login. - - - - - - You are banned until %1. - - - - - - You are banned indefinitely. - - - - - This server requires user registration. Do you want to register now? - - - - - This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. -Please close and reopen your client to try again. - - - - - An internal error has occurred, please close and reopen Cockatrice before trying again. -If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - - - - Account activation - - - - - Your account has not been activated yet. -You need to provide the activation token received in the activation email. - - - - - Server Full - - - - - Unknown login error: %1 - - - - - - -This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - - - - - - - - - Registration denied - - - - - Registration is currently disabled on this server - - - - - There is already an existing account with the same user name. - - - - - It's mandatory to specify a valid email address when registering. - - - - - It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. - - - - - Password too short. - - - - - Registration failed for a technical problem on the server. - - - - - The connection to the server has been lost. - - - - - Unknown registration error: %1 - - - - - Account activation failed - - - - - Socket error: %1 - - - - - Server timeout - - - - - You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. -Local version is %1, remote version is %2. - - - - - Your Cockatrice client is obsolete. Please update your Cockatrice version. -Local version is %1, remote version is %2. - - - - - - Success - - - - - Registration accepted. -Will now login. - - - - - Account activation accepted. -Will now login. - - - - - Information - - - - - This server supports additional features that your client doesn't have. -This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. - -To update your client, go to Help -> Check for Updates. - - - - - - - Reset Password - - - - - Your password has been reset successfully, you can now log in using the new credentials. - - - - - Failed to reset user account password, please contact the server operator to reset your password. - - - - - Activation request received, please check your email for an activation token. - - - - - Connecting to %1... - - - - - Registering to %1 as %2... - - - - - Disconnected - - - - - Connected, logging in at %1 - - - - - Requesting forgotten password to %1 as %2... - - - - - Your username must respect these rules: - - - - - is %1 - %2 characters long - - - - - can %1 contain lowercase characters - - - - - - - - NOT - - - - - can %1 contain uppercase characters - - - - - can %1 contain numeric characters - - - - - can contain the following punctuation: %1 - - - - - first character can %1 be a punctuation mark - - - - - no unacceptable language as specified by these server rules: - note that the following lines will not be translated - - - - - can not contain any of the following words: %1 - - - - - can not match any of the following expressions: %1 - - - - - You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - - CustomZoneMenu - + C&ustom Zones - - + + View custom zone '%1' @@ -1516,35 +974,30 @@ To update your client, go to Help -> Check for Updates. DeckAnalyticsWidget - + Add Panel - + Remove Panel - + Save Layout - + Load Layout - - - Include Sideboard - - DeckEditorCardDatabaseDockWidget - + Card Database @@ -1560,17 +1013,47 @@ To update your client, go to Help -> Check for Updates. DeckEditorDatabaseDisplayWidget - + Search by card name (or search expressions) - + + Add to Deck + + + + + Add to Sideboard + + + + + Select Printing + + + + + Show on EDHRec (Commander) + + + + + Show on EDHRec (Card) + + + + + Show Related cards + + + + Add card to &maindeck - + Add card to &sideboard @@ -1603,72 +1086,72 @@ To update your client, go to Help -> Check for Updates. - + Select Printing - + Deck - + Deck &name: - + Banner Card/Tags Visibility Settings - + Show banner card selection menu - + Show tags selection menu - + &Comments: - + Group by: - + Format: - + Hash: - + &Increment number - + &Decrement number - + &Remove row - + Swap card to/from sideboard @@ -1676,17 +1159,17 @@ To update your client, go to Help -> Check for Updates. DeckEditorFilterDockWidget - + Filters - + &Clear all filters - + Delete selected @@ -1817,113 +1300,169 @@ To update your client, go to Help -> Check for Updates. DeckEditorSettingsPage - - + + Update Spoilers Aktualizovat spoilery - + + Success Úspěch - + Download URLs have been reset. - + + Downloaded card pictures have been reset. + Stáhnuté obrázky karet byly resetovány. + + + + Error + Chyba + + + + One or more downloaded card pictures could not be cleared. + Některé stáhnuté obrázky karet nemohli být vymazány. + + + Add URL - - + + URL: URL: - - + + Edit URL - + + Network Cache Size: + + + + + Redirect Cache TTL: + + + + + How long cached redirects for urls are valid for. + + + + + Picture Cache Size: + + + + Add New URL - + Remove URL - + + Day(s) + + + + Updating... Aktualizuji... - + Choose path Vyberte cestu - + URL Download Priority - + Spoilers Spoilery - + Download Spoilers Automatically Stahovat spoilery automaticky - + Spoiler Location: - + Last Change Poslední změna - + Spoilers download automatically on launch Automaticky stahovat spoilery při spuštění - + Press the button to manually update without relaunching Manuálně aktualizovat bez restartování - + Do not close settings until manual update is complete - + Download card pictures on the fly - + How to add a custom URL - + + Delete Downloaded Images + Smazat stáhnuté obrázky + + + Reset Download URLs + + + On-disk cache for downloaded pictures + + + + + In-memory cache for pictures not currently on screen + + DeckListHistoryManagerWidget @@ -1989,12 +1528,12 @@ To update your client, go to Help -> Check for Updates. DeckLoader - + Common deck formats (%1) - + All files (*.*) @@ -2216,27 +1755,27 @@ To update your client, go to Help -> Check for Updates. - + Moved to %1 1 × "%2" (%3) - + Removed "%1" (all copies) - + %1 1 × "%2" (%3) - + Added - + Removed @@ -2258,74 +1797,74 @@ To update your client, go to Help -> Check for Updates. DeckViewContainer - + Load deck... Načíst balíček... - + Load remote deck... Načíst balíček ze serveru... - + Load from clipboard... - + Load from website... - + Unload deck - + Ready to start Připraven začít - + Force start - + Sideboard unlocked - + Sideboard locked - - + + Error Chyba - + The selected file could not be loaded. Vybraný soubor se nepodařilo načíst. - + Deck is greater than maximum file size. - + Are you sure you want to force start? This will kick all non-ready players from the game. - + Cockatrice @@ -2424,7 +1963,7 @@ This will kick all non-ready players from the game. - + Webpage Webová stránka @@ -2464,37 +2003,37 @@ This will kick all non-ready players from the game. Připojit k serveru - + Server URL - + Communication Port Komunikační port - + Unique Server Name - + Connection Warning - + You need to name your new connection profile. - + Connect Warning Varování přihlášení - + The player name can't be empty. Jméno hráče nemůže být prázdné @@ -2607,17 +2146,17 @@ This will kick all non-ready players from the game. Vytvořit hru - + Game information Informace o hře - + Error Chyba - + Server error. Chyba serveru. @@ -2625,97 +2164,97 @@ This will kick all non-ready players from the game. DlgCreateToken - + &Name: &Jméno: - + Token Token - + C&olor: B&arva: - + white bílá - + blue modrá - + black černá - + red červená - + green zelená - + multicolor vícebarevný - + colorless bezbarvý - + &P/T: &S/O: - + &Annotation: &Poznámka: - + &Destroy token when it leaves the table &Token se při odchodu z bojiště zničí - + Create face-down (Only hides name) - + Token data Data tokenů - + Show &all tokens Ukázat &všechny tokeny - + Show tokens from this &deck Ukázat tokeny z tohto &balíčku - + Choose token from list Vybrat token ze seznamu. - + Create token Vytvořit token @@ -2749,7 +2288,7 @@ This will kick all non-ready players from the game. - + ✖ @@ -2764,12 +2303,12 @@ This will kick all non-ready players from the game. - + Duplicate Tag - + This tag already exists. @@ -2956,12 +2495,12 @@ Pro odstranění současného avatara potvrďte bez vybrání nového obrázku.< Zadejte prosím jméno pro token: - + Error Chyba - + The chosen name conflicts with an existing card or token. Make sure to enable the 'Token' set in the "Manage sets" dialog to display them correctly. Vybrané jméno se nemůže shodovat s již existující kartou nebo tokenem. @@ -2986,12 +2525,12 @@ Pro správné zobrazení si aktivujte si edici 'Token' v "Nastavi Nespecifikováno - + Real name: Skutečné jméno: - + Edit user profile Upravit uživatelský profil @@ -3029,113 +2568,113 @@ Pro správné zobrazení si aktivujte si edici 'Token' v "Nastavi - + Hide 'buddies only' games - + Hide full games - + Hide games that have started - + Hide password protected games - + Hide 'ignored user' games - + Hide games not created by buddies Hide games not created by buddy - + Hide games with forced open decklists - + &Newer than: - + Game &description: &Popis hry: - + &Creator name: Jméno &tvůrce: - + General Obecné - + &Game types Typ &hry - + at &least: &minimálně: - + at &most: &maximálně: - + Maximum player count Maximální počet hráčů - + Restrictions Omezení - + Show games only if &spectators can watch - + Show spectator password p&rotected games - + Show only if spectators can ch&at - + Show only if spectators can see &hands - + Spectators - + Filter games Filtrovat hry @@ -3438,37 +2977,37 @@ https://tappedout.net/mtg-decks/your-deck-name/ DlgMoveTopCardsUntil - + Card name (or search expressions): - + Number of hits: - + Auto play hits - + Put top cards on stack until... - + No cards matching the search expression exists in the card database. Proceed anyways? - + Cockatrice - + Invalid filter @@ -3527,40 +3066,40 @@ Your email will be used to verify your account. Neznámý - + Real name: Skutečné jméno: - + Register to server Registrovat se na server - - - - + + + + Registration Warning - + Your password is too short. - + Your passwords do not match, please try again. Vaše hesla se neshodují. - + Your email addresses do not match, please try again. Vaše emailové adresy se neshodují. - + The player name can't be empty. Vyplňte jméno hráče. @@ -3568,17 +3107,17 @@ Your email will be used to verify your account. DlgRollDice - + Number of sides: - + Number of dice: - + Roll Dice @@ -3629,12 +3168,12 @@ Your email will be used to verify your account. DlgSettings - + Unknown Error loading card database Neznámý error při nahrávání databáze karet. - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -3651,7 +3190,7 @@ Je možné že bude nutné znovu spustit Oracle pro obnovení databáze karet. Chtěl/a by jste změnit nastavení lokace databáze? - + Your card database version is too old. This can cause problems loading card information or images @@ -3668,7 +3207,7 @@ Je možné to spravit spuštěním Oracle pro aktualizaci vaší databáze karet Chcete změnit nastavení lokace databáze? - + Your card database did not finish loading Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached @@ -3677,7 +3216,7 @@ Would you like to change your database location setting? - + File Error loading your card database. Would you like to change your database location setting? @@ -3686,7 +3225,7 @@ Would you like to change your database location setting? Chcete změnit nastavení lokace databáze? - + Your card database was loaded but contains no cards. Would you like to change your database location setting? @@ -3695,7 +3234,7 @@ Would you like to change your database location setting? Chcete změnit nastavení lokace databáze? - + Unknown card database load status Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues @@ -3704,64 +3243,59 @@ Would you like to change your database location setting? - - - + + + Error Chyba - + The path to your deck directory is invalid. Would you like to go back and set the correct path? Cesta k adresáři s balíčky je neplatná. Chcete se vrátit a nastavit správnou? - + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? Cesta k adresáři s obrázky je neplatná. Chcete se vrátit a nastavit správnou? - + Settings Nastavení - + General Obecné - + Appearance Vzhled - + User Interface Rozhraní - - Storage - - - - + Card Sources - + Chat Chat - + Sound Zvuk - + Shortcuts Skratky @@ -3853,9 +3387,9 @@ You can always change this behavior in the 'General' settings tab. - - - + + + Error Chyba @@ -3907,31 +3441,31 @@ Please visit the download page to update manually. - + Update Available Dostupná aktualizace - + A new version of Cockatrice is available! Je dostupná nová verze Cockatrice! - + New version Nová verze - + Released - + Changelog @@ -3941,50 +3475,50 @@ Please visit the download page to update manually. Chcete aktualizovat nyní? - + Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. - + Please check the <a href="%1">releases page</a> on our Github and download the build for your system. - - - + + + Update Error Chyba aktualizace - + An error occurred while checking for updates: Došlo k chybě při kontrole aktualizací: - + An error occurred while downloading an update: Došlo k chybě při stahování aktualizace: - + Installing... Instaluji... - + Cockatrice is unable to open the installer. - + Try to update manually by closing Cockatrice and running the installer. - + Download location @@ -4074,67 +3608,67 @@ You may have to manually download the new version. DrawProbabilityWidget - + Draw Probability - + Probability of drawing - + Card Name - + Type - + Subtype - + Mana Value - + At least - + Exactly - + card(s) having drawn at least - + cards - + Category - + Qty - + Odds (%) @@ -4248,7 +3782,7 @@ You may have to manually download the new version. FilterBuilder - + Type your filter here Zde napište svůj filtr: @@ -4279,22 +3813,22 @@ You may have to manually download the new version. GameEventHandler - + kicked by game host or moderator - + player left the game - + player disconnected from server - + reason unknown @@ -4302,140 +3836,140 @@ You may have to manually download the new version. GameSelector - - - - - - - - - + + + + + + + + + Error Chyba - + Please join the appropriate room first. - + Wrong password. Špatné heslo. - + Spectators are not allowed in this game. Do této hry je divákům přístup zakázán. - + The game is already full. Hra je plná. - + The game does not exist any more. Hra již neexistuje. - + This game is only open to registered users. Hra je určena jen pro registrované. - + This game is only open to its creator's buddies. Hra je dostupná jen pro přátele zakládajícícho. - + You are being ignored by the creator of this game. Zakladatel hry vás ignoruje. - + Join Game - + Spectate Game - + Game Information - + Join Game as Judge - + Spectate Game as Judge - + Join game Připojit ke hře - + Password: Heslo: - + Please join the respective room first. - + &Filter games &Filtrovat hry: - + C&lear filter Z&rušit filtr: - + C&reate V&ytvořit - + &Join &Připojit se - + Join as judge - + J&oin as spectator P&řipojit se jako divák - + Join as judge spectator - + Games shown: %1 / %2 - + Games Hry @@ -4443,32 +3977,32 @@ You may have to manually download the new version. GameSelectorQuickFilterToolBar - + All types - + Filter by game name... - + Filter by game type/format - + Hide games not created by buddies - + Hide full games - + Hide started games @@ -4476,105 +4010,105 @@ You may have to manually download the new version. GamesModel - + >1 day - + %1%2 hr short age in hours - + new - + %1%2 min short age in minutes - + password heslo - + buddies only jen pro přátele - + reg. users only jen pro registrované - + open decklists + - can chat může chatovat - + see hands vidět do rukou - + can see hands může vidět do rukou - + not allowed nepovolené - + Room Místnost - + Age Doba od otevření - + Description Popis - + Creator Zakladatel - + Type Typ - + Restrictions Omezení - + Players Hráči - + Spectators Diváci @@ -4582,158 +4116,143 @@ You may have to manually download the new version. GeneralSettingsPage - + Reset all paths - + All paths have been reset - - - - - - - + + + + + + + Choose path Vyberte cestu - - Language settings - + + Personal settings + Osobní nastavení - + Language: Jazyk: - - Version settings - - - - - Card database - - - - - Startup settings - - - - + Paths (editing disabled in portable mode) - + Paths Cesty - + How to help with translations - + Decks directory: Adresář s balíčky: - + Filters directory: - + Replays directory: Adresář se záznamy her - + Pictures directory: Adresář s obrázky: - + Card database: Databáze karet: - + Custom database directory: - + Token database: Databáze tokenů: - + Update channel - + Check for client updates on startup - + Check for card database updates on startup - + Don't check - + Prompt for update - + Always update in the background - + Check for card database updates every - + days - + Notify if a feature supported by the server is missing in my client - + Automatically run Oracle when running a new version of Cockatrice Automaticky spustit Oracle při spouštění nové verze Cockatrice - + Show tips on startup Ukázat tip při spuštění - + Last update check on %1 (%2 days ago) @@ -4741,47 +4260,47 @@ You may have to manually download the new version. GraveyardMenu - + &Graveyard - + &View graveyard - + &Move graveyard to... - + &Top of library - + &Bottom of library - + &All players - + &Hand - + &Exile - + Reveal random card to... @@ -4789,88 +4308,88 @@ You may have to manually download the new version. HandMenu - + &Hand - + &View hand - + Sort hand by... - + Name - + Type - + Mana Value - + Take &mulligan (Choose hand size) - + Take mulligan (Same hand size) - + Take mulligan (Hand size - 1) - + &Move hand to... - + &Top of library - + &Bottom of library - + &Graveyard - + &Exile - + &Reveal hand to... - - + + All players - + Reveal r&andom card to... @@ -4878,52 +4397,52 @@ You may have to manually download the new version. HomeWidget - + Create New Deck - + Browse Decks - + Browse Card Database - + Browse EDHRec - + Browse Archidekt - + View Replays - + Quit - + Connecting... - + Connect - + Play @@ -4931,213 +4450,213 @@ You may have to manually download the new version. LibraryMenu - + &Library - + &View library - + View &top cards of library... - + View bottom cards of library... - + Reveal &library to... - + Lend library to... - + Reveal &top cards to... - + &Top of library... - + &Bottom of library... - + &Always reveal top card - + &Always look at top card - + &Open deck in deck editor - + &Draw card - + D&raw cards... - + &Undo last draw - + Shuffle - + &Play top card - + Play top card &face down - + Put top card on &bottom - + Move top card to grave&yard - + Move top card to e&xile - + Move top cards to &graveyard... - + Move top cards to graveyard face down... - + Move top cards to &exile... - + Move top cards to exile face down... - + Put top cards on stack &until... - + Shuffle top cards... - + &Draw bottom card - + D&raw bottom cards... - + &Play bottom card - + Play bottom card &face down - + Move bottom card to grave&yard - + Move bottom card to e&xile - + Move bottom cards to &graveyard... - + Move bottom cards to graveyard face down... - + Move bottom cards to &exile... - + Move bottom cards to exile face down... - + Put bottom card on &top - + Shuffle bottom cards... - - + + &All players - + Reveal top cards of library - + Number of cards: (max. %1) @@ -5145,453 +4664,835 @@ You may have to manually download the new version. MainWindow - - + + + The server has reached its maximum user capacity, please check back later. + Na serveru je maximální počet uživatelů, skuste později. + + + + There are too many concurrent connections from your address. + Z vaší adresy jde mnoho současných připojení. + + + + Banned by moderator + + + + + Expected end time: %1 + + + + + This ban lasts indefinitely. + + + + + Scheduled server shutdown. + + + + + + Invalid username. + Neplatné uživatelské jméno. + + + + You have been logged out due to logging in at another location. + + + + + Connection closed + Připojení uzavřeno + + + + The server has terminated your connection. +Reason: %1 + Server přerušil spojení. +Důvod: %1 + + + + The server is going to be restarted in %n minute(s). +All running games will be lost. +Reason for shutdown: %1 + + + + + Scheduled server shutdown + + + + + + Success + + + + + Registration accepted. +Will now login. + + + + + Account activation accepted. +Will now login. + + + + + Player %1 Hráč %1 - + Load replay - + About Cockatrice O Cockatrice - + Version - + Cockatrice Webpage - + Project Manager: - + Past Project Managers: - + Developers: - + Our Developers - + Help Develop! - + Translators: Překlad: - + Our Translators - + Help Translate! - + Support: - + Report an Issue - + Troubleshooting - + F.A.Q. - - + + + + + + + + + + + + + + + + + + + + Error Chyba - + + Server timeout + Vypršel časový limit + + + + Failed Login + + + + + Your client seems to be missing features this server requires for connection. + + + + + To update your client, go to 'Help -> Check for Client Updates'. + + + + + Incorrect username or password. Please check your authentication information and try again. + + + + + There is already an active session using this user name. +Please close that session first and re-login. + S tímto uživatelským jménem jste již připojeni. +Přerušte spojení a znovu se přihlašte. + + + + + You are banned until %1. + + + + + + You are banned indefinitely. + + + + + This server requires user registration. Do you want to register now? + + + + + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. + + + + + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. + + + + + Account activation + + + + + Your account has not been activated yet. +You need to provide the activation token received in the activation email. + + + + + Server Full + + + + + Unknown login error: %1 + + + + + + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. + + + + + Your username must respect these rules: + + + + + is %1 - %2 characters long + + + + + can %1 contain lowercase characters + + + + + + + + NOT + + + + + can %1 contain uppercase characters + + + + + can %1 contain numeric characters + + + + + can contain the following punctuation: %1 + + + + + first character can %1 be a punctuation mark + + + + + no unacceptable language as specified by these server rules: + note that the following lines will not be translated + + + + + can not contain any of the following words: %1 + + + + + can not match any of the following expressions: %1 + + + + + You may only use A-Z, a-z, 0-9, _, ., and - in your username. + + + + + + + + + + Registration denied + + + + + Registration is currently disabled on this server + + + + + There is already an existing account with the same user name. + + + + + It's mandatory to specify a valid email address when registering. + + + + + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + + + + + Password too short. + + + + + Registration failed for a technical problem on the server. + + + + + The connection to the server has been lost. + + + + + Unknown registration error: %1 + + + + + Account activation failed + + + + + Socket error: %1 + Chyba socketu: %1 + + + + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + Snažíte se připojit na zastaralý server. Prosíme, stáhněte si nižší verzi Cockatrice, nebo se připojte k odpovídajícímu serveru. +Lokální verze je %1, verze serveru je %2. + + + + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + Váš klient je zastaralý. Prosíme, aktualizujte Cockatrice na vyšší verzi. +Lokální verze je %1, verze serveru je %2. + + + + Connecting to %1... + Připojování k %1... + + + + Registering to %1 as %2... + + + + + Disconnected + Odpojeno + + + + Connected, logging in at %1 + + + + + + + Requesting forgotten password to %1 as %2... + + + + &Connect... &Připojit... - + &Disconnect &Odpojit - + Start &local game... Spustit &lokální hru... - + &Watch replay... - + &Full screen &Celá obrazovka - + &Register to server... - + &Restore password... - + &Settings... &Nastavení... - + &Exit &Konec - + A&ctions - + &Cockatrice &Cockatrice - + C&ard Database - + &Manage sets... - + Edit custom &tokens... - + Open custom image folder - + Open custom sets folder - + Add custom sets/cards - + Reload card database - + Tabs - + &Help &Nápověda - + &About Cockatrice &O Cockatrice - + &Tip of the Day - + Check for Client Updates - + Check for Card Updates... - + Check for Card Updates (Automatic) - + Show Status Bar - + View &Debug Log - + Open Settings Folder - + Show/Hide - + New Version - + Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. - + Cockatrice installed - + Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. - + Card database - + Cockatrice is unable to load the card database. Do you want to update your card database now? If unsure or first time user, choose "Yes" - - + + Yes - - + + No - + Open settings - + New sets found - + %n new set(s) found in the card database Set code(s): %1 Do you want to enable it/them? - - Yes, always enable - - - - + View sets - + Welcome - + Hi! It seems like you're running this version of Cockatrice for the first time. All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. - + + Information - + A card database update is already running. - + Unable to run the card database updater: - + Card database update running. - + Failed to start. The file might be missing, or permissions might be incorrect. - + The process crashed some time after starting successfully. - + Timed out. The process took too long to respond. The last waitFor...() function timed out. - + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. - + An error occurred when attempting to read from the process. For example, the process may not be running. - + Unknown error occurred. - + The card database updater exited with an error: %1 - - - - - + + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + + + + + + + + Load sets/cards - + Selected file cannot be found. - + You can only import XML databases at this time. - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. - + Sets/cards failed to import. + + + + + Reset Password + + + + + Your password has been reset successfully, you can now log in using the new credentials. + + + + + Failed to reset user account password, please contact the server operator to reset your password. + + + + + Activation request received, please check your email for an activation token. + + ManaBaseConfigDialog - + Mana Base Configuration - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): - + OK - + Cancel @@ -5663,27 +5564,27 @@ Cockatrice will now reload the card database. ManaDevotionConfigDialog - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): @@ -5753,615 +5654,610 @@ Cockatrice will now reload the card database. MessageLogWidget - + from play - + from their graveyard - + from exile z exilnutých karet - + from their hand - + the top card of %1's library - + the top card of their library - + from the top of %1's library - + from the top of their library - + the bottom card of %1's library - + the bottom card of their library - + from the bottom of %1's library - + from the bottom of their library - + from %1's library - + from their library - + from sideboard ze sideboardu - + from the stack ze stacku - + from custom zone '%1' - + %1 is now keeping the top card %2 revealed. - + %1 is not revealing the top card %2 any longer. - + %1 can now look at top card %2 at any time. - + %1 no longer can look at top card %2 at any time. - + %1 attaches %2 to %3's %4. - + %1 has conceded the game. - + %1 has unconceded the game. - + %1 has restored connection to the game. - + %1 has lost connection to the game. - + %1 points from their %2 to themselves. - + %1 points from their %2 to %3. - + %1 points from %2's %3 to themselves. - + %1 points from %2's %3 to %4. - + %1 points from their %2 to their %3. - + %1 points from their %2 to %3's %4. - + %1 points from %2's %3 to their own %4. - + %1 points from %2's %3 to %4's %5. - + %1 creates a face down token. - + %1 creates token: %2%3. - + %1 has loaded a deck (%2). - + %1 has loaded a deck with %2 sideboard cards (%3). - + %1 destroys %2. - + a card kartu - + %1 gives %2 control over %3. %1 předává kontrolu hráči %2 karty %3. - + %1 puts %2 into play%3 face down. - + %1 puts %2 into play%3. %1 dává kartu %2 %3 do hry. - + %1 puts %2%3 into their graveyard face down. - + %1 puts %2%3 into their graveyard. - + %1 exiles %2%3 face down. - + %1 exiles %2%3. %1 exiluje %2%3. - + %1 moves %2%3 to their hand. - + %1 puts %2%3 into their library. - + %1 puts %2%3 onto the bottom of their library. - + %1 puts %2%3 on top of their library. - + %1 puts %2%3 into their library %4 cards from the top. - + %1 moves %2%3 to sideboard. %1 přesouvá %2%3 do sideboardu. - + %1 plays %2%3 face down. - + %1 plays %2%3. %1 sesílá %2%3. - + %1 moves %2%3 to custom zone '%4' face down. - + %1 moves %2%3 to custom zone '%4'. - + %1 tries to draw from an empty library - + %1 draws %2 card(s). - + %1 is looking at %2. - + %1 is looking at the %4 %3 card(s) %2. top card for singular, top %3 cards for plural - + bottom - + top - + %1 turns %2 face-down. - + %1 turns %2 face-up. - + The game has been closed. Hra byla ukončena. - + The game has started. Hra začíná. - + You are flooding the game. Please wait a couple of seconds. - + %1 has joined the game. - + %1 is now watching the game. %1 nyní sleduje hru. - + You have been kicked out of the game. - + %1 has left the game (%2). - + %1 is not watching the game any more (%2). - + %1 is not ready to start the game any more. - + %1 shuffles their deck and draws a new hand of %2 card(s). - + %1 shuffles their deck and draws a new hand. - + You are watching a replay of game #%1. - + %1 is ready to start the game. - + cards an unknown amount of cards - + %1 card(s) a card for singular, %1 cards for plural - + %1 lends %2 to %3. - + %1 reveals %2 to %3. - + %1 reveals %2. - + %1 randomly reveals %2%3 to %4. - + %1 randomly reveals %2%3. - + %1 peeks at face down card #%2. - + %1 peeks at face down card #%2: %3. - + %1 reveals %2%3 to %4. - + %1 reveals %2%3. - + %1 reversed turn order, now it's %2. - + reversed - + normal - + Heads - + Tails - + %1 flipped a coin. It landed as %2. - + %1 rolls a %2 with a %3-sided die. - + %1 flips %2 coins. There are %3 heads and %4 tails. - + %1 rolls a %2-sided dice %3 times: %4. - + %1's turn. - + %1 sets annotation of %2 to %3. - - %1 places %2 %3%4 counter(s) on %5 (now %6). + + %1 places %2 "%3" counter(s) on %4 (now %5). - - %1 removes %2 %3%4 counter(s) from %5 (now %6). + + %1 removes %2 "%3" counter(s) from %4 (now %5). - - %1 failed to undo their last draw. - - - - + %1 sets counter %2 to %3 (%4%5). - + %1 sets %2 to not untap normally. - + %1 sets %2 to untap normally. - + %1 removes the PT of %2. - + %1 changes the PT of %2 from nothing to %4. - + %1 changes the PT of %2 from %3 to %4. - + %1 has locked their sideboard. - + %1 has unlocked their sideboard. - + %1 taps their permanents. - + %1 untaps their permanents. - + %1 taps %2. - + %1 untaps %2. - + %1 shuffles %2. - + %1 shuffles the bottom %3 cards of %2. - + %1 shuffles the top %3 cards of %2. - + %1 shuffles cards %3 - %4 of %2. - + %1 unattaches %2. - + %1 undoes their last draw. - + %1 undoes their last draw (%2). @@ -6369,115 +6265,110 @@ Cockatrice will now reload the card database. MessagesSettingsPage - + Word1 Word2 Word3 - + Add New Message - + Edit Message - + Remove Message - + Add message Přidat zprávu - - + + Message: Zpráva: - + Edit message - + Chat settings - + Custom alert words - + Enable chat mentions - + Enable mention completer - + In-game message macros - + How to use in-game message macros - + Ignore chat room messages sent by unregistered users - + Ignore private messages sent by unregistered users - - Ignore private messages sent by non-buddy users - - - - - + + Invert text color - + Enable desktop notifications for private messages - + Enable desktop notification for mentions - + Enable room message history on join - - + + (Color is hexadecimal) - + Separate words with a space, alphanumeric characters only @@ -6485,42 +6376,42 @@ Cockatrice will now reload the card database. MoveMenu - + Move to - + &Top of library in random order - + X cards from the top of library... - + &Bottom of library in random order - + T&able - + &Hand - + &Graveyard - + &Exile @@ -6533,47 +6424,47 @@ Cockatrice will now reload the card database. - + Mana Value - + Color(s) - + Loyalty - + Main Card Type - + Mana Cost - + P/T - + Side - + Layout - + Color Identity @@ -6596,152 +6487,6 @@ Cockatrice will now reload the card database. - - PaletteEditorDialog - - - - Reset - - - - - - Apply - - - - - - Save && Apply - - - - - ▼ Edit Palette - - - - - - ▶ Edit Palette - - - - - Palette Editor — %1 - - - - - <b>Palette Editor</b> &nbsp;·&nbsp; %1 - - - - - This theme ships no default palette files - - - - - Replace current colours with the theme author's defaults - - - - - Switch between the light and dark palette files - - - - - Editing: - - - - - Show or hide the per-role colour grid for manual tweaks - - - - - ↺ Revert to theme default - - - - - Discard unsaved edits and restore the last saved palette - - - - - Preview this palette without saving to disk - - - - - Write palette-%1.toml and reload the theme - - - - - Cannot save: this theme has no directory on disk - - - - - Save failed - - - - - Could not write %1 to: -%2 - - - - - No default found - - - - - No default palette file found for the "%1" scheme. - - - - - PaletteGridWidget - - - Active - - - - - Disabled - - - - - Inactive - - - - - Normal interactive state - - - - - Widget is disabled / not interactive - - - - - Window is in background / unfocused - - - Phase @@ -6808,57 +6553,57 @@ Cockatrice will now reload the card database. PhasesToolbar - + Untap step Odtapovací fáze - + Upkeep step Upkeep - + Draw step Lízací fáze - + First main phase První hlavní fáze - + Beginning of combat step Začátek bojové fáze - + Declare attackers step Oznámení útočníků - + Declare blockers step Oznámení blokujících - + Combat damage step Udělení bojového zranění - + End of combat step Konec bojové fáze - + Second main phase Druhá hlavní fáze - + End of turn step Konec kola @@ -6866,7 +6611,7 @@ Cockatrice will now reload the card database. PictureLoader - + en code for scryfall's language property, not available for all languages @@ -6875,142 +6620,151 @@ Cockatrice will now reload the card database. PlayerActions - - - - - grave - - - - - - - - exile - - - - - PlayerDialogs - - + View top cards of library - - - - - - - - - + + + + + + + + + Number of cards: (max. %1) - + View bottom cards of library - + Shuffle top cards of library - + Shuffle bottom cards of library - + Draw hand - + 0 and lower are in comparison to current hand size - + Draw cards - + + + + + grave + + + + + + + + exile + + + + Move top cards to %1 - + Move bottom cards to %1 - + Draw bottom cards - + + + C&reate another %1 token + + + + Create tokens - + + Number: - + Place card X cards from top of library - + Which position should this card be placed: - + (max. %1) - + Change power/toughness - + Change stats to: - + Set annotation - + Please enter the new annotation: + + + Set counters + + PlayerMenu - + Player "%1" - + &Counters @@ -7040,7 +6794,7 @@ This setting means you'll only see the default printing for each card, instead o - + Printing Selector @@ -7048,22 +6802,22 @@ This setting means you'll only see the default printing for each card, instead o PrintingSelectorCardOverlayWidget - + Preference - + Pin Printing - + Unpin Printing - + Show Related cards @@ -7134,57 +6888,57 @@ This setting means you'll only see the default printing for each card, instead o PtMenu - + Power / toughness - + &Increase power - + &Decrease power - + I&ncrease toughness - + D&ecrease toughness - + In&crease power and toughness - + Dec&rease power and toughness - + Increase power and decrease toughness - + Decrease power and increase toughness - + Set &power and toughness... - + Reset p&ower and toughness @@ -7192,37 +6946,37 @@ This setting means you'll only see the default printing for each card, instead o QMenuBar - + Services - + Hide %1 - + Hide Others - + Show All - + Preferences... - + Quit %1 - + About %1 @@ -7230,17 +6984,17 @@ This setting means you'll only see the default printing for each card, instead o QObject - + Cockatrice card database (*.xml) - + All files (*.*) - + Cockatrice replays (*.cor) @@ -7300,177 +7054,110 @@ Are you sure you would like to disable this feature? QPlatformTheme - + OK - + Save - + Save All - + Open - + &Yes - + Yes to &All - + &No - + N&o to All - + Abort - + Retry - + Ignore - + Close - + Cancel - + Discard - + Help - + Apply - + Reset - + Restore Defaults - - QuickSetupPanel - - - %1% - - - - - <b>Quick Setup</b> - - - - - Generate all palette roles automatically from a single accent colour - - - - - Accent: - - - - - Primary hue. Used directly for highlights and links. -At high intensity it also tints buttons and backgrounds. - - - - - Intensity: - - - - - Subtle - - - - - Full colour - - - - - 0–30 Subtle tint — only highlights and links change hue -30–70 Accented — buttons, tooltips, and borders join in -70–100 Full colour — backgrounds, everything - - - - - 70% - - - - - Generate ↓ - - - - - Derive all palette roles from the accent colour above. -Fine-tune individual colours in the grid afterwards. - - - RemoteDeckList_TreeModel - + Name Jméno - + ID ID - + Upload time Průběh nahrávání @@ -7478,32 +7165,32 @@ Fine-tune individual colours in the grid afterwards. RemoteReplayList_TreeModel - + ID - + Name - + Players - + Keep - + Time started - + Duration (sec) @@ -7511,37 +7198,37 @@ Fine-tune individual colours in the grid afterwards. RfgMenu - + &Exile - + &View exile - + &Move exile to... - + &Top of library - + &Bottom of library - + &Hand - + &Graveyard @@ -7587,7 +7274,7 @@ Fine-tune individual colours in the grid afterwards. SayMenu - + S&ay @@ -7628,27 +7315,27 @@ Fine-tune individual colours in the grid afterwards. SetsModel - + Enabled - + Set type - + Set code - + Long name Dlouhý název - + Release date @@ -7656,53 +7343,53 @@ Fine-tune individual colours in the grid afterwards. ShortcutSettingsPage - - + + Restore all default shortcuts - + Do you really want to restore all default shortcuts? - + Clear all default shortcuts - + Do you really want to clear all shortcuts? - + Section: - + Action: - + Shortcut: - + How to set custom shortcuts - + Clear all shortcuts - + Search by shortcut name @@ -7756,12 +7443,12 @@ Please check your shortcut settings! SideboardMenu - + &Sideboard - + &View sideboard @@ -7769,27 +7456,27 @@ Please check your shortcut settings! SoundSettingsPage - + Enable &sounds - + Current sounds theme: - + Test system sound engine - + Sound settings - + Master volume @@ -7861,146 +7548,16 @@ Please check your shortcut settings! - + No reply received from the tag update server. - + Invalid reply received from the tag update server. - - StorageSettingsPage - - - - - Success - - - - - Cached card pictures have been reset. - - - - - Downloaded card pictures have been reset. - - - - - Error - - - - - One or more downloaded card pictures could not be cleared. - - - - - In-memory (currently loaded) card pictures have been reset. - - - - - Card Picture Loader Caching Method: - - - - - The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size. - - - - - Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while. - - - - - This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk. - - - - - Delete Cached Images - - - - - Delete Saved Images - - - - - Clear In-Memory Images - - - - - Card Picture Loader Cache Method - - - - - Network Cache - - - - - Filesystem - - - - - In-Memory Picture Cache - - - - - Network Cache Size: - - - - - On-disk cache for downloaded pictures - - - - - Redirect Cache TTL: - - - - - How long cached redirects for urls are valid for. - - - - - Picture Cache Size: - - - - - In-memory cache for pictures not currently on screen - - - - - Naming scheme: - - - - - Day(s) - - - TabAccount @@ -8136,117 +7693,117 @@ Please check your shortcut settings! TabArchidekt - - + + Desc. - - + + AND - - + + Require ALL selected colors - - + + Deck name... - - + + Owner... - - + + Packages - - + + Advanced Filters - + Bracket: - - + + Any - - + + Contains card... - - + + Commander... - - + + Tag... - - + + Deck Size - + Cards: - - + + Asc. - + Sort by: - + Filter by: - + Display Settings - - + + Search - - + + Formats @@ -8256,54 +7813,6 @@ Please check your shortcut settings! - - TabCardArtRules - - - Card: - - - - - ProviderId: - - - - - Mode: - - - - - Reason: - - - - - Type a card name... - - - - - Add rule - - - - - Remove rule - - - - - Refresh - - - - - Card Art Rules - - - TabDeckEditor @@ -8352,7 +7861,7 @@ Please check your shortcut settings! - + Deck: %1 @@ -8360,49 +7869,55 @@ Please check your shortcut settings! TabDeckEditorVisual - + Visual Deck: %1 - + &Visual Deck Editor - - + + Card Info - - + + Deck - + + + Filters + + + + &View - + Printing - + Visible - + Floating - + Reset layout @@ -8410,22 +7925,22 @@ Please check your shortcut settings! TabDeckEditorVisualTabWidget - + Visual Deck View - + Visual Database Display - + Deck Analytics - + Sample Hand @@ -8433,134 +7948,134 @@ Please check your shortcut settings! TabDeckStorage - + Local file system Lokální systém souborů - + Server deck storage Balíčky na serveru - - + + Open in deck editor Otevřít v editoru balíčků - + Rename deck or folder - + Upload deck Nahrát balíček - + Download deck Stáhnout balíček + - - - + + New folder Nová složka + - Delete Smazat - + Open decks folder - + Rename local folder - + Rename local file - + New name: - - - - + + + + Error - + Rename failed - - + + Invalid deck file - + Enter deck name Vložit jméno balíčku - + This decklist does not have a name. Please enter a name: Tentobalíček nemá jméno. Prosím vložte jméno: - + Unnamed deck Bezejmenný balíček - + Failed to upload deck to server - + Delete local file - + Are you sure you want to delete the selected files? - + Delete remote decks - + Are you sure you want to delete the selected decks? - - + + Name of new folder: Název nové složky: @@ -8632,191 +8147,191 @@ Prosím vložte jméno: TabGame - - - + + + Replay - - + + Game - - + + Player List - - + + Card Info - - + + Messages - - + + Replay Timeline - + &Phases &Fáze - + &Game &Hra - + Next &phase Další &fáze - + Next phase with &action - + Next &turn Další &kolo - + Reverse turn order - + &Remove all local arrows &Odstranit všechny lokální šipky - + Rotate View Cl&ockwise - + Rotate View Co&unterclockwise - + Game &information - + Un&concede - - - + + + &Concede &Ukončit hru - + &Leave game &Opustit hru - + C&lose replay - + &Focus Chat - + &Say: &Chat: - + Selected cards - + &View - + Visible - + Floating - + Reset layout - + Concede Ukončit hru - + Are you sure you want to concede this game? Opravdu chcete ukončit tuto hru? - + Unconcede - + You have already conceded. Do you want to return to this game? - + Leave game Opustit hru - + Are you sure you want to leave this game? Opravdu chcete opustit tuto hru? - + A player has joined game #%1 - + %1 has joined the game - + You have been kicked out of the game. @@ -8875,114 +8390,114 @@ Prosím vložte jméno: - + Username: - + IP Address: - + Game Name: - + GameID: - + Message: - + Main Room - + Game Room - + Private Chat - + Past X Days: - + Today - + Last Hour - + Maximum Results: - + At least one filter is required. The more information you put in, the more specific your results will be. - + Get User Logs - + Clear Filters - + Filters - + Log Locations - + Date Range - + Maximum Results - - + + Message History - + Failed to collect message history information. - + There are no messages for the selected filters. @@ -9000,27 +8515,27 @@ The more information you put in, the more specific your results will be.&Odejít - + %1 - Private chat - + This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. - + Private message from - + %1 has left the server. %1 opustil server. - + %1 has joined the server. %1 se připojil k serveru. @@ -9028,180 +8543,180 @@ The more information you put in, the more specific your results will be. TabReplays - + Local file system - + Server replay storage - - + + Watch replay - + Rename - - + + New folder - - + + Delete - + Open replays folder - + Download replay - + Toggle expiration lock - + Get replay share code - - + + Look up replay by share code - + Rename local folder - + Rename local file - + New name: - + Error - + Rename failed - + Name of new folder: - + Delete local file - + Are you sure you want to delete the selected files? - + Are you sure you want to delete the selected replays? - + Failed to get code - - + + Either this server does not support replay sharing, or does not permit replay sharing for you. - - - + + + Failed - + Could not get replay code - + Replay Share Code - + Others can use this code to add the replay to their list of remote replays: %1 - + Copy to clipboard - + Replay share code - + Replay code found - + Replay was added, or you already had access to it. - + Replay code not found - + Failed to submit code - + Unexpected error - + Delete remote replay @@ -9214,62 +8729,47 @@ The more information you put in, the more specific your results will be. TabRoom - - Friends - - - - - Online - - - - - Ignored - - - - + &Say: &Chat: - + Chat Chatovat - + &Room &Místnost - + &Leave room &Opustit místnost - + &Clear chat - + Chat Settings... - + mentioned you. - + Click to view - + You are flooding the chat. Please wait a couple of seconds. Píšete příliš intenzivně. Počkejte pár sekund. @@ -9282,30 +8782,30 @@ The more information you put in, the more specific your results will be. - - - - + + + + Error Chyba - + Failed to join the server room: it doesn't exist on the server. - + The server thinks you are in the server room but your client is unable to display it. Try restarting your client. - + You do not have the required permission to join this server room. - + Failed to join the server room due to an unknown error: %1. @@ -9313,97 +8813,97 @@ The more information you put in, the more specific your results will be. TabSupervisor - + Deck Editor - + Visual Deck Editor - + EDHRec - + Archidekt - + Home - + &Visual Deck Storage - + Visual Database Display - + Server - + Account - + Deck Storage - + Game Replays - + Administration - + Logs - + Are you sure? - + There are still open games. Are you sure you want to quit? - + Click to view - + Your buddy %1 has signed on! - + Unknown Event - + The server has sent you a message that your client does not understand. This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. @@ -9411,38 +8911,38 @@ To update your client, go to Help -> Check for Updates. - + Idle Timeout - + You are about to be logged out due to inactivity. - + Promotion - + You have been promoted. Please log out and back in for changes to take effect. - + Warned - + You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. - + You have received the following message from the server. (custom messages like these could be untranslated) @@ -9451,12 +8951,12 @@ Please refrain from engaging in this activity or further actions may be taken ag TabVisualDatabaseDisplay - + Database Display - + Visual Database Display @@ -9493,42 +8993,42 @@ Please refrain from engaging in this activity or further actions may be taken ag TranslateCounterName - + Life - + White - + Blue - + Black - + Red - + Green - + Colorless - + Other @@ -9536,69 +9036,11 @@ Please refrain from engaging in this activity or further actions may be taken ag UpdateDownloader - + Could not open the file for reading. - - UserCardArtSettingsDialog - - - Card Art Settings - - - - - Type a card name... - - - - - Card name: - - - - - Card ProviderId: - - - - - Left margin (%): - - - - - Right margin (%): - - - - - Vertical offset: - - - - - Zoom: - - - - - Parameters - - - - - Preview - - - - - Remove Banner Card - - - UserContextMenu @@ -9716,7 +9158,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Ban History @@ -9731,87 +9173,77 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Failed to collect ban information. - - - + + + Warning History - + Warning Time;Moderator;User Name;Reason - + User has never been warned. - + Failed to collect warning information. - + Failed to get admin notes. - - + + Success - + Successfully promoted user. - + Successfully demoted user. - - Kick Player - - - - - Are you sure you want to kick this player from the game? - - - - - - + + + Failed - + Failed to promote user. - + Failed to demote user. - + Copy hash to clipboard - + Remove this user's messages @@ -9819,554 +9251,326 @@ Please refrain from engaging in this activity or further actions may be taken ag UserInfoBox - + Location: Místo: - + Account Age: - + Edit - + Change password - + Change avatar - + Administrator Administrátor - + Moderator - + Registered user Registrovaný - - + + Unregistered user Neregistrovaný - + Judge - + Unknown - + The entered password does not match your account. - - - - + + + Information - + User information updated. - - - - - - - - - - - + + + + + + + + + + Error Chyba - + User Information - + Real Name: - + User Level: - - - Edit Banner Card - - - + %n Year(s), amount of years (only shown if more than 0) - + %10%n Day(s) %20 amount of years (if more than 0), amount of days, date in local short format - + Enter Password - + Password verification is required in order to change your email address - - - + + + An error occurred while trying to update your user information. - - The selected card is blacklisted on this server or another error occurred. - - - - - Banner card removed. - - - - - Banner card updated. - - - - + This server does not permit you to update your user informations. - + Password changed. - + This server does not permit you to change your password. - + The new password is too short. - + The old password is incorrect. - + Avatar updated. - + This server does not permit you to update your avatar. - - - An error occured while trying to update your avatar. - - - This server does not permit you to update your user informations. - An error occured while trying to updater your avatar. - - - - - UserInfoPopup - - - - Games - - - - - Chat - - - - - Open private chat - - - - - Profile - - - - - View user profile - - - - - Show this user's games - - - - - − Buddy - - - - - Remove from buddy list - - - - - + Buddy - - - - - Add to buddy list - - - - - − Ignore - - - - - Remove from ignore list - - - - - + Ignore - - - - - Add to ignore list - - - - - Ban - - - - - Ban from server - - - - - Warn - - - - - Warn user - - - - - Ban log - - - - - View ban history - - - - - Warn log - - - - - View warning history - - - - - Notes - - - - - View admin notes - - - - - − Mod - - - - - Demote from moderator - - - - - + Mod - - - - - Promote to moderator - - - - - − Judge - - - - - Demote from judge - - - - - + Judge - - - - - Promote to judge - - - - - Join game - - - - - Spectate - - - - - - Loading games… - - - - - Could not load games. - - - - - No active games. + An error occured while trying to updater your avatar. UserInterfaceSettingsPage - + General interface settings Obecné - + &Double-click cards to play them (instead of single-click) &Pro zahraní karty je třeba dvojklik - + &Clicking plays all selected cards (instead of just the clicked card) - + &Play all nonlands onto the stack (not the battlefield) by default - + Do not delete &arrows inside of subphases - + Close card view window when last card is removed - + Auto focus search bar when card view window is opened - + Annotate card text on tokens - - Show selection count during drag selection + + Show selection counter during drag selection - - Show total selection count + + Show total selection counter - - Show subtype breakdown in selection tally - - - - + Use tear-off menus, allowing right click menus to persist on screen - - Keep game chat focused when clicking in game (Note: disables card view search bar) - - - - + Notifications settings - + Enable notifications in taskbar - + Notify in the taskbar for game events while you are spectating - + Notify in the taskbar when users in your buddy list connect - + Animation settings Animace - + &Tap/untap animation &Animace tapnutí/odtapnutí - + Deck editor/storage settings - + Open deck in new tab by default - + Use visual deck storage in game lobby - + Use selection animation for Visual Deck Storage - + When adding a tag in the visual deck storage to a .txt deck: - + do nothing - + ask to convert to .cod - + always convert to .cod - + Default deck editor type - + Classic Deck Editor - + Visual Deck Editor - + Replay settings - + Buffer time for backwards skip via shortcut: @@ -10374,22 +9578,22 @@ Please refrain from engaging in this activity or further actions may be taken ag UserListWidget - + Users connected to server: %1 - + Users in this room: %1 - + Buddies online: %1 / %2 - + Ignored users online: %1 / %2 @@ -10397,45 +9601,35 @@ Please refrain from engaging in this activity or further actions may be taken ag UtilityMenu - + Increment all card counters - + &Untap all permanents - + R&oll die... - - Flip coin - - - - + &Create token... - + C&reate another token - + Cr&eate predefined token - - - C&reate another %1 token - - VisualDatabaseDisplayColorFilterWidget @@ -10487,72 +9681,72 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFilterToolbarWidget - + Sort by - + Filter by - + Save and load filters - + Filter by exact card name - + Filter by card main-type - + Filter by card sub-type - + Filter by set - + Filter by format legality - + Save/Load - + Name - + Main Type - + Sub Type - + Sets - + Formats @@ -10560,22 +9754,22 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFormatLegalityFilterWidget - + Show formats with at least: - + cards - + Do not display formats with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) @@ -10593,32 +9787,32 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayMainTypeFilterWidget - + Show main types with at least: - + cards - + Do not display card main-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10626,27 +9820,27 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayNameFilterWidget - + Filter by name... (Exact match) - + Load from Deck - + Apply all card names in currently loaded deck as exact match name filters - + Load from Clipboard - + Apply all card names in clipboard as exact match name filters @@ -10654,7 +9848,7 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayRecentSetFilterSettingsWidget - + Filter to most recent sets @@ -10662,19 +9856,19 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySetFilterWidget - + Search sets... - - + + Mode: Exact Match - - + + Mode: Includes @@ -10682,37 +9876,37 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySubTypeFilterWidget - + Search subtypes... - + Show sub types with at least: - + cards - + Do not display card sub-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10720,23 +9914,23 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayWidget - + Search by card name (or search expressions) - + Visual - + Loading database ... - + Clear all filters @@ -10775,17 +9969,17 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Toggle Layout: Overlap - + Change how cards are displayed within zones (i.e. overlapped or fully visible.) - + Toggle Layout: Flat @@ -10814,17 +10008,17 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDeckEditorWidget - + Type a card name here for suggestions from the database... - + Quick search and add card - + Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter @@ -10942,43 +10136,43 @@ Please refrain from engaging in this activity or further actions may be taken ag WarningDialog - + Which warning would you like to send? - + Redact all messages from this user in all rooms - + &OK - + &Cancel - + Warn user for misconduct - - + + Error Chyba - + User name to send a warning to can not be blank, please specify a user to warn. - + Warning to use can not be blank, please select a valid warning to send. @@ -10986,133 +10180,133 @@ Please refrain from engaging in this activity or further actions may be taken ag WndSets - + Move selected set to the top - + Move selected set up - + Move selected set down - + Move selected set to the bottom - + Search by set name, code, or type - + Default order - + Restore original art priority order - + Enable all sets - + Disable all sets - + Enable selected set(s) - + Disable selected set(s) - + Deck Editor - + Use CTRL+A to select all sets in the view. - + Only cards in enabled sets will appear in the card list of the deck editor. - + Image priority is decided in the following order: - + first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) %1 is a link to the wiki - + Include cards rebalanced for Alchemy [requires restart] - + Card Art - + How to use custom card art - + Hints - + Note - + Sorting by column allows you to find a set while not changing set priority. - + To enable ordering again, click the column header until this message disappears. - + Use the current sorting as the set priority instead - + Sorts the set priority using the same column - + Manage sets @@ -11120,72 +10314,72 @@ Please refrain from engaging in this activity or further actions may be taken ag ZoneViewWidget - + Search by card name (or search expressions) - + Ungrouped - + Group by Type - + Group by Mana Value - + Group by Color - + Unsorted - + Sort by Name - + Sort by Type - + Sort by Mana Cost - + Sort by Colors - + Sort by P/T - + Sort by Set - + shuffle when closing zamíchat po zavření - + pile view @@ -11193,7 +10387,7 @@ Please refrain from engaging in this activity or further actions may be taken ag i18n - + English Česky (Czech) @@ -11201,12 +10395,12 @@ Please refrain from engaging in this activity or further actions may be taken ag main - + Connect on startup - + Debug to file @@ -11220,7 +10414,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Deck Editor @@ -11301,7 +10495,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Replays @@ -11416,129 +10610,129 @@ Please refrain from engaging in this activity or further actions may be taken ag - - + + Load Deck from Clipboard... - + Edit Deck in Clipboard, Annotated - + Edit Deck in Clipboard - + New Deck - + Open Custom Pictures Folder - + Print Deck... - + Delete Card - - + + Reset Layout - + Save Deck - + Save Deck as... - + Save Deck to Clipboard, Annotated - + Save Deck to Clipboard, Annotated (No Set Info) - + Save Deck to Clipboard - + Save Deck to Clipboard (No Set Info) - + Load Local Deck... - + Load Remote Deck... - + Set Ready to Start - + Toggle Sideboard Lock - + Add Green Counter - + Remove Green Counter - + Set Green Counters... - + Add Red Counter - + Remove Red Counter - + Set Red Counters... - + Add Life Counter @@ -11548,744 +10742,724 @@ Please refrain from engaging in this activity or further actions may be taken ag - - Load deck from online service... - - - - - Load from website... - - - - + Unload Deck - + Force Start - + Add Card Counter (F) - + Remove Card Counter (F) - + Set Card Counters (F)... - + Add Card Counter (E) - + Remove Card Counter (E) - + Set Card Counters (E)... - + Add Card Counter(D) - + Remove Card Counter (D) - + Set Card Counters (D)... - + Add Card Counter (C) - + Remove Card Counter (C) - + Set Card Counters (C)... - + Add Card Counter (B) - + Remove Card Counter (B) - + Set Card Counters (B)... - + Add Card Counter (A) - + Remove Card Counter (A) - + Set Card Counters (A)... - + Remove Life Counter - + Set Life Counters... - + Add White Counter - + Remove White Counter - + Set White Counters... - + Add Blue Counter - + Remove Blue Counter - + Set Blue Counters... - + Add Black Counter - + Remove Black Counter - + Set Black Counters... - + Add Colorless Counter - + Remove Colorless Counter - + Set Colorless Counters... - + Add Other Counter - + Remove Other Counter - + Set Other Counters... - + Increment all card counters - + Add Power (+1/+0) - + Remove Power (-1/-0) - + Move Toughness to Power (+1/-1) - + Add Toughness (+0/+1) - + Remove Toughness (-0/-1) - + Move Power to Toughness (-1/+1) - + Add Power and Toughness (+1/+1) - + Remove Power and Toughness (-1/-1) - + Set Power and Toughness... - + Reset Power and Toughness - + Untap Odtapnutí - + Upkeep Upkeep - + Draw Lízání - + First Main Phase - + Start Combat - + Attack Útok - + Block Bránění - + Damage Zranění - + End Combat - + Second Main Phase - + End Konec - + Next Phase - + Next Phase Action - + Next Turn - + Hide Card in Reveal Window - + Tap / Untap Card - + Untap All - + Toggle Skip Untapping Toggle Untap - + Turn Card Over - + Peek Card - + Play Card - + Play Card, Face Down - + Attach Card... - + Unattach Card - + Clone Card - + Create Token... - + Create All Related Tokens - + Create Another Token - + Set Annotation... - - Reduce Life by Power - - - - + Select All Cards in Zone - + Select All Cards in Row - + Select All Cards in Column - + Reveal Selected Cards to All Players - - + + Bottom of Library - - - - + + + + Exile Exil - - - - + + + + Graveyard Hřbitov - - + + Hand Ruka - - + + Top of Library - - + + Battlefield, Face Down - + Battlefield - + Library Knihovna - + Sideboard Sideboard - + Top Cards of Library - + Bottom Cards of Library - + Close Recent View - - + + Stack - - + + Graveyard (Multiple) - - + + Graveyard (Multiple), Face Down - - + + Exile (Multiple) - - + + Exile (Multiple), Face Down - + Stack Until Found - + Draw Bottom Card - + Draw Multiple Cards from Bottom... - + Draw Arrow... - + Remove Local Arrows - + Leave Game - + Concede Vzdát hru - + Roll Dice... - - Flip Coin - - - - + Shuffle Library - + Shuffle Top Cards of Library - + Shuffle Bottom Cards of Library - + Mulligan Mulligan - + Mulligan (Same hand size) - + Mulligan (Hand size - 1) - + Draw a Card - + Draw Multiple Cards... - + Undo Draw - + Always Reveal Top Card - + Always Look At Top Card - + Sort Hand by Name - + Sort Hand by Type - + Sort Hand by Mana Value - + Reveal Hand to All Players - + Reveal Random Card to All Players - + Rotate View Clockwise - + Rotate View Counterclockwise - + Unfocus Text Box - + Focus Chat - + Clear Chat - + Refresh - + Skip Forward - + Skip Backward - + Skip Forward by a lot - + Skip Backward by a lot - + Play/Pause - + Toggle Fast Forward - + Home - + Visual Deck Storage - + Deck Storage - + Server - + Account - + Administration - + Logs diff --git a/cockatrice/translations/cockatrice_de.ts b/cockatrice/translations/cockatrice_de.ts index 51bee3cd4..564f39e25 100644 --- a/cockatrice/translations/cockatrice_de.ts +++ b/cockatrice/translations/cockatrice_de.ts @@ -2,7 +2,7 @@ AbstractCounter - + &Set counter... Zähler &setzen... @@ -10,12 +10,12 @@ AbstractCounterDialog - + Set counter Zähler setzen - + New value for counter '%1': Neuer Wert für den Zähler '%1': @@ -36,62 +36,62 @@ AbstractTabDeckEditor - + Open in new tab In neuem Reiter öffnen - + Are you sure? Sind Sie sicher? - + The decklist has been modified. Do you want to save the changes? Die Deckliste wurde bearbeitet. Änderungen speichern? - - - - - - + + + + + + Error Fehler - + Could not open deck at %1 Deck an Stelle %1 konnte nicht geöffnet werden - + Could not save remote deck Remote-Deck konnte nicht gespeichert werden - - + + The deck could not be saved. Please check that the directory is writable and try again. Das Deck konnte nicht abgespeichert werden. Bitte überprüfen Sie, ob das Verzeichnis bearbeitet werden kann und versuchen Sie es erneut. - + Save deck Deck speichern - + The deck could not be saved. Das Deck konnte nicht abgespeichert werden. - + There are no cards in your deck to be exported Es gibt keine Karten in Ihrem Deck zum Exportieren @@ -107,12 +107,12 @@ Bitte überprüfen Sie, ob das Verzeichnis bearbeitet werden kann und versuchen AdminNotesDialog - + Update Notes Aktualisierungsnotizen - + Admin Notes for %1 Administrator Notizen für %1 @@ -129,227 +129,172 @@ Bitte überprüfen Sie, ob das Verzeichnis bearbeitet werden kann und versuchen Sideboard Nebendeck - - - Tokens - - AppearanceSettingsPage - + seconds Sekunden - + Error Fehler - + Could not create themes directory at '%1'. Das Themeverzeichnis '%1' konnte nicht erstellt werden. - + Theme settings Darstellungseinstellungen - + Current theme: Aktuelles Theme: - + Open themes folder Öffne Themeverzeichnis - + Home tab background source: Startseitenhintergrund-Quelle: - + Home tab background shuffle frequency: Startseitenhintergrund Wechselfrequenz: - + Disabled Deaktiviert - + + Display card name of background in bottom right: + Kartenname des Hintergrunds unten rechts anzeigen: + + + Menu settings Einstellungsmenü - + Show keyboard shortcuts in right-click menus Tastatur-Kürzel anzeigen bei Rechtsklickmenü - + Show game filter toolbar above list in room tab Spiel-Filter Symbolleiste über der Liste im Raum-Tab anzeigen - + Card rendering Kartendarstellung - + Display card names on cards having a picture Kartennamen auch bei Karten mit Bildern darstellen - + Auto-Rotate cards with sideways layout Automatisches Drehen von Karten mit Seitwärts-Ausrichtung - + Override all card art with personal set preference (Pre-ProviderID change behavior) Überschreiben aller Kartenbilder mit persönlichen Set-Präferenzen (Vor-AnbieterID Wechselverhalten) - - Light - - - - - Dark - - - - - System - - - - - Active theme palette: - - - - - Edit theme palette - - - - - Home tab settings - - - - - Display card name of background in bottom right - - - - - Styling settings - - - - - Style user list - - - - - Card printings - - - - + Bump sets that the deck contains cards from to the top in the printing selector Priorisieren von Sets, in welchen Karten des ausgewählten Decks vorhanden sind, nach oben in der Druckauswahl - + Scale cards on mouse over Karten beim Darüberfahren mit der Maus vergrößern - + Use rounded card corners Abgerundete Kartenecken verwenden - - Card layout - - - - + Minimum overlap percentage of cards on the stack and in vertical hand Minimaler Überschneidungsanteil der Karten auf dem Stapel und in der vertikalen Hand - + Maximum initial height for card view window: Maximale Starthöhe für das Kartenansichtsfenster - - + + rows Reihen - + Maximum expanded height for card view window: Maximale ausgeklappte Höhe für das Kartenansichtsfenster: - + Card counters Kartenzähler - + Counter %1 Zähler %1 - + Hand layout Handdarstellung - + Display hand horizontally (wastes space) Hand horizontal anzeigen (verschwendet Platz) - + Enable left justification Linksbündige Ausrichtung aktivieren - + Table grid layout Spielfeldraster - + Invert vertical coordinate Vertikale Koordinate umkehren - + Minimum player count for multi-column layout: Mindestspieleranzahl für mehrspaltige Anordnung: - + Maximum font size for information displayed on cards: Maximale Schriftgröße für die Anzeige von Informationen auf Karten: @@ -357,12 +302,12 @@ Bitte überprüfen Sie, ob das Verzeichnis bearbeitet werden kann und versuchen ArchidektApiResponseDeckDisplayWidget - + Back to results Zurück zu den Ergebnissen - + Open Deck in Deck Editor Deck im Deck-Editor öffnen @@ -388,112 +333,112 @@ Bitte überprüfen Sie, ob das Verzeichnis bearbeitet werden kann und versuchen BanDialog - + ban &user name &Benutzername - + ban &IP address &IP-Adresse - + ban client I&D Client I&D bannen - + Ban type Art des Banns - + &permanent ban &permanenter Bann - + &temporary ban &temporärer Bann - + &Days: &Tage: - + &Hours: &Stunden: - + &Minutes: &Minuten: - + Duration of the ban Länge des Banns - + Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. Bitte geben Sie den Grund für den Bann ein. Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nicht gesehen werden. - + Please enter the reason for the ban that will be visible to the banned person. Bitte geben Sie den Grund ein, den die gebannte Person sehen kann. - + Redact all messages from this user in all rooms Entferne alle Nachrichten dieses Nutzers in allen Räumen - + &OK &OK - + &Cancel &Abbrechen - + Ban user from server Benutzer vom Server bannen - - - - + + + + Error Fehler - + You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. Bitte wählen Sie einen Namens-, Adress- oder Client-ID-Bann oder eine Kombination aus diesen. - + You must have a value in the name ban when selecting the name ban checkbox. Wenn Sie das Namensbannkästchen auswählen, muss ein Wert für den Namen eingegeben werden. - + You must have a value in the ip ban when selecting the ip ban checkbox. Wenn Sie das Adressbannkästchen auswählen, muss ein Wert für die IP eingegeben werden. - + You must have a value in the clientid ban when selecting the clientid ban checkbox. Wenn Sie das Client-ID-Kästchen auswählen, muss ein Wert für die Client-ID eingegeben werden. @@ -501,123 +446,59 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic BetaReleaseChannel - + Beta Beta - + No reply received from the release update server. Keine Antwort vom Veröffentlichungsaktualisierungsserver erhalten. - + Invalid reply received from the release update server. Ungültige Antwort vom Veröffentlichungsaktualisierungsserver erhalten. - + No reply received from the file update server. Keine Antwort vom Dateiaktualisierungsserver erhalten. - - CardArtPreviewWidget - - - No card selected - - - - - CardArtRulesModel - - - Card - - - - - ProviderId - - - - - Mode - - - - - Reason - - - CardDatabaseModel - + Name Name - + Sets Editionen - + Mana cost Manakosten - + Card type Kartentyp - + P/T S/W - + Color(s) Farbe(n) - - CardDatabaseView - - - Add to Deck - - - - - Add to Sideboard - - - - - Select Printing - - - - - Show on EDHRec (Commander) - - - - - Show on EDHRec (Card) - - - - - Show Related cards - - - CardFilter @@ -746,22 +627,22 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic CardInfoPictureWidget - + View related cards Zugehörige Karten ansehen - + Add card to deck Karte zum Deck hinzufügen - + Mainboard Mainboard - + Sideboard Sideboard @@ -784,12 +665,12 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic Sammlernummer: - + Related cards: Zugehörige Karten: - + Unknown card: Unbekannte Karte: @@ -797,146 +678,128 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic CardMenu - + Re&veal to... Zeigen an.... - + &All players &Alle Spieler - + View related cards Verwandte Karten ansehen - + Token: Spielstein: - + All tokens Alle Spielsteine - + &Select All &Alles auswählen - + S&elect Row Reihe auswählen - + S&elect Column Spalte auswählen - + &Play &Spielen - + &Hide &Verstecken - + Play &Face Down Verdeckt ausspielen - + &Tap / Untap Turn sideways or back again &Tappen/ Enttappen - + Skip &untapping Enttappen überspringen - + T&urn Over Turn face up/face down Umdrehen - + &Peek at card face %Kartenvorderseite ansehen - + &Clone &Kopieren - + Attac&h to card... An Karte anhängen - + Unattac&h Lösen - + &Draw arrow... &Pfeil zeichnen - + &Set annotation... &Anmerkung setzen - - Reduce life by power - - - - + Ca&rd counters Kartenzähler - + &Add counter (%1) &Zähler hinzufügen (%1) - + &Remove counter (%1) &Zähler entfernen (%1) - + &Set counters (%1)... &Zähler setzen (%1)... - - CardPictureLoaderCacheMethod - - - Network Cache - - - - - Filesystem - - - CardSizeWidget @@ -948,133 +811,133 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic CardZoneLogic - + their hand nominative ihrer Hand - + %1's hand nominative %1's Hand - + their library look at zone ihrer Bibliothek - + %1's library look at zone %1's Bibliothek - + of their library top cards of zone, von ihrer Bibliothek - + of %1's library top cards of zone von %1's Bibliothek - + their library reveal zone ihrer Bibliothek - + %1's library reveal zone %1's Bibliothek - + their library shuffle ihrer Bibliothek - + %1's library shuffle %1's Bibliothek - + their library nominative ihrer Bibliothek - + %1's library nominative %1's Bibliothek - + their graveyard nominative ihres Friedhofs - + %1's graveyard nominative %1's Friedhof - + their exile nominative ihres Exils - + %1's exile nominative %1's Exil - + their sideboard look at zone ihres Nebendecks - + %1's sideboard look at zone %1's Nebendeck - + their sideboard nominative ihres Nebendecks - + %1's sideboard nominative %1's Nebendeck - + their custom zone '%1' nominative ihrer individuellen Zone '%1' - + %1's custom zone '%2' nominative %1's individuelle Zone '%2' @@ -1096,421 +959,16 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic Parsingfehler in Zeile %1 Spalte %2: - - ColorButton - - - Click to pick a color - - - - - Pick colour - - - - - ConnectionController - - - - The server has reached its maximum user capacity, please check back later. - - - - - There are too many concurrent connections from your address. - - - - - Banned by moderator - - - - - Expected end time: %1 - - - - - This ban lasts indefinitely. - - - - - Scheduled server shutdown. - - - - - - Invalid username. - - - - - You have been logged out due to logging in at another location. - - - - - Connection closed - - - - - The server has terminated your connection. -Reason: %1 - - - - - The server is going to be restarted in %n minute(s). -All running games will be lost. -Reason for shutdown: %1 - - - - - Scheduled server shutdown - - - - - Failed Login - - - - - Your client seems to be missing features this server requires for connection. - - - - - To update your client, go to 'Help -> Check for Client Updates'. - - - - - - - - - - - - - - - - - - - - - - Error - - - - - Incorrect username or password. Please check your authentication information and try again. - - - - - There is already an active session using this user name. -Please close that session first and re-login. - - - - - - You are banned until %1. - - - - - - You are banned indefinitely. - - - - - This server requires user registration. Do you want to register now? - - - - - This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. -Please close and reopen your client to try again. - - - - - An internal error has occurred, please close and reopen Cockatrice before trying again. -If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - - - - Account activation - - - - - Your account has not been activated yet. -You need to provide the activation token received in the activation email. - - - - - Server Full - - - - - Unknown login error: %1 - - - - - - -This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - - - - - - - - - Registration denied - - - - - Registration is currently disabled on this server - - - - - There is already an existing account with the same user name. - - - - - It's mandatory to specify a valid email address when registering. - - - - - It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. - - - - - Password too short. - - - - - Registration failed for a technical problem on the server. - - - - - The connection to the server has been lost. - - - - - Unknown registration error: %1 - - - - - Account activation failed - - - - - Socket error: %1 - - - - - Server timeout - - - - - You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. -Local version is %1, remote version is %2. - - - - - Your Cockatrice client is obsolete. Please update your Cockatrice version. -Local version is %1, remote version is %2. - - - - - - Success - - - - - Registration accepted. -Will now login. - - - - - Account activation accepted. -Will now login. - - - - - Information - - - - - This server supports additional features that your client doesn't have. -This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. - -To update your client, go to Help -> Check for Updates. - - - - - - - Reset Password - - - - - Your password has been reset successfully, you can now log in using the new credentials. - - - - - Failed to reset user account password, please contact the server operator to reset your password. - - - - - Activation request received, please check your email for an activation token. - - - - - Connecting to %1... - - - - - Registering to %1 as %2... - - - - - Disconnected - - - - - Connected, logging in at %1 - - - - - Requesting forgotten password to %1 as %2... - - - - - Your username must respect these rules: - - - - - is %1 - %2 characters long - - - - - can %1 contain lowercase characters - - - - - - - - NOT - - - - - can %1 contain uppercase characters - - - - - can %1 contain numeric characters - - - - - can contain the following punctuation: %1 - - - - - first character can %1 be a punctuation mark - - - - - no unacceptable language as specified by these server rules: - note that the following lines will not be translated - - - - - can not contain any of the following words: %1 - - - - - can not match any of the following expressions: %1 - - - - - You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - - CustomZoneMenu - + C&ustom Zones Individuelle Zonen - - + + View custom zone '%1' Individuelle Zone '%1' ansehen @@ -1518,35 +976,30 @@ To update your client, go to Help -> Check for Updates. DeckAnalyticsWidget - + Add Panel Feld hinzufügen - + Remove Panel Feld entfernen - + Save Layout Layout speichern - + Load Layout Layout laden - - - Include Sideboard - - DeckEditorCardDatabaseDockWidget - + Card Database Kartendatenbank @@ -1562,17 +1015,47 @@ To update your client, go to Help -> Check for Updates. DeckEditorDatabaseDisplayWidget - + Search by card name (or search expressions) Suche nach Kartennamen (oder Suchausdrücken) - + + Add to Deck + Zum Deck hinzufügen + + + + Add to Sideboard + Zum Sideboard hinzufügen + + + + Select Printing + Auswahl der Auflage + + + + Show on EDHRec (Commander) + Auf EDHRec ansehen (Als Commander) + + + + Show on EDHRec (Card) + Auf EDHRec ansehen (Als Karte) + + + + Show Related cards + Zeige ähnliche Karten + + + Add card to &maindeck Karte zum &Hauptdeck hinzufügen - + Add card to &sideboard Karte zum &Sideboard hinzufügen @@ -1605,72 +1088,72 @@ To update your client, go to Help -> Check for Updates. Farben - + Select Printing Auswahl der Auflage - + Deck Deck - + Deck &name: Deck&name: - + Banner Card/Tags Visibility Settings Bannerkarte/Sichtbarkeitseinstellungen von Tags - + Show banner card selection menu Bannerkartenauswahlmenü anzeigen - + Show tags selection menu Tagauswahlmenü anzeigen - + &Comments: &Kommentare: - + Group by: Gruppieren nach: - + Format: Format: - + Hash: Hash: - + &Increment number &Zahl erhöhen - + &Decrement number &Zahl verringern - + &Remove row &Reihe entfernen - + Swap card to/from sideboard Karte ins/aus dem Sideboard tauschen @@ -1678,17 +1161,17 @@ To update your client, go to Help -> Check for Updates. DeckEditorFilterDockWidget - + Filters Filter - + &Clear all filters &Alle Filter entfernen - + Delete selected Auswahl löschen @@ -1819,113 +1302,169 @@ To update your client, go to Help -> Check for Updates. DeckEditorSettingsPage - - + + Update Spoilers Spoiler aktualisieren - + + Success Erfolgreich - + Download URLs have been reset. Download-URLs wurden zurückgesetzt. - + + Downloaded card pictures have been reset. + Heruntergeladene Kartenbilder wurden zurückgesetzt. + + + + Error + Fehler + + + + One or more downloaded card pictures could not be cleared. + Eines oder mehrere Kartenbilder konnten nicht gelöscht werden. + + + Add URL URL hinzufügen - - + + URL: URL - - + + Edit URL URL bearbeiten - + + Network Cache Size: + Größe des Netzwerkzwischenspeichers: + + + + Redirect Cache TTL: + Umleitungszwischenspeicher TTL: + + + + How long cached redirects for urls are valid for. + Wie lange gespeicherte Umleitungen für URLS gültig sind. + + + + Picture Cache Size: + Größe des Bilderzwischenspeichers: + + + Add New URL Neue URL hinzufügen - + Remove URL URL entfernen - + + Day(s) + Tag(e) + + + Updating... Aktualisiere... - + Choose path Pfad auswählen - + URL Download Priority URL Downloadpriorität - + Spoilers Spoiler - + Download Spoilers Automatically Lade Spoiler automatisch herunter - + Spoiler Location: Spoiler Verzeichnis: - + Last Change Letzte Änderung - + Spoilers download automatically on launch Spoiler werden beim Start automatisch heruntergeladen - + Press the button to manually update without relaunching Drücke den Knopf um manuell zu aktualisieren ohne neu zu starten - + Do not close settings until manual update is complete Schließen Sie die Einstellungen nicht solange die manuelle Aktualisierung nicht abgeschlossen ist. - + Download card pictures on the fly Kartenbilder dynamisch herunterladen - + How to add a custom URL Wie eine benutzerdefinierte URL hinzugefügt wird - + + Delete Downloaded Images + Heruntergeladene Bilder löschen + + + Reset Download URLs Download-URLs zurücksetzen + + + On-disk cache for downloaded pictures + Festplatten-Cache für heruntergeladene Bilder + + + + In-memory cache for pictures not currently on screen + Arbeitsspeicher-Cache für Bilder die gerade nicht angezeigt werden + DeckListHistoryManagerWidget @@ -1991,12 +1530,12 @@ To update your client, go to Help -> Check for Updates. DeckLoader - + Common deck formats (%1) Standarddeckformate (%1) - + All files (*.*) Alle Dateien (*.*) @@ -2218,27 +1757,27 @@ To update your client, go to Help -> Check for Updates. (%1): %2 (%3) %4 hinzugefügt - + Moved to %1 1 × "%2" (%3) Nach %1 1 × "%2" (%3) bewegt - + Removed "%1" (all copies) "%1" entfernt (alle Kopien) - + %1 1 × "%2" (%3) %1 1 × "%2" (%3) - + Added Hinzugefügt - + Removed Entfernt @@ -2260,75 +1799,75 @@ To update your client, go to Help -> Check for Updates. DeckViewContainer - + Load deck... Deck laden... - + Load remote deck... Deck vom Server laden... - + Load from clipboard... Aus der Zwischenablage laden... - + Load from website... Von Internetseite laden.... - + Unload deck Deck entladen - + Ready to start Bereit zum Start - + Force start Zwangsstart - + Sideboard unlocked Sideboard entsperrt - + Sideboard locked Sideboard gesperrt - - + + Error Fehler - + The selected file could not be loaded. Die gewählte Datei konnte nicht geladen werden. - + Deck is greater than maximum file size. Deck übersteigt die maximale Dateigröße. - + Are you sure you want to force start? This will kick all non-ready players from the game. Sind Sie sicher, dass sie den Start erzwingen wollen? Dies wirft alle nicht bereiten Spieler aus dem Spiel. - + Cockatrice Cockatrice @@ -2429,7 +1968,7 @@ Möchten sie das Deck ins .cod Format konvertieren? - + Webpage Webseite @@ -2469,37 +2008,37 @@ Möchten sie das Deck ins .cod Format konvertieren? Verbinde zum Server - + Server URL Server URL - + Communication Port Kommunikationsport - + Unique Server Name Einzigartiger Servername - + Connection Warning Verbindungswarnung - + You need to name your new connection profile. Sie müssen Ihr neues Verbindungsprofil benennen. - + Connect Warning Verbindungswarnung - + The player name can't be empty. Der Spielername kann nicht leer sein. @@ -2612,17 +2151,17 @@ Möchten sie das Deck ins .cod Format konvertieren? Spiel erstellen - + Game information &Spielinformationen - + Error Fehler - + Server error. Serverfehler. @@ -2630,97 +2169,97 @@ Möchten sie das Deck ins .cod Format konvertieren? DlgCreateToken - + &Name: &Name: - + Token Spielstein - + C&olor: &Farbe: - + white weiß - + blue blau - + black schwarz - + red rot - + green grün - + multicolor mehrfarbig - + colorless farblos - + &P/T: &Kampfwerte: - + &Annotation: &Hinweis: - + &Destroy token when it leaves the table Spielstein &zerstören, wenn er das Spielfeld verlässt - + Create face-down (Only hides name) Verdeckt erstellen (versteckt nur den Namen) - + Token data Spielstein-Daten - + Show &all tokens &Alle möglichen Spielsteine zeigen - + Show tokens from this &deck Spielsteine dieses &Decks zeigen - + Choose token from list Spielstein aus Liste auswählen - + Create token Spielstein erstellen @@ -2754,7 +2293,7 @@ Möchten sie das Deck ins .cod Format konvertieren? - + ✖ ✖ @@ -2769,12 +2308,12 @@ Möchten sie das Deck ins .cod Format konvertieren? Tagname kann nicht leer sein! - + Duplicate Tag Tag duplizieren - + This tag already exists. Dieser Tag existiert bereits @@ -2961,12 +2500,12 @@ Um Ihren derzeitigen Avatar zu entfernen, bestätigen Sie, ohne ein neues Bild z Bitte geben Sie den Namen des Spielsteins ein: - + Error Fehler - + The chosen name conflicts with an existing card or token. Make sure to enable the 'Token' set in the "Manage sets" dialog to display them correctly. Es existiert bereits eine Karte oder ein Spielstein mit dem gewählten Namen. @@ -2991,12 +2530,12 @@ Aktivieren Sie die Edition „Token" im „Editionen verwalten...“ Menü Undefiniert - + Real name: Echter Name: - + Edit user profile Benutzerprofil bearbeiten @@ -3034,113 +2573,113 @@ Aktivieren Sie die Edition „Token" im „Editionen verwalten...“ Menü 2 Stunden - + Hide 'buddies only' games „Nur Freunde“ Spiele ausblenden - + Hide full games Volle Spiele ausblenden - + Hide games that have started Bereits begonnene Spiele ausblenden - + Hide password protected games Passwortgeschützte Spiele ausblenden - + Hide 'ignored user' games Spiele von „Ignorierten Benutzern“ ausblenden - + Hide games not created by buddies Hide games not created by buddy Nicht von Freunden erstellte Spiele verstecken - + Hide games with forced open decklists Spiele mit erzwungenen offenen Decklisten verstecken - + &Newer than: &Neuer als: - + Game &description: &Spielbeschreibung: - + &Creator name: &Name des Erstellers: - + General Allgemeines - + &Game types Spiel&typen - + at &least: &mindestens: - + at &most: &höchstens: - + Maximum player count Maximale Spielerzahl - + Restrictions Einschränkungen - + Show games only if &spectators can watch Zeige Spiele nur, wenn &Zuschauer erlaubt sind - + Show spectator password p&rotected games Zeige für Zuschauer passwo&rtgeschützte Spiele - + Show only if spectators can ch&at Zeige nur, wenn Zuschauer den &Chat nutzen können - + Show only if spectators can see &hands Zeige nur, wenn Zuschauer die &Hände sehen können - + Spectators Zuschauer - + Filter games Spiele filtern @@ -3451,37 +2990,37 @@ https://tappedout.net/mtg-decks/your-deck-name/ DlgMoveTopCardsUntil - + Card name (or search expressions): Kartenname (oder Suchbezeichnung) - + Number of hits: Anzahl der Treffer: - + Auto play hits Automatisches Ausspielen von Treffern - + Put top cards on stack until... Oberste Karten auf den Stapel legen bis... - + No cards matching the search expression exists in the card database. Proceed anyways? Keine Karten, die den Suchbezeichnungen entsprechen, existieren in der Kartendatenbank. Trotzdem fortfahren? - + Cockatrice Basilisk - + Invalid filter Ungültiger Filter @@ -3541,40 +3080,40 @@ Die E-Mail-Adresse wird zur Accountverifikation genutzt. Undefiniert - + Real name: Echter Name: - + Register to server Auf Server registrieren - - - - + + + + Registration Warning Registrierungswarnung - + Your password is too short. Das Passwort ist zu kurz. - + Your passwords do not match, please try again. Ihre Passwörter stimmen nicht überein, bitte versuchen Sie es erneut. - + Your email addresses do not match, please try again. Ihre Mailadressen stimmen nicht überein, bitte versuchen Sie es erneut. - + The player name can't be empty. Der Spielername kann nicht leer sein. @@ -3582,17 +3121,17 @@ Die E-Mail-Adresse wird zur Accountverifikation genutzt. DlgRollDice - + Number of sides: Anzahl der Seiten: - + Number of dice: Anzahl der Würfel: - + Roll Dice Würfeln @@ -3643,12 +3182,12 @@ Die E-Mail-Adresse wird zur Accountverifikation genutzt. DlgSettings - + Unknown Error loading card database Unbekannter Fehler beim Laden der Kartendatenbank - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -3665,7 +3204,7 @@ Sie müssen Oracle unter Umständen nochmals ausführen um Ihre Kartendatenbank Möchten Sie Ihren Speicherort der Datenbank aktualisieren?? - + Your card database version is too old. This can cause problems loading card information or images @@ -3682,7 +3221,7 @@ Normalerweise kann dies durch einen erneuten Start von Oracle, um die Kartendate Möchten Sie Ihren Speicherort der Datenbank aktualisieren? - + Your card database did not finish loading Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached @@ -3695,7 +3234,7 @@ Bitte erstellen Sie ein Ticket auf https://github.com/Cockatrice/Cockatrice/issu Möchten Sie die Einstellung des Datenbankspeicherorts ändern? - + File Error loading your card database. Would you like to change your database location setting? @@ -3704,7 +3243,7 @@ Would you like to change your database location setting? Möchten Sie Ihren Speicherort der Datenbank aktualisieren? - + Your card database was loaded but contains no cards. Would you like to change your database location setting? @@ -3713,7 +3252,7 @@ Would you like to change your database location setting? Möchten Sie Ihren Speicherort der Datenbank aktualisieren? - + Unknown card database load status Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues @@ -3726,64 +3265,59 @@ Bitte erstellen Sie ein Ticket auf https://github.com/Cockatrice/Cockatrice/issu Möchten Sie die Einstellung des Datenbankspeicherorts ändern? - - - + + + Error Fehler - + The path to your deck directory is invalid. Would you like to go back and set the correct path? Der Pfad zu Ihrem Deckordner ist ungültig. Möchten Sie zurückgehen und den korrekten Pfad einstellen? - + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? Der Pfad zu Ihrem Kartenbilderordner ist ungültig. Möchten Sie zurückgehen und den korrekten Pfad einstellen? - + Settings Einstellungen - + General Allgemeines - + Appearance Erscheinungsbild - + User Interface Benutzeroberfläche - - Storage - - - - + Card Sources Kartenquellen - + Chat Chat - + Sound Töne - + Shortcuts Tastaturkürzel @@ -3877,9 +3411,9 @@ Sie können das Verhalten jederzeit im "Allgemein"-Tab der Einstellung - - - + + + Error Fehler @@ -3932,31 +3466,31 @@ Bitte besuchen Sie die Downloadseite, um Cockatrice manuell zu aktualisieren. - + Update Available Aktualisierung verfügbar - + A new version of Cockatrice is available! Eine neue Cockatrice-Version ist verfügbar! - + New version Neue Version - + Released Veröffentlicht - + Changelog Änderungsprotokoll @@ -3966,51 +3500,51 @@ Bitte besuchen Sie die Downloadseite, um Cockatrice manuell zu aktualisieren.Möchten Sie jetzt aktualisieren? - + Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. Leider hat der automatische Updater keinen kompatiblen Download gefunden. Eventuell müssen sie manuell eine neue Version herunterladen. - + Please check the <a href="%1">releases page</a> on our Github and download the build for your system. Bitte prüfen Sie die <a href='%1'>Veröffentlichungsseite</a> auf unserer Github-Seite und laden Sie die Version für Ihr Betriebssystem herunter. - - - + + + Update Error Aktualisierungsfehler - + An error occurred while checking for updates: Während der Suche nach Aktualisierungen ist ein Fehler aufgetreten: - + An error occurred while downloading an update: Während des Herunterladens der Aktualisierung ist ein Fehler aufgetreten: - + Installing... Installiere... - + Cockatrice is unable to open the installer. Cockatrice kann das Installationsprogramm nicht öffnen. - + Try to update manually by closing Cockatrice and running the installer. Versuchen Sie manuell zu aktualisieren, indem Sie Cockatrice beenden und das Installationsprogramm aufrufen. - + Download location Downloadverzeichnis @@ -4100,67 +3634,67 @@ Eventuell müssen sie manuell eine neue Version herunterladen. DrawProbabilityWidget - + Draw Probability Zieh-Wahrscheinlichkeit - + Probability of drawing Wahrscheinlichkeit des Ziehens - + Card Name Kartenname - + Type Typ - + Subtype Untertyp - + Mana Value Manawert - + At least mindestens - + Exactly genau - + card(s) having drawn at least Karte(n) gezogen haben mindestens - + cards Karten - + Category Kategorie - + Qty Menge - + Odds (%) Wahrscheinlichkeit (%) @@ -4274,7 +3808,7 @@ Eventuell müssen sie manuell eine neue Version herunterladen. FilterBuilder - + Type your filter here Gib hier deine Filter ein @@ -4305,22 +3839,22 @@ Eventuell müssen sie manuell eine neue Version herunterladen. GameEventHandler - + kicked by game host or moderator Von Spielhost oder Moderator gekickt - + player left the game Spieler hat das Spiel verlassen - + player disconnected from server Spieler hat die Verbindung zum Server getrennt - + reason unknown Grund unbekannt @@ -4328,140 +3862,140 @@ Eventuell müssen sie manuell eine neue Version herunterladen. GameSelector - - - - - - - - - + + + + + + + + + Error Fehler - + Please join the appropriate room first. Bitte betreten Sie erst den entsprechenden Raum. - + Wrong password. Falsches Passwort. - + Spectators are not allowed in this game. In diesem Spiel sind keine Zuschauer zugelassen. - + The game is already full. Das Spiel ist bereits voll. - + The game does not exist any more. Dieses Spiel gibt es nicht mehr. - + This game is only open to registered users. Dieses Spiel kann nur von registrierten Benutzern betreten werden. - + This game is only open to its creator's buddies. Dieses Spiel kann nur von Freunden des Erstellers betreten werden. - + You are being ignored by the creator of this game. Der Ersteller dieses Spiels ignoriert Sie. - + Join Game Spiel beitreten - + Spectate Game Spiel beobachten - + Game Information Spielinformationen - + Join Game as Judge Spiel als Richter beitreten - + Spectate Game as Judge Spiel als Richter zuschauen - + Join game Spiel beitreten - + Password: Passwort: - + Please join the respective room first. Bitte betreten Sie zuerst den entsprechenden Raum. - + &Filter games Spiele &filtern - + C&lear filter Filter &zurücksetzen - + C&reate E&rstellen - + &Join &Beitreten - + Join as judge Als Richter beitreten - + J&oin as spectator Als Zuschauer beitreten - + Join as judge spectator Als Richter-Zuschauer beitreten - + Games shown: %1 / %2 Angezeigte Spiele: %1 / %2 - + Games Spiele @@ -4469,32 +4003,32 @@ Eventuell müssen sie manuell eine neue Version herunterladen. GameSelectorQuickFilterToolBar - + All types Alle Typen - + Filter by game name... Nach Spielnamen filtern... - + Filter by game type/format Nach Spieltyp/Format filtern - + Hide games not created by buddies Nicht von Freunden erstellte Spiele ausblenden - + Hide full games Volle Spiele ausblenden - + Hide started games Gestartete Spiele ausblenden @@ -4502,105 +4036,105 @@ Eventuell müssen sie manuell eine neue Version herunterladen. GamesModel - + >1 day >1 Tag - + %1%2 hr short age in hours %1%2 h%1%2 h - + new neu - + %1%2 min short age in minutes %1%2 min%1%2 min - + password Passwort - + buddies only nur Freunde - + reg. users only nur reg. Benutzer - + open decklists Offene Decklisten + - can chat können chatten - + see hands sehen Hände - + can see hands können Hände sehen - + not allowed nicht erlaubt - + Room Raum - + Age Alter - + Description Beschreibung - + Creator Ersteller - + Type Typ - + Restrictions Bedingungen - + Players Spieler - + Spectators Zuschauer @@ -4608,158 +4142,143 @@ Eventuell müssen sie manuell eine neue Version herunterladen. GeneralSettingsPage - + Reset all paths Alle Pfade zurücksetzen - + All paths have been reset Alle Pfade wurden zurückgesetzt - - - - - - - + + + + + + + Choose path Pfad auswählen - - Language settings - + + Personal settings + Persönliche Einstellungen - + Language: Sprache: - - Version settings - - - - - Card database - - - - - Startup settings - - - - + Paths (editing disabled in portable mode) Pfade (Anpassungen im portablen Modus deaktiviert) - + Paths Pfade - + How to help with translations Wie man beim Übersetzen helfen kann - + Decks directory: Verzeichnis mit Decklisten: - + Filters directory: Filterverzeichnis: - + Replays directory: Verzeichnis mit aufgezeichneten Spielen: - + Pictures directory: Verzeichnis mit Bilddateien: - + Card database: Kartendatenbank: - + Custom database directory: Verzeichnis für benutzerdefinierte Datenbank: - + Token database: Spielsteindatenbank: - + Update channel Aktualisierungskanal - + Check for client updates on startup Nach Aktualisierungen des Klienten beim Start der Anwendung suchen - + Check for card database updates on startup Auf Kartendatenbankaktualisierungen beim Anwendungsstart prüfen - + Don't check Nicht überprüfen - + Prompt for update Zu Aktualisierungen auffordern - + Always update in the background Immer im Hintergrund aktualisieren - + Check for card database updates every Auf Kartendatenbankaktualisierung prüfen alle - + days Tage - + Notify if a feature supported by the server is missing in my client Benachrichtigung wenn ein vom Server unterstütze Funktion in meinem Client fehlt - + Automatically run Oracle when running a new version of Cockatrice Starte Oracle automatisch, wenn eine neue Version von Cockatrice gestartet wird - + Show tips on startup Zeige Tipps beim Start - + Last update check on %1 (%2 days ago) Letzte Aktualisierungsprüfung am %1 (vor %2 Tagen) @@ -4767,47 +4286,47 @@ Eventuell müssen sie manuell eine neue Version herunterladen. GraveyardMenu - + &Graveyard &Friedhof - + &View graveyard &Friedhof ansehen - + &Move graveyard to... & Friedhof nach ... bewegen - + &Top of library &Oben in der Bibliothek - + &Bottom of library &Unten in der Bibliothek - + &All players &Alle Spieler - + &Hand &Hand - + &Exile &Exil - + Reveal random card to... Zufällige Karte vorzeigen für ... @@ -4815,88 +4334,88 @@ Eventuell müssen sie manuell eine neue Version herunterladen. HandMenu - + &Hand &Hand - + &View hand &Hand ansehen - + Sort hand by... Hand nach ... sortieren - + Name Name - + Type Typ - + Mana Value Manawert - + Take &mulligan (Choose hand size) &Mulligan nehmen (Handgröße wählen) - + Take mulligan (Same hand size) Mulligan nehmen (Gleiche Handgröße) - + Take mulligan (Hand size - 1) Mulligan nehmen (Handgröße -1) - + &Move hand to... &Hand nach ... bewegen - + &Top of library &Oben in der Bibliothek - + &Bottom of library &Unten in der Bibliothek - + &Graveyard &Friedhof - + &Exile &Exil - + &Reveal hand to... &Hand an ... vorzeigen - - + + All players Alle Spieler - + Reveal r&andom card to... Zufällige Karten an ... vorzeigen @@ -4904,52 +4423,52 @@ Eventuell müssen sie manuell eine neue Version herunterladen. HomeWidget - + Create New Deck Neues Deck erstellen - + Browse Decks Decks durchsuchen - + Browse Card Database Kartendatenbank durchsuchen - + Browse EDHRec EDHRec durchsuchen - + Browse Archidekt Archidekt durchsuchen - + View Replays Wiederholung ansehen - + Quit Verlassen - + Connecting... Verbinden... - + Connect Verbinden - + Play Spielen @@ -4957,213 +4476,213 @@ Eventuell müssen sie manuell eine neue Version herunterladen. LibraryMenu - + &Library &Bibliothek - + &View library &Bibliothek ansehen - + View &top cards of library... Die obersten Karten der Bibliothek ansehen - + View bottom cards of library... Die untersten Karten der Bibliothek ansehen - + Reveal &library to... Bibliothek an ... vorzeigen - + Lend library to... Bibliothek ... leihen - + Reveal &top cards to... Die obersten Karten ... zeigen - + &Top of library... &Oben auf die Bibliothek - + &Bottom of library... &Unter die Bibliothek... - + &Always reveal top card &Immer die oberste Karte vorzeigen - + &Always look at top card &Immer die oberste Karte ansehen - + &Open deck in deck editor &Deck in Deckeditor öffnen - + &Draw card &Karte ziehen - + D&raw cards... Karten ziehen... - + &Undo last draw &Letztes Ziehen rückgängig machen - + Shuffle Mischen - + &Play top card &Oberste Karte spielen - + Play top card &face down Oberste Karte verdeckt ausspielen - + Put top card on &bottom Oberste Karte nach unten legen - + Move top card to grave&yard Oberste Karte in den Friedhof bewegen - + Move top card to e&xile Oberste Karte ins Exil bewegen - + Move top cards to &graveyard... Die obersten Karten in den Friedhof bewegen... - + Move top cards to graveyard face down... Die obersten Karten verdeckt in den Friedhof bewegen... - + Move top cards to &exile... Die obersten Karten ins Exil bewegen - + Move top cards to exile face down... Die obersten Karten verdeckt ins Exil bewegen... - + Put top cards on stack &until... Die obersten Karten auf den Stapel packen bis... - + Shuffle top cards... Oberste Karten mischeln... - + &Draw bottom card &Unterste Karte ziehen - + D&raw bottom cards... Untere Karten ziehen... - + &Play bottom card &Unterste Karte ausspielen - + Play bottom card &face down Unterste Karte verdeckt spielen - + Move bottom card to grave&yard Unterste Karte in den Friedhof bewegen - + Move bottom card to e&xile Unterste Karte ins Exil bewegen - + Move bottom cards to &graveyard... Unterste Karten in den Friedhof bewegen... - + Move bottom cards to graveyard face down... Die untersten Karten verdeckt in den Friedhof bewegen... - + Move bottom cards to &exile... Unterste Karten ins Exil bewegen... - + Move bottom cards to exile face down... Die untersten Karten verdeckt ins Exil bewegen... - + Put bottom card on &top Unterste Karte nach oben bewegen - + Shuffle bottom cards... Unterste Karten mischen... - - + + &All players &Alle Spieler - + Reveal top cards of library Oberste Karten der Bibliothek vorzeigen - + Number of cards: (max. %1) Anzahl der Karten: (max. %1) @@ -5171,273 +4690,639 @@ Eventuell müssen sie manuell eine neue Version herunterladen. MainWindow - - + + + The server has reached its maximum user capacity, please check back later. + Der Server hat seine maximale Benutzeranzahl erreicht. Bitte versuchen Sie es später noch einmal. + + + + There are too many concurrent connections from your address. + Es gibt zu viele gleichzeitige Verbindungen von Ihrer Adresse. + + + + Banned by moderator + Gebannt von einem Moderator + + + + Expected end time: %1 + Voraussichtliches Ende: %1 + + + + This ban lasts indefinitely. + Dieser Bann ist unbefristet. + + + + Scheduled server shutdown. + Planmäßige Serverabschaltung. + + + + + Invalid username. + Ungültiger Benutzername. + + + + You have been logged out due to logging in at another location. + Sie wurden abgemeldet, da Sie sich an einer anderen Stelle angemeldet haben. + + + + Connection closed + Verbindung geschlossen + + + + The server has terminated your connection. +Reason: %1 + Der Server hat Ihre Verbindung beendet. +Grund: %1 + + + + The server is going to be restarted in %n minute(s). +All running games will be lost. +Reason for shutdown: %1 + Der Server wird in %n Minute neu gestartet. +Alle laufenden Spiele werden beendet. +Grund für die Abschaltung: %1Der Server wird in %n Minuten neu gestartet. +Alle laufenden Spiele werden beendet. +Grund für die Abschaltung: %1 + + + + Scheduled server shutdown + Planmäßige Serverabschaltung + + + + + Success + Erfolgreich + + + + Registration accepted. +Will now login. + Registrierung angenommen. +Login läuft. + + + + Account activation accepted. +Will now login. + Accountaktivierung angenommen. +Login läuft. + + + + Player %1 Spieler %1 - + Load replay Aufgezeichnetes Spiel laden - + About Cockatrice Über Cockatrice - + Version Version - + Cockatrice Webpage Cockatrice Webseite - + Project Manager: Projektmanager: - + Past Project Managers: frühere Projektmanager: - + Developers: Entwickler: - + Our Developers unsere Entwickler - + Help Develop! Hilf bei der Entwicklung! - + Translators: Übersetzer: - + Our Translators Unsere Übersetzer - + Help Translate! Hilf bei der Übersetzung! - + Support: Unterstützung: - + Report an Issue Problem melden - + Troubleshooting Fehlersuche - + F.A.Q. F.A.Q. - - + + + + + + + + + + + + + + + + + + + + Error Fehler - + + Server timeout + Server Zeitüberschreitung + + + + Failed Login + Anmeldung fehlgeschlagen + + + + Your client seems to be missing features this server requires for connection. + Ihrem Client scheinen Funktionen, die der Server für die Verbindung benötigt, zu fehlen. + + + + To update your client, go to 'Help -> Check for Client Updates'. + Um Ihren Client zu aktualisieren, gehen Sie auf 'Hilfe -> Auf Clientaktualisierungen prüfen'. + + + + Incorrect username or password. Please check your authentication information and try again. + Falscher Benutzername oder Passwort. Bitte überprüfe deine Login Informationen und versuche es erneut. + + + + There is already an active session using this user name. +Please close that session first and re-login. + Es gibt bereits eine aktive Verbindung mit diesem Benutzernamen. +Bitte schließen Sie diese Verbindung zuerst und versuchen Sie es dann erneut. + + + + + You are banned until %1. + Sie sind gebannt bis: %1. + + + + + You are banned indefinitely. + Sie sind auf unbestimmte Zeit gebannt. + + + + This server requires user registration. Do you want to register now? + Diese Server benötigt eine Benutzerregistrierung. Möchten Sie sich jetzt registrieren? + + + + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. + Dieser Server verlangt Client-IDs. Entweder das Erzeugen der ID schlägt fehl oder Sie verwenden einen modifizierten Client. +Bitte starten Sie ihren Client neu, um es erneut zu versuchen. + + + + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. + Ein interner Fehler ist aufgetreten, bitte starten Sie Cockatrice neu, bevor Sie es erneut versuchen. +Falls der Fehler erneut auftritt, versichern Sie sich, dass Sie die neuste Softwareversion verwenden, und kontaktieren Sie falls nötig die Softwareentwickler. + + + + Account activation + Accountaktivierung + + + + Your account has not been activated yet. +You need to provide the activation token received in the activation email. + Ihr Account wurde noch nicht aktiviert. +Sie müssen den Aktivierungstoken aus der Aktivierungsemail verwenden + + + + Server Full + Server voll + + + + Unknown login error: %1 + Unbekannter Login-Fehler: %1 + + + + + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. + +Dies bedeutet normalerweise, dass Ihre Clientversion veraltet ist und der Server eine Antwort geschickt hat, die Ihr Client nicht versteht. + + + + Your username must respect these rules: + Ihr Benutzername muss diesen Regeln entsprechen: + + + + is %1 - %2 characters long + %1 - %2 Zeichen lang + + + + can %1 contain lowercase characters + kann %1 Kleinbuchstaben beinhalten + + + + + + + NOT + NICHT + + + + can %1 contain uppercase characters + kann %1 Großbuchstaben beinhalten + + + + can %1 contain numeric characters + kann %1 Zahlen beinhalten + + + + can contain the following punctuation: %1 + kann folgende Sonderzeichen beinhalten: %1 + + + + first character can %1 be a punctuation mark + Das erste Zeichen kann %1 ein Sonderzeichen sein + + + + no unacceptable language as specified by these server rules: + note that the following lines will not be translated + Keine inakzeptable Sprache wie durch folgende Serverregeln festgelegt: + + + + can not contain any of the following words: %1 + kann keines der folgenden Wörter enthalten: %1 + + + + can not match any of the following expressions: %1 + kann keinem der folgenden Ausdrücke entsprechen: %1 + + + + You may only use A-Z, a-z, 0-9, _, ., and - in your username. + Sie können nur A-Z, a-z, 0-9, _, ., und - in Ihrem Benutzernamen verwenden. + + + + + + + + + Registration denied + Registrierung verweigert + + + + Registration is currently disabled on this server + Momentan ist die Registrierung auf diesem Server deaktiviert + + + + There is already an existing account with the same user name. + Es existiert bereits ein Account mit dem gleichen Benutzernamen. + + + + It's mandatory to specify a valid email address when registering. + Es ist erforderlich, eine korrekte Emailadresse während der Registrierung anzugeben. + + + + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + Scheinbar versuchen Sie, ein neues Benutzerkonto auf diesem Server zu registrieren, obwohl Sie bereits ein Konto mit der verwendeten E-Mailadresse haben. Dieser Server beschränkt die Anzahl an Benutzerkonten, die ein Nutzer pro E-Mailadresse registrieren kann. Bitte kontaktieren Sie den Server-Betreiber für weitere Hilfe oder um Ihre Zugangsinformationen zu erhalten. + + + + Password too short. + Passwort zu kurz. + + + + Registration failed for a technical problem on the server. + Registrierung aufgrund eines technischen Problems des Servers fehlgeschlagen. + + + + The connection to the server has been lost. + Verbindung zum Server verloren. + + + + Unknown registration error: %1 + Unbekannter Registrierungsfehler: %1 + + + + Account activation failed + Accountaktivierung fehlgeschlagen + + + + Socket error: %1 + Netzwerkfehler: %1 + + + + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + Sie versuchen sich an einem veralteten Server anzumelden. Bitte verwenden Sie eine ältere Cockatrice-Version oder melden Sie sich an einem aktuellen Server an. +Lokale Version ist %1, Serverversion ist %2. + + + + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + Ihr Cockatrice-Client ist veraltet. Bitte laden Sie sich die neueste Version herunter. +Lokale Version ist %1, Serverversion ist %2. + + + + Connecting to %1... + Verbinde zu %1... + + + + Registering to %1 as %2... + Registrierung bei %1 als %2... + + + + Disconnected + nicht verbunden + + + + Connected, logging in at %1 + Verbunden, Anmeldung bei %1 + + + + + + Requesting forgotten password to %1 as %2... + Fordere vergessenes Password von %1 als %2 an... + + + &Connect... &Verbinden... - + &Disconnect Verbindung &trennen - + Start &local game... &Lokales Spiel starten... - + &Watch replay... &Aufgezeichnetes Spiel abspielen... - + &Full screen &Vollbild - + &Register to server... Auf Server &registrieren... - + &Restore password... Passwort wiede&rherstellen... - + &Settings... &Einstellungen... - + &Exit &Beenden - + A&ctions Aktionen - + &Cockatrice &Cockatrice - + C&ard Database K&artendatenbank - + &Manage sets... Editionen &verwalten... - + Edit custom &tokens... Bearbeite benutzerdefinierte Spiels&teine... - + Open custom image folder Öffne den Ordner für benutzerdefinierte Kartenbilder - + Open custom sets folder Öffne den Ordner für benutzerdefinierte Sets - + Add custom sets/cards Benutzerdefinierte Karten/Sets hinzufügen - + Reload card database Neu laden der Kartendatenbank - + Tabs Reiter - + &Help &Hilfe - + &About Cockatrice &Über Cockatrice - + &Tip of the Day &Tipp des Tages - + Check for Client Updates Auf Clientaktualisierungen prüfen - + Check for Card Updates... Nach Kartenaktualisierungen suchen... - + Check for Card Updates (Automatic) Prüfe auf Kartenaktualisierungen (automatisch) - + Show Status Bar Statuszeile anzeigen - + View &Debug Log Fehlerprotokoll ansehen - + Open Settings Folder Einstellungsordner öffnen - + Show/Hide Ein-/Ausblenden - + New Version Neue Version - + Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. Herzlichen Glückwunsch zur Aktualisierung auf Cockatrice %1! Oracle wird gestartet um ihre Kartendatenbank zu aktualisieren. - + Cockatrice installed Cockatrice wurde installiert - + Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. Herzlichen Glückwunsch, dass Sie Cockatrice %1 installiert haben! Oracle wird jetzt gestartet und installiert die initiale Kartendatenbank. - + Card database Kartendatenbank - + Cockatrice is unable to load the card database. Do you want to update your card database now? If unsure or first time user, choose "Yes" @@ -5446,29 +5331,29 @@ Möchten Sie Ihre Kartendatenbank jetzt aktualisieren? Falls Sie unsicher sind oder Cockatrice das erste Mal nutzen, wählen Sie „Ja“ - - + + Yes Ja - - + + No Nein - + Open settings Einstellungen öffnen - + New sets found Neue Editionen gefunden - + %n new set(s) found in the card database Set code(s): %1 Do you want to enable it/them? @@ -5479,22 +5364,17 @@ Setcode(s): %1 Möchten Sie es/sie aktivieren? - - Yes, always enable - - - - + View sets Editionen ansehen - + Welcome Willkommen - + Hi! It seems like you're running this version of Cockatrice for the first time. All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. @@ -5503,133 +5383,167 @@ Alle Editionen der Kartendatenbank wurden aktiviert. Lesen Sie mehr über das Ändern der Editionsreihenfolge oder die Deaktivierung bestimmter Editionen im „Editionen verwalten...“ Fenster. - + + Information Information - + A card database update is already running. Eine Datenbankaktualisierung wird bereits durchgeführt. - + Unable to run the card database updater: Kartendatenbankaktualisierung nicht ausführbar: - + Card database update running. Kartendatenbankaktualisierung läuft. - + Failed to start. The file might be missing, or permissions might be incorrect. Starten fehlgeschlagen. Die Datei könnte fehlen oder die Berechtigung fehlen. - + The process crashed some time after starting successfully. Der Prozess ist einige Zeit nach erfolgreichem Start abgestürzt. - + Timed out. The process took too long to respond. The last waitFor...() function timed out. Zeitüberschreitung. Der Prozess hat zu lange nicht geantwortet. Zeitüberschreitung bei letzter waitFor...() Funktion. - + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. Ein Fehler ist beim Schreiben an den Prozess aufgetreten. Beispielsweise könnte der Prozess derzeit nicht ausgeführt werden oder er hat seinen Eingabekanal geschlossen. - + An error occurred when attempting to read from the process. For example, the process may not be running. Ein Fehler ist beim Lesen vom Prozess aufgetreten. Beispielsweise könnte der Prozess derzeit nicht ausgeführt werden. - + Unknown error occurred. Unbekannter Fehler aufgetreten. - + The card database updater exited with an error: %1 Die Kartendatenbankaktualisierung brach mit einem Fehler ab: %1 - - - - - + + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + Diese Server unterstützt zusätzliche Funktionen, über die Ihr Client nicht verfügt. +Dies stellt wahrscheinlich kein Problem dar, allerdings könnte dies bedeuten, dass eine neue Version von Cockatrice verfügbar ist oder dieser Server eine angepasste oder unveröffentlichte Version verwendet. + +Um Ihren Client zu aktualisieren, navigieren Sie zu Hilfe -> Auf Aktualisierungen prüfen. + + + + + + + Load sets/cards Lade Sets/Karten - + Selected file cannot be found. Die ausgewählte Datei wurde nicht gefunden. - + You can only import XML databases at this time. Im Moment ist es nur möglich XML Datenbanken zu importieren. - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. Die neuen Sets/Karten wurden erfolgreich hinzugefügt. Cockatrice wird jetzt die Kartendatenbank neu laden. - + Sets/cards failed to import. Set-/Kartenimport fehlgeschlagen. + + + + + Reset Password + Passwort zurücksetzen + + + + Your password has been reset successfully, you can now log in using the new credentials. + Ihr Passwort wurde erfolgreich zurückgesetzt, Sie können sich jetzt mit den neuen Anmeldedaten anmelden. + + + + Failed to reset user account password, please contact the server operator to reset your password. + Passwortzurücksetzung fehlgeschlagen. Bitte kontaktieren Sie den Serverbetreiber, um Ihr Passwort zurücksetzen zu lassen. + + + + Activation request received, please check your email for an activation token. + Aktivierungsanfrage erhalten. Bitte prüfen Sie Ihre E-Mails nach einem Aktivierungstoken. + ManaBaseConfigDialog - + Mana Base Configuration Mana-Basis Konfiguration - + Display type: Anzeigetyp: - + pie Torte - + bar Leiste - + combinedBar kombinierteLeiste - + Filter Colors (optional): Farben filtern (optional): - + OK OK - + Cancel Abbrechen @@ -5701,27 +5615,27 @@ Cockatrice wird jetzt die Kartendatenbank neu laden. ManaDevotionConfigDialog - + Display type: Anzeigetyp: - + pie Torte - + bar Leiste - + combinedBar kombinierteLeiste - + Filter Colors (optional): Farben filtern (optional): @@ -5791,615 +5705,610 @@ Cockatrice wird jetzt die Kartendatenbank neu laden. MessageLogWidget - + from play vom Spielfeld - + from their graveyard von ihrem Friedhof - + from exile aus dem Exil - + from their hand von ihrer Hand - + the top card of %1's library die oberste Karte von %1s Bibliothek - + the top card of their library die oberste Karte ihrer Bibliothek - + from the top of %1's library oben von %1s Bibliothek - + from the top of their library von ihrer Bibliothek von oben - + the bottom card of %1's library die unterste Karte von %1s Bibliothek - + the bottom card of their library die unterste Karte ihrer Bibliothek - + from the bottom of %1's library von der Unterseite von %1s Bibliothek - + from the bottom of their library von ihrer Bibliothek von unten - + from %1's library aus %1s Bibliothek - + from their library von ihrer Bibliothek - + from sideboard aus dem Sideboard - + from the stack vom Stapel - + from custom zone '%1' von der benutzerdefinierten Zone '%1' - + %1 is now keeping the top card %2 revealed. %1 lässt nun die oberste Karte %2 aufgedeckt. - + %1 is not revealing the top card %2 any longer. %1 lässt die oberste Karte %2 nicht mehr aufgedeckt. - + %1 can now look at top card %2 at any time. %1 kann nun die oberste Karte %2 jederzeit betrachten. - + %1 no longer can look at top card %2 at any time. %1 kann die oberste Karte %2 nicht mehr jederzeit betrachten. - + %1 attaches %2 to %3's %4. %1 legt %2 an %3s %4 an. - + %1 has conceded the game. %1 hat das Spiel aufgegeben. - + %1 has unconceded the game. %1 hat das Spiel doch nicht aufgegeben. - + %1 has restored connection to the game. %1 ist wieder mit dem Spiel verbunden. - + %1 has lost connection to the game. %1 hat die Verbindung zum Spiel verloren. - + %1 points from their %2 to themselves. %1 zeigt von ihrem %2 auf sich selbst. - + %1 points from their %2 to %3. %1 zeigt von ihrem %2 auf %3. - + %1 points from %2's %3 to themselves. %1 zeigt von %2s %3 auf sich selbst. - + %1 points from %2's %3 to %4. %1 zeigt von %2s %3 auf %4. - + %1 points from their %2 to their %3. %1 zeigt von ihrem %2 auf ihren %3. - + %1 points from their %2 to %3's %4. %1 zeigt von ihrem %2 auf %3s %4. - + %1 points from %2's %3 to their own %4. %1 zeigt von %2s %3 auf ihr %4. - + %1 points from %2's %3 to %4's %5. %1 zeigt von %2s %3 auf %4s %5. - + %1 creates a face down token. %1 erzeugt einen umgedrehten Spielstein. - + %1 creates token: %2%3. %1 erstellt Spielstein: %2%3. - + %1 has loaded a deck (%2). %1 hat ein Deck geladen (%2). - + %1 has loaded a deck with %2 sideboard cards (%3). %1 hat ein Deck mit %2 Sideboardkarten geladen (%3). - + %1 destroys %2. %1 zerstört %2. - + a card eine Karte - + %1 gives %2 control over %3. %1 überlässt %2 die Kontrolle über %3. - + %1 puts %2 into play%3 face down. %1 bringt %2%3 verdeckt ins Spiel. - + %1 puts %2 into play%3. %1 bringt %2%3 ins Spiel. - + %1 puts %2%3 into their graveyard face down. %1 legt %2%3 verdeckt in ihren Friedhof - + %1 puts %2%3 into their graveyard. %1 legt %2%3 in ihren Friedhof. - + %1 exiles %2%3 face down. %1 schickt %2%3 verdeckt ins Exil. - + %1 exiles %2%3. %1 schickt %2%3 ins Exil. - + %1 moves %2%3 to their hand. %1 bewegt %2%3 in ihre Hand. - + %1 puts %2%3 into their library. %1 legt %2%3 in ihre Bibliothek. - + %1 puts %2%3 onto the bottom of their library. %1 legt %2%3 unter die Bibliothek. - + %1 puts %2%3 on top of their library. %1 legt %2%3 auf ihre Bibliothek. - + %1 puts %2%3 into their library %4 cards from the top. %1 legt %2%3 in die Bibliothek an %4 Stelle von oben. - + %1 moves %2%3 to sideboard. %1 legt %2%3 in sein Sideboard. - + %1 plays %2%3 face down. %1 bringt %2%3 verdeckt ins Spiel. - + %1 plays %2%3. %1 spielt %2%3 aus. - + %1 moves %2%3 to custom zone '%4' face down. %1 bewegt %2%3 verdeckt zur benutzerdefinierten Zone '%4'. - + %1 moves %2%3 to custom zone '%4'. %1 bewegt %2%3 zur benutzerdefinierten Zone '%4'. - + %1 tries to draw from an empty library %1 versucht von einer leeren Bibliothek zu ziehen - + %1 draws %2 card(s). %1 zieht %2 Karte(n).%1 zieht %2 Karte(n). - + %1 is looking at %2. %1 sieht sich %2 an. - + %1 is looking at the %4 %3 card(s) %2. top card for singular, top %3 cards for plural %1 sieht sich die %4 %3 Karte(n) %2 an.%1 sieht sich die %4 %3 Karte(n) %2 an. - + bottom untersten - + top obersten - + %1 turns %2 face-down. %1 wendet %2 auf die Rückseite. - + %1 turns %2 face-up. %1 wendet %2 auf die Vorderseite. - + The game has been closed. Das Spiel wurde geschlossen. - + The game has started. Das Spiel hat begonnen. - + You are flooding the game. Please wait a couple of seconds. Du überschwemmst das Spiel. Warte bitte einige Sekunden. - + %1 has joined the game. %1 ist dem Spiel beigetreten. - + %1 is now watching the game. %1 schaut nun dem Spiel zu. - + You have been kicked out of the game. Sie wurden aus dem Spiel geworfen. - + %1 has left the game (%2). %1 hat das Spiel verlassen (%2). - + %1 is not watching the game any more (%2). %1 schaut dem Spiel nicht mehr zu (%2). - + %1 is not ready to start the game any more. %1 ist nicht mehr bereit, das Spiel zu starten. - + %1 shuffles their deck and draws a new hand of %2 card(s). %1 mischt sein Deck und zieht eine Hand mit %2 Karte(n).%1 mischt sein Deck und zieht eine neue Hand mit %2 Karte(n). - + %1 shuffles their deck and draws a new hand. %1 mischt sein Deck und zieht eine neue Hand. - + You are watching a replay of game #%1. Sie sehen eine Aufzeichnung des Spiels #%1. - + %1 is ready to start the game. %1 ist bereit, das Spiel zu starten. - + cards an unknown amount of cards Karten - + %1 card(s) a card for singular, %1 cards for plural %1 Karte(n)%1 Karte(n) - + %1 lends %2 to %3. %1 verleiht %2 an %3. - + %1 reveals %2 to %3. %1 zeigt %3 %2. - + %1 reveals %2. %1 zeigt %2 offen vor. - + %1 randomly reveals %2%3 to %4. %1 zeigt %4 zufällig %2%3 vor. - + %1 randomly reveals %2%3. %1 zeigt zufällig %2%3 offen vor. - + %1 peeks at face down card #%2. %1 schaut sich die umgedrehte Karte #%2 an. - + %1 peeks at face down card #%2: %3. %1 schaut sich die umgedrehte Karte #%2 an: %3. - + %1 reveals %2%3 to %4. %1 zeigt %4 %2%3 vor. - + %1 reveals %2%3. %1 zeigt %2%3 offen vor. - + %1 reversed turn order, now it's %2. %1 kehrte die Zugreihenfolge um, nun ist es %2. - + reversed umgekehrt - + normal normal - + Heads Kopf - + Tails Zahl - + %1 flipped a coin. It landed as %2. %1 warf eine Münze. Es fiel %2. - + %1 rolls a %2 with a %3-sided die. %1 würfelt eine %2 mit einem %3-seitigen Würfel. - + %1 flips %2 coins. There are %3 heads and %4 tails. %1 wirft %2 Münzen. Es ergab %3 mal Kopf und %4 mal Zahl. - + %1 rolls a %2-sided dice %3 times: %4. %1 wirft einen %2-seitigen Würfel %3 mal: %4. - + %1's turn. %1 ist am Zug. - + %1 sets annotation of %2 to %3. %1 versieht %2 mit dem Hinweis %3. - - %1 places %2 %3%4 counter(s) on %5 (now %6). - + + %1 places %2 "%3" counter(s) on %4 (now %5). + %1 platziert %2 "%3" Zähler auf %4 (jetzt %5).%1 platziert %2 "%3" Zähler auf %4 (jetzt %5). - - %1 removes %2 %3%4 counter(s) from %5 (now %6). - + + %1 removes %2 "%3" counter(s) from %4 (now %5). + %1 entfernt %2 "%3" Marke(n) von %4 (jetzt %5).%1 entfernt %2 "%3" Zähler von %4 (jetzt %5). - - %1 failed to undo their last draw. - - - - + %1 sets counter %2 to %3 (%4%5). %1 setzt Zähler %2 auf %3 (%4%5). - + %1 sets %2 to not untap normally. %1 setzt %2 auf explizites Enttappen. - + %1 sets %2 to untap normally. %1 setzt %2 auf normales Enttappen. - + %1 removes the PT of %2. %1 entfernt die Kampfwerte von %2. - + %1 changes the PT of %2 from nothing to %4. %1 ändert die Kampfwerte von %2 von nichts auf %4. - + %1 changes the PT of %2 from %3 to %4. %1 ändert die Kampfwerte von %2 von %3 auf %4. - + %1 has locked their sideboard. %1 hat ihr Sideboard gesperrt. - + %1 has unlocked their sideboard. %1 hat ihr Sideboard entsperrt. - + %1 taps their permanents. %1 tappt ihre bleibenden Karten. - + %1 untaps their permanents. %1 enttappt ihre bleibenden Karten. - + %1 taps %2. %1 tappt %2. - + %1 untaps %2. %1 enttappt %2. - + %1 shuffles %2. %1 mischt %2. - + %1 shuffles the bottom %3 cards of %2. %1 mischt die untersten %3 Karten von %2. - + %1 shuffles the top %3 cards of %2. %1 mischt die obersten %3 Karten von %2. - + %1 shuffles cards %3 - %4 of %2. %1 mischt die Karten %3 - %4 von %2. - + %1 unattaches %2. %1 löst %2 ab. - + %1 undoes their last draw. %1 legt die zuletzt gezogene Karte zurück. - + %1 undoes their last draw (%2). %1 legt die zuletzt gezogene Karte zurück (%2) @@ -6407,115 +6316,110 @@ Cockatrice wird jetzt die Kartendatenbank neu laden. MessagesSettingsPage - + Word1 Word2 Word3 Wort1 Wort2 Wort3 - + Add New Message Neue Nachricht hinzufügen - + Edit Message Nachricht bearbeiten - + Remove Message Nachricht entfernen - + Add message Nachricht hinzufügen - - + + Message: Nachricht: - + Edit message Nachricht bearbeiten - + Chat settings Chat Einstellungen - + Custom alert words Benutzerdefinierte Benachrichtigungswörter - + Enable chat mentions Chat Erwähnungen aktivieren - + Enable mention completer Autovervollständigung aktivieren - + In-game message macros Makros für Nachrichten in Spielen - + How to use in-game message macros Anleitung zum Verwenden der Makros für Nachrichten in Spielen - + Ignore chat room messages sent by unregistered users Nachrichten von unregistrierten Benutzern im Chatroom ignorieren - + Ignore private messages sent by unregistered users Private Nachrichten von unregistrierten Benutzern ignorieren - - Ignore private messages sent by non-buddy users - - - - - + + Invert text color Textfarbe invertieren - + Enable desktop notifications for private messages Desktop Benachrichtigungen für private Nachrichten aktivieren - + Enable desktop notification for mentions Desktop Benachrichtigungen für Erwähnungen aktivieren - + Enable room message history on join Nachrichtenverlauf beim Betreten eines Raumes aktivieren - - + + (Color is hexadecimal) (Farbcode in hexadezimal) - + Separate words with a space, alphanumeric characters only Wörter durch Leerzeichen trennen, nur alphanumerische Zeichen @@ -6523,42 +6427,42 @@ Cockatrice wird jetzt die Kartendatenbank neu laden. MoveMenu - + Move to Bewegen nach - + &Top of library in random order &Oben auf der Bibliothek in zufälliger Reihenfolge - + X cards from the top of library... X Karten von oben in der Bibliothek... - + &Bottom of library in random order &Unter die Bibliothek in zufälliger Reihenfolge - + T&able T&isch - + &Hand &Hand - + &Graveyard &Friedhof - + &Exile &Exil @@ -6571,47 +6475,47 @@ Cockatrice wird jetzt die Kartendatenbank neu laden. Kartentyp - + Mana Value Manawert - + Color(s) Farbe(n) - + Loyalty Loyalität - + Main Card Type Hauptkartentyp - + Mana Cost Manakosten - + P/T S/W - + Side Seite - + Layout Layout - + Color Identity Farbidentität @@ -6634,152 +6538,6 @@ Cockatrice wird jetzt die Kartendatenbank neu laden. Richtung der Überschreitung: - - PaletteEditorDialog - - - - Reset - - - - - - Apply - - - - - - Save && Apply - - - - - ▼ Edit Palette - - - - - - ▶ Edit Palette - - - - - Palette Editor — %1 - - - - - <b>Palette Editor</b> &nbsp;·&nbsp; %1 - - - - - This theme ships no default palette files - - - - - Replace current colours with the theme author's defaults - - - - - Switch between the light and dark palette files - - - - - Editing: - - - - - Show or hide the per-role colour grid for manual tweaks - - - - - ↺ Revert to theme default - - - - - Discard unsaved edits and restore the last saved palette - - - - - Preview this palette without saving to disk - - - - - Write palette-%1.toml and reload the theme - - - - - Cannot save: this theme has no directory on disk - - - - - Save failed - - - - - Could not write %1 to: -%2 - - - - - No default found - - - - - No default palette file found for the "%1" scheme. - - - - - PaletteGridWidget - - - Active - - - - - Disabled - - - - - Inactive - - - - - Normal interactive state - - - - - Widget is disabled / not interactive - - - - - Window is in background / unfocused - - - Phase @@ -6846,57 +6604,57 @@ Cockatrice wird jetzt die Kartendatenbank neu laden. PhasesToolbar - + Untap step Enttappsegment - + Upkeep step Versorgungssegment - + Draw step Ziehsegment - + First main phase erste Hauptphase - + Beginning of combat step Anfangssegment der Kampfphase - + Declare attackers step Angreifer-Deklarieren-Segment - + Declare blockers step Blocker-Deklarieren-Segment - + Combat damage step Kampfschadenssegment - + End of combat step Endsegment der Kampfphase - + Second main phase zweite Hauptphase - + End of turn step Ende-des-Zuges-Segment @@ -6904,7 +6662,7 @@ Cockatrice wird jetzt die Kartendatenbank neu laden. PictureLoader - + en code for scryfall's language property, not available for all languages de @@ -6913,142 +6671,151 @@ Cockatrice wird jetzt die Kartendatenbank neu laden. PlayerActions - - - - + + View top cards of library + Oberste Karten der Bibliothek ansehen + + + + + + + + + + + + Number of cards: (max. %1) + Anzahl der Karten: (max. %1) + + + + View bottom cards of library + Unterste Karten der Bibliothek ansehen + + + + Shuffle top cards of library + Oberste Karten der Bibliothek mischen + + + + Shuffle bottom cards of library + Unterste Karten der Bibliothek mischen + + + + Draw hand + Hand ziehen + + + + 0 and lower are in comparison to current hand size + 0 und kleiner sind im Vergleich zur jetzigen Handgröße + + + + Draw cards + Karten ziehen + + + + + + grave Friedhof - - - - + + + + exile Exil - - - PlayerDialogs - - View top cards of library - - - - - - - - - - - - - Number of cards: (max. %1) - - - - - View bottom cards of library - - - - - Shuffle top cards of library - - - - - Shuffle bottom cards of library - - - - - Draw hand - - - - - 0 and lower are in comparison to current hand size - - - - - Draw cards - - - - + Move top cards to %1 - + Oberste Karten nach %1 bewegen - + Move bottom cards to %1 - + Unterste Karten nach %1 bewegen - + Draw bottom cards - + Unterste Karten ziehen - + + + C&reate another %1 token + Einen weiteren %1 Spielstein erzeugen + + + Create tokens - + Spielsteine erzeugen - + + Number: - + Anzahl: - + Place card X cards from top of library - + Karte X Karten von oben in der Bibliothek plazieren - + Which position should this card be placed: - + In welcher Position sollte diese Karte platziert werden: - + (max. %1) - + (max. %1) - + Change power/toughness - + Stärke/Widerstandskraft ändern - + Change stats to: - + Ändere Werte auf: - + Set annotation - + Anmerkung setzen - + Please enter the new annotation: - + Bitte die neue Anmerkung eingeben: + + + + Set counters + Zähler setzen PlayerMenu - + Player "%1" Spieler "%1" - + &Counters &Zähler @@ -7081,7 +6848,7 @@ Diese Einstellung bedeutet, dass sie nur den Standarddruck für jede Karte sehen Navigationstasten anzeigen - + Printing Selector Druckauswahl @@ -7089,22 +6856,22 @@ Diese Einstellung bedeutet, dass sie nur den Standarddruck für jede Karte sehen PrintingSelectorCardOverlayWidget - + Preference Preferenz - + Pin Printing Version festsetzen - + Unpin Printing Version lösen - + Show Related cards Zugehörige Karten anzeigen @@ -7175,57 +6942,57 @@ Diese Einstellung bedeutet, dass sie nur den Standarddruck für jede Karte sehen PtMenu - + Power / toughness Stärke/Widerstandskraft - + &Increase power &Stärke erhöhen - + &Decrease power &Stärke verringern - + I&ncrease toughness &Widerstandskraft erhöhen - + D&ecrease toughness &Widerstandskraft verringern - + In&crease power and toughness Stärke und Widerstandskraft erhöhen - + Dec&rease power and toughness Stärke und Widerstandskraft verringern - + Increase power and decrease toughness Erhöhe Stärke und verringere Widerstandskraft - + Decrease power and increase toughness Verringere Stärke und erhöhe Widerstandskraft - + Set &power and toughness... Stärke und Widerstandskraft setzen... - + Reset p&ower and toughness Stärke und Widerstandskraft zurücksetzen @@ -7233,37 +7000,37 @@ Diese Einstellung bedeutet, dass sie nur den Standarddruck für jede Karte sehen QMenuBar - + Services Dienste - + Hide %1 %1 ausblenden - + Hide Others Andere ausblenden - + Show All Alle anzeigen - + Preferences... Einstellungen... - + Quit %1 Schließe %1 - + About %1 Über %1 @@ -7271,17 +7038,17 @@ Diese Einstellung bedeutet, dass sie nur den Standarddruck für jede Karte sehen QObject - + Cockatrice card database (*.xml) Cockatrice Kartendatenbank (*.xml) - + All files (*.*) Alle Dateien (*.*) - + Cockatrice replays (*.cor) Aufgezeichnete Cockatrice-Spiele (*.cor) @@ -7353,177 +7120,110 @@ Sind sie sicher, dass diese Funktion deaktiviert werden soll? QPlatformTheme - + OK OK - + Save Speichern - + Save All Alle speichern - + Open Öffnen - + &Yes Ja - + Yes to &All Ja zu &Allem - + &No &Nein - + N&o to All Nein zu Allem - + Abort Abbrechen - + Retry Erneut versuchen - + Ignore Ignorieren - + Close Schließen - + Cancel Abbrechen - + Discard Verwerfen - + Help Hilfe - + Apply Anwenden - + Reset Zurücksetzen - + Restore Defaults Standard wiederherstellen - - QuickSetupPanel - - - %1% - - - - - <b>Quick Setup</b> - - - - - Generate all palette roles automatically from a single accent colour - - - - - Accent: - - - - - Primary hue. Used directly for highlights and links. -At high intensity it also tints buttons and backgrounds. - - - - - Intensity: - - - - - Subtle - - - - - Full colour - - - - - 0–30 Subtle tint — only highlights and links change hue -30–70 Accented — buttons, tooltips, and borders join in -70–100 Full colour — backgrounds, everything - - - - - 70% - - - - - Generate ↓ - - - - - Derive all palette roles from the accent colour above. -Fine-tune individual colours in the grid afterwards. - - - RemoteDeckList_TreeModel - + Name Name - + ID ID - + Upload time Änderungsdatum @@ -7531,32 +7231,32 @@ Fine-tune individual colours in the grid afterwards. RemoteReplayList_TreeModel - + ID ID - + Name Name - + Players Spieler - + Keep Behalten - + Time started Startzeit - + Duration (sec) Länge (Sekunden) @@ -7564,37 +7264,37 @@ Fine-tune individual colours in the grid afterwards. RfgMenu - + &Exile &Exil - + &View exile &Exil ansehen - + &Move exile to... &Exil nach ... bewegen - + &Top of library &Oben in der Bibliothek - + &Bottom of library &Unten in der Bibliothek - + &Hand &Hand - + &Graveyard &Friedhof @@ -7640,7 +7340,7 @@ Fine-tune individual colours in the grid afterwards. SayMenu - + S&ay S&agen @@ -7681,27 +7381,27 @@ Fine-tune individual colours in the grid afterwards. SetsModel - + Enabled Aktiviert - + Set type Editionsart - + Set code Editionscode - + Long name Langer Name - + Release date Veröffentlichung @@ -7709,53 +7409,53 @@ Fine-tune individual colours in the grid afterwards. ShortcutSettingsPage - - + + Restore all default shortcuts Alle Standard-Tastaturkürzel wiederherstellen - + Do you really want to restore all default shortcuts? Möchten Sie wirklich alle Standard-Tastaturkürzel wiederherstellen? - + Clear all default shortcuts Alle Standard-Tastaturkürzel entfernen - + Do you really want to clear all shortcuts? Möchten Sie wirklich alle Tastaturkürzel entfernen? - + Section: Abschnitt: - + Action: Aktion: - + Shortcut: Tastaturkürzel: - + How to set custom shortcuts Wie werden benutzerdefinierte Tastaturkürzel gesetzt - + Clear all shortcuts Alle Tastaturkürzel entfernen - + Search by shortcut name Suchen nach Name des Tastenkürzels @@ -7811,12 +7511,12 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen! SideboardMenu - + &Sideboard &Nebendeck - + &View sideboard &Nebendeck ansehen @@ -7824,27 +7524,27 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen! SoundSettingsPage - + Enable &sounds Töne aktivieren - + Current sounds theme: Aktuelles Ton-Theme: - + Test system sound engine Systemsound testen - + Sound settings Toneinstellungen - + Master volume Masterlautstärke @@ -7916,146 +7616,16 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen! Ungültige Antwort vom Veröffentlichungsaktualisierungsserver erhalten. - + No reply received from the tag update server. Keine Antwort vom Kennzeichnungsaktualisierungsserver. - + Invalid reply received from the tag update server. Ungültige Antwort vom Kennzeichungsaktualisierungsserver. - - StorageSettingsPage - - - - - Success - - - - - Cached card pictures have been reset. - - - - - Downloaded card pictures have been reset. - - - - - Error - - - - - One or more downloaded card pictures could not be cleared. - - - - - In-memory (currently loaded) card pictures have been reset. - - - - - Card Picture Loader Caching Method: - - - - - The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size. - - - - - Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while. - - - - - This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk. - - - - - Delete Cached Images - - - - - Delete Saved Images - - - - - Clear In-Memory Images - - - - - Card Picture Loader Cache Method - - - - - Network Cache - - - - - Filesystem - - - - - In-Memory Picture Cache - - - - - Network Cache Size: - - - - - On-disk cache for downloaded pictures - - - - - Redirect Cache TTL: - - - - - How long cached redirects for urls are valid for. - - - - - Picture Cache Size: - - - - - In-memory cache for pictures not currently on screen - - - - - Naming scheme: - - - - - Day(s) - - - TabAccount @@ -8191,117 +7761,117 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen! TabArchidekt - - + + Desc. Beschreibung. - - + + AND UND - - + + Require ALL selected colors Benötigt ALLE ausgewählten Farben - - + + Deck name... Deckname... - - + + Owner... Besitzer... - - + + Packages Pakete - - + + Advanced Filters Erweiterte Filter - + Bracket: Kategorie: - - + + Any Beliebig - - + + Contains card... Enthält Karte... - - + + Commander... Kommandant... - - + + Tag... Etikett... - - + + Deck Size Deckgröße - + Cards: Karten: - - + + Asc. Aufsteigend. - + Sort by: Sortieren nach: - + Filter by: Filtern nach: - + Display Settings Anzeigeeinstellungen - - + + Search Suche - - + + Formats Formate @@ -8311,54 +7881,6 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen! Archidekt: - - TabCardArtRules - - - Card: - - - - - ProviderId: - - - - - Mode: - - - - - Reason: - - - - - Type a card name... - - - - - Add rule - - - - - Remove rule - - - - - Refresh - - - - - Card Art Rules - - - TabDeckEditor @@ -8407,7 +7929,7 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen! Darstellung zurücksetzen - + Deck: %1 Deck: %1 @@ -8415,49 +7937,55 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen! TabDeckEditorVisual - + Visual Deck: %1 Visuelles Deck: %1 - + &Visual Deck Editor &Visueller Deckeditor - - + + Card Info Karteninformation - - + + Deck Deck - + + + Filters + Filter + + + &View &Ansehen - + Printing Auflage - + Visible Sichtbar - + Floating Schwebend - + Reset layout Anordnung zurücksetzen @@ -8465,22 +7993,22 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen! TabDeckEditorVisualTabWidget - + Visual Deck View Visuelle Deckansicht - + Visual Database Display Visuelle Datenbankanzeige - + Deck Analytics Deckanalysen - + Sample Hand Probehand @@ -8488,134 +8016,134 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen! TabDeckStorage - + Local file system Lokales Dateisystem - + Server deck storage Deckablage auf dem Server - - + + Open in deck editor Im Deckeditor öffnen - + Rename deck or folder Deck oder Ordner umbenennen - + Upload deck Deck hochladen - + Download deck Deck herunterladen + - - - + + New folder Neuer Ordner + - Delete Löschen - + Open decks folder Deckordner öffnen - + Rename local folder Lokalen Ordner umbenennen - + Rename local file Lokale Datei umbenennen - + New name: Neuer Name: - - - - + + + + Error Fehler - + Rename failed Umbenennen fehlgeschlagen - - + + Invalid deck file Ungültige Deckdatei - + Enter deck name Decknamen eingeben - + This decklist does not have a name. Please enter a name: Diese Deckliste hat keinen Namen. Bitte geben Sie einen Namen ein: - + Unnamed deck Unbenanntes Deck - + Failed to upload deck to server Hochladen des Decks zum Server fehlgeschlagen - + Delete local file Lokale Datei löschen - + Are you sure you want to delete the selected files? Sind sie sicher, dass die ausgewählten Dateien gelöscht werden sollen? - + Delete remote decks Löschen der online gespeicherten Decks - + Are you sure you want to delete the selected decks? Sind sie sicher, dass sie die ausgewählten Decks löschen wollen? - - + + Name of new folder: Name für den neuen Ordner: @@ -8687,191 +8215,191 @@ Bitte geben Sie einen Namen ein: TabGame - - - + + + Replay Wiederholung - - + + Game Spiel - - + + Player List Spielerliste - - + + Card Info Karteninformationen - - + + Messages Nachrichten - - + + Replay Timeline Zeitleiste der Aufzeichnung - + &Phases &Phasen - + &Game Spi&el - + Next &phase Nächste &Phase - + Next phase with &action Nächste Phase mit &Aktion - + Next &turn Nächster &Zug - + Reverse turn order Kehre Zugreihenfolge um - + &Remove all local arrows &Lokale Pfeile entfernen - + Rotate View Cl&ockwise Ansicht im Uhrzeigesinn drehen - + Rotate View Co&unterclockwise Ansicht gegen den Uhrzeigersinn drehen - + Game &information &Spielinformationen - + Un&concede Aufgabe zurückziehen - - - + + + &Concede &Aufgeben - + &Leave game Spiel ver&lassen - + C&lose replay Wiederholung sch&ließen - + &Focus Chat Chat &fokussieren - + &Say: &Sagen: - + Selected cards Ausgewählte Karten - + &View Ansicht - + Visible Sichtbar - + Floating Schwebend - + Reset layout Darstellung zurücksetzen - + Concede Aufgeben - + Are you sure you want to concede this game? Sind Sie sicher, dass Sie das Spiel aufgeben möchten? - + Unconcede Doch nicht aufgeben - + You have already conceded. Do you want to return to this game? Sie haben bereits aufgegeben. Möchten Sie zu diesem Spiel zurückkehren? - + Leave game Spiel verlassen - + Are you sure you want to leave this game? Sind Sie sicher, dass Sie das Spiel verlassen möchten? - + A player has joined game #%1 Ein Spieler ist Spiel #%1 beigetreten - + %1 has joined the game %1 ist dem Spiel beigetreten - + You have been kicked out of the game. Sie wurden aus dem Spiel geworfen. @@ -8930,115 +8458,115 @@ Bitte geben Sie einen Namen ein: Sie müssen eine gültige Anzahl an zu lokalisierenden Tagen auswählen. - + Username: Benutzername: - + IP Address: IP-Adresse: - + Game Name: Spielname: - + GameID: Spiel-ID: - + Message: Nachricht: - + Main Room Hauptraum - + Game Room Spielraum - + Private Chat Privater Chat - + Past X Days: Die letzten X Tage: - + Today Heute - + Last Hour Letzte Stunde - + Maximum Results: Maximale Ergebnisse: - + At least one filter is required. The more information you put in, the more specific your results will be. Mindestens ein Filter ist notwendig. Je mehr Informationen Sie angeben, desto spezifischer fallen die Ergebnisse aus. - + Get User Logs Benutzerlogs anzeigen - + Clear Filters Filter entfernen - + Filters Filter - + Log Locations Logstandorte - + Date Range Datumsbereich - + Maximum Results Maximale Ergebnisse - - + + Message History Nachrichtenverlauf - + Failed to collect message history information. Das Sammeln von Nachrichtenverlaufsinformationen ist fehlgeschlagen. - + There are no messages for the selected filters. Keine Nachrichten für die gewählten Filter. @@ -9056,27 +8584,27 @@ Je mehr Informationen Sie angeben, desto spezifischer fallen die Ergebnisse aus. Ver&lassen - + %1 - Private chat %1 - privater Chat - + This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. Dieser Benutzer ignoriert dich. Er kann deine Nachrichten im Hauptchat nicht sehen und du kannst seinen Spielen nicht beitreten. - + Private message from Private Nachricht von - + %1 has left the server. %1 hat den Server verlassen. - + %1 has joined the server. %1 hat den Server betreten. @@ -9084,181 +8612,181 @@ Je mehr Informationen Sie angeben, desto spezifischer fallen die Ergebnisse aus. TabReplays - + Local file system Lokales Dateisystem - + Server replay storage Wiederholungsablage auf dem Server - - + + Watch replay Wiederholung abspielen - + Rename Umbenennen - - + + New folder Neuer Ordner - - + + Delete Löschen - + Open replays folder Wiederholungsorder öffnen - + Download replay Wiederholung herunterladen - + Toggle expiration lock automatische Löschung umschalten - + Get replay share code Wiederholungscode zum Teilen erhalten - - + + Look up replay by share code Wiederholung durch einen Code zum Teilen nachschauen - + Rename local folder Umbenennen des lokalen Ordners - + Rename local file Umbenennen der lokalen Datei - + New name: Neuer Name: - + Error Fehler - + Rename failed Umbenennen fehlgeschlagen - + Name of new folder: Name des neuen Ordners: - + Delete local file Lokale Datei löschen - + Are you sure you want to delete the selected files? Sind sie sicher, dass die ausgewählten Dateien gelöscht werden sollen? - + Are you sure you want to delete the selected replays? Sind sie sicher, dass die ausgewählten Wiederholungen gelöscht werden sollen? - + Failed to get code Erhalten des Codes fehlgeschlagen - - + + Either this server does not support replay sharing, or does not permit replay sharing for you. Entweder unterstützt dieser Server das Teilen von Wiederholungen nicht, oder erlaubt dir das Teilen von Wiederholungen nicht. - - - + + + Failed Fehlgeschlagen - + Could not get replay code Wiederholungs-Code konnte nicht erhalten werden - + Replay Share Code Wiederholungscode zum Teilen - + Others can use this code to add the replay to their list of remote replays: %1 Andere können diesen Code benutzen um diese Wiederholung zu ihrer Liste von Fremd-Wiederholungen hinzuzufügen: %1 - + Copy to clipboard In die Zwischenablage kopieren - + Replay share code Wiederholungscode zum Teilen - + Replay code found Wiederholungscode gefunden - + Replay was added, or you already had access to it. Wiederholung wurde hinzugefügt, oder du hattest bereits Zugang dazu. - + Replay code not found Wiederholungscode nicht gefunden - + Failed to submit code Einreichen des Codes fehlgeschlagen - + Unexpected error Unerwarteter Fehler - + Delete remote replay Wiederholung vom Server löschen @@ -9271,62 +8799,47 @@ Je mehr Informationen Sie angeben, desto spezifischer fallen die Ergebnisse aus. TabRoom - - Friends - - - - - Online - - - - - Ignored - - - - + &Say: &Sagen: - + Chat Chat - + &Room &Raum - + &Leave room Raum ver&lassen - + &Clear chat Chat leeren - + Chat Settings... Chat Einstellungen - + mentioned you. hat dich erwähnt. - + Click to view Zum Anzeigen klicken. - + You are flooding the chat. Please wait a couple of seconds. Sie überfluten den Chatraum. Bitte warten Sie ein paar Sekunden. @@ -9339,30 +8852,30 @@ Je mehr Informationen Sie angeben, desto spezifischer fallen die Ergebnisse aus. Server - - - - + + + + Error Fehler - + Failed to join the server room: it doesn't exist on the server. Serverraumbeitritt fehlgeschlagen: der Raum existiert auf dem Server nicht. - + The server thinks you are in the server room but your client is unable to display it. Try restarting your client. Der Server denkt Sie seien im Serverraum, allerdings kann Ihr Client diesen nicht anzeigen. Versuchen Sie, Ihren Client neu zu starten. - + You do not have the required permission to join this server room. Sie haben nicht die erforderlichen Berechtigungen, um diesem Serverraum beizutreten. - + Failed to join the server room due to an unknown error: %1. Beitritt des Serverraums aufgrund eines unbekannten Fehlers fehlgeschlagen: %1. @@ -9370,97 +8883,97 @@ Je mehr Informationen Sie angeben, desto spezifischer fallen die Ergebnisse aus. TabSupervisor - + Deck Editor Deckeditor - + Visual Deck Editor Visueller Deckeditor - + EDHRec EDHRec - + Archidekt Archidekt - + Home Zuhause - + &Visual Deck Storage &Visuelle Deckablage - + Visual Database Display Visuelle Datenbankanzeige - + Server Server - + Account Benutzerkonto - + Deck Storage Deckablage - + Game Replays Aufgezeichnete Spiele - + Administration Administration - + Logs Logs - + Are you sure? Sind Sie sicher? - + There are still open games. Are you sure you want to quit? Es sind noch Spiele offen. Wollen Sie das Programm trotzdem beenden? - + Click to view Zum Anzeigen klicken - + Your buddy %1 has signed on! Dein Freund %1 hat sich eingeloggt! - + Unknown Event Unbekanntes Ereignis - + The server has sent you a message that your client does not understand. This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. @@ -9471,39 +8984,39 @@ Dies könnte bedeuten, dass eine neue Version von Cockatrice verfügbar ist oder Um Ihren Client zu aktualisieren, navigieren Sie zu Hilfe -> Auf Aktualisierungen prüfen. - + Idle Timeout Inaktivitätszeitüberschreitung - + You are about to be logged out due to inactivity. Sie werden wegen Inaktivität abgemeldet. - + Promotion Beförderung - + You have been promoted. Please log out and back in for changes to take effect. Sie wurden befördert. Bitte loggen Sie sich aus und wieder ein, damit die Änderungen in Kraft treten. - + Warned Gewarnt - + You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. Sie haben eine Warnung erhalten aufgrund von %1. Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie eingeleitet. Sollten Sie Fragen haben, stellen Sie diese bitte über eine private Nachricht an einen Moderator. - + You have received the following message from the server. (custom messages like these could be untranslated) Sie haben die folgende Nachricht vom Server erhalten. @@ -9513,12 +9026,12 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie TabVisualDatabaseDisplay - + Database Display Datenbankanzeige - + Visual Database Display Visuelle Datenbankanzeige @@ -9557,42 +9070,42 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie TranslateCounterName - + Life Leben - + White Weiß - + Blue Blau - + Black Schwarz - + Red Rot - + Green Grün - + Colorless Farblos - + Other Andere @@ -9600,69 +9113,11 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie UpdateDownloader - + Could not open the file for reading. Datei konnte nicht zum Lesen geöffnet werden. - - UserCardArtSettingsDialog - - - Card Art Settings - - - - - Type a card name... - - - - - Card name: - - - - - Card ProviderId: - - - - - Left margin (%): - - - - - Right margin (%): - - - - - Vertical offset: - - - - - Zoom: - - - - - Parameters - - - - - Preview - - - - - Remove Banner Card - - - UserContextMenu @@ -9780,7 +9235,7 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie - + Ban History Bannverlauf @@ -9795,87 +9250,77 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie Nutzer wurde bisher nie gebannt. - + Failed to collect ban information. Sammeln von Informationen über Bans fehlgeschlagen. - - - + + + Warning History Warnungsverlauf - + Warning Time;Moderator;User Name;Reason Warnungszeit;Moderator;Nutzername;Grund - + User has never been warned. Nutzer wurde bisher nie gewarnt. - + Failed to collect warning information. Sammeln von Informationen über Verwarnungen fehlgeschlagen. - + Failed to get admin notes. Administratornotizen konnten nicht abgerufen werden. - - + + Success Erfolgreich - + Successfully promoted user. Nutzer erfolgreich befördert. - + Successfully demoted user. Nutzer erfolgreich degradiert. - - Kick Player - - - - - Are you sure you want to kick this player from the game? - - - - - - + + + Failed Fehlgeschlagen - + Failed to promote user. Beförderung des Nutzers fehlgeschlagen. - + Failed to demote user. Degradierung des Nutzers fehlgeschlagen. - + Copy hash to clipboard Kopiere Hash in die Zwischenablage - + Remove this user's messages Nachrichten dieses Nutzers entfernen @@ -9883,554 +9328,326 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie UserInfoBox - + Location: Ort: - + Account Age: Accountalter: - + Edit Bearbeiten - + Change password Passwort ändern - + Change avatar Avatar wechseln - + Administrator Administrator - + Moderator Moderator - + Registered user Registrierter Benutzer - - + + Unregistered user Unregistrierter Benutzer - + Judge Richter - + Unknown Unbekannt - + The entered password does not match your account. Das eingegebene Passwort stimmt nicht mit dem Konto überein. - - - - + + + Information Information - + User information updated. Benutzerinformationen aktualisiert. - - - - - - - - - - - + + + + + + + + + + Error Fehler - + User Information Benutzerinformationen - + Real Name: Echter Name: - + User Level: Nutzerlevel: - - - Edit Banner Card - - - + %n Year(s), amount of years (only shown if more than 0) %n Jahre,%n Jahre, - + %10%n Day(s) %20 amount of years (if more than 0), amount of days, date in local short format %10%n Tage %20%10%n Tage %20 - + Enter Password Passwort eingeben - + Password verification is required in order to change your email address Passwortverifikation benötigt, um die E-Mail-Adresse zu ändern - - - + + + An error occurred while trying to update your user information. Ein Fehler ist während der Aktualisierung Ihrer Benutzerinformationen aufgetreten. - - The selected card is blacklisted on this server or another error occurred. - - - - - Banner card removed. - - - - - Banner card updated. - - - - + This server does not permit you to update your user informations. Dieser Server erlaubt Ihnen nicht, Ihre Benutzerinformationen zu aktualisieren. - + Password changed. Passwort geändert. - + This server does not permit you to change your password. Dieser Server erlaubt Ihnen nicht, Ihr Passwort zu ändern. - + The new password is too short. Das neue Passwort ist zu kurz. - + The old password is incorrect. Altes Passwort inkorrekt. - + Avatar updated. Avatar gewechselt. - + This server does not permit you to update your avatar. Dieser Server erlaubt Ihnen nicht, Ihren Avatar zu ändern. - - - An error occured while trying to update your avatar. - - - This server does not permit you to update your user informations. - An error occured while trying to updater your avatar. - Dieser Server erlaubt Ihnen nicht, Ihre Benutzerinformationen zu aktualisieren. - - - - UserInfoPopup - - - - Games - - - - - Chat - - - - - Open private chat - - - - - Profile - - - - - View user profile - - - - - Show this user's games - - - - - − Buddy - - - - - Remove from buddy list - - - - - + Buddy - - - - - Add to buddy list - - - - - − Ignore - - - - - Remove from ignore list - - - - - + Ignore - - - - - Add to ignore list - - - - - Ban - - - - - Ban from server - - - - - Warn - - - - - Warn user - - - - - Ban log - - - - - View ban history - - - - - Warn log - - - - - View warning history - - - - - Notes - - - - - View admin notes - - - - - − Mod - - - - - Demote from moderator - - - - - + Mod - - - - - Promote to moderator - - - - - − Judge - - - - - Demote from judge - - - - - + Judge - - - - - Promote to judge - - - - - Join game - - - - - Spectate - - - - - - Loading games… - - - - - Could not load games. - - - - - No active games. - + An error occured while trying to updater your avatar. + Ein Fehler ist während des Wechselns Ihres Avatars aufgetreten. UserInterfaceSettingsPage - + General interface settings Allgemeine Bedienung - + &Double-click cards to play them (instead of single-click) Karten durch &Doppelklick ausspielen (statt Einzelklick) - + &Clicking plays all selected cards (instead of just the clicked card) &Anklicken spielt alle ausgewählten Karten aus (anstatt nur der angeklickten Karte) - + &Play all nonlands onto the stack (not the battlefield) by default Alle Nichtländer standardmäßig über den Stapel spielen (anstatt direkt auf das Spielfeld) - + Do not delete &arrows inside of subphases Keine &Pfeile löschen in Unterphasen - + Close card view window when last card is removed Schließe Kartenanzeigefenster, wenn die letzte Karte entfernt wird - + Auto focus search bar when card view window is opened Sucheingabe automatisch in den Fokus nehmen, wenn das Kartenansichtsfenster geöffnet wird - + Annotate card text on tokens Kartentext auf Spielsteinen anzeigen - - Show selection count during drag selection - + + Show selection counter during drag selection + Auswahlzähler während Zugauswahl anzeigen - - Show total selection count - + + Show total selection counter + Gesamtauswahlszähler anzeigen - - Show subtype breakdown in selection tally - - - - + Use tear-off menus, allowing right click menus to persist on screen Benutze Abreißmenüs, erlaubt Kontextmenüs auf dem Bildschirm zu verbleiben - - Keep game chat focused when clicking in game (Note: disables card view search bar) - - - - + Notifications settings Benachrichtigungseinstellungen - + Enable notifications in taskbar Benachrichtigungen in der Taskleiste aktivieren - + Notify in the taskbar for game events while you are spectating Benachrichtigungen für Spielereignisse auch beim Zuschauen anderer Spiele in der Taskbar anzeigen - + Notify in the taskbar when users in your buddy list connect Benachrichtige in der Taskleiste wenn sich Benutzer aus der Freundesliste anmelden - + Animation settings Animationseinstellungen - + &Tap/untap animation Animiertes &Tappen/Enttappen - + Deck editor/storage settings Deckeditor/-ablage Einstellungen - + Open deck in new tab by default Decks in neuem Tab öffnen als Standard - + Use visual deck storage in game lobby Visuelle Deckablage in der Spielelobby verwenden - + Use selection animation for Visual Deck Storage Auswahlanimation für Visuellen Deckspeicher verwenden - + When adding a tag in the visual deck storage to a .txt deck: Wenn ein Tag im Visuellen Deckspeicher zu einem .txt Deck hinzugefügt wird: - + do nothing tue nichts - + ask to convert to .cod frage, ob zu .cod konvertiert werden soll - + always convert to .cod immer nach .cod konvertieren - + Default deck editor type Standarddeckeditortyp - + Classic Deck Editor Klassischer Deckeditor - + Visual Deck Editor Visueller Deckeditor - + Replay settings Wiederholungsoptionen - + Buffer time for backwards skip via shortcut: Pufferzeit für Rückwärtsüberspringen durch Tastenkürzel @@ -10438,22 +9655,22 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie UserListWidget - + Users connected to server: %1 Mit dem Server verbundene Nutzer: %1 - + Users in this room: %1 Benutzer in diesem Raum: %1 - + Buddies online: %1 / %2 Freunde online: %1 / %2 - + Ignored users online: %1 / %2 Ignorierte Benutzer online: %1 / %2 @@ -10461,45 +9678,35 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie UtilityMenu - + Increment all card counters Alle Kartenzähler erhöhen - + &Untap all permanents &Enttappe alle bleibenden Karten - + R&oll die... &Würfeln... - - Flip coin - - - - + &Create token... &Spielstein erzeugen... - + C&reate another token Einen weiteren Spielstein erzeugen - + Cr&eate predefined token &Vordefinierten Spielstein erzeugen - - - C&reate another %1 token - - VisualDatabaseDisplayColorFilterWidget @@ -10551,72 +9758,72 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie VisualDatabaseDisplayFilterToolbarWidget - + Sort by Sortieren nach - + Filter by Filtern nach - + Save and load filters Filter speichern und laden - + Filter by exact card name Nach exaktem Kartennamen filtern - + Filter by card main-type Nach Kartenhaupttyp filtern - + Filter by card sub-type Nach Kartenuntertyp filtern - + Filter by set Nach Set filtern - + Filter by format legality Nach Formatslegalität filtern - + Save/Load Speichern/Laden - + Name Name - + Main Type Haupttyp - + Sub Type Untertyp - + Sets Editionen - + Formats Formate @@ -10624,22 +9831,22 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie VisualDatabaseDisplayFormatLegalityFilterWidget - + Show formats with at least: Formate anzeigen mit mindestens: - + cards Karten - + Do not display formats with less than this amount of cards in the database Keine Formate mit weniger als dieser Anzahl an Karten in der Datenbank anzeigen - + Filter mode (AND/OR/NOT conjunctions of filters) Filtermodus (UND/ODER/NICHT Verbindungen von Filtern) @@ -10657,32 +9864,32 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie VisualDatabaseDisplayMainTypeFilterWidget - + Show main types with at least: Haupttypen anzeigen mit mindestens: - + cards Karten - + Do not display card main-types with less than this amount of cards in the database Kartenhaupttypen mit weniger als dieser Anzahl Karten in der Datenbank nicht anzeigen - + Filter mode (AND/OR/NOT conjunctions of filters) Filtermodus (UND/ODER/NICHT Verknüpfungen der Filter) - + Mode: Exact Match Modus: Exakte Übereinstimmung - + Mode: Includes Modus: Enthält @@ -10690,27 +9897,27 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie VisualDatabaseDisplayNameFilterWidget - + Filter by name... (Exact match) Nach Namen filtern... (Exakte Übereinstimmung) - + Load from Deck Aus Deck laden - + Apply all card names in currently loaded deck as exact match name filters Alle Kartennamen im momentan geladenen Deck als Filter mit exakter Übereinstimmung anwenden - + Load from Clipboard Aus der Zwischenablage laden - + Apply all card names in clipboard as exact match name filters Alle Kartennamen aus der Zwischenablage als Filter mit exakter Übereinstimmung anwenden @@ -10718,7 +9925,7 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie VisualDatabaseDisplayRecentSetFilterSettingsWidget - + Filter to most recent sets Filtern nach aktuellsten Sets @@ -10726,19 +9933,19 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie VisualDatabaseDisplaySetFilterWidget - + Search sets... Sets durchsuchen... - - + + Mode: Exact Match Modus: Exakte Übereinstimmung - - + + Mode: Includes Modus: Enthält @@ -10746,37 +9953,37 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie VisualDatabaseDisplaySubTypeFilterWidget - + Search subtypes... Untertypen durchsuchen... - + Show sub types with at least: Untertypen anzeigen mit mindestens: - + cards Karten - + Do not display card sub-types with less than this amount of cards in the database Kartenuntertypen mit weniger als dieser Anzahl Karten in der Datenbank nicht anzeigen - + Filter mode (AND/OR/NOT conjunctions of filters) Filtermodus (UND/ODER/NICHT Verknüpfungen der Filter) - + Mode: Exact Match Modus: Exakte Übereinstimmung - + Mode: Includes Modus: Enthält @@ -10784,23 +9991,23 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie VisualDatabaseDisplayWidget - + Search by card name (or search expressions) Suche nach Kartennamen (oder Suchausdrücken) - + Visual Visuell - + Loading database ... Datenbank wird geladen... - + Clear all filters Alle Filter entfernen @@ -10839,17 +10046,17 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie - + Toggle Layout: Overlap Umschalten des Layouts: Überlappung - + Change how cards are displayed within zones (i.e. overlapped or fully visible.) Wie Karten innerhalb von Zonen angezeigt werden ändern ( z.B. überlappend oder vollständig sichtbar) - + Toggle Layout: Flat Umschalten des Layouts: Flach @@ -10878,17 +10085,17 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie VisualDeckEditorWidget - + Type a card name here for suggestions from the database... Hier einen Kartennahmen eingeben für Vorschläge aus der Datenbank... - + Quick search and add card Schnellsuche und Karte hinzufügen - + Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter Nach bester Entsprechung in der Datenbank suchen (mit automatischen Vorschlägen) und die bevorzugte Auflage beim Betätigen der Eingabetaste dem Deck hinzufügen @@ -11006,43 +10213,43 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie WarningDialog - + Which warning would you like to send? Welche Warnung möchten Sie versenden? - + Redact all messages from this user in all rooms Entferne alle Nachrichten dieses Nutzers in allen Räumen - + &OK &OK - + &Cancel Abbre&chen - + Warn user for misconduct Nutzer aufgrund von Fehlverhalten warnen - - + + Error Fehler - + User name to send a warning to can not be blank, please specify a user to warn. Der zu warnende Nutzername kann nicht leer gelassen werden, bitte geben Sie einen Nutzernamen an. - + Warning to use can not be blank, please select a valid warning to send. Warnungsart kann nicht leer gelassen werden, bitte wählen Sie die zu sendende Warnungsart. @@ -11050,133 +10257,133 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie WndSets - + Move selected set to the top Ausgewählte Edition an die Spitze verschieben - + Move selected set up nach oben verschieben - + Move selected set down nach unten verschieben - + Move selected set to the bottom Ausgewählte Edition ans Ende verschieben - + Search by set name, code, or type Suche nach Setname, Code oder Typ - + Default order Standardreihenfolge - + Restore original art priority order Stelle die ursprüngliche Reihenfolge für Bilderprioritäten wieder her - + Enable all sets Alle Editionen aktivieren - + Disable all sets Alle Editionen deaktivieren - + Enable selected set(s) Ausgewählte Edition(en) aktivieren - + Disable selected set(s) Ausgewählte Edition(en) deaktivieren - + Deck Editor Deckeditor - + Use CTRL+A to select all sets in the view. Benutzen Sie Strg+A, um alle Sets in der Ansicht auszuwählen. - + Only cards in enabled sets will appear in the card list of the deck editor. Nur Karten aus aktivierten Sets werden in der Kartenliste des Deckeditors angezeigt. - + Image priority is decided in the following order: Bildpriorität wird auf folgende Reihenfolge festgelegt: - + first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) %1 is a link to the wiki zuerst der BENUTZERDEFINIERTE Ordner (%1), dann die aktivierten Sets aus diesem Dialog (von oben nach unten) - + Include cards rebalanced for Alchemy [requires restart] Karten, die für Alchemy augeglichen wurden, einschließen [erfordert Neustart] - + Card Art Kartenzeichnung - + How to use custom card art Wie benutzerdefinierte Kartenbilder verwendet werden - + Hints Tipps - + Note Notiz - + Sorting by column allows you to find a set while not changing set priority. Nach einer Spalte sortieren erlaubt, eine Edition zu finden, ohne die Editionspriorität zu verändern. - + To enable ordering again, click the column header until this message disappears. Um die Sortierung erneut zu aktivieren, klicken Sie auf den Spaltenkopf bis diese Nachricht verschwindet. - + Use the current sorting as the set priority instead Benutze die momentane Sortierung als Editionspriorität. - + Sorts the set priority using the same column Sortiert die Editionspriorität mit der selben Spalte - + Manage sets Editionen verwalten @@ -11184,72 +10391,72 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie ZoneViewWidget - + Search by card name (or search expressions) Suche nach Kartennamen (oder Suchausdrücken) - + Ungrouped Ungruppiert - + Group by Type Gruppieren nach Kartentyp - + Group by Mana Value Gruppieren nach Manabetrag - + Group by Color Gruppieren nach Farbe - + Unsorted Unsortiert - + Sort by Name Sortieren nach Name - + Sort by Type Sortieren nach Kartentyp - + Sort by Mana Cost Sortieren nach Manakosten - + Sort by Colors Sortieren nach Farben - + Sort by P/T Sortieren nach P/T - + Sort by Set Sortieren nach Auflage - + shuffle when closing beim Schließen mischen - + pile view Stapelansicht @@ -11257,7 +10464,7 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie i18n - + English Deutsch (German) @@ -11265,12 +10472,12 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie main - + Connect on startup Verbinde beim Start - + Debug to file Debugge in Datei @@ -11284,7 +10491,7 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie - + Deck Editor Deckeditor @@ -11365,7 +10572,7 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie - + Replays Wiederholungen @@ -11480,129 +10687,129 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie Deck laden... - - + + Load Deck from Clipboard... Deck aus der Zwischenablage laden... - + Edit Deck in Clipboard, Annotated Deck in Zwischenablage bearbeiten, kommentiert - + Edit Deck in Clipboard Deck in Zwischenablage bearbeiten - + New Deck Neues Deck - + Open Custom Pictures Folder Benutzerdefinierten Bilderordner öffnen - + Print Deck... Deck drucken... - + Delete Card Karte löschen - - + + Reset Layout Darstellung zurücksetzen - + Save Deck Deck speichern - + Save Deck as... Deck speichern unter... - + Save Deck to Clipboard, Annotated Deck kommentiert in die Zwischenablage speichern - + Save Deck to Clipboard, Annotated (No Set Info) Deck in die Zwischenablage speichern, kommentiert (keine Setinformationen) - + Save Deck to Clipboard Deck in die Zwischenablage speichern - + Save Deck to Clipboard (No Set Info) Deck in die Zwischenablage speichern (keine Setinformationen) - + Load Local Deck... Lokales Deck laden... - + Load Remote Deck... Deck vom Server laden... - + Set Ready to Start Bereit zum Start setzen - + Toggle Sideboard Lock Sideboardsperre umschalten - + Add Green Counter Grüne Marke hinzufügen - + Remove Green Counter Grüne Marke entfernen - + Set Green Counters... Grüne Marken setzen... - + Add Red Counter Rote Marke hinzufügen - + Remove Red Counter Rote Marke entfernen - + Set Red Counters... Rote Marken setzen... - + Add Life Counter Lebensmarke hinzufügen @@ -11612,744 +10819,724 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie Statuszeile anzeigen - - Load deck from online service... - - - - - Load from website... - - - - + Unload Deck Deck entladen - + Force Start Zwangsstart - + Add Card Counter (F) Kartenmarke hinzufügen (F) - + Remove Card Counter (F) Kartenmarke entfernen (F) - + Set Card Counters (F)... Kartenmarke setzen (F)... - + Add Card Counter (E) Kartenmarke hinzufügen (E) - + Remove Card Counter (E) Kartenmarke entfernen (E) - + Set Card Counters (E)... Kartenmarke setzen (E)... - + Add Card Counter(D) Kartenmarke hinzufügen (D) - + Remove Card Counter (D) Kartenmarke entfernen (D) - + Set Card Counters (D)... Kartenmarke setzen (D)... - + Add Card Counter (C) Kartenmarke hinzufügen (C) - + Remove Card Counter (C) Kartenmarke entfernen (C) - + Set Card Counters (C)... Kartenmarke setzen (C)... - + Add Card Counter (B) Kartenmarke hinzufügen (B) - + Remove Card Counter (B) Kartenmarke entfernen (B) - + Set Card Counters (B)... Kartenmarke setzen (B)... - + Add Card Counter (A) Kartenmarke hinzufügen (A) - + Remove Card Counter (A) Kartenmarke entfernen (A) - + Set Card Counters (A)... Kartenmarke setzen (A)... - + Remove Life Counter Lebensmarke entfernen - + Set Life Counters... Lebensmarken setzen... - + Add White Counter Weiße Marke hinzufügen - + Remove White Counter Weiße Marke entfernen - + Set White Counters... Weiße Marken setzen... - + Add Blue Counter Blaue Marke hinzufügen - + Remove Blue Counter Blaue Marke entfernen - + Set Blue Counters... Blaue Marken setzen... - + Add Black Counter Schwarze Marke hinzufügen - + Remove Black Counter Schwarze Marke entfernen - + Set Black Counters... Schwarze Marken setzen... - + Add Colorless Counter Farblose Marke hinzufügen - + Remove Colorless Counter Farblose Marke entfernen - + Set Colorless Counters... Farblose Marken setzen... - + Add Other Counter Andere Marke hinzufügen - + Remove Other Counter Andere Marke entfernen - + Set Other Counters... Andere Marke setzen... - + Increment all card counters Alle Kartenzähler erhöhen - + Add Power (+1/+0) Stärke hinzufügen (+1/+0) - + Remove Power (-1/-0) Stärke entfernen (-1/-0) - + Move Toughness to Power (+1/-1) Widerstandskraft nach Stärke verschieben (+1/-1) - + Add Toughness (+0/+1) Widerstandskraft hinzufügen (+0/+1) - + Remove Toughness (-0/-1) Widerstandskraft entfernen (-0/-1) - + Move Power to Toughness (-1/+1) Stärke nach Widerstandskraft verschieben (-1/+1) - + Add Power and Toughness (+1/+1) Stärke und Widerstandskraft hinzufügen (+1/+1) - + Remove Power and Toughness (-1/-1) Stärke und Widerstandskraft entfernen (-1/-1) - + Set Power and Toughness... Stärke und Widerstandskraft setzen... - + Reset Power and Toughness Stärke und Widerstandskraft zurücksetzen - + Untap Enttappen - + Upkeep Versorgung - + Draw Ziehen - + First Main Phase Erste Hauptphase - + Start Combat Beginn des Kampfes - + Attack Angriff - + Block Blocken - + Damage Schaden - + End Combat Ende des Kampfes - + Second Main Phase Zweite Hauptphase - + End Endsegment - + Next Phase Nächste Phase - + Next Phase Action Nächste Phasenaktion - + Next Turn Nächster Zug - + Hide Card in Reveal Window Karte im Enthüllungsfenster verstecken - + Tap / Untap Card Tappe / Enttappe Karte - + Untap All Alle enttappen - + Toggle Skip Untapping Toggle Untap Enttapen überspringen umschalten - + Turn Card Over Karte herumdrehen - + Peek Card Karte ansehen - + Play Card Karte spielen - + Play Card, Face Down Karte spielen, verdeckt - + Attach Card... Karte anlegen... - + Unattach Card Karte lösen - + Clone Card Karte klonen - + Create Token... Spielstein erstellen... - + Create All Related Tokens Alle zugehörigen Spielsteine erstellen - + Create Another Token Einen weiter Spielstein erstellen - + Set Annotation... Notiz setzen... - - Reduce Life by Power - - - - + Select All Cards in Zone Alle Karten in der Zone auswählen - + Select All Cards in Row Alle Karten in der Reihe auswählen - + Select All Cards in Column Alle Karten in der Spalte auswählen - + Reveal Selected Cards to All Players Ausgewählte Karten allen Spielern vorzeigen - - + + Bottom of Library Untere Karte der Bibliothek - - - - + + + + Exile Exil - - - - + + + + Graveyard Friedhof - - + + Hand Hand - - + + Top of Library Obere Karte der Bibliothek - - + + Battlefield, Face Down Spielfeld, verdeckt - + Battlefield Spielfeld - + Library Bibliothek - + Sideboard Sideboard - + Top Cards of Library Oberste Karten der Bibliothek - + Bottom Cards of Library Unterste Karten der Bibliothek - + Close Recent View Schließe letzte Ansicht - - + + Stack Stapel - - + + Graveyard (Multiple) Friedhof (mehrere) - - + + Graveyard (Multiple), Face Down Friedhof (mehrere), verdeckt - - + + Exile (Multiple) Exil (mehrere) - - + + Exile (Multiple), Face Down Exil (mehrere), verdeckt - + Stack Until Found Stapel bis gefunden - + Draw Bottom Card Unterste Karte ziehen - + Draw Multiple Cards from Bottom... Mehrere Karten von unten ziehen... - + Draw Arrow... Pfeil zeichnen... - + Remove Local Arrows Lokale Pfeile entfernen - + Leave Game Spiel verlassen - + Concede Aufgeben - + Roll Dice... Würfeln... - - Flip Coin - - - - + Shuffle Library Bibliothek mischen - + Shuffle Top Cards of Library Oberste Karten der Bibliothek mischen - + Shuffle Bottom Cards of Library Unterste Karten der Bibliothek mischen - + Mulligan Mulligan - + Mulligan (Same hand size) Mulligan nehmen (Gleiche Handgröße) - + Mulligan (Hand size - 1) Mulligan nehmen (Handgröße -1) - + Draw a Card Eine Karte ziehen - + Draw Multiple Cards... Mehrere Karten ziehen... - + Undo Draw Ziehen rückgängig machen - + Always Reveal Top Card Oberste Karte aufgedeckt lassen - + Always Look At Top Card Oberste Karte immer betrachten - + Sort Hand by Name Hand sortieren nach Name - + Sort Hand by Type Hand sortieren nach Typ - + Sort Hand by Mana Value Hand sortieren nach Manawert - + Reveal Hand to All Players Hand allen Spielern vorzeigen - + Reveal Random Card to All Players Zufällige Karte allen Spielern vorzeigen - + Rotate View Clockwise Ansicht im Uhrzeigersinn drehen - + Rotate View Counterclockwise Ansicht gegen den Uhrzeigersinn drehen - + Unfocus Text Box Textboxfokus aufheben - + Focus Chat Chat fokussieren - + Clear Chat Chat leeren - + Refresh Aktualisieren - + Skip Forward Vorspulen - + Skip Backward Zurückspulen - + Skip Forward by a lot Sehr weit vorspulen - + Skip Backward by a lot Sehr weit zurückspulen - + Play/Pause Abspielen/Pausieren - + Toggle Fast Forward Schnelldurchlauf umschalten - + Home Zuhause - + Visual Deck Storage Visuelle Deckablage - + Deck Storage Deckablage - + Server Server - + Account Benutzerkonto - + Administration Administration - + Logs Logs diff --git a/cockatrice/translations/cockatrice_el.ts b/cockatrice/translations/cockatrice_el.ts index be66756d9..5bd3b2826 100644 --- a/cockatrice/translations/cockatrice_el.ts +++ b/cockatrice/translations/cockatrice_el.ts @@ -2,7 +2,7 @@ AbstractCounter - + &Set counter... &Ρύθμιση μετρητή... @@ -10,12 +10,12 @@ AbstractCounterDialog - + Set counter Ρύθμιση μετρητή - + New value for counter '%1': Νέα τιμή για τον μετρητή '%1' @@ -36,60 +36,60 @@ AbstractTabDeckEditor - + Open in new tab - + Are you sure? - + The decklist has been modified. Do you want to save the changes? - - - - - - + + + + + + Error - + Could not open deck at %1 - + Could not save remote deck - - + + The deck could not be saved. Please check that the directory is writable and try again. - + Save deck - + The deck could not be saved. - + There are no cards in your deck to be exported @@ -105,12 +105,12 @@ Please check that the directory is writable and try again. AdminNotesDialog - + Update Notes - + Admin Notes for %1 @@ -127,227 +127,172 @@ Please check that the directory is writable and try again. Sideboard - - - Tokens - - AppearanceSettingsPage - + seconds - + Error Σφάλμα - + Could not create themes directory at '%1'. - + Theme settings Ρυθμίσεις θέματος - + Current theme: Τρέχον θέμα: - + Open themes folder Άνοιγμα φακέλου θεμάτων - + Home tab background source: - + Home tab background shuffle frequency: - + Disabled - + + Display card name of background in bottom right: + + + + Menu settings - + Show keyboard shortcuts in right-click menus - + Show game filter toolbar above list in room tab - + Card rendering Απόδοση κάρτας - + Display card names on cards having a picture Εμφανίστε τα ονόματα καρτών σε κάρτες με εικόνα - + Auto-Rotate cards with sideways layout - + Override all card art with personal set preference (Pre-ProviderID change behavior) - - Light - - - - - Dark - - - - - System - - - - - Active theme palette: - - - - - Edit theme palette - - - - - Home tab settings - - - - - Display card name of background in bottom right - - - - - Styling settings - - - - - Style user list - - - - - Card printings - - - - + Bump sets that the deck contains cards from to the top in the printing selector - + Scale cards on mouse over Αύξηση της κλίμακας των καρτών με την επιλογή του ποντικιού - + Use rounded card corners - - Card layout - - - - + Minimum overlap percentage of cards on the stack and in vertical hand - + Maximum initial height for card view window: - - + + rows - + Maximum expanded height for card view window: - + Card counters - + Counter %1 - + Hand layout Διάταξη χειρός - + Display hand horizontally (wastes space) Εμφάνιση χεριού οριζόντια (σπατάλη χώρου) - + Enable left justification Ενεργοποιήστε την αριστερή αιτιολόγηση - + Table grid layout Διάταξη πλέγματος πίνακα - + Invert vertical coordinate Ανατροπή κάθετης συντεταγμένης - + Minimum player count for multi-column layout: Ελάχιστος αριθμός παικτών για διάταξη πολλαπλών στηλών: - + Maximum font size for information displayed on cards: Μέγιστο μέγεθος γραμματοσειράς για πληροφορίες που εμφανίζονται στις κάρτες: @@ -355,12 +300,12 @@ Please check that the directory is writable and try again. ArchidektApiResponseDeckDisplayWidget - + Back to results - + Open Deck in Deck Editor @@ -386,112 +331,112 @@ Please check that the directory is writable and try again. BanDialog - + ban &user name απαγόρευση και όνομα χρήστη - + ban &IP address απαγόρευση & διεύθυνση IP - + ban client I&D απαγόρευση εξυπηρετητή I&D - + Ban type Τύπος απαγόρευσης - + &permanent ban &μόνιμη απαγόρευση - + &temporary ban &προσωρινή απαγόρευση - + &Days: &Μέρες: - + &Hours: &Ώρες: - + &Minutes: &Λεπτά: - + Duration of the ban Διάρκεια της απαγόρευσης - + Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. Παρακαλώ καταχωρίστε τον λόγο της απαγόρευσης. Αυτό αποθηκεύεται μόνο για τους επόπτες και δεν μπορεί να το δει το αποκλεισμένο άτομο. - + Please enter the reason for the ban that will be visible to the banned person. Παρακαλώ καταχωρίστε τον λόγο της απαγόρευσης που θα είναι ορατή στο αποκλεισμένο άτομο. - + Redact all messages from this user in all rooms - + &OK &Εντάξει - + &Cancel &Άκυρο - + Ban user from server Απαγόρευση χρήστη από τον διακομιστή - - - - + + + + Error Σφάλμα - + You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. Για την απαγόρευση πρέπει να επιλέξετε ένα όνομα, μία IP, ένα clientId, ή κάποιο συνδυασμό των τριών. - + You must have a value in the name ban when selecting the name ban checkbox. Πρέπει να έχετε μια τιμή στην απαγόρευση ονόματος όταν επιλέγετε το πλαίσιο ελέγχου απαγόρευσης ονόματος. - + You must have a value in the ip ban when selecting the ip ban checkbox. Πρέπει να έχετε μια τιμή στην απαγόρευση ip όταν επιλέγετε το πλαίσιο ελέγχου απαγόρευσης ip. - + You must have a value in the clientid ban when selecting the clientid ban checkbox. Πρέπει να έχετε μια τιμή στην απαγόρευση clientid όταν επιλέγετε το πλαίσιο ελέγχου απαγόρευσης clientid. @@ -499,123 +444,59 @@ This is only saved for moderators and cannot be seen by the banned person. BetaReleaseChannel - + Beta - + No reply received from the release update server. - + Invalid reply received from the release update server. - + No reply received from the file update server. - - CardArtPreviewWidget - - - No card selected - - - - - CardArtRulesModel - - - Card - - - - - ProviderId - - - - - Mode - - - - - Reason - - - CardDatabaseModel - + Name Όνομα - + Sets Σετς - + Mana cost Το κόστος του Μάνα - + Card type Είδος κάρτας - + P/T P/T - + Color(s) Χρώμα(τα) - - CardDatabaseView - - - Add to Deck - - - - - Add to Sideboard - - - - - Select Printing - - - - - Show on EDHRec (Commander) - - - - - Show on EDHRec (Card) - - - - - Show Related cards - - - CardFilter @@ -744,22 +625,22 @@ This is only saved for moderators and cannot be seen by the banned person. CardInfoPictureWidget - + View related cards - + Add card to deck - + Mainboard - + Sideboard @@ -782,12 +663,12 @@ This is only saved for moderators and cannot be seen by the banned person. - + Related cards: - + Unknown card: @@ -795,146 +676,128 @@ This is only saved for moderators and cannot be seen by the banned person. CardMenu - + Re&veal to... - + &All players - + View related cards - + Token: - + All tokens - + &Select All - + S&elect Row - + S&elect Column - + &Play - + &Hide - + Play &Face Down - + &Tap / Untap Turn sideways or back again - + Skip &untapping - + T&urn Over Turn face up/face down - + &Peek at card face - + &Clone - + Attac&h to card... - + Unattac&h - + &Draw arrow... - + &Set annotation... - - Reduce life by power - - - - + Ca&rd counters - + &Add counter (%1) - + &Remove counter (%1) - + &Set counters (%1)... - - CardPictureLoaderCacheMethod - - - Network Cache - - - - - Filesystem - - - CardSizeWidget @@ -946,133 +809,133 @@ This is only saved for moderators and cannot be seen by the banned person. CardZoneLogic - + their hand nominative - + %1's hand nominative - + their library look at zone - + %1's library look at zone - + of their library top cards of zone, - + of %1's library top cards of zone - + their library reveal zone - + %1's library reveal zone - + their library shuffle - + %1's library shuffle - + their library nominative - + %1's library nominative - + their graveyard nominative - + %1's graveyard nominative - + their exile nominative - + %1's exile nominative - + their sideboard look at zone - + %1's sideboard look at zone - + their sideboard nominative - + %1's sideboard nominative - + their custom zone '%1' nominative - + %1's custom zone '%2' nominative @@ -1094,421 +957,16 @@ This is only saved for moderators and cannot be seen by the banned person. - - ColorButton - - - Click to pick a color - - - - - Pick colour - - - - - ConnectionController - - - - The server has reached its maximum user capacity, please check back later. - - - - - There are too many concurrent connections from your address. - - - - - Banned by moderator - - - - - Expected end time: %1 - - - - - This ban lasts indefinitely. - - - - - Scheduled server shutdown. - - - - - - Invalid username. - - - - - You have been logged out due to logging in at another location. - - - - - Connection closed - - - - - The server has terminated your connection. -Reason: %1 - - - - - The server is going to be restarted in %n minute(s). -All running games will be lost. -Reason for shutdown: %1 - - - - - Scheduled server shutdown - - - - - Failed Login - - - - - Your client seems to be missing features this server requires for connection. - - - - - To update your client, go to 'Help -> Check for Client Updates'. - - - - - - - - - - - - - - - - - - - - - - Error - - - - - Incorrect username or password. Please check your authentication information and try again. - - - - - There is already an active session using this user name. -Please close that session first and re-login. - - - - - - You are banned until %1. - - - - - - You are banned indefinitely. - - - - - This server requires user registration. Do you want to register now? - - - - - This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. -Please close and reopen your client to try again. - - - - - An internal error has occurred, please close and reopen Cockatrice before trying again. -If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - - - - Account activation - - - - - Your account has not been activated yet. -You need to provide the activation token received in the activation email. - - - - - Server Full - - - - - Unknown login error: %1 - - - - - - -This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - - - - - - - - - Registration denied - - - - - Registration is currently disabled on this server - - - - - There is already an existing account with the same user name. - - - - - It's mandatory to specify a valid email address when registering. - - - - - It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. - - - - - Password too short. - - - - - Registration failed for a technical problem on the server. - - - - - The connection to the server has been lost. - - - - - Unknown registration error: %1 - - - - - Account activation failed - - - - - Socket error: %1 - - - - - Server timeout - - - - - You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. -Local version is %1, remote version is %2. - - - - - Your Cockatrice client is obsolete. Please update your Cockatrice version. -Local version is %1, remote version is %2. - - - - - - Success - - - - - Registration accepted. -Will now login. - - - - - Account activation accepted. -Will now login. - - - - - Information - - - - - This server supports additional features that your client doesn't have. -This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. - -To update your client, go to Help -> Check for Updates. - - - - - - - Reset Password - - - - - Your password has been reset successfully, you can now log in using the new credentials. - - - - - Failed to reset user account password, please contact the server operator to reset your password. - - - - - Activation request received, please check your email for an activation token. - - - - - Connecting to %1... - - - - - Registering to %1 as %2... - - - - - Disconnected - - - - - Connected, logging in at %1 - - - - - Requesting forgotten password to %1 as %2... - - - - - Your username must respect these rules: - - - - - is %1 - %2 characters long - - - - - can %1 contain lowercase characters - - - - - - - - NOT - - - - - can %1 contain uppercase characters - - - - - can %1 contain numeric characters - - - - - can contain the following punctuation: %1 - - - - - first character can %1 be a punctuation mark - - - - - no unacceptable language as specified by these server rules: - note that the following lines will not be translated - - - - - can not contain any of the following words: %1 - - - - - can not match any of the following expressions: %1 - - - - - You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - - CustomZoneMenu - + C&ustom Zones - - + + View custom zone '%1' @@ -1516,35 +974,30 @@ To update your client, go to Help -> Check for Updates. DeckAnalyticsWidget - + Add Panel - + Remove Panel - + Save Layout - + Load Layout - - - Include Sideboard - - DeckEditorCardDatabaseDockWidget - + Card Database @@ -1560,17 +1013,47 @@ To update your client, go to Help -> Check for Updates. DeckEditorDatabaseDisplayWidget - + Search by card name (or search expressions) - + + Add to Deck + + + + + Add to Sideboard + + + + + Select Printing + + + + + Show on EDHRec (Commander) + + + + + Show on EDHRec (Card) + + + + + Show Related cards + + + + Add card to &maindeck - + Add card to &sideboard @@ -1603,72 +1086,72 @@ To update your client, go to Help -> Check for Updates. - + Select Printing - + Deck - + Deck &name: - + Banner Card/Tags Visibility Settings - + Show banner card selection menu - + Show tags selection menu - + &Comments: - + Group by: - + Format: - + Hash: - + &Increment number - + &Decrement number - + &Remove row - + Swap card to/from sideboard @@ -1676,17 +1159,17 @@ To update your client, go to Help -> Check for Updates. DeckEditorFilterDockWidget - + Filters - + &Clear all filters - + Delete selected @@ -1817,113 +1300,169 @@ To update your client, go to Help -> Check for Updates. DeckEditorSettingsPage - - + + Update Spoilers - + + Success Επιτυχία - + Download URLs have been reset. - + + Downloaded card pictures have been reset. + + + + + Error + Σφάλμα + + + + One or more downloaded card pictures could not be cleared. + + + + Add URL - - + + URL: - - + + Edit URL - + + Network Cache Size: + + + + + Redirect Cache TTL: + + + + + How long cached redirects for urls are valid for. + + + + + Picture Cache Size: + + + + Add New URL - + Remove URL - + + Day(s) + + + + Updating... - + Choose path - + URL Download Priority - + Spoilers - + Download Spoilers Automatically - + Spoiler Location: - + Last Change - + Spoilers download automatically on launch - + Press the button to manually update without relaunching - + Do not close settings until manual update is complete - + Download card pictures on the fly - + How to add a custom URL - + + Delete Downloaded Images + + + + Reset Download URLs + + + On-disk cache for downloaded pictures + + + + + In-memory cache for pictures not currently on screen + + DeckListHistoryManagerWidget @@ -1989,12 +1528,12 @@ To update your client, go to Help -> Check for Updates. DeckLoader - + Common deck formats (%1) - + All files (*.*) @@ -2216,27 +1755,27 @@ To update your client, go to Help -> Check for Updates. - + Moved to %1 1 × "%2" (%3) - + Removed "%1" (all copies) - + %1 1 × "%2" (%3) - + Added - + Removed @@ -2258,74 +1797,74 @@ To update your client, go to Help -> Check for Updates. DeckViewContainer - + Load deck... Φόρτωση deck... - + Load remote deck... Φόρτωση απομακρυσμένου deck... - + Load from clipboard... - + Load from website... - + Unload deck - + Ready to start - + Force start - + Sideboard unlocked - + Sideboard locked - - + + Error Σφάλμα - + The selected file could not be loaded. Δεν ήταν δυνατή η φόρτωση του επιλεγμένου αρχείου. - + Deck is greater than maximum file size. - + Are you sure you want to force start? This will kick all non-ready players from the game. - + Cockatrice @@ -2424,7 +1963,7 @@ This will kick all non-ready players from the game. - + Webpage @@ -2464,37 +2003,37 @@ This will kick all non-ready players from the game. - + Server URL - + Communication Port - + Unique Server Name - + Connection Warning Προειδοποίηση σύνδεσης - + You need to name your new connection profile. Πρέπει να ονομάσετε το νέο προφίλ σύνδεσης. - + Connect Warning Προειδοποίηση σύνδεσης - + The player name can't be empty. Το όνομα παίκτη δεν μπορεί να είναι άδειο. @@ -2607,17 +2146,17 @@ This will kick all non-ready players from the game. Δημιουργία παιχνιδιού - + Game information Πληροφορίες παιχνιδιού - + Error Σφάλμα - + Server error. Σφάλμα Διακομιστή. @@ -2625,97 +2164,97 @@ This will kick all non-ready players from the game. DlgCreateToken - + &Name: &Όνομα: - + Token Token - + C&olor: Χ&ρώμα: - + white άσπρο - + blue μπλε - + black μαύρο - + red κόκκινο - + green πράσινο - + multicolor πολύχρωμο - + colorless άχρωμο - + &P/T: &P/T: - + &Annotation: &Σχόλιο: - + &Destroy token when it leaves the table &κατέστρεψε το token όταν φύγει από το τραπέζι - + Create face-down (Only hides name) - + Token data Στοιχεία token - + Show &all tokens Εμφάνισε &όλα τα tokens - + Show tokens from this &deck Εμφάνιση tokens από αυτό το &deck - + Choose token from list Επέλεξε token από τη λίστα - + Create token Δημιουργία token @@ -2749,7 +2288,7 @@ This will kick all non-ready players from the game. - + ✖ @@ -2764,12 +2303,12 @@ This will kick all non-ready players from the game. - + Duplicate Tag - + This tag already exists. @@ -2956,12 +2495,12 @@ To remove your current avatar, confirm without choosing a new image. Παρακαλώ εισάγετε το όνομα του token: - + Error Σφάλμα - + The chosen name conflicts with an existing card or token. Make sure to enable the 'Token' set in the "Manage sets" dialog to display them correctly. @@ -2985,12 +2524,12 @@ Make sure to enable the 'Token' set in the "Manage sets" dia Απροσδιόριστο - + Real name: Πραγματικό όνομα: - + Edit user profile Επεξεργασία προφίλ χρήστη @@ -3028,113 +2567,113 @@ Make sure to enable the 'Token' set in the "Manage sets" dia - + Hide 'buddies only' games - + Hide full games - + Hide games that have started - + Hide password protected games - + Hide 'ignored user' games - + Hide games not created by buddies Hide games not created by buddy - + Hide games with forced open decklists - + &Newer than: - + Game &description: Παιχνίδι και &περιγραφή: - + &Creator name: &Όνομα δημιουργού: - + General - + &Game types &Είδη παιχνιδιού - + at &least: το &λιγότερο: - + at &most: το &περισσότερο: - + Maximum player count Μέγιστος αριθμός παικτών - + Restrictions Περιορισμοί - + Show games only if &spectators can watch - + Show spectator password p&rotected games - + Show only if spectators can ch&at - + Show only if spectators can see &hands - + Spectators - + Filter games Φίλτρο παιχνιδιών @@ -3437,37 +2976,37 @@ https://tappedout.net/mtg-decks/your-deck-name/ DlgMoveTopCardsUntil - + Card name (or search expressions): - + Number of hits: - + Auto play hits - + Put top cards on stack until... - + No cards matching the search expression exists in the card database. Proceed anyways? - + Cockatrice - + Invalid filter @@ -3526,40 +3065,40 @@ Your email will be used to verify your account. Απροσδιόριστο - + Real name: Πραγματικό όνομα: - + Register to server Εγγραφή σε διακομιστή - - - - + + + + Registration Warning Προειδοποίηση Εγγραφής - + Your password is too short. Ο κωδικός σας είναι πολύ μικρός. - + Your passwords do not match, please try again. Οι κωδικοί δεν ταιριάζουν, παρακαλώ προσπαθήστε ξανά - + Your email addresses do not match, please try again. - + The player name can't be empty. Το όνομα παίκτη δεν μπορεί να είναι άδειο. @@ -3567,17 +3106,17 @@ Your email will be used to verify your account. DlgRollDice - + Number of sides: - + Number of dice: - + Roll Dice @@ -3628,12 +3167,12 @@ Your email will be used to verify your account. DlgSettings - + Unknown Error loading card database - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -3644,7 +3183,7 @@ Would you like to change your database location setting? - + Your card database version is too old. This can cause problems loading card information or images @@ -3661,7 +3200,7 @@ Would you like to change your database location setting? Θα θέλατε να αλλάξετε τη ρυθμισμένη θέση της βάσης δεδομένων σας; - + Your card database did not finish loading Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached @@ -3670,21 +3209,21 @@ Would you like to change your database location setting? - + File Error loading your card database. Would you like to change your database location setting? - + Your card database was loaded but contains no cards. Would you like to change your database location setting? - + Unknown card database load status Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues @@ -3693,64 +3232,59 @@ Would you like to change your database location setting? - - - + + + Error Σφάλμα - + The path to your deck directory is invalid. Would you like to go back and set the correct path? - + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? - + Settings Ρυθμίσεις - + General Γενικά - + Appearance Εμφάνιση - + User Interface Διεπαφή Χρήστη - - Storage - - - - + Card Sources - + Chat - + Sound Ήχος - + Shortcuts Συντομεύσεις @@ -3842,9 +3376,9 @@ You can always change this behavior in the 'General' settings tab. - - - + + + Error Σφάλμα @@ -3896,31 +3430,31 @@ Please visit the download page to update manually. - + Update Available Υπάρχει Διαθέσιμη Ενημέρωση - + A new version of Cockatrice is available! Μία νέα έκδοση του Cockatrice είναι διαθέσιμη! - + New version Νέα έκδοση - + Released - + Changelog Αρχείο Αλλαγών @@ -3930,50 +3464,50 @@ Please visit the download page to update manually. Θέλετε να ενημερώσετε τώρα; - + Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. - + Please check the <a href="%1">releases page</a> on our Github and download the build for your system. - - - + + + Update Error - + An error occurred while checking for updates: - + An error occurred while downloading an update: - + Installing... - + Cockatrice is unable to open the installer. - + Try to update manually by closing Cockatrice and running the installer. - + Download location @@ -4063,67 +3597,67 @@ You may have to manually download the new version. DrawProbabilityWidget - + Draw Probability - + Probability of drawing - + Card Name - + Type - + Subtype - + Mana Value - + At least - + Exactly - + card(s) having drawn at least - + cards - + Category - + Qty - + Odds (%) @@ -4237,7 +3771,7 @@ You may have to manually download the new version. FilterBuilder - + Type your filter here @@ -4268,22 +3802,22 @@ You may have to manually download the new version. GameEventHandler - + kicked by game host or moderator - + player left the game - + player disconnected from server - + reason unknown @@ -4291,140 +3825,140 @@ You may have to manually download the new version. GameSelector - - - - - - - - - + + + + + + + + + Error Σφάλμα - + Please join the appropriate room first. - + Wrong password. Λάθος κωδικός. - + Spectators are not allowed in this game. - + The game is already full. - + The game does not exist any more. - + This game is only open to registered users. - + This game is only open to its creator's buddies. - + You are being ignored by the creator of this game. - + Join Game - + Spectate Game - + Game Information - + Join Game as Judge - + Spectate Game as Judge - + Join game - + Password: Κωδικός: - + Please join the respective room first. - + &Filter games - + C&lear filter Καθάρισμα Φίλτρου - + C&reate Δημιουργία - + &Join Είσοδος - + Join as judge - + J&oin as spectator Είσοδος ως θεατής - + Join as judge spectator - + Games shown: %1 / %2 - + Games @@ -4432,32 +3966,32 @@ You may have to manually download the new version. GameSelectorQuickFilterToolBar - + All types - + Filter by game name... - + Filter by game type/format - + Hide games not created by buddies - + Hide full games - + Hide started games @@ -4465,105 +3999,105 @@ You may have to manually download the new version. GamesModel - + >1 day - + %1%2 hr short age in hours - + new - + %1%2 min short age in minutes - + password κωδικός - + buddies only μόνο φίλοι - + reg. users only μόνο εγγεγραμμένοι χρήστες - + open decklists + - can chat μπορούν να συνομιλήσουν - + see hands βλέπουν τα χέρια - + can see hands μπορούν να δούν τα χέρια - + not allowed δεν επιτρέπεται - + Room Δωμάτιο - + Age Ηλικία - + Description Περιγραφή - + Creator Δημιουργός - + Type Τύπος - + Restrictions Περιορισμοί - + Players Παίκτες - + Spectators Θεατές @@ -4571,158 +4105,143 @@ You may have to manually download the new version. GeneralSettingsPage - + Reset all paths - + All paths have been reset - - - - - - - + + + + + + + Choose path Επιλέξτε θέση - - Language settings + + Personal settings - + Language: Γλώσσα: - - Version settings - - - - - Card database - - - - - Startup settings - - - - + Paths (editing disabled in portable mode) - + Paths - + How to help with translations - + Decks directory: Φάκελος deck: - + Filters directory: - + Replays directory: Φάκελος replay: - + Pictures directory: Φάκελος εικόνων: - + Card database: Βάση δεδομένων καρτών - + Custom database directory: - + Token database: Βάση δεδομένων token: - + Update channel - + Check for client updates on startup - + Check for card database updates on startup - + Don't check - + Prompt for update - + Always update in the background - + Check for card database updates every - + days - + Notify if a feature supported by the server is missing in my client - + Automatically run Oracle when running a new version of Cockatrice - + Show tips on startup - + Last update check on %1 (%2 days ago) @@ -4730,47 +4249,47 @@ You may have to manually download the new version. GraveyardMenu - + &Graveyard - + &View graveyard - + &Move graveyard to... - + &Top of library - + &Bottom of library - + &All players - + &Hand - + &Exile - + Reveal random card to... @@ -4778,88 +4297,88 @@ You may have to manually download the new version. HandMenu - + &Hand - + &View hand - + Sort hand by... - + Name - + Type - + Mana Value - + Take &mulligan (Choose hand size) - + Take mulligan (Same hand size) - + Take mulligan (Hand size - 1) - + &Move hand to... - + &Top of library - + &Bottom of library - + &Graveyard - + &Exile - + &Reveal hand to... - - + + All players - + Reveal r&andom card to... @@ -4867,52 +4386,52 @@ You may have to manually download the new version. HomeWidget - + Create New Deck - + Browse Decks - + Browse Card Database - + Browse EDHRec - + Browse Archidekt - + View Replays - + Quit - + Connecting... - + Connect - + Play @@ -4920,213 +4439,213 @@ You may have to manually download the new version. LibraryMenu - + &Library - + &View library - + View &top cards of library... - + View bottom cards of library... - + Reveal &library to... - + Lend library to... - + Reveal &top cards to... - + &Top of library... - + &Bottom of library... - + &Always reveal top card - + &Always look at top card - + &Open deck in deck editor - + &Draw card - + D&raw cards... - + &Undo last draw - + Shuffle - + &Play top card - + Play top card &face down - + Put top card on &bottom - + Move top card to grave&yard - + Move top card to e&xile - + Move top cards to &graveyard... - + Move top cards to graveyard face down... - + Move top cards to &exile... - + Move top cards to exile face down... - + Put top cards on stack &until... - + Shuffle top cards... - + &Draw bottom card - + D&raw bottom cards... - + &Play bottom card - + Play bottom card &face down - + Move bottom card to grave&yard - + Move bottom card to e&xile - + Move bottom cards to &graveyard... - + Move bottom cards to graveyard face down... - + Move bottom cards to &exile... - + Move bottom cards to exile face down... - + Put bottom card on &top - + Shuffle bottom cards... - - + + &All players - + Reveal top cards of library - + Number of cards: (max. %1) @@ -5134,453 +4653,831 @@ You may have to manually download the new version. MainWindow - - + + + The server has reached its maximum user capacity, please check back later. + + + + + There are too many concurrent connections from your address. + + + + + Banned by moderator + + + + + Expected end time: %1 + + + + + This ban lasts indefinitely. + + + + + Scheduled server shutdown. + + + + + + Invalid username. + + + + + You have been logged out due to logging in at another location. + + + + + Connection closed + + + + + The server has terminated your connection. +Reason: %1 + + + + + The server is going to be restarted in %n minute(s). +All running games will be lost. +Reason for shutdown: %1 + + + + + Scheduled server shutdown + + + + + + Success + + + + + Registration accepted. +Will now login. + + + + + Account activation accepted. +Will now login. + + + + + Player %1 - + Load replay - + About Cockatrice - + Version Έκδοση - + Cockatrice Webpage - + Project Manager: - + Past Project Managers: - + Developers: - + Our Developers - + Help Develop! - + Translators: - + Our Translators Οι μεταφραστές μας - + Help Translate! - + Support: Υποστήριξη: - + Report an Issue Αναφορά Προβλήματος - + Troubleshooting Αντιμετώπιση Προβλημάτων - + F.A.Q. Συχνές Ερωτήσεις - - + + + + + + + + + + + + + + + + + + + + Error Σφάλμα - - &Connect... - Σύνδεση... - - - - &Disconnect - Αποσύνδεση - - - - Start &local game... - Έναρξη τοπικού παιχνιδιού... - - - - &Watch replay... + + Server timeout - - &Full screen - Πλήρης οθόνη + + Failed Login + Αποτυχημένη Σύνδεση - - &Register to server... - Εγγραφή σε σέρβερ... - - - - &Restore password... + + Your client seems to be missing features this server requires for connection. - - &Settings... - Ρυθμίσεις... - - - - &Exit - Έξοδος - - - - A&ctions + + To update your client, go to 'Help -> Check for Client Updates'. - - &Cockatrice - &Cockatrice - - - - C&ard Database - Βάση δεδομένων καρτών - - - - &Manage sets... + + Incorrect username or password. Please check your authentication information and try again. - - Edit custom &tokens... + + There is already an active session using this user name. +Please close that session first and re-login. - - Open custom image folder + + + You are banned until %1. + Είστε αποκλεισμένος μέχρι %1. + + + + + You are banned indefinitely. + Είστε αποκλεισμένος επ' αόριστον. + + + + This server requires user registration. Do you want to register now? + Ο σέρβερ απαιτεί εγγραφή. Θέλετε να εγγραφείτε τώρα; + + + + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. - - Open custom sets folder + + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - Add custom sets/cards + + Account activation + Ενεργοποίηση λογαριασμού + + + + Your account has not been activated yet. +You need to provide the activation token received in the activation email. - - Reload card database + + Server Full + Σέρβερ Πλήρης + + + + Unknown login error: %1 + Άγνωστο σφάλμα σύνδεσης: %1 + + + + + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - Tabs + + Your username must respect these rules: - - &Help - Βοήθεια - - - - &About Cockatrice - Σχετικά με το Cockatrice - - - - &Tip of the Day + + is %1 - %2 characters long - - Check for Client Updates - Έλεγχος για ενημερώσεις - - - - Check for Card Updates... + + can %1 contain lowercase characters - - Check for Card Updates (Automatic) + + + + + NOT - - Show Status Bar + + can %1 contain uppercase characters - - View &Debug Log + + can %1 contain numeric characters - - Open Settings Folder + + can contain the following punctuation: %1 - - Show/Hide + + first character can %1 be a punctuation mark - - New Version + + no unacceptable language as specified by these server rules: + note that the following lines will not be translated + + + + + can not contain any of the following words: %1 + + + + + can not match any of the following expressions: %1 + + + + + You may only use A-Z, a-z, 0-9, _, ., and - in your username. + + + + + + + + + + Registration denied + + + + + Registration is currently disabled on this server + + + + + There is already an existing account with the same user name. + + + + + It's mandatory to specify a valid email address when registering. + + + + + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + + + + + Password too short. + Ο κωδικός είναι πολύ μικρός. + + + + Registration failed for a technical problem on the server. + + + + + The connection to the server has been lost. + + + + + Unknown registration error: %1 + + + + + Account activation failed + + + + + Socket error: %1 + + + + + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + + + + + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + + + + + Connecting to %1... + + + + + Registering to %1 as %2... + + + + + Disconnected + Connected, logging in at %1 + + + + + + + Requesting forgotten password to %1 as %2... + + + + + &Connect... + Σύνδεση... + + + + &Disconnect + Αποσύνδεση + + + + Start &local game... + Έναρξη τοπικού παιχνιδιού... + + + + &Watch replay... + + + + + &Full screen + Πλήρης οθόνη + + + + &Register to server... + Εγγραφή σε σέρβερ... + + + + &Restore password... + + + + + &Settings... + Ρυθμίσεις... + + + + &Exit + Έξοδος + + + + A&ctions + + + + + &Cockatrice + &Cockatrice + + + + C&ard Database + Βάση δεδομένων καρτών + + + + &Manage sets... + + + + + Edit custom &tokens... + + + + + Open custom image folder + + + + + Open custom sets folder + + + + + Add custom sets/cards + + + + + Reload card database + + + + + Tabs + + + + + &Help + Βοήθεια + + + + &About Cockatrice + Σχετικά με το Cockatrice + + + + &Tip of the Day + + + + + Check for Client Updates + Έλεγχος για ενημερώσεις + + + + Check for Card Updates... + + + + + Check for Card Updates (Automatic) + + + + + Show Status Bar + + + + + View &Debug Log + + + + + Open Settings Folder + + + + + Show/Hide + + + + + New Version + + + + Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. - + Cockatrice installed - + Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. - + Card database Βάση δεδομένων καρτών - + Cockatrice is unable to load the card database. Do you want to update your card database now? If unsure or first time user, choose "Yes" - - + + Yes Ναι - - + + No Όχι - + Open settings Άνοιγμα ρυθμίσεων - + New sets found Βρέθηκαν νέα σετ - + %n new set(s) found in the card database Set code(s): %1 Do you want to enable it/them? - - Yes, always enable - - - - + View sets Εμφάνιση σετ - + Welcome Καλωσήρθατε - + Hi! It seems like you're running this version of Cockatrice for the first time. All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. - + + Information Πληροφορίες - + A card database update is already running. - + Unable to run the card database updater: - + Card database update running. - + Failed to start. The file might be missing, or permissions might be incorrect. - + The process crashed some time after starting successfully. - + Timed out. The process took too long to respond. The last waitFor...() function timed out. - + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. - + An error occurred when attempting to read from the process. For example, the process may not be running. - + Unknown error occurred. - + The card database updater exited with an error: %1 - - - - - + + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + + + + + + + + Load sets/cards Φόρτωση σετ/καρτών - + Selected file cannot be found. Το επιλεγμένο αρχείο δε βρέθηκε. - + You can only import XML databases at this time. - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. - + Sets/cards failed to import. + + + + + Reset Password + + + + + Your password has been reset successfully, you can now log in using the new credentials. + + + + + Failed to reset user account password, please contact the server operator to reset your password. + + + + + Activation request received, please check your email for an activation token. + + ManaBaseConfigDialog - + Mana Base Configuration - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): - + OK - + Cancel @@ -5652,27 +5549,27 @@ Cockatrice will now reload the card database. ManaDevotionConfigDialog - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): @@ -5742,615 +5639,610 @@ Cockatrice will now reload the card database. MessageLogWidget - + from play από το παιχνίδι - + from their graveyard - + from exile από την εξορία - + from their hand - + the top card of %1's library την πρώτη κάρτα της βιβλιοθήκης του/της %1 - + the top card of their library - + from the top of %1's library από την κορυφή της βιβλιοθήκης του/της %1 - + from the top of their library - + the bottom card of %1's library την τελευταία κάρτα της βιβλιοθήκης του/της %1 - + the bottom card of their library - + from the bottom of %1's library από το τέλος της βιβλιοθήκης του/της %1 - + from the bottom of their library - + from %1's library από τη βιβλιοθήκη του/της %1 - + from their library - + from sideboard από το sideboard - + from the stack από το stack - + from custom zone '%1' - + %1 is now keeping the top card %2 revealed. - + %1 is not revealing the top card %2 any longer. - + %1 can now look at top card %2 at any time. - + %1 no longer can look at top card %2 at any time. - + %1 attaches %2 to %3's %4. - + %1 has conceded the game. - + %1 has unconceded the game. - + %1 has restored connection to the game. - + %1 has lost connection to the game. - + %1 points from their %2 to themselves. - + %1 points from their %2 to %3. - + %1 points from %2's %3 to themselves. - + %1 points from %2's %3 to %4. - + %1 points from their %2 to their %3. - + %1 points from their %2 to %3's %4. - + %1 points from %2's %3 to their own %4. - + %1 points from %2's %3 to %4's %5. - + %1 creates a face down token. - + %1 creates token: %2%3. - + %1 has loaded a deck (%2). Ο/Η %1 φόρτωσε ένα deck (%2). - + %1 has loaded a deck with %2 sideboard cards (%3). Ο/Η %1 φόρτωσε ένα deck με %2 κάτρες στο sideboard (%3). - + %1 destroys %2. - + a card μία κάρτα - + %1 gives %2 control over %3. ο/η %1 δίνει στον/στην %2 τον έλεγχο του %3 . - + %1 puts %2 into play%3 face down. - + %1 puts %2 into play%3. ο/η %1 βάζει στο παιχνίδι το %2%3. - + %1 puts %2%3 into their graveyard face down. - + %1 puts %2%3 into their graveyard. - + %1 exiles %2%3 face down. - + %1 exiles %2%3. ο/η %1 εξορίζει το %2%3. - + %1 moves %2%3 to their hand. - + %1 puts %2%3 into their library. - + %1 puts %2%3 onto the bottom of their library. - + %1 puts %2%3 on top of their library. - + %1 puts %2%3 into their library %4 cards from the top. - + %1 moves %2%3 to sideboard. - + %1 plays %2%3 face down. - + %1 plays %2%3. - + %1 moves %2%3 to custom zone '%4' face down. - + %1 moves %2%3 to custom zone '%4'. - + %1 tries to draw from an empty library - + %1 draws %2 card(s). - + %1 is looking at %2. - + %1 is looking at the %4 %3 card(s) %2. top card for singular, top %3 cards for plural - + bottom - + top - + %1 turns %2 face-down. - + %1 turns %2 face-up. - + The game has been closed. Το παιχνίδι έχει κλείσει - + The game has started. Το παιχνίδι ξεκίνησε. - + You are flooding the game. Please wait a couple of seconds. - + %1 has joined the game. - + %1 is now watching the game. Ο/Η %1 παρακολουθεί το παιχνίδι. - + You have been kicked out of the game. Σας απέβαλαν από το παιχνίδι. - + %1 has left the game (%2). - + %1 is not watching the game any more (%2). - + %1 is not ready to start the game any more. - + %1 shuffles their deck and draws a new hand of %2 card(s). - + %1 shuffles their deck and draws a new hand. - + You are watching a replay of game #%1. - + %1 is ready to start the game. - + cards an unknown amount of cards - + %1 card(s) a card for singular, %1 cards for plural - + %1 lends %2 to %3. - + %1 reveals %2 to %3. - + %1 reveals %2. - + %1 randomly reveals %2%3 to %4. - + %1 randomly reveals %2%3. - + %1 peeks at face down card #%2. - + %1 peeks at face down card #%2: %3. - + %1 reveals %2%3 to %4. - + %1 reveals %2%3. - + %1 reversed turn order, now it's %2. - + reversed - + normal - + Heads - + Tails - + %1 flipped a coin. It landed as %2. - + %1 rolls a %2 with a %3-sided die. - + %1 flips %2 coins. There are %3 heads and %4 tails. - + %1 rolls a %2-sided dice %3 times: %4. - + %1's turn. - + %1 sets annotation of %2 to %3. - - %1 places %2 %3%4 counter(s) on %5 (now %6). + + %1 places %2 "%3" counter(s) on %4 (now %5). - - %1 removes %2 %3%4 counter(s) from %5 (now %6). + + %1 removes %2 "%3" counter(s) from %4 (now %5). - - %1 failed to undo their last draw. - - - - + %1 sets counter %2 to %3 (%4%5). - + %1 sets %2 to not untap normally. - + %1 sets %2 to untap normally. - + %1 removes the PT of %2. - + %1 changes the PT of %2 from nothing to %4. - + %1 changes the PT of %2 from %3 to %4. - + %1 has locked their sideboard. - + %1 has unlocked their sideboard. - + %1 taps their permanents. - + %1 untaps their permanents. - + %1 taps %2. - + %1 untaps %2. - + %1 shuffles %2. - + %1 shuffles the bottom %3 cards of %2. - + %1 shuffles the top %3 cards of %2. - + %1 shuffles cards %3 - %4 of %2. - + %1 unattaches %2. - + %1 undoes their last draw. - + %1 undoes their last draw (%2). @@ -6358,115 +6250,110 @@ Cockatrice will now reload the card database. MessagesSettingsPage - + Word1 Word2 Word3 - + Add New Message - + Edit Message - + Remove Message - + Add message - - + + Message: - + Edit message - + Chat settings - + Custom alert words - + Enable chat mentions - + Enable mention completer - + In-game message macros - + How to use in-game message macros - + Ignore chat room messages sent by unregistered users - + Ignore private messages sent by unregistered users - - Ignore private messages sent by non-buddy users - - - - - + + Invert text color - + Enable desktop notifications for private messages - + Enable desktop notification for mentions - + Enable room message history on join - - + + (Color is hexadecimal) - + Separate words with a space, alphanumeric characters only @@ -6474,42 +6361,42 @@ Cockatrice will now reload the card database. MoveMenu - + Move to - + &Top of library in random order - + X cards from the top of library... - + &Bottom of library in random order - + T&able - + &Hand - + &Graveyard - + &Exile @@ -6522,47 +6409,47 @@ Cockatrice will now reload the card database. - + Mana Value - + Color(s) - + Loyalty - + Main Card Type - + Mana Cost - + P/T - + Side - + Layout - + Color Identity @@ -6585,152 +6472,6 @@ Cockatrice will now reload the card database. - - PaletteEditorDialog - - - - Reset - - - - - - Apply - - - - - - Save && Apply - - - - - ▼ Edit Palette - - - - - - ▶ Edit Palette - - - - - Palette Editor — %1 - - - - - <b>Palette Editor</b> &nbsp;·&nbsp; %1 - - - - - This theme ships no default palette files - - - - - Replace current colours with the theme author's defaults - - - - - Switch between the light and dark palette files - - - - - Editing: - - - - - Show or hide the per-role colour grid for manual tweaks - - - - - ↺ Revert to theme default - - - - - Discard unsaved edits and restore the last saved palette - - - - - Preview this palette without saving to disk - - - - - Write palette-%1.toml and reload the theme - - - - - Cannot save: this theme has no directory on disk - - - - - Save failed - - - - - Could not write %1 to: -%2 - - - - - No default found - - - - - No default palette file found for the "%1" scheme. - - - - - PaletteGridWidget - - - Active - - - - - Disabled - - - - - Inactive - - - - - Normal interactive state - - - - - Widget is disabled / not interactive - - - - - Window is in background / unfocused - - - Phase @@ -6797,57 +6538,57 @@ Cockatrice will now reload the card database. PhasesToolbar - + Untap step - + Upkeep step - + Draw step - + First main phase - + Beginning of combat step - + Declare attackers step - + Declare blockers step - + Combat damage step - + End of combat step - + Second main phase - + End of turn step @@ -6855,7 +6596,7 @@ Cockatrice will now reload the card database. PictureLoader - + en code for scryfall's language property, not available for all languages @@ -6864,142 +6605,151 @@ Cockatrice will now reload the card database. PlayerActions - - - - - grave - - - - - - - - exile - - - - - PlayerDialogs - - + View top cards of library - - - - - - - - - + + + + + + + + + Number of cards: (max. %1) - + View bottom cards of library - + Shuffle top cards of library - + Shuffle bottom cards of library - + Draw hand - + 0 and lower are in comparison to current hand size - + Draw cards - + + + + + grave + + + + + + + + exile + + + + Move top cards to %1 - + Move bottom cards to %1 - + Draw bottom cards - + + + C&reate another %1 token + + + + Create tokens - + + Number: - + Place card X cards from top of library - + Which position should this card be placed: - + (max. %1) - + Change power/toughness - + Change stats to: - + Set annotation - + Please enter the new annotation: + + + Set counters + + PlayerMenu - + Player "%1" - + &Counters @@ -7029,7 +6779,7 @@ This setting means you'll only see the default printing for each card, instead o - + Printing Selector @@ -7037,22 +6787,22 @@ This setting means you'll only see the default printing for each card, instead o PrintingSelectorCardOverlayWidget - + Preference - + Pin Printing - + Unpin Printing - + Show Related cards @@ -7123,57 +6873,57 @@ This setting means you'll only see the default printing for each card, instead o PtMenu - + Power / toughness - + &Increase power - + &Decrease power - + I&ncrease toughness - + D&ecrease toughness - + In&crease power and toughness - + Dec&rease power and toughness - + Increase power and decrease toughness - + Decrease power and increase toughness - + Set &power and toughness... - + Reset p&ower and toughness @@ -7181,37 +6931,37 @@ This setting means you'll only see the default printing for each card, instead o QMenuBar - + Services - + Hide %1 - + Hide Others - + Show All - + Preferences... - + Quit %1 - + About %1 @@ -7219,17 +6969,17 @@ This setting means you'll only see the default printing for each card, instead o QObject - + Cockatrice card database (*.xml) - + All files (*.*) - + Cockatrice replays (*.cor) @@ -7289,177 +7039,110 @@ Are you sure you would like to disable this feature? QPlatformTheme - + OK - + Save - + Save All - + Open - + &Yes - + Yes to &All - + &No - + N&o to All - + Abort - + Retry - + Ignore - + Close - + Cancel - + Discard - + Help - + Apply - + Reset - + Restore Defaults - - QuickSetupPanel - - - %1% - - - - - <b>Quick Setup</b> - - - - - Generate all palette roles automatically from a single accent colour - - - - - Accent: - - - - - Primary hue. Used directly for highlights and links. -At high intensity it also tints buttons and backgrounds. - - - - - Intensity: - - - - - Subtle - - - - - Full colour - - - - - 0–30 Subtle tint — only highlights and links change hue -30–70 Accented — buttons, tooltips, and borders join in -70–100 Full colour — backgrounds, everything - - - - - 70% - - - - - Generate ↓ - - - - - Derive all palette roles from the accent colour above. -Fine-tune individual colours in the grid afterwards. - - - RemoteDeckList_TreeModel - + Name - + ID - + Upload time @@ -7467,32 +7150,32 @@ Fine-tune individual colours in the grid afterwards. RemoteReplayList_TreeModel - + ID - + Name - + Players - + Keep - + Time started - + Duration (sec) @@ -7500,37 +7183,37 @@ Fine-tune individual colours in the grid afterwards. RfgMenu - + &Exile - + &View exile - + &Move exile to... - + &Top of library - + &Bottom of library - + &Hand - + &Graveyard @@ -7576,7 +7259,7 @@ Fine-tune individual colours in the grid afterwards. SayMenu - + S&ay @@ -7617,27 +7300,27 @@ Fine-tune individual colours in the grid afterwards. SetsModel - + Enabled - + Set type - + Set code - + Long name - + Release date @@ -7645,53 +7328,53 @@ Fine-tune individual colours in the grid afterwards. ShortcutSettingsPage - - + + Restore all default shortcuts - + Do you really want to restore all default shortcuts? - + Clear all default shortcuts - + Do you really want to clear all shortcuts? - + Section: - + Action: - + Shortcut: - + How to set custom shortcuts - + Clear all shortcuts - + Search by shortcut name @@ -7745,12 +7428,12 @@ Please check your shortcut settings! SideboardMenu - + &Sideboard - + &View sideboard @@ -7758,27 +7441,27 @@ Please check your shortcut settings! SoundSettingsPage - + Enable &sounds - + Current sounds theme: - + Test system sound engine - + Sound settings - + Master volume @@ -7850,146 +7533,16 @@ Please check your shortcut settings! - + No reply received from the tag update server. - + Invalid reply received from the tag update server. - - StorageSettingsPage - - - - - Success - - - - - Cached card pictures have been reset. - - - - - Downloaded card pictures have been reset. - - - - - Error - - - - - One or more downloaded card pictures could not be cleared. - - - - - In-memory (currently loaded) card pictures have been reset. - - - - - Card Picture Loader Caching Method: - - - - - The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size. - - - - - Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while. - - - - - This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk. - - - - - Delete Cached Images - - - - - Delete Saved Images - - - - - Clear In-Memory Images - - - - - Card Picture Loader Cache Method - - - - - Network Cache - - - - - Filesystem - - - - - In-Memory Picture Cache - - - - - Network Cache Size: - - - - - On-disk cache for downloaded pictures - - - - - Redirect Cache TTL: - - - - - How long cached redirects for urls are valid for. - - - - - Picture Cache Size: - - - - - In-memory cache for pictures not currently on screen - - - - - Naming scheme: - - - - - Day(s) - - - TabAccount @@ -8125,117 +7678,117 @@ Please check your shortcut settings! TabArchidekt - - + + Desc. - - + + AND - - + + Require ALL selected colors - - + + Deck name... - - + + Owner... - - + + Packages - - + + Advanced Filters - + Bracket: - - + + Any - - + + Contains card... - - + + Commander... - - + + Tag... - - + + Deck Size - + Cards: - - + + Asc. - + Sort by: - + Filter by: - + Display Settings - - + + Search - - + + Formats @@ -8245,54 +7798,6 @@ Please check your shortcut settings! - - TabCardArtRules - - - Card: - - - - - ProviderId: - - - - - Mode: - - - - - Reason: - - - - - Type a card name... - - - - - Add rule - - - - - Remove rule - - - - - Refresh - - - - - Card Art Rules - - - TabDeckEditor @@ -8341,7 +7846,7 @@ Please check your shortcut settings! - + Deck: %1 @@ -8349,49 +7854,55 @@ Please check your shortcut settings! TabDeckEditorVisual - + Visual Deck: %1 - + &Visual Deck Editor - - + + Card Info - - + + Deck - + + + Filters + + + + &View - + Printing - + Visible - + Floating - + Reset layout @@ -8399,22 +7910,22 @@ Please check your shortcut settings! TabDeckEditorVisualTabWidget - + Visual Deck View - + Visual Database Display - + Deck Analytics - + Sample Hand @@ -8422,133 +7933,133 @@ Please check your shortcut settings! TabDeckStorage - + Local file system - + Server deck storage - - + + Open in deck editor - + Rename deck or folder - + Upload deck - + Download deck + - - - + + New folder + - Delete - + Open decks folder - + Rename local folder - + Rename local file - + New name: - - - - + + + + Error Σφάλμα - + Rename failed - - + + Invalid deck file - + Enter deck name - + This decklist does not have a name. Please enter a name: - + Unnamed deck - + Failed to upload deck to server - + Delete local file - + Are you sure you want to delete the selected files? - + Delete remote decks - + Are you sure you want to delete the selected decks? - - + + Name of new folder: @@ -8620,191 +8131,191 @@ Please enter a name: TabGame - - - + + + Replay - - + + Game - - + + Player List - - + + Card Info - - + + Messages - - + + Replay Timeline - + &Phases - + &Game - + Next &phase - + Next phase with &action - + Next &turn - + Reverse turn order - + &Remove all local arrows - + Rotate View Cl&ockwise - + Rotate View Co&unterclockwise - + Game &information - + Un&concede - - - + + + &Concede - + &Leave game - + C&lose replay - + &Focus Chat - + &Say: - + Selected cards - + &View - + Visible - + Floating - + Reset layout - + Concede - + Are you sure you want to concede this game? - + Unconcede - + You have already conceded. Do you want to return to this game? - + Leave game - + Are you sure you want to leave this game? - + A player has joined game #%1 - + %1 has joined the game - + You have been kicked out of the game. @@ -8863,114 +8374,114 @@ Please enter a name: - + Username: - + IP Address: - + Game Name: - + GameID: - + Message: - + Main Room - + Game Room - + Private Chat - + Past X Days: - + Today - + Last Hour - + Maximum Results: - + At least one filter is required. The more information you put in, the more specific your results will be. - + Get User Logs - + Clear Filters - + Filters - + Log Locations - + Date Range - + Maximum Results - - + + Message History - + Failed to collect message history information. - + There are no messages for the selected filters. @@ -8988,27 +8499,27 @@ The more information you put in, the more specific your results will be. - + %1 - Private chat - + This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. - + Private message from - + %1 has left the server. - + %1 has joined the server. @@ -9016,180 +8527,180 @@ The more information you put in, the more specific your results will be. TabReplays - + Local file system - + Server replay storage - - + + Watch replay - + Rename - - + + New folder - - + + Delete - + Open replays folder - + Download replay - + Toggle expiration lock - + Get replay share code - - + + Look up replay by share code - + Rename local folder - + Rename local file - + New name: - + Error - + Rename failed - + Name of new folder: - + Delete local file - + Are you sure you want to delete the selected files? - + Are you sure you want to delete the selected replays? - + Failed to get code - - + + Either this server does not support replay sharing, or does not permit replay sharing for you. - - - + + + Failed - + Could not get replay code - + Replay Share Code - + Others can use this code to add the replay to their list of remote replays: %1 - + Copy to clipboard - + Replay share code - + Replay code found - + Replay was added, or you already had access to it. - + Replay code not found - + Failed to submit code - + Unexpected error - + Delete remote replay @@ -9202,62 +8713,47 @@ The more information you put in, the more specific your results will be. TabRoom - - Friends - - - - - Online - - - - - Ignored - - - - + &Say: - + Chat - + &Room - + &Leave room - + &Clear chat - + Chat Settings... - + mentioned you. - + Click to view - + You are flooding the chat. Please wait a couple of seconds. @@ -9270,30 +8766,30 @@ The more information you put in, the more specific your results will be. - - - - + + + + Error Σφάλμα - + Failed to join the server room: it doesn't exist on the server. - + The server thinks you are in the server room but your client is unable to display it. Try restarting your client. - + You do not have the required permission to join this server room. - + Failed to join the server room due to an unknown error: %1. @@ -9301,97 +8797,97 @@ The more information you put in, the more specific your results will be. TabSupervisor - + Deck Editor - + Visual Deck Editor - + EDHRec - + Archidekt - + Home - + &Visual Deck Storage - + Visual Database Display - + Server - + Account - + Deck Storage - + Game Replays - + Administration - + Logs - + Are you sure? - + There are still open games. Are you sure you want to quit? - + Click to view - + Your buddy %1 has signed on! - + Unknown Event - + The server has sent you a message that your client does not understand. This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. @@ -9399,38 +8895,38 @@ To update your client, go to Help -> Check for Updates. - + Idle Timeout - + You are about to be logged out due to inactivity. - + Promotion - + You have been promoted. Please log out and back in for changes to take effect. - + Warned - + You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. - + You have received the following message from the server. (custom messages like these could be untranslated) @@ -9439,12 +8935,12 @@ Please refrain from engaging in this activity or further actions may be taken ag TabVisualDatabaseDisplay - + Database Display - + Visual Database Display @@ -9481,42 +8977,42 @@ Please refrain from engaging in this activity or further actions may be taken ag TranslateCounterName - + Life - + White - + Blue - + Black - + Red - + Green - + Colorless - + Other @@ -9524,69 +9020,11 @@ Please refrain from engaging in this activity or further actions may be taken ag UpdateDownloader - + Could not open the file for reading. - - UserCardArtSettingsDialog - - - Card Art Settings - - - - - Type a card name... - - - - - Card name: - - - - - Card ProviderId: - - - - - Left margin (%): - - - - - Right margin (%): - - - - - Vertical offset: - - - - - Zoom: - - - - - Parameters - - - - - Preview - - - - - Remove Banner Card - - - UserContextMenu @@ -9704,7 +9142,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Ban History @@ -9719,87 +9157,77 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Failed to collect ban information. - - - + + + Warning History - + Warning Time;Moderator;User Name;Reason - + User has never been warned. - + Failed to collect warning information. - + Failed to get admin notes. - - + + Success - + Successfully promoted user. - + Successfully demoted user. - - Kick Player - - - - - Are you sure you want to kick this player from the game? - - - - - - + + + Failed - + Failed to promote user. - + Failed to demote user. - + Copy hash to clipboard - + Remove this user's messages @@ -9807,554 +9235,326 @@ Please refrain from engaging in this activity or further actions may be taken ag UserInfoBox - + Location: - + Account Age: - + Edit - + Change password - + Change avatar - + Administrator - + Moderator - + Registered user - - + + Unregistered user - + Judge - + Unknown - + The entered password does not match your account. - - - - + + + Information - + User information updated. - - - - - - - - - - - + + + + + + + + + + Error Σφάλμα - + User Information - + Real Name: - + User Level: - - - Edit Banner Card - - - + %n Year(s), amount of years (only shown if more than 0) - + %10%n Day(s) %20 amount of years (if more than 0), amount of days, date in local short format - + Enter Password Εισάγετε κωδικό - + Password verification is required in order to change your email address - - - + + + An error occurred while trying to update your user information. - - The selected card is blacklisted on this server or another error occurred. - - - - - Banner card removed. - - - - - Banner card updated. - - - - + This server does not permit you to update your user informations. - + Password changed. - + This server does not permit you to change your password. - + The new password is too short. - + The old password is incorrect. - + Avatar updated. - + This server does not permit you to update your avatar. - - - An error occured while trying to update your avatar. - - - This server does not permit you to update your user informations. - An error occured while trying to updater your avatar. - - - - - UserInfoPopup - - - - Games - - - - - Chat - - - - - Open private chat - - - - - Profile - - - - - View user profile - - - - - Show this user's games - - - - - − Buddy - - - - - Remove from buddy list - - - - - + Buddy - - - - - Add to buddy list - - - - - − Ignore - - - - - Remove from ignore list - - - - - + Ignore - - - - - Add to ignore list - - - - - Ban - - - - - Ban from server - - - - - Warn - - - - - Warn user - - - - - Ban log - - - - - View ban history - - - - - Warn log - - - - - View warning history - - - - - Notes - - - - - View admin notes - - - - - − Mod - - - - - Demote from moderator - - - - - + Mod - - - - - Promote to moderator - - - - - − Judge - - - - - Demote from judge - - - - - + Judge - - - - - Promote to judge - - - - - Join game - - - - - Spectate - - - - - - Loading games… - - - - - Could not load games. - - - - - No active games. + An error occured while trying to updater your avatar. UserInterfaceSettingsPage - + General interface settings - + &Double-click cards to play them (instead of single-click) - + &Clicking plays all selected cards (instead of just the clicked card) - + &Play all nonlands onto the stack (not the battlefield) by default - + Do not delete &arrows inside of subphases - + Close card view window when last card is removed - + Auto focus search bar when card view window is opened - + Annotate card text on tokens - - Show selection count during drag selection + + Show selection counter during drag selection - - Show total selection count + + Show total selection counter - - Show subtype breakdown in selection tally - - - - + Use tear-off menus, allowing right click menus to persist on screen - - Keep game chat focused when clicking in game (Note: disables card view search bar) - - - - + Notifications settings - + Enable notifications in taskbar - + Notify in the taskbar for game events while you are spectating - + Notify in the taskbar when users in your buddy list connect - + Animation settings - + &Tap/untap animation - + Deck editor/storage settings - + Open deck in new tab by default - + Use visual deck storage in game lobby - + Use selection animation for Visual Deck Storage - + When adding a tag in the visual deck storage to a .txt deck: - + do nothing - + ask to convert to .cod - + always convert to .cod - + Default deck editor type - + Classic Deck Editor - + Visual Deck Editor - + Replay settings - + Buffer time for backwards skip via shortcut: @@ -10362,22 +9562,22 @@ Please refrain from engaging in this activity or further actions may be taken ag UserListWidget - + Users connected to server: %1 - + Users in this room: %1 - + Buddies online: %1 / %2 - + Ignored users online: %1 / %2 @@ -10385,45 +9585,35 @@ Please refrain from engaging in this activity or further actions may be taken ag UtilityMenu - + Increment all card counters - + &Untap all permanents - + R&oll die... - - Flip coin - - - - + &Create token... - + C&reate another token - + Cr&eate predefined token - - - C&reate another %1 token - - VisualDatabaseDisplayColorFilterWidget @@ -10475,72 +9665,72 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFilterToolbarWidget - + Sort by - + Filter by - + Save and load filters - + Filter by exact card name - + Filter by card main-type - + Filter by card sub-type - + Filter by set - + Filter by format legality - + Save/Load - + Name - + Main Type - + Sub Type - + Sets - + Formats @@ -10548,22 +9738,22 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFormatLegalityFilterWidget - + Show formats with at least: - + cards - + Do not display formats with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) @@ -10581,32 +9771,32 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayMainTypeFilterWidget - + Show main types with at least: - + cards - + Do not display card main-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10614,27 +9804,27 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayNameFilterWidget - + Filter by name... (Exact match) - + Load from Deck - + Apply all card names in currently loaded deck as exact match name filters - + Load from Clipboard - + Apply all card names in clipboard as exact match name filters @@ -10642,7 +9832,7 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayRecentSetFilterSettingsWidget - + Filter to most recent sets @@ -10650,19 +9840,19 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySetFilterWidget - + Search sets... - - + + Mode: Exact Match - - + + Mode: Includes @@ -10670,37 +9860,37 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySubTypeFilterWidget - + Search subtypes... - + Show sub types with at least: - + cards - + Do not display card sub-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10708,23 +9898,23 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayWidget - + Search by card name (or search expressions) - + Visual - + Loading database ... - + Clear all filters @@ -10763,17 +9953,17 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Toggle Layout: Overlap - + Change how cards are displayed within zones (i.e. overlapped or fully visible.) - + Toggle Layout: Flat @@ -10802,17 +9992,17 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDeckEditorWidget - + Type a card name here for suggestions from the database... - + Quick search and add card - + Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter @@ -10930,43 +10120,43 @@ Please refrain from engaging in this activity or further actions may be taken ag WarningDialog - + Which warning would you like to send? - + Redact all messages from this user in all rooms - + &OK - + &Cancel - + Warn user for misconduct - - + + Error Σφάλμα - + User name to send a warning to can not be blank, please specify a user to warn. - + Warning to use can not be blank, please select a valid warning to send. @@ -10974,133 +10164,133 @@ Please refrain from engaging in this activity or further actions may be taken ag WndSets - + Move selected set to the top - + Move selected set up - + Move selected set down - + Move selected set to the bottom - + Search by set name, code, or type - + Default order - + Restore original art priority order - + Enable all sets - + Disable all sets - + Enable selected set(s) - + Disable selected set(s) - + Deck Editor - + Use CTRL+A to select all sets in the view. - + Only cards in enabled sets will appear in the card list of the deck editor. - + Image priority is decided in the following order: - + first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) %1 is a link to the wiki - + Include cards rebalanced for Alchemy [requires restart] - + Card Art - + How to use custom card art - + Hints - + Note - + Sorting by column allows you to find a set while not changing set priority. - + To enable ordering again, click the column header until this message disappears. - + Use the current sorting as the set priority instead - + Sorts the set priority using the same column - + Manage sets @@ -11108,72 +10298,72 @@ Please refrain from engaging in this activity or further actions may be taken ag ZoneViewWidget - + Search by card name (or search expressions) - + Ungrouped - + Group by Type - + Group by Mana Value - + Group by Color - + Unsorted - + Sort by Name - + Sort by Type - + Sort by Mana Cost - + Sort by Colors - + Sort by P/T - + Sort by Set - + shuffle when closing - + pile view @@ -11181,7 +10371,7 @@ Please refrain from engaging in this activity or further actions may be taken ag i18n - + English Ελληνικά (Greek) @@ -11189,12 +10379,12 @@ Please refrain from engaging in this activity or further actions may be taken ag main - + Connect on startup - + Debug to file @@ -11208,7 +10398,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Deck Editor @@ -11289,7 +10479,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Replays @@ -11404,129 +10594,129 @@ Please refrain from engaging in this activity or further actions may be taken ag - - + + Load Deck from Clipboard... - + Edit Deck in Clipboard, Annotated - + Edit Deck in Clipboard - + New Deck - + Open Custom Pictures Folder - + Print Deck... - + Delete Card - - + + Reset Layout - + Save Deck - + Save Deck as... - + Save Deck to Clipboard, Annotated - + Save Deck to Clipboard, Annotated (No Set Info) - + Save Deck to Clipboard - + Save Deck to Clipboard (No Set Info) - + Load Local Deck... - + Load Remote Deck... - + Set Ready to Start - + Toggle Sideboard Lock - + Add Green Counter - + Remove Green Counter - + Set Green Counters... - + Add Red Counter - + Remove Red Counter - + Set Red Counters... - + Add Life Counter @@ -11536,744 +10726,724 @@ Please refrain from engaging in this activity or further actions may be taken ag - - Load deck from online service... - - - - - Load from website... - - - - + Unload Deck - + Force Start - + Add Card Counter (F) - + Remove Card Counter (F) - + Set Card Counters (F)... - + Add Card Counter (E) - + Remove Card Counter (E) - + Set Card Counters (E)... - + Add Card Counter(D) - + Remove Card Counter (D) - + Set Card Counters (D)... - + Add Card Counter (C) - + Remove Card Counter (C) - + Set Card Counters (C)... - + Add Card Counter (B) - + Remove Card Counter (B) - + Set Card Counters (B)... - + Add Card Counter (A) - + Remove Card Counter (A) - + Set Card Counters (A)... - + Remove Life Counter - + Set Life Counters... - + Add White Counter - + Remove White Counter - + Set White Counters... - + Add Blue Counter - + Remove Blue Counter - + Set Blue Counters... - + Add Black Counter - + Remove Black Counter - + Set Black Counters... - + Add Colorless Counter - + Remove Colorless Counter - + Set Colorless Counters... - + Add Other Counter - + Remove Other Counter - + Set Other Counters... - + Increment all card counters - + Add Power (+1/+0) - + Remove Power (-1/-0) - + Move Toughness to Power (+1/-1) - + Add Toughness (+0/+1) - + Remove Toughness (-0/-1) - + Move Power to Toughness (-1/+1) - + Add Power and Toughness (+1/+1) - + Remove Power and Toughness (-1/-1) - + Set Power and Toughness... - + Reset Power and Toughness - + Untap - + Upkeep - + Draw - + First Main Phase - + Start Combat - + Attack - + Block - + Damage - + End Combat - + Second Main Phase - + End - + Next Phase - + Next Phase Action - + Next Turn - + Hide Card in Reveal Window - + Tap / Untap Card - + Untap All - + Toggle Skip Untapping Toggle Untap - + Turn Card Over - + Peek Card - + Play Card - + Play Card, Face Down - + Attach Card... - + Unattach Card - + Clone Card - + Create Token... - + Create All Related Tokens - + Create Another Token - + Set Annotation... - - Reduce Life by Power - - - - + Select All Cards in Zone - + Select All Cards in Row - + Select All Cards in Column - + Reveal Selected Cards to All Players - - + + Bottom of Library - - - - + + + + Exile - - - - + + + + Graveyard - - + + Hand - - + + Top of Library - - + + Battlefield, Face Down - + Battlefield - + Library - + Sideboard - + Top Cards of Library - + Bottom Cards of Library - + Close Recent View - - + + Stack - - + + Graveyard (Multiple) - - + + Graveyard (Multiple), Face Down - - + + Exile (Multiple) - - + + Exile (Multiple), Face Down - + Stack Until Found - + Draw Bottom Card - + Draw Multiple Cards from Bottom... - + Draw Arrow... - + Remove Local Arrows - + Leave Game - + Concede - + Roll Dice... - - Flip Coin - - - - + Shuffle Library - + Shuffle Top Cards of Library - + Shuffle Bottom Cards of Library - + Mulligan - + Mulligan (Same hand size) - + Mulligan (Hand size - 1) - + Draw a Card - + Draw Multiple Cards... - + Undo Draw - + Always Reveal Top Card - + Always Look At Top Card - + Sort Hand by Name - + Sort Hand by Type - + Sort Hand by Mana Value - + Reveal Hand to All Players - + Reveal Random Card to All Players - + Rotate View Clockwise - + Rotate View Counterclockwise - + Unfocus Text Box - + Focus Chat - + Clear Chat - + Refresh - + Skip Forward - + Skip Backward - + Skip Forward by a lot - + Skip Backward by a lot - + Play/Pause - + Toggle Fast Forward - + Home - + Visual Deck Storage - + Deck Storage - + Server - + Account - + Administration - + Logs diff --git a/cockatrice/translations/cockatrice_en_US.ts b/cockatrice/translations/cockatrice_en_US.ts index 00075c8c3..254ead590 100644 --- a/cockatrice/translations/cockatrice_en_US.ts +++ b/cockatrice/translations/cockatrice_en_US.ts @@ -2,7 +2,7 @@ AbstractCounter - + &Set counter... &Set counter... @@ -10,12 +10,12 @@ AbstractCounterDialog - + Set counter Set counter - + New value for counter '%1': New value for counter '%1': @@ -36,62 +36,62 @@ AbstractTabDeckEditor - + Open in new tab Open in new tab - + Are you sure? Are you sure? - + The decklist has been modified. Do you want to save the changes? The decklist has been modified. Do you want to save the changes? - - - - - - + + + + + + Error Error - + Could not open deck at %1 Could not open deck at %1 - + Could not save remote deck Could not save remote deck - - + + The deck could not be saved. Please check that the directory is writable and try again. The deck could not be saved. Please check that the directory is writable and try again. - + Save deck Save deck - + The deck could not be saved. The deck could not be saved. - + There are no cards in your deck to be exported There are no cards in your deck to be exported @@ -107,12 +107,12 @@ Please check that the directory is writable and try again. AdminNotesDialog - + Update Notes Update Notes - + Admin Notes for %1 Admin Notes for %1 @@ -129,227 +129,172 @@ Please check that the directory is writable and try again. Sideboard Sideboard - - - Tokens - - AppearanceSettingsPage - + seconds seconds - + Error Error - + Could not create themes directory at '%1'. Could not create themes directory at '%1'. - + Theme settings Theme settings - + Current theme: Current theme: - + Open themes folder Open themes folder - + Home tab background source: Home tab background source: - + Home tab background shuffle frequency: Home tab background shuffle frequency: - + Disabled Disabled - + + Display card name of background in bottom right: + Display card name of background in bottom right: + + + Menu settings Menu settings - + Show keyboard shortcuts in right-click menus Show keyboard shortcuts in right-click menus - + Show game filter toolbar above list in room tab Show game filter toolbar above list in room tab - + Card rendering Card rendering - + Display card names on cards having a picture Display card names on cards having a picture - + Auto-Rotate cards with sideways layout Auto-Rotate cards with sideways layout - + Override all card art with personal set preference (Pre-ProviderID change behavior) Override all card art with personal set preference (Pre-ProviderID change behavior) - - Light - - - - - Dark - - - - - System - - - - - Active theme palette: - - - - - Edit theme palette - - - - - Home tab settings - - - - - Display card name of background in bottom right - - - - - Styling settings - - - - - Style user list - - - - - Card printings - - - - + Bump sets that the deck contains cards from to the top in the printing selector Bump sets that the deck contains cards from to the top in the printing selector - + Scale cards on mouse over Scale cards on mouse over - + Use rounded card corners Use rounded card corners - - Card layout - - - - + Minimum overlap percentage of cards on the stack and in vertical hand Minimum overlap percentage of cards on the stack and in vertical hand - + Maximum initial height for card view window: Maximum initial height for card view window: - - + + rows rows - + Maximum expanded height for card view window: Maximum expanded height for card view window: - + Card counters Card counters - + Counter %1 Counter %1 - + Hand layout Hand layout - + Display hand horizontally (wastes space) Display hand horizontally (wastes space) - + Enable left justification Enable left justification - + Table grid layout Table grid layout - + Invert vertical coordinate Invert vertical coordinate - + Minimum player count for multi-column layout: Minimum player count for multi-column layout: - + Maximum font size for information displayed on cards: Maximum font size for information displayed on cards: @@ -357,12 +302,12 @@ Please check that the directory is writable and try again. ArchidektApiResponseDeckDisplayWidget - + Back to results Back to results - + Open Deck in Deck Editor Open Deck in Deck Editor @@ -388,112 +333,112 @@ Please check that the directory is writable and try again. BanDialog - + ban &user name ban &user name - + ban &IP address ban &IP address - + ban client I&D ban client I&D - + Ban type Ban type - + &permanent ban &permanent ban - + &temporary ban &temporary ban - + &Days: &Days: - + &Hours: &Hours: - + &Minutes: &Minutes: - + Duration of the ban Duration of the ban - + Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. - + Please enter the reason for the ban that will be visible to the banned person. Please enter the reason for the ban that will be visible to the banned person. - + Redact all messages from this user in all rooms Redact all messages from this user in all rooms - + &OK &OK - + &Cancel &Cancel - + Ban user from server Ban user from server - - - - + + + + Error Error - + You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. - + You must have a value in the name ban when selecting the name ban checkbox. You must have a value in the name ban when selecting the name ban checkbox. - + You must have a value in the ip ban when selecting the ip ban checkbox. You must have a value in the ip ban when selecting the ip ban checkbox. - + You must have a value in the clientid ban when selecting the clientid ban checkbox. You must have a value in the clientid ban when selecting the clientid ban checkbox. @@ -501,123 +446,59 @@ This is only saved for moderators and cannot be seen by the banned person. BetaReleaseChannel - + Beta Beta - + No reply received from the release update server. No reply received from the release update server. - + Invalid reply received from the release update server. Invalid reply received from the release update server. - + No reply received from the file update server. No reply received from the file update server. - - CardArtPreviewWidget - - - No card selected - - - - - CardArtRulesModel - - - Card - - - - - ProviderId - - - - - Mode - - - - - Reason - - - CardDatabaseModel - + Name Name - + Sets Sets - + Mana cost Mana cost - + Card type Card type - + P/T P/T - + Color(s) Color(s) - - CardDatabaseView - - - Add to Deck - - - - - Add to Sideboard - - - - - Select Printing - - - - - Show on EDHRec (Commander) - - - - - Show on EDHRec (Card) - - - - - Show Related cards - - - CardFilter @@ -746,22 +627,22 @@ This is only saved for moderators and cannot be seen by the banned person. CardInfoPictureWidget - + View related cards View related cards - + Add card to deck Add card to deck - + Mainboard Mainboard - + Sideboard Sideboard @@ -784,12 +665,12 @@ This is only saved for moderators and cannot be seen by the banned person.Collector Number: - + Related cards: Related cards: - + Unknown card: Unknown card: @@ -797,146 +678,128 @@ This is only saved for moderators and cannot be seen by the banned person. CardMenu - + Re&veal to... Re&veal to... - + &All players &All players - + View related cards View related cards - + Token: Token: - + All tokens All tokens - + &Select All &Select All - + S&elect Row S&elect Row - + S&elect Column S&elect Column - + &Play &Play - + &Hide &Hide - + Play &Face Down Play &Face Down - + &Tap / Untap Turn sideways or back again &Tap / Untap - + Skip &untapping Skip &untapping - + T&urn Over Turn face up/face down T&urn Over - + &Peek at card face &Peek at card face - + &Clone &Clone - + Attac&h to card... Attac&h to card... - + Unattac&h Unattac&h - + &Draw arrow... &Draw arrow... - + &Set annotation... &Set annotation... - - Reduce life by power - - - - + Ca&rd counters Ca&rd counters - + &Add counter (%1) &Add counter (%1) - + &Remove counter (%1) &Remove counter (%1) - + &Set counters (%1)... &Set counters (%1)... - - CardPictureLoaderCacheMethod - - - Network Cache - - - - - Filesystem - - - CardSizeWidget @@ -948,133 +811,133 @@ This is only saved for moderators and cannot be seen by the banned person. CardZoneLogic - + their hand nominative their hand - + %1's hand nominative %1's hand - + their library look at zone their library - + %1's library look at zone %1's library - + of their library top cards of zone, of their library - + of %1's library top cards of zone of %1's library - + their library reveal zone their library - + %1's library reveal zone %1's library - + their library shuffle their library - + %1's library shuffle %1's library - + their library nominative their library - + %1's library nominative %1's library - + their graveyard nominative their graveyard - + %1's graveyard nominative %1's graveyard - + their exile nominative their exile - + %1's exile nominative %1's exile - + their sideboard look at zone their sideboard - + %1's sideboard look at zone %1's sideboard - + their sideboard nominative their sideboard - + %1's sideboard nominative %1's sideboard - + their custom zone '%1' nominative their custom zone '%1' - + %1's custom zone '%2' nominative %1's custom zone '%2' @@ -1096,421 +959,16 @@ This is only saved for moderators and cannot be seen by the banned person.Parse error at line %1 col %2: - - ColorButton - - - Click to pick a color - - - - - Pick colour - - - - - ConnectionController - - - - The server has reached its maximum user capacity, please check back later. - - - - - There are too many concurrent connections from your address. - - - - - Banned by moderator - - - - - Expected end time: %1 - - - - - This ban lasts indefinitely. - - - - - Scheduled server shutdown. - - - - - - Invalid username. - - - - - You have been logged out due to logging in at another location. - - - - - Connection closed - - - - - The server has terminated your connection. -Reason: %1 - - - - - The server is going to be restarted in %n minute(s). -All running games will be lost. -Reason for shutdown: %1 - - - - - Scheduled server shutdown - - - - - Failed Login - - - - - Your client seems to be missing features this server requires for connection. - - - - - To update your client, go to 'Help -> Check for Client Updates'. - - - - - - - - - - - - - - - - - - - - - - Error - - - - - Incorrect username or password. Please check your authentication information and try again. - - - - - There is already an active session using this user name. -Please close that session first and re-login. - - - - - - You are banned until %1. - - - - - - You are banned indefinitely. - - - - - This server requires user registration. Do you want to register now? - - - - - This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. -Please close and reopen your client to try again. - - - - - An internal error has occurred, please close and reopen Cockatrice before trying again. -If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - - - - Account activation - - - - - Your account has not been activated yet. -You need to provide the activation token received in the activation email. - - - - - Server Full - - - - - Unknown login error: %1 - - - - - - -This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - - - - - - - - - Registration denied - - - - - Registration is currently disabled on this server - - - - - There is already an existing account with the same user name. - - - - - It's mandatory to specify a valid email address when registering. - - - - - It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. - - - - - Password too short. - - - - - Registration failed for a technical problem on the server. - - - - - The connection to the server has been lost. - - - - - Unknown registration error: %1 - - - - - Account activation failed - - - - - Socket error: %1 - - - - - Server timeout - - - - - You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. -Local version is %1, remote version is %2. - - - - - Your Cockatrice client is obsolete. Please update your Cockatrice version. -Local version is %1, remote version is %2. - - - - - - Success - - - - - Registration accepted. -Will now login. - - - - - Account activation accepted. -Will now login. - - - - - Information - - - - - This server supports additional features that your client doesn't have. -This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. - -To update your client, go to Help -> Check for Updates. - - - - - - - Reset Password - - - - - Your password has been reset successfully, you can now log in using the new credentials. - - - - - Failed to reset user account password, please contact the server operator to reset your password. - - - - - Activation request received, please check your email for an activation token. - - - - - Connecting to %1... - - - - - Registering to %1 as %2... - - - - - Disconnected - - - - - Connected, logging in at %1 - - - - - Requesting forgotten password to %1 as %2... - - - - - Your username must respect these rules: - - - - - is %1 - %2 characters long - - - - - can %1 contain lowercase characters - - - - - - - - NOT - - - - - can %1 contain uppercase characters - - - - - can %1 contain numeric characters - - - - - can contain the following punctuation: %1 - - - - - first character can %1 be a punctuation mark - - - - - no unacceptable language as specified by these server rules: - note that the following lines will not be translated - - - - - can not contain any of the following words: %1 - - - - - can not match any of the following expressions: %1 - - - - - You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - - CustomZoneMenu - + C&ustom Zones C&ustom Zones - - + + View custom zone '%1' View custom zone '%1' @@ -1518,35 +976,30 @@ To update your client, go to Help -> Check for Updates. DeckAnalyticsWidget - + Add Panel Add Panel - + Remove Panel Remove Panel - + Save Layout Save Layout - + Load Layout Load Layout - - - Include Sideboard - - DeckEditorCardDatabaseDockWidget - + Card Database Card Database @@ -1562,17 +1015,47 @@ To update your client, go to Help -> Check for Updates. DeckEditorDatabaseDisplayWidget - + Search by card name (or search expressions) Search by card name (or search expressions) - + + Add to Deck + Add to Deck + + + + Add to Sideboard + Add to Sideboard + + + + Select Printing + Select Printing + + + + Show on EDHRec (Commander) + Show on EDHRec (Commander) + + + + Show on EDHRec (Card) + Show on EDHRec (Card) + + + + Show Related cards + Show Related cards + + + Add card to &maindeck Add card to &maindeck - + Add card to &sideboard Add card to &sideboard @@ -1605,72 +1088,72 @@ To update your client, go to Help -> Check for Updates. Colors - + Select Printing Select Printing - + Deck Deck - + Deck &name: Deck &name: - + Banner Card/Tags Visibility Settings Banner Card/Tags Visibility Settings - + Show banner card selection menu Show banner card selection menu - + Show tags selection menu Show tags selection menu - + &Comments: &Comments: - + Group by: Group by: - + Format: Format: - + Hash: Hash: - + &Increment number &Increment number - + &Decrement number &Decrement number - + &Remove row &Remove row - + Swap card to/from sideboard Swap card to/from sideboard @@ -1678,17 +1161,17 @@ To update your client, go to Help -> Check for Updates. DeckEditorFilterDockWidget - + Filters Filters - + &Clear all filters &Clear all filters - + Delete selected Delete selected @@ -1819,113 +1302,169 @@ To update your client, go to Help -> Check for Updates. DeckEditorSettingsPage - - + + Update Spoilers Update Spoilers - + + Success Success - + Download URLs have been reset. Download URLs have been reset. - + + Downloaded card pictures have been reset. + Downloaded card pictures have been reset. + + + + Error + Error + + + + One or more downloaded card pictures could not be cleared. + One or more downloaded card pictures could not be cleared. + + + Add URL Add URL - - + + URL: URL: - - + + Edit URL Edit URL - + + Network Cache Size: + Network Cache Size: + + + + Redirect Cache TTL: + Redirect Cache TTL: + + + + How long cached redirects for urls are valid for. + How long cached redirects for urls are valid for. + + + + Picture Cache Size: + Picture Cache Size: + + + Add New URL Add New URL - + Remove URL Remove URL - + + Day(s) + Day(s) + + + Updating... Updating... - + Choose path Choose path - + URL Download Priority URL Download Priority - + Spoilers Spoilers - + Download Spoilers Automatically Download Spoilers Automatically - + Spoiler Location: Spoiler Location: - + Last Change Last Change - + Spoilers download automatically on launch Spoilers download automatically on launch - + Press the button to manually update without relaunching Press the button to manually update without relaunching - + Do not close settings until manual update is complete Do not close settings until manual update is complete - + Download card pictures on the fly Download card pictures on the fly - + How to add a custom URL How to add a custom URL - + + Delete Downloaded Images + Delete Downloaded Images + + + Reset Download URLs Reset Download URLs + + + On-disk cache for downloaded pictures + On-disk cache for downloaded pictures + + + + In-memory cache for pictures not currently on screen + In-memory cache for pictures not currently on screen + DeckListHistoryManagerWidget @@ -1991,12 +1530,12 @@ To update your client, go to Help -> Check for Updates. DeckLoader - + Common deck formats (%1) Common deck formats (%1) - + All files (*.*) All files (*.*) @@ -2218,27 +1757,27 @@ To update your client, go to Help -> Check for Updates. Added (%1): %2 (%3) %4 - + Moved to %1 1 × "%2" (%3) Moved to %1 1 × "%2" (%3) - + Removed "%1" (all copies) Removed "%1" (all copies) - + %1 1 × "%2" (%3) %1 1 × "%2" (%3) - + Added Added - + Removed Removed @@ -2260,75 +1799,75 @@ To update your client, go to Help -> Check for Updates. DeckViewContainer - + Load deck... Load deck... - + Load remote deck... Load remote deck... - + Load from clipboard... Load from clipboard... - + Load from website... Load from website... - + Unload deck Unload deck - + Ready to start Ready to start - + Force start Force start - + Sideboard unlocked Sideboard unlocked - + Sideboard locked Sideboard locked - - + + Error Error - + The selected file could not be loaded. The selected file could not be loaded. - + Deck is greater than maximum file size. Deck is greater than maximum file size. - + Are you sure you want to force start? This will kick all non-ready players from the game. Are you sure you want to force start? This will kick all non-ready players from the game. - + Cockatrice Cockatrice @@ -2429,7 +1968,7 @@ This will kick all non-ready players from the game. - + Webpage Webpage @@ -2469,37 +2008,37 @@ This will kick all non-ready players from the game. Connect to Server - + Server URL Server URL - + Communication Port Communication Port - + Unique Server Name Unique Server Name - + Connection Warning Connection Warning - + You need to name your new connection profile. You need to name your new connection profile. - + Connect Warning Connect Warning - + The player name can't be empty. The player name can't be empty. @@ -2612,17 +2151,17 @@ This will kick all non-ready players from the game. Create game - + Game information Game information - + Error Error - + Server error. Server error. @@ -2630,97 +2169,97 @@ This will kick all non-ready players from the game. DlgCreateToken - + &Name: &Name: - + Token Token - + C&olor: C&olor: - + white white - + blue blue - + black black - + red red - + green green - + multicolor multicolor - + colorless colorless - + &P/T: &P/T: - + &Annotation: &Annotation: - + &Destroy token when it leaves the table &Destroy token when it leaves the table - + Create face-down (Only hides name) Create face-down (Only hides name) - + Token data Token data - + Show &all tokens Show &all tokens - + Show tokens from this &deck Show tokens from this &deck - + Choose token from list Choose token from list - + Create token Create token @@ -2754,7 +2293,7 @@ This will kick all non-ready players from the game. - + ✖ ✖ @@ -2769,12 +2308,12 @@ This will kick all non-ready players from the game. Tag name cannot be empty! - + Duplicate Tag Duplicate Tag - + This tag already exists. This tag already exists. @@ -2961,12 +2500,12 @@ To remove your current avatar, confirm without choosing a new image.Please enter the name of the token: - + Error Error - + The chosen name conflicts with an existing card or token. Make sure to enable the 'Token' set in the "Manage sets" dialog to display them correctly. The chosen name conflicts with an existing card or token. @@ -2991,12 +2530,12 @@ Make sure to enable the 'Token' set in the "Manage sets" dia Undefined - + Real name: Real name: - + Edit user profile Edit user profile @@ -3034,113 +2573,113 @@ Make sure to enable the 'Token' set in the "Manage sets" dia 2 hours - + Hide 'buddies only' games Hide 'buddies only' games - + Hide full games Hide full games - + Hide games that have started Hide games that have started - + Hide password protected games Hide password protected games - + Hide 'ignored user' games Hide 'ignored user' games - + Hide games not created by buddies Hide games not created by buddy Hide games not created by buddies - + Hide games with forced open decklists Hide games with forced open decklists - + &Newer than: &Newer than: - + Game &description: Game &description: - + &Creator name: &Creator name: - + General General - + &Game types &Game types - + at &least: at &least: - + at &most: at &most: - + Maximum player count Maximum player count - + Restrictions Restrictions - + Show games only if &spectators can watch Show games only if &spectators can watch - + Show spectator password p&rotected games Show spectator password p&rotected games - + Show only if spectators can ch&at Show only if spectators can ch&at - + Show only if spectators can see &hands Show only if spectators can see &hands - + Spectators Spectators - + Filter games Filter games @@ -3451,37 +2990,37 @@ https://tappedout.net/mtg-decks/your-deck-name/ DlgMoveTopCardsUntil - + Card name (or search expressions): Card name (or search expressions): - + Number of hits: Number of hits: - + Auto play hits Auto play hits - + Put top cards on stack until... Put top cards on stack until... - + No cards matching the search expression exists in the card database. Proceed anyways? No cards matching the search expression exists in the card database. Proceed anyways? - + Cockatrice Cockatrice - + Invalid filter Invalid filter @@ -3541,40 +3080,40 @@ Your email will be used to verify your account. Undefined - + Real name: Real name: - + Register to server Register to server - - - - + + + + Registration Warning Registration Warning - + Your password is too short. Your password is too short. - + Your passwords do not match, please try again. Your passwords do not match, please try again. - + Your email addresses do not match, please try again. Your email addresses do not match, please try again. - + The player name can't be empty. The player name can't be empty. @@ -3582,17 +3121,17 @@ Your email will be used to verify your account. DlgRollDice - + Number of sides: Number of sides: - + Number of dice: Number of dice: - + Roll Dice Roll Dice @@ -3643,12 +3182,12 @@ Your email will be used to verify your account. DlgSettings - + Unknown Error loading card database Unknown Error loading card database - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -3665,7 +3204,7 @@ You may need to rerun oracle to update your card database. Would you like to change your database location setting? - + Your card database version is too old. This can cause problems loading card information or images @@ -3682,7 +3221,7 @@ Usually this can be fixed by rerunning oracle to to update your card database. Would you like to change your database location setting? - + Your card database did not finish loading Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached @@ -3695,7 +3234,7 @@ Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with you Would you like to change your database location setting? - + File Error loading your card database. Would you like to change your database location setting? @@ -3704,7 +3243,7 @@ Would you like to change your database location setting? Would you like to change your database location setting? - + Your card database was loaded but contains no cards. Would you like to change your database location setting? @@ -3713,7 +3252,7 @@ Would you like to change your database location setting? Would you like to change your database location setting? - + Unknown card database load status Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues @@ -3726,64 +3265,59 @@ Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues Would you like to change your database location setting? - - - + + + Error Error - + The path to your deck directory is invalid. Would you like to go back and set the correct path? The path to your deck directory is invalid. Would you like to go back and set the correct path? - + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? The path to your card pictures directory is invalid. Would you like to go back and set the correct path? - + Settings Settings - + General General - + Appearance Appearance - + User Interface User Interface - - Storage - - - - + Card Sources Card Sources - + Chat Chat - + Sound Sound - + Shortcuts Shortcuts @@ -3877,9 +3411,9 @@ You can always change this behavior in the 'General' settings tab. - - - + + + Error Error @@ -3932,31 +3466,31 @@ Please visit the download page to update manually. - + Update Available Update Available - + A new version of Cockatrice is available! A new version of Cockatrice is available! - + New version New version - + Released Released - + Changelog Changelog @@ -3966,51 +3500,51 @@ Please visit the download page to update manually. Do you want to update now? - + Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. - + Please check the <a href="%1">releases page</a> on our Github and download the build for your system. Please check the <a href="%1">releases page</a> on our Github and download the build for your system. - - - + + + Update Error Update Error - + An error occurred while checking for updates: An error occurred while checking for updates: - + An error occurred while downloading an update: An error occurred while downloading an update: - + Installing... Installing... - + Cockatrice is unable to open the installer. Cockatrice is unable to open the installer. - + Try to update manually by closing Cockatrice and running the installer. Try to update manually by closing Cockatrice and running the installer. - + Download location Download location @@ -4100,67 +3634,67 @@ You may have to manually download the new version. DrawProbabilityWidget - + Draw Probability Draw Probability - + Probability of drawing Probability of drawing - + Card Name Card Name - + Type Type - + Subtype Subtype - + Mana Value Mana Value - + At least At least - + Exactly Exactly - + card(s) having drawn at least card(s) having drawn at least - + cards cards - + Category Category - + Qty Qty - + Odds (%) Odds (%) @@ -4274,7 +3808,7 @@ You may have to manually download the new version. FilterBuilder - + Type your filter here Type your filter here @@ -4305,22 +3839,22 @@ You may have to manually download the new version. GameEventHandler - + kicked by game host or moderator kicked by game host or moderator - + player left the game player left the game - + player disconnected from server player disconnected from server - + reason unknown reason unknown @@ -4328,140 +3862,140 @@ You may have to manually download the new version. GameSelector - - - - - - - - - + + + + + + + + + Error Error - + Please join the appropriate room first. Please join the appropriate room first. - + Wrong password. Wrong password. - + Spectators are not allowed in this game. Spectators are not allowed in this game. - + The game is already full. The game is already full. - + The game does not exist any more. The game does not exist any more. - + This game is only open to registered users. This game is only open to registered users. - + This game is only open to its creator's buddies. This game is only open to its creator's buddies. - + You are being ignored by the creator of this game. You are being ignored by the creator of this game. - + Join Game Join Game - + Spectate Game Spectate Game - + Game Information Game Information - + Join Game as Judge Join Game as Judge - + Spectate Game as Judge Spectate Game as Judge - + Join game Join game - + Password: Password: - + Please join the respective room first. Please join the respective room first. - + &Filter games &Filter games - + C&lear filter C&lear filter - + C&reate C&reate - + &Join &Join - + Join as judge Join as judge - + J&oin as spectator J&oin as spectator - + Join as judge spectator Join as judge spectator - + Games shown: %1 / %2 Games shown: %1 / %2 - + Games Games @@ -4469,32 +4003,32 @@ You may have to manually download the new version. GameSelectorQuickFilterToolBar - + All types All types - + Filter by game name... Filter by game name... - + Filter by game type/format Filter by game type/format - + Hide games not created by buddies Hide games not created by buddies - + Hide full games Hide full games - + Hide started games Hide started games @@ -4502,105 +4036,105 @@ You may have to manually download the new version. GamesModel - + >1 day >1 day - + %1%2 hr short age in hours %1%2 hr%1%2 hrs - + new new - + %1%2 min short age in minutes %1%2 min%1%2 mins - + password password - + buddies only buddies only - + reg. users only reg. users only - + open decklists open decklists + - can chat can chat - + see hands see hands - + can see hands can see hands - + not allowed not allowed - + Room Room - + Age Age - + Description Description - + Creator Creator - + Type Type - + Restrictions Restrictions - + Players Players - + Spectators Spectators @@ -4608,158 +4142,143 @@ You may have to manually download the new version. GeneralSettingsPage - + Reset all paths Reset all paths - + All paths have been reset All paths have been reset - - - - - - - + + + + + + + Choose path Choose path - - Language settings - + + Personal settings + Personal settings - + Language: Language: - - Version settings - - - - - Card database - - - - - Startup settings - - - - + Paths (editing disabled in portable mode) Paths (editing disabled in portable mode) - + Paths Paths - + How to help with translations How to help with translations - + Decks directory: Decks directory: - + Filters directory: Filters directory: - + Replays directory: Replays directory: - + Pictures directory: Pictures directory: - + Card database: Card database: - + Custom database directory: Custom database directory: - + Token database: Token database: - + Update channel Update channel - + Check for client updates on startup Check for client updates on startup - + Check for card database updates on startup Check for card database updates on startup - + Don't check Don't check - + Prompt for update Prompt for update - + Always update in the background Always update in the background - + Check for card database updates every Check for card database updates every - + days days - + Notify if a feature supported by the server is missing in my client Notify if a feature supported by the server is missing in my client - + Automatically run Oracle when running a new version of Cockatrice Automatically run Oracle when running a new version of Cockatrice - + Show tips on startup Show tips on startup - + Last update check on %1 (%2 days ago) Last update check on %1 (%2 days ago) @@ -4767,47 +4286,47 @@ You may have to manually download the new version. GraveyardMenu - + &Graveyard &Graveyard - + &View graveyard &View graveyard - + &Move graveyard to... &Move graveyard to... - + &Top of library &Top of library - + &Bottom of library &Bottom of library - + &All players &All players - + &Hand &Hand - + &Exile &Exile - + Reveal random card to... Reveal random card to... @@ -4815,88 +4334,88 @@ You may have to manually download the new version. HandMenu - + &Hand &Hand - + &View hand &View hand - + Sort hand by... Sort hand by... - + Name Name - + Type Type - + Mana Value Mana Value - + Take &mulligan (Choose hand size) Take &mulligan (Choose hand size) - + Take mulligan (Same hand size) Take mulligan (Same hand size) - + Take mulligan (Hand size - 1) Take mulligan (Hand size - 1) - + &Move hand to... &Move hand to... - + &Top of library &Top of library - + &Bottom of library &Bottom of library - + &Graveyard &Graveyard - + &Exile &Exile - + &Reveal hand to... &Reveal hand to... - - + + All players All players - + Reveal r&andom card to... Reveal r&andom card to... @@ -4904,52 +4423,52 @@ You may have to manually download the new version. HomeWidget - + Create New Deck Create New Deck - + Browse Decks Browse Decks - + Browse Card Database Browse Card Database - + Browse EDHRec Browse EDHRec - + Browse Archidekt Browse Archidekt - + View Replays View Replays - + Quit Quit - + Connecting... Connecting... - + Connect Connect - + Play Play @@ -4957,213 +4476,213 @@ You may have to manually download the new version. LibraryMenu - + &Library &Library - + &View library &View library - + View &top cards of library... View &top cards of library... - + View bottom cards of library... View bottom cards of library... - + Reveal &library to... Reveal &library to... - + Lend library to... Lend library to... - + Reveal &top cards to... Reveal &top cards to... - + &Top of library... &Top of library... - + &Bottom of library... &Bottom of library... - + &Always reveal top card &Always reveal top card - + &Always look at top card &Always look at top card - + &Open deck in deck editor &Open deck in deck editor - + &Draw card &Draw card - + D&raw cards... D&raw cards... - + &Undo last draw &Undo last draw - + Shuffle Shuffle - + &Play top card &Play top card - + Play top card &face down Play top card &face down - + Put top card on &bottom Put top card on &bottom - + Move top card to grave&yard Move top card to grave&yard - + Move top card to e&xile Move top card to e&xile - + Move top cards to &graveyard... Move top cards to &graveyard... - + Move top cards to graveyard face down... Move top cards to graveyard face down... - + Move top cards to &exile... Move top cards to &exile... - + Move top cards to exile face down... Move top cards to exile face down... - + Put top cards on stack &until... Put top cards on stack &until... - + Shuffle top cards... Shuffle top cards... - + &Draw bottom card &Draw bottom card - + D&raw bottom cards... D&raw bottom cards... - + &Play bottom card &Play bottom card - + Play bottom card &face down Play bottom card &face down - + Move bottom card to grave&yard Move bottom card to grave&yard - + Move bottom card to e&xile Move bottom card to e&xile - + Move bottom cards to &graveyard... Move bottom cards to &graveyard... - + Move bottom cards to graveyard face down... Move bottom cards to graveyard face down... - + Move bottom cards to &exile... Move bottom cards to &exile... - + Move bottom cards to exile face down... Move bottom cards to exile face down... - + Put bottom card on &top Put bottom card on &top - + Shuffle bottom cards... Shuffle bottom cards... - - + + &All players &All players - + Reveal top cards of library Reveal top cards of library - + Number of cards: (max. %1) Number of cards: (max. %1) @@ -5171,273 +4690,639 @@ You may have to manually download the new version. MainWindow - - + + + The server has reached its maximum user capacity, please check back later. + The server has reached its maximum user capacity, please check back later. + + + + There are too many concurrent connections from your address. + There are too many concurrent connections from your address. + + + + Banned by moderator + Banned by moderator + + + + Expected end time: %1 + Expected end time: %1 + + + + This ban lasts indefinitely. + This ban lasts indefinitely. + + + + Scheduled server shutdown. + Scheduled server shutdown. + + + + + Invalid username. + Invalid username. + + + + You have been logged out due to logging in at another location. + You have been logged out due to logging in at another location. + + + + Connection closed + Connection closed + + + + The server has terminated your connection. +Reason: %1 + The server has terminated your connection. +Reason: %1 + + + + The server is going to be restarted in %n minute(s). +All running games will be lost. +Reason for shutdown: %1 + The server is going to be restarted in %n minute. +All running games will be lost. +Reason for shutdown: %1The server is going to be restarted in %n minutes. +All running games will be lost. +Reason for shutdown: %1 + + + + Scheduled server shutdown + Scheduled server shutdown + + + + + Success + Success + + + + Registration accepted. +Will now login. + Registration accepted. +Will now login. + + + + Account activation accepted. +Will now login. + Account activation accepted. +Will now login. + + + + Player %1 Player %1 - + Load replay Load replay - + About Cockatrice About Cockatrice - + Version Version - + Cockatrice Webpage Cockatrice Webpage - + Project Manager: Project Manager: - + Past Project Managers: Past Project Managers: - + Developers: Developers: - + Our Developers Our Developers - + Help Develop! Help Develop! - + Translators: Translators: - + Our Translators Our Translators - + Help Translate! Help Translate! - + Support: Support: - + Report an Issue Report an Issue - + Troubleshooting Troubleshooting - + F.A.Q. F.A.Q. - - + + + + + + + + + + + + + + + + + + + + Error Error - + + Server timeout + Server timeout + + + + Failed Login + Failed Login + + + + Your client seems to be missing features this server requires for connection. + Your client seems to be missing features this server requires for connection. + + + + To update your client, go to 'Help -> Check for Client Updates'. + To update your client, go to 'Help -> Check for Client Updates'. + + + + Incorrect username or password. Please check your authentication information and try again. + Incorrect username or password. Please check your authentication information and try again. + + + + There is already an active session using this user name. +Please close that session first and re-login. + There is already an active session using this user name. +Please close that session first and re-login. + + + + + You are banned until %1. + You are banned until %1. + + + + + You are banned indefinitely. + You are banned indefinitely. + + + + This server requires user registration. Do you want to register now? + This server requires user registration. Do you want to register now? + + + + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. + + + + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. + + + + Account activation + Account activation + + + + Your account has not been activated yet. +You need to provide the activation token received in the activation email. + Your account has not been activated yet. +You need to provide the activation token received in the activation email. + + + + Server Full + Server Full + + + + Unknown login error: %1 + Unknown login error: %1 + + + + + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. + + + + Your username must respect these rules: + Your username must respect these rules: + + + + is %1 - %2 characters long + is %1 - %2 characters long + + + + can %1 contain lowercase characters + can %1 contain lowercase characters + + + + + + + NOT + NOT + + + + can %1 contain uppercase characters + can %1 contain uppercase characters + + + + can %1 contain numeric characters + can %1 contain numeric characters + + + + can contain the following punctuation: %1 + can contain the following punctuation: %1 + + + + first character can %1 be a punctuation mark + first character can %1 be a punctuation mark + + + + no unacceptable language as specified by these server rules: + note that the following lines will not be translated + no unacceptable language as specified by these server rules: + + + + can not contain any of the following words: %1 + can not contain any of the following words: %1 + + + + can not match any of the following expressions: %1 + can not match any of the following expressions: %1 + + + + You may only use A-Z, a-z, 0-9, _, ., and - in your username. + You may only use A-Z, a-z, 0-9, _, ., and - in your username. + + + + + + + + + Registration denied + Registration denied + + + + Registration is currently disabled on this server + Registration is currently disabled on this server + + + + There is already an existing account with the same user name. + There is already an existing account with the same user name. + + + + It's mandatory to specify a valid email address when registering. + It's mandatory to specify a valid email address when registering. + + + + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + + + + Password too short. + Password too short. + + + + Registration failed for a technical problem on the server. + Registration failed for a technical problem on the server. + + + + The connection to the server has been lost. + The connection to the server has been lost. + + + + Unknown registration error: %1 + Unknown registration error: %1 + + + + Account activation failed + Account activation failed + + + + Socket error: %1 + Socket error: %1 + + + + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + + + + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + + + + Connecting to %1... + Connecting to %1... + + + + Registering to %1 as %2... + Registering to %1 as %2... + + + + Disconnected + Disconnected + + + + Connected, logging in at %1 + Connected, logging in at %1 + + + + + + Requesting forgotten password to %1 as %2... + Requesting forgotten password to %1 as %2... + + + &Connect... &Connect... - + &Disconnect &Disconnect - + Start &local game... Start &local game... - + &Watch replay... &Watch replay... - + &Full screen &Full screen - + &Register to server... &Register to server... - + &Restore password... &Restore password... - + &Settings... &Settings... - + &Exit &Exit - + A&ctions A&ctions - + &Cockatrice &Cockatrice - + C&ard Database C&ard Database - + &Manage sets... &Manage sets... - + Edit custom &tokens... Edit custom &tokens... - + Open custom image folder Open custom image folder - + Open custom sets folder Open custom sets folder - + Add custom sets/cards Add custom sets/cards - + Reload card database Reload card database - + Tabs Tabs - + &Help &Help - + &About Cockatrice &About Cockatrice - + &Tip of the Day &Tip of the Day - + Check for Client Updates Check for Client Updates - + Check for Card Updates... Check for Card Updates... - + Check for Card Updates (Automatic) Check for Card Updates (Automatic) - + Show Status Bar Show Status Bar - + View &Debug Log View &Debug Log - + Open Settings Folder Open Settings Folder - + Show/Hide Show/Hide - + New Version New Version - + Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. - + Cockatrice installed Cockatrice installed - + Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. - + Card database Card database - + Cockatrice is unable to load the card database. Do you want to update your card database now? If unsure or first time user, choose "Yes" @@ -5446,29 +5331,29 @@ Do you want to update your card database now? If unsure or first time user, choose "Yes" - - + + Yes Yes - - + + No No - + Open settings Open settings - + New sets found New sets found - + %n new set(s) found in the card database Set code(s): %1 Do you want to enable it/them? @@ -5479,22 +5364,17 @@ Set codes: %1 Do you want to enable them? - - Yes, always enable - - - - + View sets View sets - + Welcome Welcome - + Hi! It seems like you're running this version of Cockatrice for the first time. All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. @@ -5503,133 +5383,167 @@ All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. - + + Information Information - + A card database update is already running. A card database update is already running. - + Unable to run the card database updater: Unable to run the card database updater: - + Card database update running. Card database update running. - + Failed to start. The file might be missing, or permissions might be incorrect. Failed to start. The file might be missing, or permissions might be incorrect. - + The process crashed some time after starting successfully. The process crashed some time after starting successfully. - + Timed out. The process took too long to respond. The last waitFor...() function timed out. Timed out. The process took too long to respond. The last waitFor...() function timed out. - + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. - + An error occurred when attempting to read from the process. For example, the process may not be running. An error occurred when attempting to read from the process. For example, the process may not be running. - + Unknown error occurred. Unknown error occurred. - + The card database updater exited with an error: %1 The card database updater exited with an error: %1 - - - - - + + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + + + + + + + Load sets/cards Load sets/cards - + Selected file cannot be found. Selected file cannot be found. - + You can only import XML databases at this time. You can only import XML databases at this time. - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. The new sets/cards have been added successfully. Cockatrice will now reload the card database. - + Sets/cards failed to import. Sets/cards failed to import. + + + + + Reset Password + Reset Password + + + + Your password has been reset successfully, you can now log in using the new credentials. + Your password has been reset successfully, you can now log in using the new credentials. + + + + Failed to reset user account password, please contact the server operator to reset your password. + Failed to reset user account password, please contact the server operator to reset your password. + + + + Activation request received, please check your email for an activation token. + Activation request received, please check your email for an activation token. + ManaBaseConfigDialog - + Mana Base Configuration Mana Base Configuration - + Display type: Display type: - + pie pie - + bar bar - + combinedBar combinedBar - + Filter Colors (optional): Filter Colors (optional): - + OK OK - + Cancel Cancel @@ -5701,27 +5615,27 @@ Cockatrice will now reload the card database. ManaDevotionConfigDialog - + Display type: Display type: - + pie pie - + bar bar - + combinedBar combinedBar - + Filter Colors (optional): Filter Colors (optional): @@ -5791,615 +5705,610 @@ Cockatrice will now reload the card database. MessageLogWidget - + from play from play - + from their graveyard from their graveyard - + from exile from exile - + from their hand from their hand - + the top card of %1's library the top card of %1's library - + the top card of their library the top card of their library - + from the top of %1's library from the top of %1's library - + from the top of their library from the top of their library - + the bottom card of %1's library the bottom card of %1's library - + the bottom card of their library the bottom card of their library - + from the bottom of %1's library from the bottom of %1's library - + from the bottom of their library from the bottom of their library - + from %1's library from %1's library - + from their library from their library - + from sideboard from sideboard - + from the stack from the stack - + from custom zone '%1' from custom zone '%1' - + %1 is now keeping the top card %2 revealed. %1 is now keeping the top card %2 revealed. - + %1 is not revealing the top card %2 any longer. %1 is not revealing the top card %2 any longer. - + %1 can now look at top card %2 at any time. %1 can now look at top card %2 at any time. - + %1 no longer can look at top card %2 at any time. %1 no longer can look at top card %2 at any time. - + %1 attaches %2 to %3's %4. %1 attaches %2 to %3's %4. - + %1 has conceded the game. %1 has conceded the game. - + %1 has unconceded the game. %1 has unconceded the game. - + %1 has restored connection to the game. %1 has restored connection to the game. - + %1 has lost connection to the game. %1 has lost connection to the game. - + %1 points from their %2 to themselves. %1 points from their %2 to themselves. - + %1 points from their %2 to %3. %1 points from their %2 to %3. - + %1 points from %2's %3 to themselves. %1 points from %2's %3 to themselves. - + %1 points from %2's %3 to %4. %1 points from %2's %3 to %4. - + %1 points from their %2 to their %3. %1 points from their %2 to their %3. - + %1 points from their %2 to %3's %4. %1 points from their %2 to %3's %4. - + %1 points from %2's %3 to their own %4. %1 points from %2's %3 to their own %4. - + %1 points from %2's %3 to %4's %5. %1 points from %2's %3 to %4's %5. - + %1 creates a face down token. %1 creates a face down token. - + %1 creates token: %2%3. %1 creates token: %2%3. - + %1 has loaded a deck (%2). %1 has loaded a deck (%2). - + %1 has loaded a deck with %2 sideboard cards (%3). %1 has loaded a deck with %2 sideboard cards (%3). - + %1 destroys %2. %1 destroys %2. - + a card a card - + %1 gives %2 control over %3. %1 gives %2 control over %3. - + %1 puts %2 into play%3 face down. %1 puts %2 into play%3 face down. - + %1 puts %2 into play%3. %1 puts %2 into play%3. - + %1 puts %2%3 into their graveyard face down. %1 puts %2%3 into their graveyard face down. - + %1 puts %2%3 into their graveyard. %1 puts %2%3 into their graveyard. - + %1 exiles %2%3 face down. %1 exiles %2%3 face down. - + %1 exiles %2%3. %1 exiles %2%3. - + %1 moves %2%3 to their hand. %1 moves %2%3 to their hand. - + %1 puts %2%3 into their library. %1 puts %2%3 into their library. - + %1 puts %2%3 onto the bottom of their library. %1 puts %2%3 onto the bottom of their library. - + %1 puts %2%3 on top of their library. %1 puts %2%3 on top of their library. - + %1 puts %2%3 into their library %4 cards from the top. %1 puts %2%3 into their library %4 cards from the top. - + %1 moves %2%3 to sideboard. %1 moves %2%3 to sideboard. - + %1 plays %2%3 face down. %1 plays %2%3 face down. - + %1 plays %2%3. %1 plays %2%3. - + %1 moves %2%3 to custom zone '%4' face down. %1 moves %2%3 to custom zone '%4' face down. - + %1 moves %2%3 to custom zone '%4'. %1 moves %2%3 to custom zone '%4'. - + %1 tries to draw from an empty library %1 tries to draw from an empty library - + %1 draws %2 card(s). %1 draws %2 card.%1 draws %2 cards. - + %1 is looking at %2. %1 is looking at %2. - + %1 is looking at the %4 %3 card(s) %2. top card for singular, top %3 cards for plural %1 is looking at the %4 %3 card %2.%1 is looking at the %4 %3 cards %2. - + bottom bottom - + top top - + %1 turns %2 face-down. %1 turns %2 face-down. - + %1 turns %2 face-up. %1 turns %2 face-up. - + The game has been closed. The game has been closed. - + The game has started. The game has started. - + You are flooding the game. Please wait a couple of seconds. You are flooding the game. Please wait a couple of seconds. - + %1 has joined the game. %1 has joined the game. - + %1 is now watching the game. %1 is now watching the game. - + You have been kicked out of the game. You have been kicked out of the game. - + %1 has left the game (%2). %1 has left the game (%2). - + %1 is not watching the game any more (%2). %1 is not watching the game any more (%2). - + %1 is not ready to start the game any more. %1 is not ready to start the game any more. - + %1 shuffles their deck and draws a new hand of %2 card(s). %1 shuffles their deck and draws a card.%1 shuffles their deck and draws a new hand of %2 cards. - + %1 shuffles their deck and draws a new hand. %1 shuffles their deck and draws a new hand. - + You are watching a replay of game #%1. You are watching a replay of game #%1. - + %1 is ready to start the game. %1 is ready to start the game. - + cards an unknown amount of cards cards - + %1 card(s) a card for singular, %1 cards for plural one card%1 cards - + %1 lends %2 to %3. %1 lends %2 to %3. - + %1 reveals %2 to %3. %1 reveals %2 to %3. - + %1 reveals %2. %1 reveals %2. - + %1 randomly reveals %2%3 to %4. %1 randomly reveals %2%3 to %4. - + %1 randomly reveals %2%3. %1 randomly reveals %2%3. - + %1 peeks at face down card #%2. %1 peeks at face down card #%2. - + %1 peeks at face down card #%2: %3. %1 peeks at face down card #%2: %3. - + %1 reveals %2%3 to %4. %1 reveals %2%3 to %4. - + %1 reveals %2%3. %1 reveals %2%3. - + %1 reversed turn order, now it's %2. %1 reversed turn order, now it's %2. - + reversed reversed - + normal normal - + Heads Heads - + Tails Tails - + %1 flipped a coin. It landed as %2. %1 flipped a coin. It landed as %2. - + %1 rolls a %2 with a %3-sided die. %1 rolls a %2 with a %3-sided die. - + %1 flips %2 coins. There are %3 heads and %4 tails. %1 flips %2 coins. There are %3 heads and %4 tails. - + %1 rolls a %2-sided dice %3 times: %4. %1 rolls a %2-sided dice %3 times: %4. - + %1's turn. %1's turn. - + %1 sets annotation of %2 to %3. %1 sets annotation of %2 to %3. - - %1 places %2 %3%4 counter(s) on %5 (now %6). - + + %1 places %2 "%3" counter(s) on %4 (now %5). + %1 places %2 "%3" counter on %4 (now %5).%1 places %2 "%3" counters on %4 (now %5). - - %1 removes %2 %3%4 counter(s) from %5 (now %6). - + + %1 removes %2 "%3" counter(s) from %4 (now %5). + %1 removes %2 "%3" counter from %4 (now %5).%1 removes %2 "%3" counters from %4 (now %5). - - %1 failed to undo their last draw. - - - - + %1 sets counter %2 to %3 (%4%5). %1 sets counter %2 to %3 (%4%5). - + %1 sets %2 to not untap normally. %1 sets %2 to not untap normally. - + %1 sets %2 to untap normally. %1 sets %2 to untap normally. - + %1 removes the PT of %2. %1 removes the PT of %2. - + %1 changes the PT of %2 from nothing to %4. %1 changes the PT of %2 from nothing to %4. - + %1 changes the PT of %2 from %3 to %4. %1 changes the PT of %2 from %3 to %4. - + %1 has locked their sideboard. %1 has locked their sideboard. - + %1 has unlocked their sideboard. %1 has unlocked their sideboard. - + %1 taps their permanents. %1 taps their permanents. - + %1 untaps their permanents. %1 untaps their permanents. - + %1 taps %2. %1 taps %2. - + %1 untaps %2. %1 untaps %2. - + %1 shuffles %2. %1 shuffles %2. - + %1 shuffles the bottom %3 cards of %2. %1 shuffles the bottom %3 cards of %2. - + %1 shuffles the top %3 cards of %2. %1 shuffles the top %3 cards of %2. - + %1 shuffles cards %3 - %4 of %2. %1 shuffles cards %3 - %4 of %2. - + %1 unattaches %2. %1 unattaches %2. - + %1 undoes their last draw. %1 undoes their last draw. - + %1 undoes their last draw (%2). %1 undoes their last draw (%2). @@ -6407,115 +6316,110 @@ Cockatrice will now reload the card database. MessagesSettingsPage - + Word1 Word2 Word3 Word1 Word2 Word3 - + Add New Message Add New Message - + Edit Message Edit Message - + Remove Message Remove Message - + Add message Add message - - + + Message: Message: - + Edit message Edit message - + Chat settings Chat settings - + Custom alert words Custom alert words - + Enable chat mentions Enable chat mentions - + Enable mention completer Enable mention completer - + In-game message macros In-game message macros - + How to use in-game message macros How to use in-game message macros - + Ignore chat room messages sent by unregistered users Ignore chat room messages sent by unregistered users - + Ignore private messages sent by unregistered users Ignore private messages sent by unregistered users - - Ignore private messages sent by non-buddy users - - - - - + + Invert text color Invert text color - + Enable desktop notifications for private messages Enable desktop notifications for private messages - + Enable desktop notification for mentions Enable desktop notification for mentions - + Enable room message history on join Enable room message history on join - - + + (Color is hexadecimal) (Color is hexadecimal) - + Separate words with a space, alphanumeric characters only Separate words with a space, alphanumeric characters only @@ -6523,42 +6427,42 @@ Cockatrice will now reload the card database. MoveMenu - + Move to Move to - + &Top of library in random order &Top of library in random order - + X cards from the top of library... X cards from the top of library... - + &Bottom of library in random order &Bottom of library in random order - + T&able T&able - + &Hand &Hand - + &Graveyard &Graveyard - + &Exile &Exile @@ -6571,47 +6475,47 @@ Cockatrice will now reload the card database. Card Type - + Mana Value Mana Value - + Color(s) Color(s) - + Loyalty Loyalty - + Main Card Type Main Card Type - + Mana Cost Mana Cost - + P/T P/T - + Side Side - + Layout Layout - + Color Identity Color Identity @@ -6634,152 +6538,6 @@ Cockatrice will now reload the card database. Overlap direction: - - PaletteEditorDialog - - - - Reset - - - - - - Apply - - - - - - Save && Apply - - - - - ▼ Edit Palette - - - - - - ▶ Edit Palette - - - - - Palette Editor — %1 - - - - - <b>Palette Editor</b> &nbsp;·&nbsp; %1 - - - - - This theme ships no default palette files - - - - - Replace current colours with the theme author's defaults - - - - - Switch between the light and dark palette files - - - - - Editing: - - - - - Show or hide the per-role colour grid for manual tweaks - - - - - ↺ Revert to theme default - - - - - Discard unsaved edits and restore the last saved palette - - - - - Preview this palette without saving to disk - - - - - Write palette-%1.toml and reload the theme - - - - - Cannot save: this theme has no directory on disk - - - - - Save failed - - - - - Could not write %1 to: -%2 - - - - - No default found - - - - - No default palette file found for the "%1" scheme. - - - - - PaletteGridWidget - - - Active - - - - - Disabled - - - - - Inactive - - - - - Normal interactive state - - - - - Widget is disabled / not interactive - - - - - Window is in background / unfocused - - - Phase @@ -6846,57 +6604,57 @@ Cockatrice will now reload the card database. PhasesToolbar - + Untap step Untap step - + Upkeep step Upkeep step - + Draw step Draw step - + First main phase First main phase - + Beginning of combat step Beginning of combat step - + Declare attackers step Declare attackers step - + Declare blockers step Declare blockers step - + Combat damage step Combat damage step - + End of combat step End of combat step - + Second main phase Second main phase - + End of turn step End of turn step @@ -6904,7 +6662,7 @@ Cockatrice will now reload the card database. PictureLoader - + en code for scryfall's language property, not available for all languages en @@ -6913,142 +6671,151 @@ Cockatrice will now reload the card database. PlayerActions - - - - + + View top cards of library + View top cards of library + + + + + + + + + + + + Number of cards: (max. %1) + Number of cards: (max. %1) + + + + View bottom cards of library + View bottom cards of library + + + + Shuffle top cards of library + Shuffle top cards of library + + + + Shuffle bottom cards of library + Shuffle bottom cards of library + + + + Draw hand + Draw hand + + + + 0 and lower are in comparison to current hand size + 0 and lower are in comparison to current hand size + + + + Draw cards + Draw cards + + + + + + grave grave - - - - + + + + exile exile - - - PlayerDialogs - - View top cards of library - - - - - - - - - - - - - Number of cards: (max. %1) - - - - - View bottom cards of library - - - - - Shuffle top cards of library - - - - - Shuffle bottom cards of library - - - - - Draw hand - - - - - 0 and lower are in comparison to current hand size - - - - - Draw cards - - - - + Move top cards to %1 - + Move top cards to %1 - + Move bottom cards to %1 - + Move bottom cards to %1 - + Draw bottom cards - + Draw bottom cards - + + + C&reate another %1 token + C&reate another %1 token + + + Create tokens - + Create tokens - + + Number: - + Number: - + Place card X cards from top of library - + Place card X cards from top of library - + Which position should this card be placed: - + Which position should this card be placed: - + (max. %1) - + (max. %1) - + Change power/toughness - + Change power/toughness - + Change stats to: - + Change stats to: - + Set annotation - + Set annotation - + Please enter the new annotation: - + Please enter the new annotation: + + + + Set counters + Set counters PlayerMenu - + Player "%1" Player "%1" - + &Counters &Counters @@ -7082,7 +6849,7 @@ This setting means you'll only see the default printing for each card, inst Display Navigation Buttons - + Printing Selector Printing Selector @@ -7090,22 +6857,22 @@ This setting means you'll only see the default printing for each card, inst PrintingSelectorCardOverlayWidget - + Preference Preference - + Pin Printing Pin Printing - + Unpin Printing Unpin Printing - + Show Related cards Show Related cards @@ -7176,57 +6943,57 @@ This setting means you'll only see the default printing for each card, inst PtMenu - + Power / toughness Power / toughness - + &Increase power &Increase power - + &Decrease power &Decrease power - + I&ncrease toughness I&ncrease toughness - + D&ecrease toughness D&ecrease toughness - + In&crease power and toughness In&crease power and toughness - + Dec&rease power and toughness Dec&rease power and toughness - + Increase power and decrease toughness Increase power and decrease toughness - + Decrease power and increase toughness Decrease power and increase toughness - + Set &power and toughness... Set &power and toughness... - + Reset p&ower and toughness Reset p&ower and toughness @@ -7234,37 +7001,37 @@ This setting means you'll only see the default printing for each card, inst QMenuBar - + Services Services - + Hide %1 Hide %1 - + Hide Others Hide Others - + Show All Show All - + Preferences... Preferences... - + Quit %1 Quit %1 - + About %1 About %1 @@ -7272,17 +7039,17 @@ This setting means you'll only see the default printing for each card, inst QObject - + Cockatrice card database (*.xml) Cockatrice card database (*.xml) - + All files (*.*) All files (*.*) - + Cockatrice replays (*.cor) Cockatrice replays (*.cor) @@ -7354,177 +7121,110 @@ Are you sure you would like to disable this feature? QPlatformTheme - + OK OK - + Save Save - + Save All Save All - + Open Open - + &Yes &Yes - + Yes to &All Yes to &All - + &No &No - + N&o to All N&o to All - + Abort Abort - + Retry Retry - + Ignore Ignore - + Close Close - + Cancel Cancel - + Discard Discard - + Help Help - + Apply Apply - + Reset Reset - + Restore Defaults Restore Defaults - - QuickSetupPanel - - - %1% - - - - - <b>Quick Setup</b> - - - - - Generate all palette roles automatically from a single accent colour - - - - - Accent: - - - - - Primary hue. Used directly for highlights and links. -At high intensity it also tints buttons and backgrounds. - - - - - Intensity: - - - - - Subtle - - - - - Full colour - - - - - 0–30 Subtle tint — only highlights and links change hue -30–70 Accented — buttons, tooltips, and borders join in -70–100 Full colour — backgrounds, everything - - - - - 70% - - - - - Generate ↓ - - - - - Derive all palette roles from the accent colour above. -Fine-tune individual colours in the grid afterwards. - - - RemoteDeckList_TreeModel - + Name Name - + ID ID - + Upload time Upload time @@ -7532,32 +7232,32 @@ Fine-tune individual colours in the grid afterwards. RemoteReplayList_TreeModel - + ID ID - + Name Name - + Players Players - + Keep Keep - + Time started Time started - + Duration (sec) Duration (sec) @@ -7565,37 +7265,37 @@ Fine-tune individual colours in the grid afterwards. RfgMenu - + &Exile &Exile - + &View exile &View exile - + &Move exile to... &Move exile to... - + &Top of library &Top of library - + &Bottom of library &Bottom of library - + &Hand &Hand - + &Graveyard &Graveyard @@ -7641,7 +7341,7 @@ Fine-tune individual colours in the grid afterwards. SayMenu - + S&ay S&ay @@ -7682,27 +7382,27 @@ Fine-tune individual colours in the grid afterwards. SetsModel - + Enabled Enabled - + Set type Set type - + Set code Set code - + Long name Long name - + Release date Release date @@ -7710,53 +7410,53 @@ Fine-tune individual colours in the grid afterwards. ShortcutSettingsPage - - + + Restore all default shortcuts Restore all default shortcuts - + Do you really want to restore all default shortcuts? Do you really want to restore all default shortcuts? - + Clear all default shortcuts Clear all default shortcuts - + Do you really want to clear all shortcuts? Do you really want to clear all shortcuts? - + Section: Section: - + Action: Action: - + Shortcut: Shortcut: - + How to set custom shortcuts How to set custom shortcuts - + Clear all shortcuts Clear all shortcuts - + Search by shortcut name Search by shortcut name @@ -7812,12 +7512,12 @@ Please check your shortcut settings! SideboardMenu - + &Sideboard &Sideboard - + &View sideboard &View sideboard @@ -7825,27 +7525,27 @@ Please check your shortcut settings! SoundSettingsPage - + Enable &sounds Enable &sounds - + Current sounds theme: Current sounds theme: - + Test system sound engine Test system sound engine - + Sound settings Sound settings - + Master volume Master volume @@ -7917,146 +7617,16 @@ Please check your shortcut settings! Invalid reply received from the release update server. - + No reply received from the tag update server. No reply received from the tag update server. - + Invalid reply received from the tag update server. Invalid reply received from the tag update server. - - StorageSettingsPage - - - - - Success - - - - - Cached card pictures have been reset. - - - - - Downloaded card pictures have been reset. - - - - - Error - - - - - One or more downloaded card pictures could not be cleared. - - - - - In-memory (currently loaded) card pictures have been reset. - - - - - Card Picture Loader Caching Method: - - - - - The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size. - - - - - Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while. - - - - - This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk. - - - - - Delete Cached Images - - - - - Delete Saved Images - - - - - Clear In-Memory Images - - - - - Card Picture Loader Cache Method - - - - - Network Cache - - - - - Filesystem - - - - - In-Memory Picture Cache - - - - - Network Cache Size: - - - - - On-disk cache for downloaded pictures - - - - - Redirect Cache TTL: - - - - - How long cached redirects for urls are valid for. - - - - - Picture Cache Size: - - - - - In-memory cache for pictures not currently on screen - - - - - Naming scheme: - - - - - Day(s) - - - TabAccount @@ -8192,117 +7762,117 @@ Please check your shortcut settings! TabArchidekt - - + + Desc. Desc. - - + + AND AND - - + + Require ALL selected colors Require ALL selected colors - - + + Deck name... Deck name... - - + + Owner... Owner... - - + + Packages Packages - - + + Advanced Filters Advanced Filters - + Bracket: Bracket: - - + + Any Any - - + + Contains card... Contains card... - - + + Commander... Commander... - - + + Tag... Tag... - - + + Deck Size Deck Size - + Cards: Cards: - - + + Asc. Asc. - + Sort by: Sort by: - + Filter by: Filter by: - + Display Settings Display Settings - - + + Search Search - - + + Formats Formats @@ -8312,54 +7882,6 @@ Please check your shortcut settings! Archidekt: - - TabCardArtRules - - - Card: - - - - - ProviderId: - - - - - Mode: - - - - - Reason: - - - - - Type a card name... - - - - - Add rule - - - - - Remove rule - - - - - Refresh - - - - - Card Art Rules - - - TabDeckEditor @@ -8408,7 +7930,7 @@ Please check your shortcut settings! Reset layout - + Deck: %1 Deck: %1 @@ -8416,49 +7938,55 @@ Please check your shortcut settings! TabDeckEditorVisual - + Visual Deck: %1 Visual Deck: %1 - + &Visual Deck Editor &Visual Deck Editor - - + + Card Info Card Info - - + + Deck Deck - + + + Filters + Filters + + + &View &View - + Printing Printing - + Visible Visible - + Floating Floating - + Reset layout Reset layout @@ -8466,22 +7994,22 @@ Please check your shortcut settings! TabDeckEditorVisualTabWidget - + Visual Deck View Visual Deck View - + Visual Database Display Visual Database Display - + Deck Analytics Deck Analytics - + Sample Hand Sample Hand @@ -8489,134 +8017,134 @@ Please check your shortcut settings! TabDeckStorage - + Local file system Local file system - + Server deck storage Server deck storage - - + + Open in deck editor Open in deck editor - + Rename deck or folder Rename deck or folder - + Upload deck Upload deck - + Download deck Download deck + - - - + + New folder New folder + - Delete Delete - + Open decks folder Open decks folder - + Rename local folder Rename local folder - + Rename local file Rename local file - + New name: New name: - - - - + + + + Error Error - + Rename failed Rename failed - - + + Invalid deck file Invalid deck file - + Enter deck name Enter deck name - + This decklist does not have a name. Please enter a name: This decklist does not have a name. Please enter a name: - + Unnamed deck Unnamed deck - + Failed to upload deck to server Failed to upload deck to server - + Delete local file Delete local file - + Are you sure you want to delete the selected files? Are you sure you want to delete the selected files? - + Delete remote decks Delete remote decks - + Are you sure you want to delete the selected decks? Are you sure you want to delete the selected decks? - - + + Name of new folder: Name of new folder: @@ -8688,191 +8216,191 @@ Please enter a name: TabGame - - - + + + Replay Replay - - + + Game Game - - + + Player List Player List - - + + Card Info Card Info - - + + Messages Messages - - + + Replay Timeline Replay Timeline - + &Phases &Phases - + &Game &Game - + Next &phase Next &phase - + Next phase with &action Next phase with &action - + Next &turn Next &turn - + Reverse turn order Reverse turn order - + &Remove all local arrows &Remove all local arrows - + Rotate View Cl&ockwise Rotate View Cl&ockwise - + Rotate View Co&unterclockwise Rotate View Co&unterclockwise - + Game &information Game &information - + Un&concede Un&concede - - - + + + &Concede &Concede - + &Leave game &Leave game - + C&lose replay C&lose replay - + &Focus Chat &Focus Chat - + &Say: &Say: - + Selected cards Selected cards - + &View &View - + Visible Visible - + Floating Floating - + Reset layout Reset layout - + Concede Concede - + Are you sure you want to concede this game? Are you sure you want to concede this game? - + Unconcede Unconcede - + You have already conceded. Do you want to return to this game? You have already conceded. Do you want to return to this game? - + Leave game Leave game - + Are you sure you want to leave this game? Are you sure you want to leave this game? - + A player has joined game #%1 A player has joined game #%1 - + %1 has joined the game %1 has joined the game - + You have been kicked out of the game. You have been kicked out of the game. @@ -8931,115 +8459,115 @@ Please enter a name: You have to select a valid number of days to locate. - + Username: Username: - + IP Address: IP Address: - + Game Name: Game Name: - + GameID: GameID: - + Message: Message: - + Main Room Main Room - + Game Room Game Room - + Private Chat Private Chat - + Past X Days: Past X Days: - + Today Today - + Last Hour Last Hour - + Maximum Results: Maximum Results: - + At least one filter is required. The more information you put in, the more specific your results will be. At least one filter is required. The more information you put in, the more specific your results will be. - + Get User Logs Get User Logs - + Clear Filters Clear Filters - + Filters Filters - + Log Locations Log Locations - + Date Range Date Range - + Maximum Results Maximum Results - - + + Message History Message History - + Failed to collect message history information. Failed to collect message history information. - + There are no messages for the selected filters. There are no messages for the selected filters. @@ -9057,27 +8585,27 @@ The more information you put in, the more specific your results will be.&Leave - + %1 - Private chat %1 - Private chat - + This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. - + Private message from Private message from - + %1 has left the server. %1 has left the server. - + %1 has joined the server. %1 has joined the server. @@ -9085,181 +8613,181 @@ The more information you put in, the more specific your results will be. TabReplays - + Local file system Local file system - + Server replay storage Server replay storage - - + + Watch replay Watch replay - + Rename Rename - - + + New folder New folder - - + + Delete Delete - + Open replays folder Open replays folder - + Download replay Download replay - + Toggle expiration lock Toggle expiration lock - + Get replay share code Get replay share code - - + + Look up replay by share code Look up replay by share code - + Rename local folder Rename local folder - + Rename local file Rename local file - + New name: New name: - + Error Error - + Rename failed Rename failed - + Name of new folder: Name of new folder: - + Delete local file Delete local file - + Are you sure you want to delete the selected files? Are you sure you want to delete the selected files? - + Are you sure you want to delete the selected replays? Are you sure you want to delete the selected replays? - + Failed to get code Failed to get code - - + + Either this server does not support replay sharing, or does not permit replay sharing for you. Either this server does not support replay sharing, or does not permit replay sharing for you. - - - + + + Failed Failed - + Could not get replay code Could not get replay code - + Replay Share Code Replay Share Code - + Others can use this code to add the replay to their list of remote replays: %1 Others can use this code to add the replay to their list of remote replays: %1 - + Copy to clipboard Copy to clipboard - + Replay share code Replay share code - + Replay code found Replay code found - + Replay was added, or you already had access to it. Replay was added, or you already had access to it. - + Replay code not found Replay code not found - + Failed to submit code Failed to submit code - + Unexpected error Unexpected error - + Delete remote replay Delete remote replay @@ -9272,62 +8800,47 @@ The more information you put in, the more specific your results will be. TabRoom - - Friends - - - - - Online - - - - - Ignored - - - - + &Say: &Say: - + Chat Chat - + &Room &Room - + &Leave room &Leave room - + &Clear chat &Clear chat - + Chat Settings... Chat Settings... - + mentioned you. mentioned you. - + Click to view Click to view - + You are flooding the chat. Please wait a couple of seconds. You are flooding the chat. Please wait a couple of seconds. @@ -9340,30 +8853,30 @@ The more information you put in, the more specific your results will be.Server - - - - + + + + Error Error - + Failed to join the server room: it doesn't exist on the server. Failed to join the server room: it doesn't exist on the server. - + The server thinks you are in the server room but your client is unable to display it. Try restarting your client. The server thinks you are in the server room but your client is unable to display it. Try restarting your client. - + You do not have the required permission to join this server room. You do not have the required permission to join this server room. - + Failed to join the server room due to an unknown error: %1. Failed to join the server room due to an unknown error: %1. @@ -9371,97 +8884,97 @@ The more information you put in, the more specific your results will be. TabSupervisor - + Deck Editor Deck Editor - + Visual Deck Editor Visual Deck Editor - + EDHRec EDHRec - + Archidekt Archidekt - + Home Home - + &Visual Deck Storage &Visual Deck Storage - + Visual Database Display Visual Database Display - + Server Server - + Account Account - + Deck Storage Deck Storage - + Game Replays Game Replays - + Administration Administration - + Logs Logs - + Are you sure? Are you sure? - + There are still open games. Are you sure you want to quit? There are still open games. Are you sure you want to quit? - + Click to view Click to view - + Your buddy %1 has signed on! Your buddy %1 has signed on! - + Unknown Event Unknown Event - + The server has sent you a message that your client does not understand. This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. @@ -9472,39 +8985,39 @@ This message might mean there is a new version of Cockatrice available or this s To update your client, go to Help -> Check for Updates. - + Idle Timeout Idle Timeout - + You are about to be logged out due to inactivity. You are about to be logged out due to inactivity. - + Promotion Promotion - + You have been promoted. Please log out and back in for changes to take effect. You have been promoted. Please log out and back in for changes to take effect. - + Warned Warned - + You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. - + You have received the following message from the server. (custom messages like these could be untranslated) You have received the following message from the server. @@ -9514,12 +9027,12 @@ Please refrain from engaging in this activity or further actions may be taken ag TabVisualDatabaseDisplay - + Database Display Database Display - + Visual Database Display Visual Database Display @@ -9558,42 +9071,42 @@ Please refrain from engaging in this activity or further actions may be taken ag TranslateCounterName - + Life Life - + White White - + Blue Blue - + Black Black - + Red Red - + Green Green - + Colorless Colorless - + Other Other @@ -9601,69 +9114,11 @@ Please refrain from engaging in this activity or further actions may be taken ag UpdateDownloader - + Could not open the file for reading. Could not open the file for reading. - - UserCardArtSettingsDialog - - - Card Art Settings - - - - - Type a card name... - - - - - Card name: - - - - - Card ProviderId: - - - - - Left margin (%): - - - - - Right margin (%): - - - - - Vertical offset: - - - - - Zoom: - - - - - Parameters - - - - - Preview - - - - - Remove Banner Card - - - UserContextMenu @@ -9781,7 +9236,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Ban History Ban History @@ -9796,87 +9251,77 @@ Please refrain from engaging in this activity or further actions may be taken ag User has never been banned. - + Failed to collect ban information. Failed to collect ban information. - - - + + + Warning History Warning History - + Warning Time;Moderator;User Name;Reason Warning Time;Moderator;User Name;Reason - + User has never been warned. User has never been warned. - + Failed to collect warning information. Failed to collect warning information. - + Failed to get admin notes. Failed to get admin notes. - - + + Success Success - + Successfully promoted user. Successfully promoted user. - + Successfully demoted user. Successfully demoted user. - - Kick Player - - - - - Are you sure you want to kick this player from the game? - - - - - - + + + Failed Failed - + Failed to promote user. Failed to promote user. - + Failed to demote user. Failed to demote user. - + Copy hash to clipboard Copy hash to clipboard - + Remove this user's messages Remove this user's messages @@ -9884,554 +9329,326 @@ Please refrain from engaging in this activity or further actions may be taken ag UserInfoBox - + Location: Location: - + Account Age: Account Age: - + Edit Edit - + Change password Change password - + Change avatar Change avatar - + Administrator Administrator - + Moderator Moderator - + Registered user Registered user - - + + Unregistered user Unregistered user - + Judge Judge - + Unknown Unknown - + The entered password does not match your account. The entered password does not match your account. - - - - + + + Information Information - + User information updated. User information updated. - - - - - - - - - - - + + + + + + + + + + Error Error - + User Information User Information - + Real Name: Real Name: - + User Level: User Level: - - - Edit Banner Card - - - + %n Year(s), amount of years (only shown if more than 0) %n Year, %n Years, - + %10%n Day(s) %20 amount of years (if more than 0), amount of days, date in local short format %10%n Day %20%10%n Days %20 - + Enter Password Enter Password - + Password verification is required in order to change your email address Password verification is required in order to change your email address - - - + + + An error occurred while trying to update your user information. An error occurred while trying to update your user information. - - The selected card is blacklisted on this server or another error occurred. - - - - - Banner card removed. - - - - - Banner card updated. - - - - + This server does not permit you to update your user informations. This server does not permit you to update your user informations. - + Password changed. Password changed. - + This server does not permit you to change your password. This server does not permit you to change your password. - + The new password is too short. The new password is too short. - + The old password is incorrect. The old password is incorrect. - + Avatar updated. Avatar updated. - + This server does not permit you to update your avatar. This server does not permit you to update your avatar. - - - An error occured while trying to update your avatar. - - - This server does not permit you to update your user informations. - An error occured while trying to updater your avatar. - This server does not permit you to update your user informations. - - - - UserInfoPopup - - - - Games - - - - - Chat - - - - - Open private chat - - - - - Profile - - - - - View user profile - - - - - Show this user's games - - - - - − Buddy - - - - - Remove from buddy list - - - - - + Buddy - - - - - Add to buddy list - - - - - − Ignore - - - - - Remove from ignore list - - - - - + Ignore - - - - - Add to ignore list - - - - - Ban - - - - - Ban from server - - - - - Warn - - - - - Warn user - - - - - Ban log - - - - - View ban history - - - - - Warn log - - - - - View warning history - - - - - Notes - - - - - View admin notes - - - - - − Mod - - - - - Demote from moderator - - - - - + Mod - - - - - Promote to moderator - - - - - − Judge - - - - - Demote from judge - - - - - + Judge - - - - - Promote to judge - - - - - Join game - - - - - Spectate - - - - - - Loading games… - - - - - Could not load games. - - - - - No active games. - + An error occured while trying to updater your avatar. + An error occured while trying to updater your avatar. UserInterfaceSettingsPage - + General interface settings General interface settings - + &Double-click cards to play them (instead of single-click) &Double-click cards to play them (instead of single-click) - + &Clicking plays all selected cards (instead of just the clicked card) &Clicking plays all selected cards (instead of just the clicked card) - + &Play all nonlands onto the stack (not the battlefield) by default &Play all nonlands onto the stack (not the battlefield) by default - + Do not delete &arrows inside of subphases Do not delete &arrows inside of subphases - + Close card view window when last card is removed Close card view window when last card is removed - + Auto focus search bar when card view window is opened Auto focus search bar when card view window is opened - + Annotate card text on tokens Annotate card text on tokens - - Show selection count during drag selection - + + Show selection counter during drag selection + Show selection counter during drag selection - - Show total selection count - + + Show total selection counter + Show total selection counter - - Show subtype breakdown in selection tally - - - - + Use tear-off menus, allowing right click menus to persist on screen Use tear-off menus, allowing right click menus to persist on screen - - Keep game chat focused when clicking in game (Note: disables card view search bar) - - - - + Notifications settings Notifications settings - + Enable notifications in taskbar Enable notifications in taskbar - + Notify in the taskbar for game events while you are spectating Notify in the taskbar for game events while you are spectating - + Notify in the taskbar when users in your buddy list connect Notify in the taskbar when users in your buddy list connect - + Animation settings Animation settings - + &Tap/untap animation &Tap/untap animation - + Deck editor/storage settings Deck editor/storage settings - + Open deck in new tab by default Open deck in new tab by default - + Use visual deck storage in game lobby Use visual deck storage in game lobby - + Use selection animation for Visual Deck Storage Use selection animation for Visual Deck Storage - + When adding a tag in the visual deck storage to a .txt deck: When adding a tag in the visual deck storage to a .txt deck: - + do nothing do nothing - + ask to convert to .cod ask to convert to .cod - + always convert to .cod always convert to .cod - + Default deck editor type Default deck editor type - + Classic Deck Editor Classic Deck Editor - + Visual Deck Editor Visual Deck Editor - + Replay settings Replay settings - + Buffer time for backwards skip via shortcut: Buffer time for backwards skip via shortcut: @@ -10439,22 +9656,22 @@ Please refrain from engaging in this activity or further actions may be taken ag UserListWidget - + Users connected to server: %1 Users connected to server: %1 - + Users in this room: %1 Users in this room: %1 - + Buddies online: %1 / %2 Buddies online: %1 / %2 - + Ignored users online: %1 / %2 Ignored users online: %1 / %2 @@ -10462,45 +9679,35 @@ Please refrain from engaging in this activity or further actions may be taken ag UtilityMenu - + Increment all card counters Increment all card counters - + &Untap all permanents &Untap all permanents - + R&oll die... R&oll die... - - Flip coin - - - - + &Create token... &Create token... - + C&reate another token C&reate another token - + Cr&eate predefined token Cr&eate predefined token - - - C&reate another %1 token - - VisualDatabaseDisplayColorFilterWidget @@ -10552,72 +9759,72 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFilterToolbarWidget - + Sort by Sort by - + Filter by Filter by - + Save and load filters Save and load filters - + Filter by exact card name Filter by exact card name - + Filter by card main-type Filter by card main-type - + Filter by card sub-type Filter by card sub-type - + Filter by set Filter by set - + Filter by format legality Filter by format legality - + Save/Load Save/Load - + Name Name - + Main Type Main Type - + Sub Type Sub Type - + Sets Sets - + Formats Formats @@ -10625,22 +9832,22 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFormatLegalityFilterWidget - + Show formats with at least: Show formats with at least: - + cards cards - + Do not display formats with less than this amount of cards in the database Do not display formats with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) Filter mode (AND/OR/NOT conjunctions of filters) @@ -10658,32 +9865,32 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayMainTypeFilterWidget - + Show main types with at least: Show main types with at least: - + cards cards - + Do not display card main-types with less than this amount of cards in the database Do not display card main-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match Mode: Exact Match - + Mode: Includes Mode: Includes @@ -10691,27 +9898,27 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayNameFilterWidget - + Filter by name... (Exact match) Filter by name... (Exact match) - + Load from Deck Load from Deck - + Apply all card names in currently loaded deck as exact match name filters Apply all card names in currently loaded deck as exact match name filters - + Load from Clipboard Load from Clipboard - + Apply all card names in clipboard as exact match name filters Apply all card names in clipboard as exact match name filters @@ -10719,7 +9926,7 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayRecentSetFilterSettingsWidget - + Filter to most recent sets Filter to most recent sets @@ -10727,19 +9934,19 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySetFilterWidget - + Search sets... Search sets... - - + + Mode: Exact Match Mode: Exact Match - - + + Mode: Includes Mode: Includes @@ -10747,37 +9954,37 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySubTypeFilterWidget - + Search subtypes... Search subtypes... - + Show sub types with at least: Show sub types with at least: - + cards cards - + Do not display card sub-types with less than this amount of cards in the database Do not display card sub-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match Mode: Exact Match - + Mode: Includes Mode: Includes @@ -10785,23 +9992,23 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayWidget - + Search by card name (or search expressions) Search by card name (or search expressions) - + Visual Visual - + Loading database ... Loading database ... - + Clear all filters Clear all filters @@ -10840,17 +10047,17 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Toggle Layout: Overlap Toggle Layout: Overlap - + Change how cards are displayed within zones (i.e. overlapped or fully visible.) Change how cards are displayed within zones (i.e. overlapped or fully visible.) - + Toggle Layout: Flat Toggle Layout: Flat @@ -10879,17 +10086,17 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDeckEditorWidget - + Type a card name here for suggestions from the database... Type a card name here for suggestions from the database... - + Quick search and add card Quick search and add card - + Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter @@ -11007,43 +10214,43 @@ Please refrain from engaging in this activity or further actions may be taken ag WarningDialog - + Which warning would you like to send? Which warning would you like to send? - + Redact all messages from this user in all rooms Redact all messages from this user in all rooms - + &OK &OK - + &Cancel &Cancel - + Warn user for misconduct Warn user for misconduct - - + + Error Error - + User name to send a warning to can not be blank, please specify a user to warn. User name to send a warning to can not be blank, please specify a user to warn. - + Warning to use can not be blank, please select a valid warning to send. Warning to use can not be blank, please select a valid warning to send. @@ -11051,133 +10258,133 @@ Please refrain from engaging in this activity or further actions may be taken ag WndSets - + Move selected set to the top Move selected set to the top - + Move selected set up Move selected set up - + Move selected set down Move selected set down - + Move selected set to the bottom Move selected set to the bottom - + Search by set name, code, or type Search by set name, code, or type - + Default order Default order - + Restore original art priority order Restore original art priority order - + Enable all sets Enable all sets - + Disable all sets Disable all sets - + Enable selected set(s) Enable selected set(s) - + Disable selected set(s) Disable selected set(s) - + Deck Editor Deck Editor - + Use CTRL+A to select all sets in the view. Use CTRL+A to select all sets in the view. - + Only cards in enabled sets will appear in the card list of the deck editor. Only cards in enabled sets will appear in the card list of the deck editor. - + Image priority is decided in the following order: Image priority is decided in the following order: - + first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) %1 is a link to the wiki first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) - + Include cards rebalanced for Alchemy [requires restart] Include cards rebalanced for Alchemy [requires restart] - + Card Art Card Art - + How to use custom card art How to use custom card art - + Hints Hints - + Note Note - + Sorting by column allows you to find a set while not changing set priority. Sorting by column allows you to find a set while not changing set priority. - + To enable ordering again, click the column header until this message disappears. To enable ordering again, click the column header until this message disappears. - + Use the current sorting as the set priority instead Use the current sorting as the set priority instead - + Sorts the set priority using the same column Sorts the set priority using the same column - + Manage sets Manage sets @@ -11185,72 +10392,72 @@ Please refrain from engaging in this activity or further actions may be taken ag ZoneViewWidget - + Search by card name (or search expressions) Search by card name (or search expressions) - + Ungrouped Ungrouped - + Group by Type Group by Type - + Group by Mana Value Group by Mana Value - + Group by Color Group by Color - + Unsorted Unsorted - + Sort by Name Sort by Name - + Sort by Type Sort by Type - + Sort by Mana Cost Sort by Mana Cost - + Sort by Colors Sort by Colors - + Sort by P/T Sort by P/T - + Sort by Set Sort by Set - + shuffle when closing shuffle when closing - + pile view pile view @@ -11258,7 +10465,7 @@ Please refrain from engaging in this activity or further actions may be taken ag i18n - + English English @@ -11266,12 +10473,12 @@ Please refrain from engaging in this activity or further actions may be taken ag main - + Connect on startup Connect on startup - + Debug to file Debug to file @@ -11285,7 +10492,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Deck Editor Deck Editor @@ -11366,7 +10573,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Replays Replays @@ -11481,129 +10688,129 @@ Please refrain from engaging in this activity or further actions may be taken ag Load Deck... - - + + Load Deck from Clipboard... Load Deck from Clipboard... - + Edit Deck in Clipboard, Annotated Edit Deck in Clipboard, Annotated - + Edit Deck in Clipboard Edit Deck in Clipboard - + New Deck New Deck - + Open Custom Pictures Folder Open Custom Pictures Folder - + Print Deck... Print Deck... - + Delete Card Delete Card - - + + Reset Layout Reset Layout - + Save Deck Save Deck - + Save Deck as... Save Deck as... - + Save Deck to Clipboard, Annotated Save Deck to Clipboard, Annotated - + Save Deck to Clipboard, Annotated (No Set Info) Save Deck to Clipboard, Annotated (No Set Info) - + Save Deck to Clipboard Save Deck to Clipboard - + Save Deck to Clipboard (No Set Info) Save Deck to Clipboard (No Set Info) - + Load Local Deck... Load Local Deck... - + Load Remote Deck... Load Remote Deck... - + Set Ready to Start Set Ready to Start - + Toggle Sideboard Lock Toggle Sideboard Lock - + Add Green Counter Add Green Counter - + Remove Green Counter Remove Green Counter - + Set Green Counters... Set Green Counters... - + Add Red Counter Add Red Counter - + Remove Red Counter Remove Red Counter - + Set Red Counters... Set Red Counters... - + Add Life Counter Add Life Counter @@ -11613,744 +10820,724 @@ Please refrain from engaging in this activity or further actions may be taken ag Show Status Bar - - Load deck from online service... - - - - - Load from website... - - - - + Unload Deck Unload Deck - + Force Start Force Start - + Add Card Counter (F) Add Card Counter (F) - + Remove Card Counter (F) Remove Card Counter (F) - + Set Card Counters (F)... Set Card Counters (F)... - + Add Card Counter (E) Add Card Counter (E) - + Remove Card Counter (E) Remove Card Counter (E) - + Set Card Counters (E)... Set Card Counters (E)... - + Add Card Counter(D) Add Card Counter(D) - + Remove Card Counter (D) Remove Card Counter (D) - + Set Card Counters (D)... Set Card Counters (D)... - + Add Card Counter (C) Add Card Counter (C) - + Remove Card Counter (C) Remove Card Counter (C) - + Set Card Counters (C)... Set Card Counters (C)... - + Add Card Counter (B) Add Card Counter (B) - + Remove Card Counter (B) Remove Card Counter (B) - + Set Card Counters (B)... Set Card Counters (B)... - + Add Card Counter (A) Add Card Counter (A) - + Remove Card Counter (A) Remove Card Counter (A) - + Set Card Counters (A)... Set Card Counters (A)... - + Remove Life Counter Remove Life Counter - + Set Life Counters... Set Life Counters... - + Add White Counter Add White Counter - + Remove White Counter Remove White Counter - + Set White Counters... Set White Counters... - + Add Blue Counter Add Blue Counter - + Remove Blue Counter Remove Blue Counter - + Set Blue Counters... Set Blue Counters... - + Add Black Counter Add Black Counter - + Remove Black Counter Remove Black Counter - + Set Black Counters... Set Black Counters... - + Add Colorless Counter Add Colorless Counter - + Remove Colorless Counter Remove Colorless Counter - + Set Colorless Counters... Set Colorless Counters... - + Add Other Counter Add Other Counter - + Remove Other Counter Remove Other Counter - + Set Other Counters... Set Other Counters... - + Increment all card counters Increment all card counters - + Add Power (+1/+0) Add Power (+1/+0) - + Remove Power (-1/-0) Remove Power (-1/-0) - + Move Toughness to Power (+1/-1) Move Toughness to Power (+1/-1) - + Add Toughness (+0/+1) Add Toughness (+0/+1) - + Remove Toughness (-0/-1) Remove Toughness (-0/-1) - + Move Power to Toughness (-1/+1) Move Power to Toughness (-1/+1) - + Add Power and Toughness (+1/+1) Add Power and Toughness (+1/+1) - + Remove Power and Toughness (-1/-1) Remove Power and Toughness (-1/-1) - + Set Power and Toughness... Set Power and Toughness... - + Reset Power and Toughness Reset Power and Toughness - + Untap Untap - + Upkeep Upkeep - + Draw Draw - + First Main Phase First Main Phase - + Start Combat Start Combat - + Attack Attack - + Block Block - + Damage Damage - + End Combat End Combat - + Second Main Phase Second Main Phase - + End End - + Next Phase Next Phase - + Next Phase Action Next Phase Action - + Next Turn Next Turn - + Hide Card in Reveal Window Hide Card in Reveal Window - + Tap / Untap Card Tap / Untap Card - + Untap All Untap All - + Toggle Skip Untapping Toggle Untap Toggle Skip Untapping - + Turn Card Over Turn Card Over - + Peek Card Peek Card - + Play Card Play Card - + Play Card, Face Down Play Card, Face Down - + Attach Card... Attach Card... - + Unattach Card Unattach Card - + Clone Card Clone Card - + Create Token... Create Token... - + Create All Related Tokens Create All Related Tokens - + Create Another Token Create Another Token - + Set Annotation... Set Annotation... - - Reduce Life by Power - - - - + Select All Cards in Zone Select All Cards in Zone - + Select All Cards in Row Select All Cards in Row - + Select All Cards in Column Select All Cards in Column - + Reveal Selected Cards to All Players Reveal Selected Cards to All Players - - + + Bottom of Library Bottom of Library - - - - + + + + Exile Exile - - - - + + + + Graveyard Graveyard - - + + Hand Hand - - + + Top of Library Top of Library - - + + Battlefield, Face Down Battlefield, Face Down - + Battlefield Battlefield - + Library Library - + Sideboard Sideboard - + Top Cards of Library Top Cards of Library - + Bottom Cards of Library Bottom Cards of Library - + Close Recent View Close Recent View - - + + Stack Stack - - + + Graveyard (Multiple) Graveyard (Multiple) - - + + Graveyard (Multiple), Face Down Graveyard (Multiple), Face Down - - + + Exile (Multiple) Exile (Multiple) - - + + Exile (Multiple), Face Down Exile (Multiple), Face Down - + Stack Until Found Stack Until Found - + Draw Bottom Card Draw Bottom Card - + Draw Multiple Cards from Bottom... Draw Multiple Cards from Bottom... - + Draw Arrow... Draw Arrow... - + Remove Local Arrows Remove Local Arrows - + Leave Game Leave Game - + Concede Concede - + Roll Dice... Roll Dice... - - Flip Coin - - - - + Shuffle Library Shuffle Library - + Shuffle Top Cards of Library Shuffle Top Cards of Library - + Shuffle Bottom Cards of Library Shuffle Bottom Cards of Library - + Mulligan Mulligan - + Mulligan (Same hand size) Mulligan (Same hand size) - + Mulligan (Hand size - 1) Mulligan (Hand size - 1) - + Draw a Card Draw a Card - + Draw Multiple Cards... Draw Multiple Cards... - + Undo Draw Undo Draw - + Always Reveal Top Card Always Reveal Top Card - + Always Look At Top Card Always Look At Top Card - + Sort Hand by Name Sort Hand by Name - + Sort Hand by Type Sort Hand by Type - + Sort Hand by Mana Value Sort Hand by Mana Value - + Reveal Hand to All Players Reveal Hand to All Players - + Reveal Random Card to All Players Reveal Random Card to All Players - + Rotate View Clockwise Rotate View Clockwise - + Rotate View Counterclockwise Rotate View Counterclockwise - + Unfocus Text Box Unfocus Text Box - + Focus Chat Focus Chat - + Clear Chat Clear Chat - + Refresh Refresh - + Skip Forward Skip Forward - + Skip Backward Skip Backward - + Skip Forward by a lot Skip Forward by a lot - + Skip Backward by a lot Skip Backward by a lot - + Play/Pause Play/Pause - + Toggle Fast Forward Toggle Fast Forward - + Home Home - + Visual Deck Storage Visual Deck Storage - + Deck Storage Deck Storage - + Server Server - + Account Account - + Administration Administration - + Logs Logs diff --git a/cockatrice/translations/cockatrice_es.ts b/cockatrice/translations/cockatrice_es.ts index 2a0e479c3..53fc9ac61 100644 --- a/cockatrice/translations/cockatrice_es.ts +++ b/cockatrice/translations/cockatrice_es.ts @@ -2,7 +2,7 @@ AbstractCounter - + &Set counter... &Establecer contador... @@ -10,12 +10,12 @@ AbstractCounterDialog - + Set counter Establecer contador - + New value for counter '%1': Nuevo valor para el contador '%1': @@ -30,66 +30,66 @@ Parse Set Name and Number (if available) - Interpretar nombre del expansión y numero (si disponible) + AbstractTabDeckEditor - + Open in new tab Abrir en nueva pestaña - + Are you sure? ¿Estás seguro? - + The decklist has been modified. Do you want to save the changes? La lista del mazo ha sido modificada. ¿Deseas guardar los cambios? - - - - - - + + + + + + Error Error - + Could not open deck at %1 - No se pudo abrir mazo en %1 + - + Could not save remote deck - No se pudo guardar mazo remoto + - - + + The deck could not be saved. Please check that the directory is writable and try again. - + Save deck Guardar mazo - + The deck could not be saved. El mazo no puede ser guardado. - + There are no cards in your deck to be exported No hay cartas en tu mazo para exportar @@ -99,18 +99,18 @@ Please check that the directory is writable and try again. Add Analytics Panel - Añadir panel de análisis + AdminNotesDialog - + Update Notes Notas de actualización - + Admin Notes for %1 @@ -127,227 +127,172 @@ Please check that the directory is writable and try again. Sideboard Banquillo - - - Tokens - - AppearanceSettingsPage - + seconds segundos - + Error Error - + Could not create themes directory at '%1'. No se pudo crear directorio de temas en '%1'. - + Theme settings Preferencias del tema - + Current theme: Tema actual: - + Open themes folder Abrir carpeta de temas - + Home tab background source: - Fuente de segundo plano de pestaña de incio: + - + Home tab background shuffle frequency: - + Disabled Deshabilitado - - Menu settings - Preferencias del menú + + Display card name of background in bottom right: + - + + Menu settings + + + + Show keyboard shortcuts in right-click menus - + Show game filter toolbar above list in room tab - + Card rendering Representación de las cartas - + Display card names on cards having a picture Mostrar nombre de las cartas en aquellas que tengan imagen - + Auto-Rotate cards with sideways layout - + Override all card art with personal set preference (Pre-ProviderID change behavior) - - Light - - - - - Dark - - - - - System - - - - - Active theme palette: - - - - - Edit theme palette - - - - - Home tab settings - - - - - Display card name of background in bottom right - - - - - Styling settings - - - - - Style user list - - - - - Card printings - - - - + Bump sets that the deck contains cards from to the top in the printing selector - + Scale cards on mouse over Cambiar tamaño de las cartas al pasar el ratón por encima - + Use rounded card corners - Usar esquinas redondeadas de las cartas - - - - Card layout - + Minimum overlap percentage of cards on the stack and in vertical hand - + Maximum initial height for card view window: - - + + rows filas - + Maximum expanded height for card view window: - + Card counters Contadores de carta - + Counter %1 - Contador %1 + - + Hand layout Disposición de la mano - + Display hand horizontally (wastes space) Mostrar la mano horizontalmente (desperdicia espacio) - + Enable left justification Habilitar justificación a la izquierda - + Table grid layout Diseño de la cuadrícula de la mesa - + Invert vertical coordinate Invertir coordenada vertical - + Minimum player count for multi-column layout: Número minimo de jugadores para usar la cuadrícula multicolumna: - + Maximum font size for information displayed on cards: Tamaño de fuente máxima para la información presentada en las cartas: @@ -355,14 +300,14 @@ Please check that the directory is writable and try again. ArchidektApiResponseDeckDisplayWidget - + Back to results - Regressar a los resultados + - + Open Deck in Deck Editor - Abrir mazo en editor de mazos + @@ -370,7 +315,7 @@ Please check that the directory is writable and try again. Theme - Tema + @@ -386,112 +331,112 @@ Please check that the directory is writable and try again. BanDialog - + ban &user name banear &usuario - + ban &IP address banear dirección IP &IP - + ban client I&D banear por I&D de cliente - + Ban type Tipo de ban - + &permanent ban acceso prohibido &permanentemente - + &temporary ban acceso prohibido &temporalmente - + &Days: &Días: - + &Hours: &Horas: - + &Minutes: &Minutos: - + Duration of the ban Duración del ban - + Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. Por favor, introduce el motivo de la restricción de acceso Se almacenará unicamente para moderadores y no podrá ser visto por la persona restringida. - + Please enter the reason for the ban that will be visible to the banned person. Por favor, introduce el motivo de la restricción que será visible para la persona restringida. - + Redact all messages from this user in all rooms Redactar todos los mensajes de este usuario en todas las salas - + &OK Aceptar (&O) - + &Cancel &Cancelar - + Ban user from server Banear usuario del servidor - - - - + + + + Error Error - + You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. Debes seleccionar baneo por nombre, por IP, por id de cliente, o cualquier combinación de los tres. - + You must have a value in the name ban when selecting the name ban checkbox. Debes introducir un nombre cuando la casilla de baneo por nombre está activada. - + You must have a value in the ip ban when selecting the ip ban checkbox. Debes introducir una IP cuando la casilla de baneo por IP está activada. - + You must have a value in the clientid ban when selecting the clientid ban checkbox. Debes introducir un id de cliente cuando la casilla de baneo por id de cliente está activada. @@ -499,123 +444,59 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona BetaReleaseChannel - + Beta Beta - + No reply received from the release update server. No se recibió respuesta del servidor de actualización. - + Invalid reply received from the release update server. Respuesta inválida del servidor de actualización. - + No reply received from the file update server. Sin respuesta por parte del servidor de actualización de archivos - - CardArtPreviewWidget - - - No card selected - - - - - CardArtRulesModel - - - Card - - - - - ProviderId - - - - - Mode - - - - - Reason - - - CardDatabaseModel - + Name Nombre - + Sets Ediciones - + Mana cost Coste de maná - + Card type Tipo de carta - + P/T F/R - + Color(s) Color(es) - - CardDatabaseView - - - Add to Deck - - - - - Add to Sideboard - - - - - Select Printing - - - - - Show on EDHRec (Commander) - - - - - Show on EDHRec (Card) - - - - - Show Related cards - - - CardFilter @@ -650,7 +531,7 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona Name (Exact) - Nombre (exacto) + @@ -738,28 +619,28 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona View transformation - Ver transformación + CardInfoPictureWidget - + View related cards Ver cartas relacionadas - + Add card to deck Añadir carta al mazo - + Mainboard Mazo principal - + Sideboard Banquillo @@ -774,7 +655,7 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona Set: - Expansión + @@ -782,12 +663,12 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona - + Related cards: Cartas relacionadas: - + Unknown card: Carta desconocida: @@ -795,146 +676,128 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona CardMenu - + Re&veal to... - + &All players &Todos los jugadores - + View related cards Ver cartas relacionadas - + Token: Ficha: - + All tokens Todas las fichas - + &Select All &Seleccionar todo - + S&elect Row &Seleccionar fila - + S&elect Column &Seleccionar columna - + &Play &Jugar - + &Hide &Ocultar - + Play &Face Down Jugar boca abajo - + &Tap / Untap Turn sideways or back again &Girar / Enderezar - + Skip &untapping - + T&urn Over Turn face up/face down - + &Peek at card face - + &Clone &Clonar - + Attac&h to card... - Anexar a carta... - - - - Unattac&h - Desanexar - - - - &Draw arrow... - Dibujar flecha... - - - - &Set annotation... - Escribir anotación... - - - - Reduce life by power - - Ca&rd counters - Contadores de carta + + Unattac&h + - + + &Draw arrow... + + + + + &Set annotation... + + + + + Ca&rd counters + + + + &Add counter (%1) &Añadir contador (%1) - + &Remove counter (%1) &Quitar contador (%1) - + &Set counters (%1)... &Establecer contadores (%1) - - CardPictureLoaderCacheMethod - - - Network Cache - - - - - Filesystem - - - CardSizeWidget @@ -946,136 +809,136 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona CardZoneLogic - + their hand nominative su mano - + %1's hand nominative - el mano de %1 + - + their library look at zone su biblioteca - + %1's library look at zone - la biblioteca de %1 + - + of their library top cards of zone, de su biblioteca - + of %1's library top cards of zone - de la biblioteca de %1 + - + their library reveal zone su biblioteca - + %1's library reveal zone - la biblioteca de %1 + - + their library shuffle su biblioteca - + %1's library shuffle - la biblioteca de %1 + - + their library nominative su biblioteca - + %1's library nominative - la biblioteca de %1 + - + their graveyard nominative su cementerio - + %1's graveyard nominative - el cementerio de %1 + - + their exile nominative su zona de exilio - + %1's exile nominative - exilio de %1 + - + their sideboard look at zone su banquillo - + %1's sideboard look at zone - el banquillo de %1 + - + their sideboard nominative su banquillo - + %1's sideboard nominative - el banquillo de %1 + - + their custom zone '%1' nominative - su zona personalizada '%1' + - + %1's custom zone '%2' nominative - la zona personalizada de %1 '%2' + @@ -1094,459 +957,49 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona - - ColorButton - - - Click to pick a color - - - - - Pick colour - - - - - ConnectionController - - - - The server has reached its maximum user capacity, please check back later. - - - - - There are too many concurrent connections from your address. - - - - - Banned by moderator - - - - - Expected end time: %1 - - - - - This ban lasts indefinitely. - - - - - Scheduled server shutdown. - - - - - - Invalid username. - - - - - You have been logged out due to logging in at another location. - - - - - Connection closed - - - - - The server has terminated your connection. -Reason: %1 - - - - - The server is going to be restarted in %n minute(s). -All running games will be lost. -Reason for shutdown: %1 - - - - - Scheduled server shutdown - - - - - Failed Login - - - - - Your client seems to be missing features this server requires for connection. - - - - - To update your client, go to 'Help -> Check for Client Updates'. - - - - - - - - - - - - - - - - - - - - - - Error - - - - - Incorrect username or password. Please check your authentication information and try again. - - - - - There is already an active session using this user name. -Please close that session first and re-login. - - - - - - You are banned until %1. - - - - - - You are banned indefinitely. - - - - - This server requires user registration. Do you want to register now? - - - - - This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. -Please close and reopen your client to try again. - - - - - An internal error has occurred, please close and reopen Cockatrice before trying again. -If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - - - - Account activation - - - - - Your account has not been activated yet. -You need to provide the activation token received in the activation email. - - - - - Server Full - - - - - Unknown login error: %1 - - - - - - -This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - - - - - - - - - Registration denied - - - - - Registration is currently disabled on this server - - - - - There is already an existing account with the same user name. - - - - - It's mandatory to specify a valid email address when registering. - - - - - It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. - - - - - Password too short. - - - - - Registration failed for a technical problem on the server. - - - - - The connection to the server has been lost. - - - - - Unknown registration error: %1 - - - - - Account activation failed - - - - - Socket error: %1 - - - - - Server timeout - - - - - You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. -Local version is %1, remote version is %2. - - - - - Your Cockatrice client is obsolete. Please update your Cockatrice version. -Local version is %1, remote version is %2. - - - - - - Success - - - - - Registration accepted. -Will now login. - - - - - Account activation accepted. -Will now login. - - - - - Information - - - - - This server supports additional features that your client doesn't have. -This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. - -To update your client, go to Help -> Check for Updates. - - - - - - - Reset Password - - - - - Your password has been reset successfully, you can now log in using the new credentials. - - - - - Failed to reset user account password, please contact the server operator to reset your password. - - - - - Activation request received, please check your email for an activation token. - - - - - Connecting to %1... - - - - - Registering to %1 as %2... - - - - - Disconnected - - - - - Connected, logging in at %1 - - - - - Requesting forgotten password to %1 as %2... - - - - - Your username must respect these rules: - - - - - is %1 - %2 characters long - - - - - can %1 contain lowercase characters - - - - - - - - NOT - - - - - can %1 contain uppercase characters - - - - - can %1 contain numeric characters - - - - - can contain the following punctuation: %1 - - - - - first character can %1 be a punctuation mark - - - - - no unacceptable language as specified by these server rules: - note that the following lines will not be translated - - - - - can not contain any of the following words: %1 - - - - - can not match any of the following expressions: %1 - - - - - You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - - CustomZoneMenu - + C&ustom Zones - Zonas Personalizadas + - - + + View custom zone '%1' - Ver la zona personalizada '%1' + DeckAnalyticsWidget - + Add Panel - Añadir panel + - + Remove Panel - Borrar panel + - + Save Layout - Guardar diseño + - + Load Layout - Cargar diseño - - - - Include Sideboard DeckEditorCardDatabaseDockWidget - + Card Database - Base de datos de cartas + @@ -1560,17 +1013,47 @@ To update your client, go to Help -> Check for Updates. DeckEditorDatabaseDisplayWidget - + Search by card name (or search expressions) Buscar por nombre de carta (o buscar expresiones) - + + Add to Deck + Añadir al Mazo + + + + Add to Sideboard + Añadir al Banquillo + + + + Select Printing + + + + + Show on EDHRec (Commander) + + + + + Show on EDHRec (Card) + + + + + Show Related cards + Mostrar cartas Relacionadas + + + Add card to &maindeck Añadir carta al &mazo principal - + Add card to &sideboard Añadir carta al &banquillo @@ -1580,7 +1063,7 @@ To update your client, go to Help -> Check for Updates. Loading Database... - Cargando la base de datos... + @@ -1603,72 +1086,72 @@ To update your client, go to Help -> Check for Updates. Colores - + Select Printing - + Deck Mazo - + Deck &name: &Nombre del mazo: - + Banner Card/Tags Visibility Settings - + Show banner card selection menu - + Show tags selection menu - + &Comments: &Comentarios: - + Group by: Agrupar por: - + Format: - Formato: + - + Hash: - Hash: + - + &Increment number &Incrementar número - + &Decrement number &Reducir número - + &Remove row &Quitar fila - + Swap card to/from sideboard @@ -1676,17 +1159,17 @@ To update your client, go to Help -> Check for Updates. DeckEditorFilterDockWidget - + Filters Filtros - + &Clear all filters &Limpiar todos los filtros - + Delete selected Borrar seleccionado @@ -1768,12 +1251,12 @@ To update your client, go to Help -> Check for Updates. &Print deck... - Imprimir mazo... + Load deck from online service... - Cargar mazo desde el servicio en línea... + @@ -1817,130 +1300,186 @@ To update your client, go to Help -> Check for Updates. DeckEditorSettingsPage - - + + Update Spoilers Actualizar Spoilers - + + Success Éxito - + Download URLs have been reset. Las URL de descarga se han reiniciado. - + + Downloaded card pictures have been reset. + Las imágenes de las cartas descargadas se han reiniciado. + + + + Error + Error + + + + One or more downloaded card pictures could not be cleared. + Una o más imágenes descargadas pueden no ser claras + + + Add URL Añadir URL - - + + URL: URL: - - + + Edit URL Editar URL - + + Network Cache Size: + + + + + Redirect Cache TTL: + + + + + How long cached redirects for urls are valid for. + + + + + Picture Cache Size: + + + + Add New URL Añadir URL - + Remove URL Borrar URL - + + Day(s) + Día(s) + + + Updating... Actualizando... - + Choose path Elegir camino - + URL Download Priority Prioridad de descarga de URL - + Spoilers Spoilers - + Download Spoilers Automatically Descargar Spoilers automáticamente - + Spoiler Location: Localización del Spoiler: - + Last Change Último cambio - + Spoilers download automatically on launch Spoilers se descargan automáticamente en lanzamiento - + Press the button to manually update without relaunching Presione el botón para actualizar manualmente sin reiniciar - + Do not close settings until manual update is complete No cierre la ventana de configuración hasta que la actualización manual este completa. - + Download card pictures on the fly Descargar imagenes de las cartas rapidamente - + How to add a custom URL Cómo agregar una URL personalizada - + + Delete Downloaded Images + Eliminar imágenes descargadas + + + Reset Download URLs Reiniciar descarga de URLs + + + On-disk cache for downloaded pictures + + + + + In-memory cache for pictures not currently on screen + + DeckListHistoryManagerWidget Undo - Deshacer + Redo - Rehacer + Undo/Redo history - Historial de deshacer/rehacer + @@ -1950,12 +1489,12 @@ To update your client, go to Help -> Check for Updates. [redo] - [rehacer] + [undo] - [deshacer] + @@ -1963,12 +1502,12 @@ To update your client, go to Help -> Check for Updates. Count - Conteo + Set - Expansión + @@ -1989,14 +1528,14 @@ To update your client, go to Help -> Check for Updates. DeckLoader - + Common deck formats (%1) - + All files (*.*) - Todos los archivos (*.*) + @@ -2004,12 +1543,12 @@ To update your client, go to Help -> Check for Updates. Mode: Exact Match - Modo: Coincidencia Exacta + Mode: Includes - Modo: Incluye + @@ -2075,12 +1614,12 @@ To update your client, go to Help -> Check for Updates. Tag name cannot be empty! - ¡Nombre de etiqueta no puede estar vacío! + Duplicate Tag - Etiqueta Duplicada + @@ -2098,7 +1637,7 @@ To update your client, go to Help -> Check for Updates. Open in deck editor - Abrir en editor de mazos + @@ -2113,7 +1652,7 @@ To update your client, go to Help -> Check for Updates. Save Deck to Clipboard - Guardar mazo al portapapeles + @@ -2213,32 +1752,32 @@ To update your client, go to Help -> Check for Updates. Added (%1): %2 (%3) %4 - Añadido (%1): %2 (%3) %4 + - + Moved to %1 1 × "%2" (%3) - + Removed "%1" (all copies) - + %1 1 × "%2" (%3) - + Added - Añadido + - + Removed - Borrado + @@ -2258,74 +1797,74 @@ To update your client, go to Help -> Check for Updates. DeckViewContainer - + Load deck... Cargar mazo... - + Load remote deck... Cargar mazo remoto... - + Load from clipboard... Cargar desde el portapapeles... - + Load from website... - Cargar desde el sitio web... + - + Unload deck - + Ready to start Listo para empezar - + Force start Forzar inicio - + Sideboard unlocked Banquillo desbloqueado - + Sideboard locked Banquillo bloqueado - - + + Error Error - + The selected file could not be loaded. El fichero seleccionado no pudo cargarse. - + Deck is greater than maximum file size. - + Are you sure you want to force start? This will kick all non-ready players from the game. - + Cockatrice Cockatrice @@ -2424,7 +1963,7 @@ This will kick all non-ready players from the game. - + Webpage Página web @@ -2464,37 +2003,37 @@ This will kick all non-ready players from the game. Conectar al Servidor - + Server URL dirección URL del servidor - + Communication Port Puerto de comunicación - + Unique Server Name Nombre único para el servidor - + Connection Warning Advertencia de Conexión - + You need to name your new connection profile. Necesita dar nombre a su nuevo perfil de conexión. - + Connect Warning Advertencia de conexión - + The player name can't be empty. El nombre del jugador no puede estar vacío. @@ -2607,17 +2146,17 @@ This will kick all non-ready players from the game. Crear partida - + Game information Información de la partida - + Error Error - + Server error. Error del servidor. @@ -2625,97 +2164,97 @@ This will kick all non-ready players from the game. DlgCreateToken - + &Name: &Nombre: - + Token Ficha - + C&olor: &Color: - + white blanco - + blue azul - + black negro - + red rojo - + green verde - + multicolor multicolor - + colorless incoloro - + &P/T: &F/R: - + &Annotation: &Anotación: - + &Destroy token when it leaves the table &Destruir la ficha cuando deje la mesa - + Create face-down (Only hides name) - + Token data Datos de la ficha - + Show &all tokens Mostrar &todas las fichas - + Show tokens from this &deck Mostrar todas las fichas de este &mazo - + Choose token from list Elegir ficha de la lista - + Create token Crear ficha @@ -2749,7 +2288,7 @@ This will kick all non-ready players from the game. - + ✖ @@ -2764,12 +2303,12 @@ This will kick all non-ready players from the game. El nombre de la etiqueta no puede estar vacío! - + Duplicate Tag Duplicar etiqueta - + This tag already exists. Esta etiqueta ya existe. @@ -2820,7 +2359,7 @@ Para eliminar tu avatar actual, confirma sin elegir una nueva imagen. Edit deck in clipboard - Editar mazo en el portapapeles + @@ -2956,12 +2495,12 @@ Para eliminar tu avatar actual, confirma sin elegir una nueva imagen.Por favor, introduzca el nombre de la ficha: - + Error Error - + The chosen name conflicts with an existing card or token. Make sure to enable the 'Token' set in the "Manage sets" dialog to display them correctly. El nombre elegido ya existe y está siendo usado por una carta o ficha. @@ -2986,12 +2525,12 @@ Asegúrese de habilitar la edición 'Fichas' en la opción "Mante Indefinido - + Real name: Nombre real: - + Edit user profile Editar perfil de usuario @@ -3029,113 +2568,113 @@ Asegúrese de habilitar la edición 'Fichas' en la opción "Mante 2 horas - + Hide 'buddies only' games - Esconder los partidos de solo amigos + - + Hide full games - Esconder los partidos llenos + - + Hide games that have started - + Hide password protected games - + Hide 'ignored user' games - Esconder los partidos de usuarios ignorados + - + Hide games not created by buddies Hide games not created by buddy - Esconder los partidos no creados por amigos + - + Hide games with forced open decklists - + &Newer than: &Más nuevo que: - + Game &description: &Descipción de la partida: - + &Creator name: &Nombre del creador: - + General General - + &Game types Tipos de &partida - + at &least: al &menos: - + at &most: &como máximo: - + Maximum player count Número máximo de jugadores - + Restrictions Restricciones - + Show games only if &spectators can watch Mostrar partidas solo si &espectadores pueden ver - + Show spectator password p&rotected games Mostrar contraseña de espectador para juegos p&rotegidos - + Show only if spectators can ch&at Mostrar solo si los espectadores pueden ha&blar - + Show only if spectators can see &hands Mostrar solo si los espectadores pueden ver &manos - + Spectators Espectadores - + Filter games Filtrar partidas @@ -3359,7 +2898,7 @@ Asegúrese de habilitar la edición 'Fichas' en la opción "Mante Load Deck from Website - Cargar mazo desde el sitio web + @@ -3407,17 +2946,17 @@ https://tappedout.net/mtg-decks/your-deck-name/ Players: - Jugadores: + General - General + Starting life total: - Total de vidas inicial: + @@ -3427,7 +2966,7 @@ https://tappedout.net/mtg-decks/your-deck-name/ Remember settings - Recordar preferencias + @@ -3438,37 +2977,37 @@ https://tappedout.net/mtg-decks/your-deck-name/ DlgMoveTopCardsUntil - + Card name (or search expressions): - Nombre de carta (o buscar expresiones): + - + Number of hits: - + Auto play hits - + Put top cards on stack until... - + No cards matching the search expression exists in the card database. Proceed anyways? - + Cockatrice Cockatrice - + Invalid filter Filtro no válido @@ -3528,40 +3067,40 @@ Tu correo electrónico se utilizará para verificar tu cuenta. Indefinido - + Real name: Nombre real: - + Register to server Registrarse en el servidor - - - - + + + + Registration Warning Advertencia durante el registro - + Your password is too short. Tu contraseña es demasiado corta. - + Your passwords do not match, please try again. Tus contraseñas no coinciden, por favor inténtalo de nuevo. - + Your email addresses do not match, please try again. Tus direcciones de correo electrónico no coinciden, por favor inténtalo de nuevo. - + The player name can't be empty. El nombre del jugador no puede estar vacío. @@ -3569,17 +3108,17 @@ Tu correo electrónico se utilizará para verificar tu cuenta. DlgRollDice - + Number of sides: - + Number of dice: Número de dado: - + Roll Dice Lanzar dados @@ -3630,12 +3169,12 @@ Tu correo electrónico se utilizará para verificar tu cuenta. DlgSettings - + Unknown Error loading card database Error desconocido al cargar la base de datos de cartas. - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -3652,7 +3191,7 @@ Podrías necesitar volver a ejecutar oracle para actualizar tu base de datos de ¿Quieres cambiar la ubicación de tu base de datos? - + Your card database version is too old. This can cause problems loading card information or images @@ -3669,7 +3208,7 @@ Normalmente esto se soluciona volviendo a ejecutar oracle para actualizar tu bas ¿Quieres cambiar la ubicación de tu base de datos? - + Your card database did not finish loading Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached @@ -3682,7 +3221,7 @@ Por favor, envía un ticket en https://github.com/Cockatrice/Cockatrice/issues c ¿Te gustaría cambiar la configuración de la ubicación de tu base de datos? - + File Error loading your card database. Would you like to change your database location setting? @@ -3691,7 +3230,7 @@ Would you like to change your database location setting? ¿Quieres cambiar la ubicación de tu base de datos? - + Your card database was loaded but contains no cards. Would you like to change your database location setting? @@ -3700,7 +3239,7 @@ Would you like to change your database location setting? ¿Quieres cambiar la ubicación de tu base de datos? - + Unknown card database load status Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues @@ -3713,64 +3252,59 @@ Por favor, envía un ticket en https://github.com/Cockatrice/Cockatrice/issues ¿Te gustaría cambiar la configuración de la ubicación de tu base de datos? - - - + + + Error Error - + The path to your deck directory is invalid. Would you like to go back and set the correct path? La ruta a tu directorio de mazos no es válida. ¿Deseas volver y seleccionar la ruta correcta? - + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? La ruta a tu directorio de imágenes de las cartas no es válida. ¿Deseas volver y seleccionar la ruta correcta? - + Settings Preferencias - + General General - + Appearance Apariencia - + User Interface Interfaz de usuario - - Storage - - - - + Card Sources Origen de la carta - + Chat Chat - + Sound Sonido - + Shortcuts Atajos de teclado @@ -3802,7 +3336,7 @@ You can always change this behavior in the 'General' settings tab. Run in background and always from now on - Ejecutar en segundo plano y siempre a partir de ahora + @@ -3862,9 +3396,9 @@ You can always change this behavior in the 'General' settings tab. - - - + + + Error Error @@ -3917,31 +3451,31 @@ Por favor, visita la página de descargas para actualizarlo manualmente. - + Update Available Actualización disponible - + A new version of Cockatrice is available! ¡Una nueva version de Cockatrice está disponible! - + New version Nueva versión - + Released Lanzado - + Changelog Registro de cambios @@ -3951,50 +3485,50 @@ Por favor, visita la página de descargas para actualizarlo manualmente.¿Quieres actualizar ahora? - + Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. - + Please check the <a href="%1">releases page</a> on our Github and download the build for your system. - - - + + + Update Error Error en la actualización - + An error occurred while checking for updates: Ha ocurrido un error mientras se buscaban actualizaciones: - + An error occurred while downloading an update: Ha ocurrido un error mientras se descargaba una actualización: - + Installing... Instalando... - + Cockatrice is unable to open the installer. Cockatrice es incapaz de abrir el instalador. - + Try to update manually by closing Cockatrice and running the installer. Intente actualizar manualmente cerrando Cockatrice y ejecutando el instalador. - + Download location Ubicación de descarga @@ -4009,7 +3543,7 @@ You may have to manually download the new version. Copy to clipboard - Copiar al portapapeles + @@ -4032,17 +3566,17 @@ You may have to manually download the new version. Card Name - Nombre de la carta + Type - Tipo + Subtype - Subtipo + @@ -4057,7 +3591,7 @@ You may have to manually download the new version. At least - Al menos + @@ -4078,73 +3612,73 @@ You may have to manually download the new version. cards - cartas + DrawProbabilityWidget - + Draw Probability - + Probability of drawing - - - Card Name - Nombre de la carta - - - - Type - Tipo - - Subtype - Subtipo + Card Name + - Mana Value + Type + + + + + Subtype - At least - Al menos + Mana Value + - - Exactly + + At least + Exactly + + + + card(s) having drawn at least - + cards - cartas + - + Category - + Qty - + Odds (%) @@ -4207,7 +3741,7 @@ You may have to manually download the new version. Tcgplayer - TCGplayer + @@ -4258,7 +3792,7 @@ You may have to manually download the new version. FilterBuilder - + Type your filter here Escriba su filtro aquí @@ -4273,7 +3807,7 @@ You may have to manually download the new version. Are you sure you want to delete the filter '%1'? - ¿Estás seguro/a de que quieres eliminar el filtro '%1'? + @@ -4289,22 +3823,22 @@ You may have to manually download the new version. GameEventHandler - + kicked by game host or moderator expulsado por el anfitrión del juego o moderador - + player left the game jugador ha dejado la partida - + player disconnected from server jugador se ha desconectado del servidor - + reason unknown razón desconocida @@ -4312,140 +3846,140 @@ You may have to manually download the new version. GameSelector - - - - - - - - - + + + + + + + + + Error Error - + Please join the appropriate room first. Por favor, entre a la sala adecuada primero. - + Wrong password. Contraseña incorrecta. - + Spectators are not allowed in this game. No se permiten espectadores en esta partida. - + The game is already full. La partida no tiene plazas libres. - + The game does not exist any more. La partida ya no existe. - + This game is only open to registered users. Esta partida está abierta sólo a usuarios registrados. - + This game is only open to its creator's buddies. Esta partida está abierta sólo a los amigos del creador. - + You are being ignored by the creator of this game. Estás siendo ignorado por el creador de la partida. - + Join Game Unirse a partida - + Spectate Game Espectar partida - + Game Information Información de la partida - + Join Game as Judge - + Spectate Game as Judge - + Join game Entrar en la partida - + Password: Contraseña: - + Please join the respective room first. Por favor, entre primero en la sala respectiva. - + &Filter games &Filtrar partidas - + C&lear filter &Limpiar filtro - + C&reate C&rear - + &Join Unirse (&J) - + Join as judge - + J&oin as spectator Entrar como e&spectador - + Join as judge spectator - + Games shown: %1 / %2 Juegos mostrados: %1 / %2 - + Games Partidas @@ -4453,32 +3987,32 @@ You may have to manually download the new version. GameSelectorQuickFilterToolBar - + All types - Todos los tipos + - + Filter by game name... - Filtrar por nombre de partida... + - + Filter by game type/format - + Hide games not created by buddies - Esconder los partidos no creados por amigos + - + Hide full games - + Hide started games @@ -4486,105 +4020,105 @@ You may have to manually download the new version. GamesModel - + >1 day >1 day - + %1%2 hr short age in hours %1%2 hora%1%2 horas%1%2 horas - + new nuevo - + %1%2 min short age in minutes %1%2 min%1%2 min%1%2 min - + password contraseña - + buddies only solo amigos - + reg. users only solo usuarios registrados - + open decklists + - can chat pueden usar el chat - + see hands ver manos - + can see hands puede ver manos - + not allowed no permitidos - + Room Sala - + Age Edad - + Description Descripción - + Creator Creador - + Type Tipo - + Restrictions Restricciones - + Players Jugadores - + Spectators Espectadores @@ -4592,158 +4126,143 @@ You may have to manually download the new version. GeneralSettingsPage - + Reset all paths Reiniciar todos los caminos - + All paths have been reset Todos los caminos se han reiniciado - - - - - - - + + + + + + + Choose path Elija ruta - - Language settings - + + Personal settings + Preferencias personales - + Language: Idioma: - - Version settings - - - - - Card database - - - - - Startup settings - - - - + Paths (editing disabled in portable mode) Rutas (edición deshabilitada en modo portatil) - + Paths Rutas - + How to help with translations Cómo ayudar con las traducciones - + Decks directory: Directorio de mazos: - + Filters directory: Directorio de filtros: - + Replays directory: Directorio de repeticiones: - + Pictures directory: Directorio de imágenes: - + Card database: Base de datos de cartas: - + Custom database directory: Directorio de base de datos personalizado: - + Token database: Base de datos de tokens: - + Update channel Actualizar canal - + Check for client updates on startup Comprobar actualizaciones del cliente al arrancar - + Check for card database updates on startup Comprobar actualizaciones de la base de datos de cartas al arrancar - + Don't check No comprobar - + Prompt for update - + Always update in the background Siempre actualizar en segundo plano - + Check for card database updates every Comprobar actualizaciones de la base de datos de cartas cada - + days días - + Notify if a feature supported by the server is missing in my client Notificar si hace falta en mi cliente alguna característica soportada por el servidor - + Automatically run Oracle when running a new version of Cockatrice Oracle se ejecutará automáticamente cuando se ejecuté una nueva versión de Cockatrice - + Show tips on startup Mostrar tips al inicio - + Last update check on %1 (%2 days ago) @@ -4751,47 +4270,47 @@ You may have to manually download the new version. GraveyardMenu - + &Graveyard &Cementerio - + &View graveyard Ver &cementerio - + &Move graveyard to... &Mover cementerio a... - + &Top of library &Parte superior de la biblioteca - + &Bottom of library &Parte inferior de la biblioteca - + &All players - Todos los jugadores + - + &Hand &Mano - + &Exile &Exilio - + Reveal random card to... Mostrar una carta al azar a... @@ -4799,88 +4318,88 @@ You may have to manually download the new version. HandMenu - + &Hand &Mano - + &View hand &Ver mano - + Sort hand by... - + Name - Nombre + - + Type - Tipo + - + Mana Value - + Take &mulligan (Choose hand size) - + Take mulligan (Same hand size) - + Take mulligan (Hand size - 1) - + &Move hand to... &Mover mano a... - + &Top of library &Parte superior de la biblioteca - + &Bottom of library &Parte inferior de la biblioteca - + &Graveyard &Cementerio - + &Exile &Exilio - + &Reveal hand to... &Mostrar mano a... - - + + All players - Todos los jugadores + - + Reveal r&andom card to... Mostrar una carta al azar a... @@ -4888,52 +4407,52 @@ You may have to manually download the new version. HomeWidget - + Create New Deck Crear nuevo mazo - + Browse Decks Buscar mazos - + Browse Card Database Buscar base de datos de cartas - + Browse EDHRec - Buscar EDHRec + - + Browse Archidekt - Buscar Archidekt + - + View Replays Ver repeticiones - + Quit Quitar - + Connecting... Conectando... - + Connect Conectar - + Play Jugar @@ -4941,213 +4460,213 @@ You may have to manually download the new version. LibraryMenu - + &Library &Biblioteca - + &View library &Ver biblioteca - + View &top cards of library... Ver cartas de la parte superior de la biblioteca - + View bottom cards of library... Ver cartas de la parte inferior de la biblioteca - + Reveal &library to... Mostrar &biblioteca a... - + Lend library to... - Prestar la biblioteca a... + - + Reveal &top cards to... Mostrar &cartas de la parte superior a... - + &Top of library... &Parte superior de la biblioteca... - + &Bottom of library... &Parte inferior de la biblioteca... - + &Always reveal top card - Mostrar siempre la carta superior + - + &Always look at top card - Ver siempre la carta superior + - + &Open deck in deck editor - Abrir mazo en editor de mazos + - + &Draw card &Robar carta - + D&raw cards... - + &Undo last draw - Deshacer último robo + - + Shuffle Barajar - + &Play top card &Jugar carta de la parte superior - + Play top card &face down - Jugar carta de la parte superior boca abajo + - + Put top card on &bottom - + Move top card to grave&yard - Mover la carta superior al cementario + - + Move top card to e&xile - Mover la carta superior al exilio + - + Move top cards to &graveyard... - Mover las cartas superiores al cementario... + - + Move top cards to graveyard face down... - Mover las cartas superiores al cementario boca abajo... + - + Move top cards to &exile... - Mover las cartas superiores al exilio... + - + Move top cards to exile face down... - Mover las cartas superiores al exilio boca abajo... + - + Put top cards on stack &until... - + Shuffle top cards... Barajar cartas de la parte superior... - + &Draw bottom card - &Robar carta inferior + &Robar carta de la parte inferior - + D&raw bottom cards... - Robar cartas inferiores... + - + &Play bottom card - &Jugar carta inferior + &Jugar carta de la parte inferior - + Play bottom card &face down - Jugar carta inferior boca abajo + - + Move bottom card to grave&yard - Mover la carta inferior al cementario + - + Move bottom card to e&xile - Mover la carta inferior al exilio + - + Move bottom cards to &graveyard... - Mover las cartas inferiores al cementario... + - + Move bottom cards to graveyard face down... - Mover las cartas inferiores al cementario boca abajo... + - + Move bottom cards to &exile... - Mover las cartas inferiores al exilio... + - + Move bottom cards to exile face down... - Mover las cartas inferiores al exilio boca abajo... + - + Put bottom card on &top - Poner carta inferior en la parte superior + Poner carta de la parte inferior en la parte superior - + Shuffle bottom cards... Barajar cartas de la parte inferior... - - + + &All players - Todos los jugadores + - + Reveal top cards of library - + Number of cards: (max. %1) @@ -5155,273 +4674,640 @@ You may have to manually download the new version. MainWindow - - + + + The server has reached its maximum user capacity, please check back later. + Este servidor ha alcanzado su capacidad máxima de usuarios, por favor inténtalo más tarde. + + + + There are too many concurrent connections from your address. + Hay demasiadas conexiones simultaneas desde tu dirección. + + + + Banned by moderator + Baneado por el moderador + + + + Expected end time: %1 + Tiempo de finalización estimado: %1 + + + + This ban lasts indefinitely. + Este ban permanecerá indefinidamente. + + + + Scheduled server shutdown. + Apagado programado del servidor. + + + + + Invalid username. + El nombre de usuario no es válido. + + + + You have been logged out due to logging in at another location. + Se ha cerrado tu sesión debido a que se ha iniciado en otra ubicación. + + + + Connection closed + Conexión cerrada + + + + The server has terminated your connection. +Reason: %1 + El servidor ha finalizado tu conexión. +Motivo: %1 + + + + The server is going to be restarted in %n minute(s). +All running games will be lost. +Reason for shutdown: %1 + El servidor será reiniciado en un minuto. +Todas las partidas en curso se cerraran. +Motivo para el apagado: %1El servidor será reiniciado en %n minuto(s). +Todas las partidas en curso se cerraran. +Motivo para el apagado: %1El servidor será reiniciado en %n minuto(s). +Todas las partidas en curso se cerraran. +Motivo para el apagado: %1 + + + + Scheduled server shutdown + Apagado programado del servidor + + + + + Success + Éxito + + + + Registration accepted. +Will now login. + Registro aceptado. +Iniciando sesión. + + + + Account activation accepted. +Will now login. + Activación de la cuenta aceptada. +Iniciando sesión. + + + + Player %1 Jugador %1 - + Load replay Cargar repetición - + About Cockatrice Acerca de Cockatrice - + Version Versión - + Cockatrice Webpage Página de Cockatrice - + Project Manager: Jefe de Proyecto: - + Past Project Managers: Antiguos Jefes de Proyecto: - + Developers: Desarrolladores: - + Our Developers Nuestros desarrolladores - + Help Develop! ¡Ayuda a desarrollar! - + Translators: Traductores: - + Our Translators Nuestros Traductores - + Help Translate! ¡Ayuda a traducir! - + Support: Soporte: - + Report an Issue Informa de un problema - + Troubleshooting Problemas frecuentes - + F.A.Q. Preguntas frecuentes - - + + + + + + + + + + + + + + + + + + + + Error Error - + + Server timeout + Tiempo de espera del servidor agotado + + + + Failed Login + Inicio de sesión fallido + + + + Your client seems to be missing features this server requires for connection. + Tu cliente parece no tener las características requeridas para la conexión de este servidor. + + + + To update your client, go to 'Help -> Check for Client Updates'. + Para actualizar tu cliente, ir a 'Ayuda->Marcar para Actualizaciones del Cliente' + + + + Incorrect username or password. Please check your authentication information and try again. + Nombre de usuario o contraseña incorrecto. Por favor, verifica tu información de autentificación y vuelve a intentarlo. + + + + There is already an active session using this user name. +Please close that session first and re-login. + Ya existe una sesión activa usando ese nombre de usuario. +Por favor, cierra esa sesión primero y reintentalo. + + + + + You are banned until %1. + Estás baneado hasta %1. + + + + + You are banned indefinitely. + Estás baneado indefinidamente. + + + + This server requires user registration. Do you want to register now? + Este servidor requiere el registro de usuarios. ¿Quieres registrarte ahora? + + + + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. + Este servidor exige IDs de cliente. Tu cliente no está generando un ID o estás ejecutando un cliente modificado. Cierra y vuelve a abrir el cliente para intentarlo de nuevo. + + + + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. + Ha ocurrido un error interno. Cierra y vuelve a abrir Cockatrice antes de intentar de nuevo. +Si el error persiste, asegúrate de que estás ejecutando la versión más reciente del software y contacta a los desarrolladores del software si es necesario. + + + + Account activation + Activación de cuenta + + + + Your account has not been activated yet. +You need to provide the activation token received in the activation email. + Tu cuenta aún no ha sido activada. +Tienes que proporcionar el código recibido en el email de activación + + + + Server Full + Servidor Lleno + + + + Unknown login error: %1 + Error de inicio de sesión desconocido: %1 + + + + + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. + +Esto suele ser debido a que tu versión del cliente está desfasada y el servidor ha enviado una respuesta que tu cliente no comprende. + + + + Your username must respect these rules: + Tu nombre de usuario debe: + + + + is %1 - %2 characters long + Tener de %1 a %2 caracteres de longitud. + + + + can %1 contain lowercase characters + %1 Puede tener minúsculas. + + + + + + + NOT + NO + + + + can %1 contain uppercase characters + %1 Puede tener mayúsculas. + + + + can %1 contain numeric characters + %1 Puede tener caracteres númericos. + + + + can contain the following punctuation: %1 + Puede tener los siguientes signos de puntuación: %1 + + + + first character can %1 be a punctuation mark + El primer caracter %1 puede ser un signo de puntuación. + + + + no unacceptable language as specified by these server rules: + note that the following lines will not be translated + + + + + can not contain any of the following words: %1 + No puede contener ninguna de las siguientes palabras: %1 + + + + can not match any of the following expressions: %1 + No puede coincidir ninguna de las siguientes expresiones: %1 + + + + You may only use A-Z, a-z, 0-9, _, ., and - in your username. + Sólo puedes usar A-Z, a-z, 0-9, _, ., y - en tu nombre de usuario. + + + + + + + + + Registration denied + Registro denegado + + + + Registration is currently disabled on this server + El registro está actualmente deshabilitado en este servidor + + + + There is already an existing account with the same user name. + Ya existe una cuenta con ese nombre. + + + + It's mandatory to specify a valid email address when registering. + Es obligatorio especificar una dirección de correo válida al registrarse. + + + + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + Parece ser que usted está intentando registrar una cuenta nueva en este servidor; sin embargo usted ya tiene una cuetna registrada con el correo provisto. Este servidor restringe el número de cuentas que un usuario puede registrar por correo electrónico. Por favor contacte al operador del servidor para asistencia o para obtener la información de sus credenciales. + + + + Password too short. + La contraseña es demasiado corta. + + + + Registration failed for a technical problem on the server. + El registro falló debido a un problema técnico en el servidor. + + + + The connection to the server has been lost. + Se ha perdido la conexión con el servidor. + + + + Unknown registration error: %1 + Error de registro desconocido: %1 + + + + Account activation failed + La activación de cuenta falló. + + + + Socket error: %1 + Error del Socket: %1 + + + + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + Estás intentando conectar a un servidor obsoleto. Por favor, usa una versión anterior de Cockatrice o conecta a un servidor apropiado. +La versión local es %1, la versión remota es %2. + + + + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + Tu cliente de Cockatrice está obsoleto. Por favor, actualiza tu versión de Cockatrice. +La versión local es %1, la versión remota es %2. + + + + Connecting to %1... + Conectando a %1... + + + + Registering to %1 as %2... + Registrando en %1 como %2... + + + + Disconnected + Desconectado + + + + Connected, logging in at %1 + Conectado, hora de inicio de sesión: %1 + + + + + + Requesting forgotten password to %1 as %2... + Solicitando contraseña olvidada de %1 como %2... + + + &Connect... &Conectar... - + &Disconnect &Desconectar - + Start &local game... Empezar partida &local... - + &Watch replay... &Ver repetición... - + &Full screen &Pantalla completa - + &Register to server... &Registrarse en el servidor... - + &Restore password... &Restaurar contraseña... - + &Settings... &Preferencias... - + &Exit &Salir - + A&ctions A&cciones - + &Cockatrice &Cockatrice - + C&ard Database Base de datos de c&artas - + &Manage sets... &Mantenedor de ediciones... - + Edit custom &tokens... Editar &fichas personalizadas... - + Open custom image folder Abrir carpeta de imágenes personalizadas - + Open custom sets folder Abrir carpeta de ediciones personalizadas - + Add custom sets/cards Agregar cartas/ediciones personalizadas - + Reload card database Recargar la base de datos de cartas - + Tabs Pestañas - + &Help A&yuda - + &About Cockatrice &Acerca de Cockatrice - + &Tip of the Day &Tip del Día - + Check for Client Updates Buscar Actualizaciones de Cliente - + Check for Card Updates... Comprobar actualizaciones de cartas... - + Check for Card Updates (Automatic) Comprobar actualizaciones de cartas (Automático) - + Show Status Bar Mostrar barra de estatus - + View &Debug Log Ver &registro de debugs - + Open Settings Folder Abrir carpeta de preferencias - + Show/Hide Mostrar/Ocultar - + New Version Nueva Versión - + Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. Felicitaciones se ha actualizado Cockatrice %1! Oracle actualizará tu base de datos de cartas. - + Cockatrice installed Cockatrice está instalado. - + Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. ¡Felicitaciones! Se ha instalado Cockatrice %1 Ahora se ejecutará Oracle para instalar la base de datos de cartas inicial. - + Card database Base de datos de cartas - + Cockatrice is unable to load the card database. Do you want to update your card database now? If unsure or first time user, choose "Yes" @@ -5430,29 +5316,29 @@ If unsure or first time user, choose "Yes" Si no está seguro o es su primera vez, seleccione "Sí" - - + + Yes Si - - + + No No - + Open settings Abrir preferencias - + New sets found Nuevas ediciones encontradas - + %n new set(s) found in the card database Set code(s): %1 Do you want to enable it/them? @@ -5465,22 +5351,17 @@ Códigos de sets: %1 ¿Quieres habilitarlos? - - Yes, always enable - - - - + View sets Ver ediciones - + Welcome Bienvenido/a - + Hi! It seems like you're running this version of Cockatrice for the first time. All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. @@ -5489,132 +5370,165 @@ Todas las ediciones en la base de datos de cartas han sido habilitadas. Aprenda más sobre cambiar el orden de la edición o deshabilitando ediciones especificas y otras preferencias en la opción "Mantenedor de ediciones". - + + Information Información - + A card database update is already running. La actualización de la base de datos de cartas ya está en marcha. - + Unable to run the card database updater: Imposible iniciar el actualizador de la base de datos de cartas: - + Card database update running. - + Failed to start. The file might be missing, or permissions might be incorrect. - + The process crashed some time after starting successfully. - + Timed out. The process took too long to respond. The last waitFor...() function timed out. - + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. - + An error occurred when attempting to read from the process. For example, the process may not be running. - + Unknown error occurred. Ocurrió un error desconocido. - + The card database updater exited with an error: %1 - - - - - + + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + Este servidor soporta características adicionales que tu cliente no tiene. +Esto no debería ser un problema, pero este mensaje podría significar que hay una nueva versión de Cockatrice disponible o este servidor está usando una versión personalizada o de prelanzamiento. +Para actualizar tu cliente, ve a Ayuda -> Buscar Actualizaciones. + + + + + + + Load sets/cards Cargar ediciones/cartas - + Selected file cannot be found. El archivo seleccionado no fue encontrado. - + You can only import XML databases at this time. Solo puedes importar bases de datos en XML en este momento. - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. Las nuevas ediciones/cartas se han agregado correctamente. Cockatrice está recargando la base de datos de cartas. - + Sets/cards failed to import. Las ediciones/cartas fallaron al ser importadas. + + + + + Reset Password + Reiniciar contraseña + + + + Your password has been reset successfully, you can now log in using the new credentials. + Tu contraseña se ha reiniciado con éxito, ahora puedes conectarte con las nuevas credenciales. + + + + Failed to reset user account password, please contact the server operator to reset your password. + No se pudo reiniciar la contraseña, por favor contacte con el operador del servidor para reiniciar su contraseña. + + + + Activation request received, please check your email for an activation token. + Petición de activación recibida, por favor comprueba tu email para el código de activación. + ManaBaseConfigDialog - + Mana Base Configuration - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): - + OK - + Cancel @@ -5637,27 +5551,27 @@ Cockatrice está recargando la base de datos de cartas. type - tipo + color - color + subtype - subtipo + power - fuerza + toughness - resistencia + @@ -5686,27 +5600,27 @@ Cockatrice está recargando la base de datos de cartas. ManaDevotionConfigDialog - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): @@ -5776,616 +5690,611 @@ Cockatrice está recargando la base de datos de cartas. MessageLogWidget - + from play del juego - + from their graveyard de su cementerio - + from exile del exilio - + from their hand de su mano - + the top card of %1's library la carta superior de la biblioteca de %1 - + the top card of their library la parte superior de su biblioteca - + from the top of %1's library desde la parte superior de la biblioteca de %1 - + from the top of their library Desde la parte superior de su biblioteca - + the bottom card of %1's library la carta de la parte inferior de la biblioteca de %1 - + the bottom card of their library La carta de la parte inferior de su biblioteca - + from the bottom of %1's library desde la parte inferior de la biblioteca de %1 - + from the bottom of their library Desde la parte inferior de su biblioteca - + from %1's library desde la biblioteca de %1 - + from their library desde su biblioteca - + from sideboard desde el banquillo - + from the stack desde la pila - + from custom zone '%1' - desde la zona personalizada '%1' + - + %1 is now keeping the top card %2 revealed. %1 está manteniendo la carta superior %2 revelada. - + %1 is not revealing the top card %2 any longer. %1 ya no mantiene revelada la carta superior %2. - + %1 can now look at top card %2 at any time. %1 ahora puede ver la carta superior de %2 en cualquier momento. - + %1 no longer can look at top card %2 at any time. %1 ya no puede ver la carta superior de %2 en cualquier momento. - + %1 attaches %2 to %3's %4. %1 anexa %2 a %3's %4. - + %1 has conceded the game. %1 ha concedido la partida. - + %1 has unconceded the game. %1 ha concedido la partida - + %1 has restored connection to the game. %1 ha recuperado la conexión a la partida. - + %1 has lost connection to the game. %1 ha perdido la conexión a la partida. - + %1 points from their %2 to themselves. %1 apunta desde su %2 a si mismo. - + %1 points from their %2 to %3. %1 apunta desde su %2 a %3. - + %1 points from %2's %3 to themselves. %1 apunta desde el %3 de %2 a si mismo. - + %1 points from %2's %3 to %4. %1 apunta desde el %3 de %2 a %4. - + %1 points from their %2 to their %3. %1 apunta de su %2 a su %3. - + %1 points from their %2 to %3's %4. %1 apunta desde su %2 al %4 de %3. - + %1 points from %2's %3 to their own %4. %1 apunta desde el %3 de %2 a su %4. - + %1 points from %2's %3 to %4's %5. %1 apunta desde el %3 de %2 al %5 de %4. - + %1 creates a face down token. - + %1 creates token: %2%3. %1 crea una ficha: %2%3. - + %1 has loaded a deck (%2). %1 ha cargado un mazo (%2). - + %1 has loaded a deck with %2 sideboard cards (%3). %1 ha cargado un mazo con %2 cartas en el banquillo (%3). - + %1 destroys %2. %1 destruye %2. - + a card una carta - + %1 gives %2 control over %3. %1 entrega a %2 el control sobre %3. - + %1 puts %2 into play%3 face down. %1 pone %2 en juego %3 bocabajo. - + %1 puts %2 into play%3. %1 pone %2 en juego %3. - + %1 puts %2%3 into their graveyard face down. - %1 pone %2%3 en su cementerio boca abajo. + - + %1 puts %2%3 into their graveyard. %1 pone %2%3 en su cementerio. - + %1 exiles %2%3 face down. - %1 exilia %2%3 boca abajo. + - + %1 exiles %2%3. %1 exilia %2%3. - + %1 moves %2%3 to their hand. %1 mueve %2%3 a su mano. - + %1 puts %2%3 into their library. %1 pone %2%3 en su biblioteca. - + %1 puts %2%3 onto the bottom of their library. %1 pone %2%3 al fondo de su biblioteca. - + %1 puts %2%3 on top of their library. %1 pone %2%3 en la parte superior de su biblioteca. - + %1 puts %2%3 into their library %4 cards from the top. %1 pone %2%3 en la biblioteca de su propietario en el %4 lugar desde la parte superior - + %1 moves %2%3 to sideboard. %1 mueve %2%3 al banquillo. - + %1 plays %2%3 face down. - %1 juga %2%3 boca abajo. + - + %1 plays %2%3. %1 juega %2%3. - + %1 moves %2%3 to custom zone '%4' face down. - %1 mueve %2%3 a la zona personalizada '%4' boca abajo. + - + %1 moves %2%3 to custom zone '%4'. - %1 mueve %2%3 a la zona personalizada '%4' + - + %1 tries to draw from an empty library - + %1 draws %2 card(s). %1 roba %2 carta(s).%1 roba %2 c%1 roba %2 c - + %1 is looking at %2. %1 está mirando a %2. - + %1 is looking at the %4 %3 card(s) %2. top card for singular, top %3 cards for plural - + bottom parte inferior - + top parte superior - + %1 turns %2 face-down. %1 pone %2 boca abajo. - + %1 turns %2 face-up. %1 pone %2 boca arriba. - + The game has been closed. La partida ha sido cerrada. - + The game has started. La partida ha comenzado. - + You are flooding the game. Please wait a couple of seconds. - + %1 has joined the game. %1 se ha unido a la partida. - + %1 is now watching the game. %1 está ahora observando la partida. - + You have been kicked out of the game. Has sido expulsado de la partida. - + %1 has left the game (%2). %1 ha dejado la partida (%2). - + %1 is not watching the game any more (%2). %1 ya no está viendo el juego (%2). - + %1 is not ready to start the game any more. %1 está preparado/a para empezar la partida. - + %1 shuffles their deck and draws a new hand of %2 card(s). %1 barajea su mazo y roba una nueva mano de %2 carta(s).%1 barajea su mazo y roba una nueva mano de %2 carta(s)%1 barajea su mazo y roba una nueva mano de %2 carta(s) - + %1 shuffles their deck and draws a new hand. %1 Baraja su maso y robas una nueva mano. - + You are watching a replay of game #%1. Estás viendo una repetición de la partida #%1. - + %1 is ready to start the game. %1 está preparado/a para empezar la partida. - + cards an unknown amount of cards cartas - + %1 card(s) a card for singular, %1 cards for plural %1 carta(s)%1 cars%1 cars - + %1 lends %2 to %3. - %1 presta %2 a %3. + - + %1 reveals %2 to %3. %1 revela %2 a %3. - + %1 reveals %2. %1 revela %2. - + %1 randomly reveals %2%3 to %4. %1 revela al azar %2%3 a %4. - + %1 randomly reveals %2%3. %1 revela al azar %2%3. - + %1 peeks at face down card #%2. %1 está mirando la carta #%2 boca abajo. - + %1 peeks at face down card #%2: %3. %1 mira la carta boca abajo #%2: %3. - + %1 reveals %2%3 to %4. %1 revela %2%3 a %4. - + %1 reveals %2%3. %1 revela %2%3. - + %1 reversed turn order, now it's %2. %1 Orden del turno invertido, ahora es %2. - + reversed Invertido. - + normal Normal. - + Heads Cara - + Tails Cruz - + %1 flipped a coin. It landed as %2. %1 tira una moneda. Ha salido %2. - + %1 rolls a %2 with a %3-sided die. %1 sacó un %2 con un dado de %3 caras. - + %1 flips %2 coins. There are %3 heads and %4 tails. - + %1 rolls a %2-sided dice %3 times: %4. - + %1's turn. Turno %1. - + %1 sets annotation of %2 to %3. %1 sets annotation of %2 to %3. - - %1 places %2 %3%4 counter(s) on %5 (now %6). + + %1 places %2 "%3" counter(s) on %4 (now %5). - - %1 removes %2 %3%4 counter(s) from %5 (now %6). + + %1 removes %2 "%3" counter(s) from %4 (now %5). - - %1 failed to undo their last draw. - - - - + %1 sets counter %2 to %3 (%4%5). %1 establece el contador %2 a %3 (%4%5). - + %1 sets %2 to not untap normally. %1 establece que %2 no se endereze normalmente. - + %1 sets %2 to untap normally. %1 establece que %2 se endereze normalmente. - + %1 removes the PT of %2. %1 elimina la F/R de %2 - + %1 changes the PT of %2 from nothing to %4. %1 cambia la F/R de %2 de nada a %4. - + %1 changes the PT of %2 from %3 to %4. %1 cambia la F/R de %2 de %3 a %4. - + %1 has locked their sideboard. %1 ha bloqueado su banquillo. - + %1 has unlocked their sideboard. %1 ha desbloqueado su banquillo. - + %1 taps their permanents. %1 gira sus permanentes. - + %1 untaps their permanents. %1 ha enderezado sus permanentes. - + %1 taps %2. %1 gira %2. - + %1 untaps %2. %1 endereza %2. - + %1 shuffles %2. %1 baraja %2. - + %1 shuffles the bottom %3 cards of %2. %1 barajea las últimas %3 cartas de %2. - + %1 shuffles the top %3 cards of %2. %1 barajea las primeras %3 cartas de %2. - + %1 shuffles cards %3 - %4 of %2. %1 barajea las cartas %3 - %4 de %2. - + %1 unattaches %2. %1 desanexa %2. - + %1 undoes their last draw. %1 deshace su último robo. - + %1 undoes their last draw (%2). %1 deshace su último robo (%2). @@ -6393,115 +6302,110 @@ Cockatrice está recargando la base de datos de cartas. MessagesSettingsPage - + Word1 Word2 Word3 Palabra1 Palabra2 Palabra3 - + Add New Message Añadir nuevo mensaje - + Edit Message Editar mensaje - + Remove Message Borrar mensaje - + Add message Añadir mensaje - - + + Message: Mensaje: - + Edit message Editar mensaje - + Chat settings Preferencias de Chat - + Custom alert words Palabras de alerta personalizadas - + Enable chat mentions Habilitar las menciones en el chat - + Enable mention completer Habilitar completado de menciones - + In-game message macros Macros para mensajes durante la partida - + How to use in-game message macros - + Ignore chat room messages sent by unregistered users Ignorar mensajes de sala de usuarios sin registrar - + Ignore private messages sent by unregistered users Ignorar mensajes privados de usuarios sin registrar - - Ignore private messages sent by non-buddy users - - - - - + + Invert text color Invertir el color del texto - + Enable desktop notifications for private messages Habilitar notificaciones de escritorio para los mensajes privados - + Enable desktop notification for mentions Habilitar notificaciones de escritorio para menciones - + Enable room message history on join Habilitar historial de mensajes de sala al unirse - - + + (Color is hexadecimal) (El color es hexadecimal) - + Separate words with a space, alphanumeric characters only Separa las palabras con un espacio, solo caracteres alfanuméricos @@ -6509,42 +6413,42 @@ Cockatrice está recargando la base de datos de cartas. MoveMenu - + Move to Mover a - + &Top of library in random order - + X cards from the top of library... - + &Bottom of library in random order - + T&able - Tabla + - + &Hand &Mano - + &Graveyard &Cementerio - + &Exile &Exilio @@ -6557,47 +6461,47 @@ Cockatrice está recargando la base de datos de cartas. Tipo de carta - + Mana Value Valor de maná - + Color(s) Color(es) - + Loyalty Lealtad - + Main Card Type Tipo principal de carta - + Mana Cost Coste de maná - + P/T F/R - + Side Lado - + Layout Diseño - + Color Identity Identidad de color @@ -6620,152 +6524,6 @@ Cockatrice está recargando la base de datos de cartas. - - PaletteEditorDialog - - - - Reset - - - - - - Apply - - - - - - Save && Apply - - - - - ▼ Edit Palette - - - - - - ▶ Edit Palette - - - - - Palette Editor — %1 - - - - - <b>Palette Editor</b> &nbsp;·&nbsp; %1 - - - - - This theme ships no default palette files - - - - - Replace current colours with the theme author's defaults - - - - - Switch between the light and dark palette files - - - - - Editing: - - - - - Show or hide the per-role colour grid for manual tweaks - - - - - ↺ Revert to theme default - - - - - Discard unsaved edits and restore the last saved palette - - - - - Preview this palette without saving to disk - - - - - Write palette-%1.toml and reload the theme - - - - - Cannot save: this theme has no directory on disk - - - - - Save failed - - - - - Could not write %1 to: -%2 - - - - - No default found - - - - - No default palette file found for the "%1" scheme. - - - - - PaletteGridWidget - - - Active - - - - - Disabled - - - - - Inactive - - - - - Normal interactive state - - - - - Widget is disabled / not interactive - - - - - Window is in background / unfocused - - - Phase @@ -6832,57 +6590,57 @@ Cockatrice está recargando la base de datos de cartas. PhasesToolbar - + Untap step Paso de enderezar - + Upkeep step Paso de mantenimiento - + Draw step Paso de robar - + First main phase Primera fase principal - + Beginning of combat step Paso de inicio del combate - + Declare attackers step Paso de declarar atacantes - + Declare blockers step Paso de declarar bloqueadores - + Combat damage step Paso de daño de combate - + End of combat step Paso de final del combate - + Second main phase Segunda fase principal - + End of turn step Paso final @@ -6890,7 +6648,7 @@ Cockatrice está recargando la base de datos de cartas. PictureLoader - + en code for scryfall's language property, not available for all languages es @@ -6899,144 +6657,153 @@ Cockatrice está recargando la base de datos de cartas. PlayerActions - - - - - grave - cementerio - - - - - - - exile - exilio - - - - PlayerDialogs - - + View top cards of library - + Ver cartas de la parte superior de la biblioteca - - - - - - - - - + + + + + + + + + Number of cards: (max. %1) - + Número de cartas: (máx. %1) - + View bottom cards of library - + Ver cartas de la parte inferior de la biblioteca - + Shuffle top cards of library - + Shuffle bottom cards of library - + Draw hand - + Robar mano - + 0 and lower are in comparison to current hand size - + Draw cards + Robar cartas + + + + + + + grave - + + + + + exile + + + + Move top cards to %1 - + Move bottom cards to %1 - + Draw bottom cards - + + + C&reate another %1 token + + + + Create tokens - + Crear fichas - + + Number: - + Número: - + Place card X cards from top of library - + Which position should this card be placed: - + (max. %1) - + Change power/toughness - + Cambiar fuerza/resistencia - + Change stats to: - + Set annotation - + Please enter the new annotation: + + + Set counters + Establecer contadores + PlayerMenu - + Player "%1" - Jugador(a) "%1" + - + &Counters - Contadores + @@ -7064,7 +6831,7 @@ This setting means you'll only see the default printing for each card, instead o - + Printing Selector @@ -7072,22 +6839,22 @@ This setting means you'll only see the default printing for each card, instead o PrintingSelectorCardOverlayWidget - + Preference - Preferencia + - + Pin Printing - + Unpin Printing - + Show Related cards @@ -7128,7 +6895,7 @@ This setting means you'll only see the default printing for each card, instead o Preference - Preferencia + @@ -7158,57 +6925,57 @@ This setting means you'll only see the default printing for each card, instead o PtMenu - + Power / toughness Fuerza / resistencia - + &Increase power &Incrementar fuerza - + &Decrease power &Reducir fuerza - + I&ncrease toughness I&ncrementar resistencia - + D&ecrease toughness R&educir resistencia - + In&crease power and toughness In&crementar fuerza y resistencia - + Dec&rease power and toughness Red&ucir fuerza y resistencia - + Increase power and decrease toughness Incrementa fuerza y reducir resistencia - + Decrease power and increase toughness Reducir fuerza e incrementar resistencia - + Set &power and toughness... Establecer &fuerza y resistencia... - + Reset p&ower and toughness Reiniciar f&uerza y resistencia @@ -7216,37 +6983,37 @@ This setting means you'll only see the default printing for each card, instead o QMenuBar - + Services Servicios - + Hide %1 Ocultar %1 - + Hide Others Ocultar otros - + Show All Mostrar todo - + Preferences... Preferencias... - + Quit %1 Salir %1 - + About %1 Sobre %1 @@ -7254,17 +7021,17 @@ This setting means you'll only see the default printing for each card, instead o QObject - + Cockatrice card database (*.xml) Base de datos de cartas de Cockatrice (*.xml) - + All files (*.*) Todos los archivos (*.*) - + Cockatrice replays (*.cor) Repeticiones de Cockatrice (*.cor) @@ -7286,12 +7053,12 @@ This setting means you'll only see the default printing for each card, instead o Overwrite Existing File? - ¿Sobrescribir archivo existente? + Sobrescribir archivo existente? A .cod version of this deck already exists. Overwrite it? - Ya existe una versión .cod de este mazo. ¿Sobrescribirla? + Ya existe una versión .cod de este mazo. Sobrescribirla? @@ -7324,177 +7091,110 @@ Are you sure you would like to disable this feature? QPlatformTheme - + OK OK - + Save Guardar - + Save All Guardar todo - + Open Abrir - + &Yes &Sí - + Yes to &All Sí a &Todo - + &No &No - + N&o to All N&o a todo - + Abort Abortar - + Retry Volver a intentar - + Ignore Ignorar - + Close Cerrar - + Cancel Cancelar - + Discard Descartar - + Help Ayuda - + Apply Aplicar - + Reset Reiniciar - + Restore Defaults Restaurar predeterminados - - QuickSetupPanel - - - %1% - - - - - <b>Quick Setup</b> - - - - - Generate all palette roles automatically from a single accent colour - - - - - Accent: - - - - - Primary hue. Used directly for highlights and links. -At high intensity it also tints buttons and backgrounds. - - - - - Intensity: - - - - - Subtle - - - - - Full colour - - - - - 0–30 Subtle tint — only highlights and links change hue -30–70 Accented — buttons, tooltips, and borders join in -70–100 Full colour — backgrounds, everything - - - - - 70% - - - - - Generate ↓ - - - - - Derive all palette roles from the accent colour above. -Fine-tune individual colours in the grid afterwards. - - - RemoteDeckList_TreeModel - + Name Nombre - + ID ID - + Upload time Tiempo de subida @@ -7502,32 +7202,32 @@ Fine-tune individual colours in the grid afterwards. RemoteReplayList_TreeModel - + ID ID - + Name Nombre - + Players Jugadores - + Keep Mantener - + Time started Tiempo de inicio - + Duration (sec) Duración (seg.) @@ -7535,37 +7235,37 @@ Fine-tune individual colours in the grid afterwards. RfgMenu - + &Exile &Exilio - + &View exile Ver &exilio - + &Move exile to... &Mover exilio a... - + &Top of library &Parte superior de la biblioteca - + &Bottom of library &Parte inferior de la biblioteca - + &Hand &Mano - + &Graveyard &Cementerio @@ -7611,9 +7311,9 @@ Fine-tune individual colours in the grid afterwards. SayMenu - + S&ay - Decir + @@ -7652,27 +7352,27 @@ Fine-tune individual colours in the grid afterwards. SetsModel - + Enabled Activado - + Set type Tipo de set - + Set code Código de set - + Long name Nombre largo - + Release date Fecha de lanzamiento @@ -7680,53 +7380,53 @@ Fine-tune individual colours in the grid afterwards. ShortcutSettingsPage - - + + Restore all default shortcuts Restaurar atajos por defecto - + Do you really want to restore all default shortcuts? ¿Realmente quieres restablecer los atajos predeterminados? - + Clear all default shortcuts Limpiar todos los atajos predeterminados - + Do you really want to clear all shortcuts? ¿Realmente quieres limpiar los atajos predeterminados? - + Section: Sección: - + Action: Acción: - + Shortcut: Atajo: - + How to set custom shortcuts Cómo fijar atajos personalizados - + Clear all shortcuts - + Search by shortcut name @@ -7781,40 +7481,40 @@ Por favor, revise su configuración de atajos. SideboardMenu - + &Sideboard &Banquillo - + &View sideboard - Ver banquillo + SoundSettingsPage - + Enable &sounds Activar &sonidos - + Current sounds theme: Tema de sonidos actual: - + Test system sound engine Probar el audio del sistema - + Sound settings Preferencias de sonido - + Master volume Volumen maestro @@ -7886,146 +7586,16 @@ Por favor, revise su configuración de atajos. Respuesta invalida del servidor de lanzamiento de actualizaciones. - + No reply received from the tag update server. No se recibe respuesta del servidor de etiquetas de actualizaciones. - + Invalid reply received from the tag update server. Respuesta invalida del servidor de etiquetas de actualizaciones. - - StorageSettingsPage - - - - - Success - - - - - Cached card pictures have been reset. - - - - - Downloaded card pictures have been reset. - - - - - Error - - - - - One or more downloaded card pictures could not be cleared. - - - - - In-memory (currently loaded) card pictures have been reset. - - - - - Card Picture Loader Caching Method: - - - - - The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size. - - - - - Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while. - - - - - This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk. - - - - - Delete Cached Images - - - - - Delete Saved Images - - - - - Clear In-Memory Images - - - - - Card Picture Loader Cache Method - - - - - Network Cache - - - - - Filesystem - - - - - In-Memory Picture Cache - - - - - Network Cache Size: - - - - - On-disk cache for downloaded pictures - - - - - Redirect Cache TTL: - - - - - How long cached redirects for urls are valid for. - - - - - Picture Cache Size: - - - - - In-memory cache for pictures not currently on screen - - - - - Naming scheme: - - - - - Day(s) - - - TabAccount @@ -8036,7 +7606,7 @@ Por favor, revise su configuración de atajos. Add to Ignore List - Añadir a la Lista de Ignorados + @@ -8079,7 +7649,7 @@ Por favor, revise su configuración de atajos. Replay ID - ID de repetición + @@ -8161,119 +7731,119 @@ Por favor, revise su configuración de atajos. TabArchidekt - - + + Desc. - - + + AND - Y + - - + + Require ALL selected colors - - + + Deck name... - Nombre del mazo... + - - + + Owner... - - + + Packages - - + + Advanced Filters - + Bracket: - - + + Any - Alguno + - - + + Contains card... - - + + Commander... - Comandante... + - - + + Tag... - - + + Deck Size - Tamaño de mazo + - + Cards: - Cartas: + - - + + Asc. - + Sort by: - + Filter by: - Filtrar por: + - + Display Settings - - + + Search - - + + Formats - Formatos + @@ -8281,54 +7851,6 @@ Por favor, revise su configuración de atajos. - - TabCardArtRules - - - Card: - - - - - ProviderId: - - - - - Mode: - - - - - Reason: - - - - - Type a card name... - - - - - Add rule - - - - - Remove rule - - - - - Refresh - - - - - Card Art Rules - - - TabDeckEditor @@ -8354,7 +7876,7 @@ Por favor, revise su configuración de atajos. Card Database - Base de datos de cartas + @@ -8377,7 +7899,7 @@ Por favor, revise su configuración de atajos. Reinicializar la disposición - + Deck: %1 Mazo: %1 @@ -8385,49 +7907,55 @@ Por favor, revise su configuración de atajos. TabDeckEditorVisual - + Visual Deck: %1 - Mazo visual: %1 + - + &Visual Deck Editor - Editor de mazos visual + - - + + Card Info Información de la carta - - + + Deck Mazo - - &View - Ver + + + Filters + - - Printing + + &View + Printing + + + + Visible Visible - + Floating - + Reset layout @@ -8435,22 +7963,22 @@ Por favor, revise su configuración de atajos. TabDeckEditorVisualTabWidget - + Visual Deck View - Vista de mazos visual + - + Visual Database Display - + Deck Analytics - Análisis de mazo + - + Sample Hand @@ -8458,141 +7986,141 @@ Por favor, revise su configuración de atajos. TabDeckStorage - + Local file system Sistema de archivos local - + Server deck storage Almacen de mazos del servidor - - + + Open in deck editor Abrir en el editor de mazos - + Rename deck or folder - Renombrar mazo o carpeta + - + Upload deck Subir mazo - + Download deck Descargar mazo + - - - + + New folder Nueva carpeta + - Delete Borrar - + Open decks folder - Abrir carpeta de mazos + - + Rename local folder - Renombrar carpeta local + - + Rename local file - + New name: - Nombre nuevo: + - - - - + + + + Error Error - + Rename failed - - + + Invalid deck file Archivo de baraja inválido - + Enter deck name Introduzca el nombre del mazo - + This decklist does not have a name. Please enter a name: Esta lista de mazo no tiene un nombre. Por favor, introduce un nombre: - + Unnamed deck Mazo sin nombre - + Failed to upload deck to server Fallo al subir baraja al servidor - + Delete local file Borrar fichero local - + Are you sure you want to delete the selected files? - ¿Estás seguro/a de que quieres eliminar los archivos seleccionados? + - + Delete remote decks - Borrar mazos remotos + - + Are you sure you want to delete the selected decks? - ¿Estás seguro/a de que quieres eliminar los mazos seleccionados? + - - + + Name of new folder: Nombre de la nueva carpeta: Deck Storage - Almacén de mazos + @@ -8600,7 +8128,7 @@ Por favor, introduce un nombre: Visual Deck Storage - Almacén de mazos visual + @@ -8610,7 +8138,7 @@ Por favor, introduce un nombre: Could not open deck at %1 - No se pudo abrir mazo en %1 + @@ -8618,7 +8146,7 @@ Por favor, introduce un nombre: EDHREC: - EDHREC: + @@ -8651,197 +8179,197 @@ Por favor, introduce un nombre: EDHRec: - EDHRec: + TabGame - - - + + + Replay Repetir - - + + Game Partida - - + + Player List Lista de jugadores - - + + Card Info Información de la carta - - + + Messages Mensajes - - + + Replay Timeline Historial de partidas - + &Phases &Fases - + &Game &Partida - + Next &phase Próxima &fase - + Next phase with &action Próxima fase con &acción - + Next &turn Próximo &turno - + Reverse turn order Orden del turno invertido. - + &Remove all local arrows &Retirar todas las flechas locales - + Rotate View Cl&ockwise Girar en sentido horario - + Rotate View Co&unterclockwise Girar en sentido antih&orario (&U) - + Game &information &Información de la partida - + Un&concede - - - + + + &Concede &Conceder - + &Leave game &Abandonar la partida - + C&lose replay &Cerrar repetición - + &Focus Chat &Resaltar chat - + &Say: &Decir: - + Selected cards Cartas seleccionadas - + &View &Ver - + Visible Visible - + Floating Flotante - + Reset layout Resetear la distribución - + Concede Conceder - + Are you sure you want to concede this game? ¿Estás seguro de que quieres conceder esta partida? - + Unconcede Revertir rendición - + You have already conceded. Do you want to return to this game? Ya te rendiste. ¿Quieres regresar a este juego? - + Leave game Abandonar la partida - + Are you sure you want to leave this game? ¿Estás seguro de que quieres abandonar la partida? - + A player has joined game #%1 Un jugador se ha unido a la partida #%1 - + %1 has joined the game %1 se ha unido a la partida - + You have been kicked out of the game. Has sido expulsado de la partida. @@ -8900,115 +8428,115 @@ Por favor, introduce un nombre: Debes seleccionar un número de días válido para buscar. - + Username: Nombre de usuario: - + IP Address: Dirección IP: - + Game Name: Nombre de partida: - + GameID: ID de partida: - + Message: Mensaje: - + Main Room Sala Principal - + Game Room Sala de Partida - + Private Chat Chat privado - + Past X Days: Pasados X días: - + Today Hoy - + Last Hour Última hora - + Maximum Results: Resultados máximos: - + At least one filter is required. The more information you put in, the more specific your results will be. Se requiere un filtro como mínimo. Cuando más información introduzcas, más específicos serán los resultados. - + Get User Logs Ver registros de usuario - + Clear Filters Borrar filtros - + Filters Filtros - + Log Locations Localización de registro. - + Date Range Alcance de fecha - + Maximum Results Resultados máximos - - + + Message History Historial de mensajes - + Failed to collect message history information. Error al recopilar información del historial de mensajes. - + There are no messages for the selected filters. No hay mensajes con los filtros seleccionados @@ -9026,27 +8554,27 @@ Cuando más información introduzcas, más específicos serán los resultados.&Cerrar - + %1 - Private chat %1 - Chat privado - + This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. El usuario te esta ignorando, los usuarios no podrán ver tus mensajes en el chat principal y no podrás unirte a sus partidas. - + Private message from Mensaje privado de - + %1 has left the server. %1 ha abandonado el servidor. - + %1 has joined the server. %1 se ha unido al servidor. @@ -9054,180 +8582,180 @@ Cuando más información introduzcas, más específicos serán los resultados. TabReplays - + Local file system Sistema de archivos local - + Server replay storage Almacén de repeticiones del servidor - - + + Watch replay Ver repetición - + Rename Renombrar - - + + New folder Nueva carpeta - - + + Delete Borrar - + Open replays folder - Abrir carpeta de repeticiones + - + Download replay Descargar repetición - + Toggle expiration lock Alternar expiración del bloqueo - + Get replay share code - - + + Look up replay by share code - + Rename local folder - Renombrar carpeta local + - + Rename local file - + New name: - + Error Error - + Rename failed - + Name of new folder: - Nombre de nueva carpeta + - + Delete local file Borrar fichero local - + Are you sure you want to delete the selected files? - ¿Estás seguro/a de que quieres eliminar los archivos seleccionados? + - + Are you sure you want to delete the selected replays? - ¿Estás seguro/a de que quieres eliminar los repeticiones seleccionados? + - + Failed to get code - - + + Either this server does not support replay sharing, or does not permit replay sharing for you. - - - + + + Failed Fallido - + Could not get replay code - + Replay Share Code - + Others can use this code to add the replay to their list of remote replays: %1 - + Copy to clipboard - Copiar al portapapeles + - + Replay share code - + Replay code found - + Replay was added, or you already had access to it. - + Replay code not found - + Failed to submit code - + Unexpected error - + Delete remote replay Borrar repetición remota @@ -9240,62 +8768,47 @@ Cuando más información introduzcas, más específicos serán los resultados. TabRoom - - Friends - - - - - Online - - - - - Ignored - - - - + &Say: &Decir: - + Chat Chat - + &Room &Sala - + &Leave room &Dejar sala - + &Clear chat &Limpiar chat - + Chat Settings... Preferencias del Chat... - + mentioned you. te ha mencionado. - + Click to view Click para ver - + You are flooding the chat. Please wait a couple of seconds. Estás saturando el chat. Por favor, espera unos segundos. @@ -9308,30 +8821,30 @@ Cuando más información introduzcas, más específicos serán los resultados.Servidor - - - - + + + + Error Error - + Failed to join the server room: it doesn't exist on the server. Fallo al unirse a la sala del servidor: no existe en el servidor. - + The server thinks you are in the server room but your client is unable to display it. Try restarting your client. El servidor cree que estás en la sala del servidor pero tu cliente es incapaz de mostrarlo. Intenta reiniciar tu cliente. - + You do not have the required permission to join this server room. No tienes los permisos requeridos para unirte a esta sala del servidor. - + Failed to join the server room due to an unknown error: %1. Fallo al unirse a la sala del servidor debido a un error desconocido: %1. @@ -9339,97 +8852,97 @@ Cuando más información introduzcas, más específicos serán los resultados. TabSupervisor - + Deck Editor Editor de mazos - + Visual Deck Editor - Editor de mazos visual + - + EDHRec - EDHRec + - + Archidekt - + Home Inicio - + &Visual Deck Storage - Almacén de mazos visual + - + Visual Database Display - + Server Servidor - + Account Cuenta - + Deck Storage - Almacén de mazos + - + Game Replays - Repetición de partidas + - + Administration Administración - + Logs - + Are you sure? ¿Estás seguro? - + There are still open games. Are you sure you want to quit? Todavía hay partidas abiertas. ¿Estás seguro/a de que quieres salir? - + Click to view Click para ver - + Your buddy %1 has signed on! Tu amigo %1 se ha conectado! - + Unknown Event Evento desconocido - + The server has sent you a message that your client does not understand. This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. @@ -9439,39 +8952,39 @@ Este mensaje podría significar que hay una nueva versión de Cockatrice disponi Para actualizar tu cliente, ve a Ayuda -> Buscar Actualizaciones. - + Idle Timeout Tiempo de ausencia agotado - + You are about to be logged out due to inactivity. Va a ser desconectado por inactividad. - + Promotion Promoción - + You have been promoted. Please log out and back in for changes to take effect. Has sido promocionado. Por favor cierra la sesión y vuelve a iniciarla para que los cambios surtan efecto. - + Warned Advertido - + You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. Has recibido una advertencia debido a %1 Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas contra usted. Si tiene alguna pregunta, por favor envíe un mensaje privado a un moderador. - + You have received the following message from the server. (custom messages like these could be untranslated) Ha recibido los siguientes mensajes del servidor. @@ -9481,12 +8994,12 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas TabVisualDatabaseDisplay - + Database Display - + Visual Database Display @@ -9523,42 +9036,42 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas TranslateCounterName - + Life Vida - + White Blanco - + Blue Azul - + Black Negro - + Red Rojo - + Green Verde - + Colorless Sin Color - + Other Otro @@ -9566,69 +9079,11 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas UpdateDownloader - + Could not open the file for reading. No se pudo abrir el archivo para su lectura. - - UserCardArtSettingsDialog - - - Card Art Settings - - - - - Type a card name... - - - - - Card name: - - - - - Card ProviderId: - - - - - Left margin (%): - - - - - Right margin (%): - - - - - Vertical offset: - - - - - Zoom: - - - - - Parameters - - - - - Preview - - - - - Remove Banner Card - - - UserContextMenu @@ -9726,12 +9181,12 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas This user does not exist. - Este usuario no existe. + You are being ignored by %1 and can't see their games. - Estás siendo ignorado por %1 y no puedes ver sus partidos. + @@ -9746,7 +9201,7 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas - + Ban History Historial de baneo @@ -9761,87 +9216,77 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas El usuario nunca ha sido baneado - + Failed to collect ban information. Error al recopilar informacion de baneos. - - - + + + Warning History Historial de advertencias - + Warning Time;Moderator;User Name;Reason Warning Time;Moderator;User Name;Reason - + User has never been warned. El usuario nunca ha sido advertido - + Failed to collect warning information. Error al recopilar información de advertencias. - + Failed to get admin notes. - - + + Success Éxito - + Successfully promoted user. Usuario promocionado con éxito. - + Successfully demoted user. Usuario degradado con éxito. - - Kick Player - - - - - Are you sure you want to kick this player from the game? - - - - - - + + + Failed Fallo - + Failed to promote user. Fallo al promocionar usuario. - + Failed to demote user. Fallo al degradar usuario. - + Copy hash to clipboard Copiar al portapapeles - + Remove this user's messages Borrar mensajes de este usuario @@ -9849,554 +9294,326 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas UserInfoBox - + Location: Localización: - + Account Age: Tiempo de la cuenta: - + Edit Editar - + Change password Cambiar contraseña - + Change avatar Cambiar avatar - + Administrator Administrador - + Moderator Moderador - + Registered user Usuario registrado - - + + Unregistered user Usuario no registrado - + Judge Juez - + Unknown Desconocido - + The entered password does not match your account. La contraseña introducida no coincide con tu cuenta - - - - + + + Information Información - + User information updated. Información del usuario actualizada. - - - - - - - - - - - + + + + + + + + + + Error Error - + User Information Información de usuario - + Real Name: Nombre real: - + User Level: Nivel de usuario: - - - Edit Banner Card - - - + %n Year(s), amount of years (only shown if more than 0) %n año,%n años,%n año(s), - + %10%n Day(s) %20 amount of years (if more than 0), amount of days, date in local short format %10%n día %20%10%n días %20%10%n días %20 - + Enter Password Introducir contraseña - + Password verification is required in order to change your email address Se requiere verificación de la contraseña para cambiar tu dirección de correo electrónico - - - + + + An error occurred while trying to update your user information. Un error ha ocurrido mientras intentaba actualizarse tu información de usuario. - - The selected card is blacklisted on this server or another error occurred. - - - - - Banner card removed. - - - - - Banner card updated. - - - - + This server does not permit you to update your user informations. Este servidor no permite actualizar su información de usuario. - + Password changed. Tu contraseña ha sido cambiada. - + This server does not permit you to change your password. Este servidor no permite cambiar tu contraseña. - + The new password is too short. La nueva contraseña es muy corta - + The old password is incorrect. La contraseña anterior no es correcta. - + Avatar updated. Avatar actualizado - + This server does not permit you to update your avatar. Este servidor no permite actualizar avatar. - - - An error occured while trying to update your avatar. - - - This server does not permit you to update your user informations. - An error occured while trying to updater your avatar. - Este servidor no permite actualizar su información de usuario. - - - - UserInfoPopup - - - - Games - - - - - Chat - - - - - Open private chat - - - - - Profile - - - - - View user profile - - - - - Show this user's games - - - - - − Buddy - - - - - Remove from buddy list - - - - - + Buddy - - - - - Add to buddy list - - - - - − Ignore - - - - - Remove from ignore list - - - - - + Ignore - - - - - Add to ignore list - - - - - Ban - - - - - Ban from server - - - - - Warn - - - - - Warn user - - - - - Ban log - - - - - View ban history - - - - - Warn log - - - - - View warning history - - - - - Notes - - - - - View admin notes - - - - - − Mod - - - - - Demote from moderator - - - - - + Mod - - - - - Promote to moderator - - - - - − Judge - - - - - Demote from judge - - - - - + Judge - - - - - Promote to judge - - - - - Join game - - - - - Spectate - - - - - - Loading games… - - - - - Could not load games. - - - - - No active games. - + An error occured while trying to updater your avatar. + Ocurrió un error mientras se actualizaba tu avatar. UserInterfaceSettingsPage - + General interface settings Preferencias generales de la interfaz - + &Double-click cards to play them (instead of single-click) &Doble click en las cartas para jugarlas (en lugar de un solo click) - + &Clicking plays all selected cards (instead of just the clicked card) - + &Play all nonlands onto the stack (not the battlefield) by default &Jugar todas las cartas que no sean tierras en la pila (en lugar de en el campo de batalla) por defecto. - + Do not delete &arrows inside of subphases - + Close card view window when last card is removed - + Auto focus search bar when card view window is opened - + Annotate card text on tokens Anotar en las fichas. - - Show selection count during drag selection + + Show selection counter during drag selection - - Show total selection count + + Show total selection counter - - Show subtype breakdown in selection tally - - - - + Use tear-off menus, allowing right click menus to persist on screen Usar menus flotantes, permitir click derecho para anclar menus en la pantalla - - Keep game chat focused when clicking in game (Note: disables card view search bar) - - - - + Notifications settings Ajustes de notificaciones - + Enable notifications in taskbar Habilitar notificaciones en la barra de tareas - + Notify in the taskbar for game events while you are spectating Notificar en la barra de tareas los eventos de la partida mientras estás como espectador - + Notify in the taskbar when users in your buddy list connect Recibir una notificación en la barra de tareas cuando alguien de tu lista de amigos se conecte - + Animation settings Preferencias de animación - + &Tap/untap animation Animación de &girar/enderezar - + Deck editor/storage settings - Preferencias de editor/almacén de mazos + - + Open deck in new tab by default - + Use visual deck storage in game lobby - Usar almacén de mazos visual en el vestíbulo de juego + - + Use selection animation for Visual Deck Storage - + When adding a tag in the visual deck storage to a .txt deck: - + do nothing no hacer nada - + ask to convert to .cod - + always convert to .cod - + Default deck editor type - + Classic Deck Editor - + Visual Deck Editor - Editor de mazos visual + - + Replay settings - Preferencias de repetición + - + Buffer time for backwards skip via shortcut: @@ -10404,66 +9621,56 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas UserListWidget - + Users connected to server: %1 - + Users in this room: %1 - + Buddies online: %1 / %2 - Amigos en línea: %1 / %2 + - + Ignored users online: %1 / %2 - Usuarios ignorados en línea: %1 / %2 + UtilityMenu - + Increment all card counters - + &Untap all permanents - + R&oll die... &Lanzar dado... - - Flip coin - - - - + &Create token... - Crear ficha... - - - - C&reate another token - Crear otra ficha - - - - Cr&eate predefined token - - C&reate another %1 token + + C&reate another token + + + + + Cr&eate predefined token @@ -10472,7 +9679,7 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas Exact match - Coincidencia exacta + @@ -10517,166 +9724,166 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas VisualDatabaseDisplayFilterToolbarWidget - + Sort by - + Filter by - Filtrar por + + + + + Save and load filters + + + + + Filter by exact card name + - Save and load filters - Guardar y cargar filtros + Filter by card main-type + - Filter by exact card name - Filtrar por nombre de carta exacto + Filter by card sub-type + - Filter by card main-type - Filtrar por tipo principal de carta + Filter by set + - Filter by card sub-type - Filtrar por subtipo de carta - - - - Filter by set - Filtrar por expansión - - - Filter by format legality - + Save/Load - Guardar/Cargar + + + + + Name + + + + + Main Type + - Name - Nombre + Sub Type + - Main Type - Tipo principal + Sets + - Sub Type - Subtipo - - - - Sets - Ediciones - - - Formats - Formatos + VisualDatabaseDisplayFormatLegalityFilterWidget - + Show formats with at least: - Mostrar formatos con al menos: + + + + + cards + - cards - cartas - - - Do not display formats with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) Mode: Exact Match - Modo: Coincidencia Exacta + Mode: Includes - Modo: Incluye + VisualDatabaseDisplayMainTypeFilterWidget - + Show main types with at least: - + cards - cartas + - + Do not display card main-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - Modo: Coincidencia Exacta + - + Mode: Includes - Modo: Incluye + VisualDatabaseDisplayNameFilterWidget - + Filter by name... (Exact match) - Filtrar por nombre de partida... (Coincidencia exacta) + - + Load from Deck Cargar desde mazo - + Apply all card names in currently loaded deck as exact match name filters - + Load from Clipboard - Cargar desde el portapapeles + - + Apply all card names in clipboard as exact match name filters @@ -10684,7 +9891,7 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas VisualDatabaseDisplayRecentSetFilterSettingsWidget - + Filter to most recent sets @@ -10692,88 +9899,88 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas VisualDatabaseDisplaySetFilterWidget - + Search sets... - Buscar ediciones... + - - + + Mode: Exact Match - Modo: Coincidencia Exacta + - - + + Mode: Includes - Modo: Incluye + VisualDatabaseDisplaySubTypeFilterWidget - + Search subtypes... - Buscar subtipos... + - + Show sub types with at least: - + cards - cartas + - + Do not display card sub-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - Modo: Coincidencia Exacta + - + Mode: Includes - Modo: Incluye + VisualDatabaseDisplayWidget - + Search by card name (or search expressions) - Buscar por nombre de carta (o buscar expresiones) + - + Visual - Visual + - + Loading database ... - Cargando la base de datos... + - + Clear all filters Limpiar todos los filtros Table - Tabla + @@ -10805,17 +10012,17 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas - + Toggle Layout: Overlap - + Change how cards are displayed within zones (i.e. overlapped or fully visible.) - + Toggle Layout: Flat @@ -10844,17 +10051,17 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas VisualDeckEditorWidget - + Type a card name here for suggestions from the database... - + Quick search and add card - + Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter @@ -10864,7 +10071,7 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas Deck Storage - Almacén de mazos + @@ -10872,7 +10079,7 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas Show Folders - Mostrar las carpetas + @@ -10956,7 +10163,7 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas Loading database ... - Cargando la base de datos... + @@ -10966,49 +10173,49 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas Visual Deck Storage Settings - Preferencias de almacén de mazos visual + WarningDialog - + Which warning would you like to send? ¿Qué advertencia quieres enviar? - + Redact all messages from this user in all rooms Redactar todos los mensajes de este usuario en todas las salas - + &OK &OK - + &Cancel &Cancelar - + Warn user for misconduct Usuario advertido por conducta inadecuada - - + + Error Error - + User name to send a warning to can not be blank, please specify a user to warn. El nombre de usuario no puede quedarse en blanco, por favor especifique un usuario al que advertir. - + Warning to use can not be blank, please select a valid warning to send. La advertencia no puede quedarse en blanco, por favor seleccione una advertencia válida. @@ -11016,133 +10223,133 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas WndSets - + Move selected set to the top Mover el set seleccionado al principio - + Move selected set up Mover arriba el set seleccionado - + Move selected set down Mover abajo el set seleccionado - + Move selected set to the bottom Mover el set seleccionado al final - + Search by set name, code, or type Buscar por nombre de edición, código, o tipo - + Default order Orden por defecto - + Restore original art priority order Restaurar orden predeterminado de arte original - + Enable all sets Seleccionar todos los sets - + Disable all sets Deseleccionar todos los sets - + Enable selected set(s) Habilitar set(s) seleccionados - + Disable selected set(s) Deshabilitar set(s) seleccionados - + Deck Editor Editor de mazo - + Use CTRL+A to select all sets in the view. Usa CTRL+A para seleccionar todas las colecciones aquí mostradas. - + Only cards in enabled sets will appear in the card list of the deck editor. Solo las cartas en las colecciones permitidas aparecerán en la lista de cartas del editor de mazos. - + Image priority is decided in the following order: La prioridad de las imágenes es decidida en el siguiente orden: - + first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) %1 is a link to the wiki primero la Carpeta PERSONALIZADA (%1), luego las Ediciones Habilitadas en este mensaje (de Arriba a Abajo) - + Include cards rebalanced for Alchemy [requires restart] - + Card Art Arte de carta - + How to use custom card art Cómo usar arte de carta personalizada. - + Hints Consejos - + Note Nota - + Sorting by column allows you to find a set while not changing set priority. Ordenar por columna te permite encontrar una edición sin cambiar la prioridad de edición. - + To enable ordering again, click the column header until this message disappears. Para habilitar el orden de nuevo, haga click en el encabezado de la columna hasta que este mensaje deje de aparecer. - + Use the current sorting as the set priority instead Usa el filtro actual como la prioridad de edición - + Sorts the set priority using the same column Ordena la prioridad de edición usando la misma columna - + Manage sets Mantenedor de ediciones @@ -11150,72 +10357,72 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas ZoneViewWidget - + Search by card name (or search expressions) - Buscar por nombre de carta (o buscar expresiones) + - + Ungrouped Desagrupado - + Group by Type Agrupar por tipo - + Group by Mana Value Agrupar por valor de maná - + Group by Color Agrupar por color - + Unsorted Desordenado - + Sort by Name Ordenar por nombre - + Sort by Type Ordenar por tipo - + Sort by Mana Cost Ordenar por coste de maná - + Sort by Colors Ordenar por colores - + Sort by P/T - + Sort by Set - + shuffle when closing barajar al cerrar - + pile view vista de la pila @@ -11223,7 +10430,7 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas i18n - + English Español (Spanish) @@ -11231,12 +10438,12 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas main - + Connect on startup Conectar al inicio - + Debug to file Depurar a archivo @@ -11250,7 +10457,7 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas - + Deck Editor Editor de mazos @@ -11331,7 +10538,7 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas - + Replays Repeticiones @@ -11446,129 +10653,129 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas Cargar mazo... - - + + Load Deck from Clipboard... Cargar mazo desde el portapapeles - + Edit Deck in Clipboard, Annotated - Editar mazo en el portapapeles, Comentado + - + Edit Deck in Clipboard - Editar mazo en el portapapeles + - + New Deck Nuevo mazo - + Open Custom Pictures Folder Abrir carpeta de imágenes personalizadas - + Print Deck... Imprimir mazo... - + Delete Card Borrar carta - - + + Reset Layout Restablecer disposición - + Save Deck Guardar mazo - + Save Deck as... Guarda mazo como... - + Save Deck to Clipboard, Annotated Guarda mazo al portapapeles, Comentado - + Save Deck to Clipboard, Annotated (No Set Info) - + Save Deck to Clipboard Guardar mazo al portapapeles - + Save Deck to Clipboard (No Set Info) - + Load Local Deck... Cargar mazo local... - + Load Remote Deck... Carga mazo remoto... - + Set Ready to Start Marcar listo para empezar - + Toggle Sideboard Lock Permitir bloqueo de banquillo - + Add Green Counter Añadir contador verde - + Remove Green Counter Retirar un contador verde - + Set Green Counters... Establecer contadores verdes... - + Add Red Counter Agregar contador rojo - + Remove Red Counter Retirar un contador rojo - + Set Red Counters... Establecer contadores rojos... - + Add Life Counter Añadir contador de vida @@ -11578,744 +10785,724 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas - - Load deck from online service... - - - - - Load from website... - - - - + Unload Deck - + Force Start Forzar inicio - + Add Card Counter (F) - Añadir contador de carta (F) + - + Remove Card Counter (F) - Retirar un contador de carta (F) + - + Set Card Counters (F)... - Establecer contadores de carta (F)... + - + Add Card Counter (E) - Añadir contador de carta (E) + - + Remove Card Counter (E) - Retirar un contador de carta (E) + - + Set Card Counters (E)... - Establecer contadores de carta (E)... + - + Add Card Counter(D) - Añadir contador de carta (D) + - + Remove Card Counter (D) - Retirar un contador de carta (D) + - + Set Card Counters (D)... - Establecer contadores de carta (D)... + - + Add Card Counter (C) - Añadir contador de carta (D) + - + Remove Card Counter (C) - Retirar un contador de carta (C) + - + Set Card Counters (C)... - Establecer contadores de carta (C)... + - + Add Card Counter (B) - Añadir contador de carta (B) + - + Remove Card Counter (B) - Retirar un contador de carta (B) + - + Set Card Counters (B)... - Establecer contadores de carta (B)... + - + Add Card Counter (A) - Añadir contador de carta (A) + - + Remove Card Counter (A) - Retirar un contador de carta (A) + - + Set Card Counters (A)... - Establecer contadores de carta (A)... + - + Remove Life Counter Retirar un contador de vida - + Set Life Counters... Establecer contadores de vida... - + Add White Counter Agregar contador blanco - + Remove White Counter Retirar un contador blanco... - + Set White Counters... Establecer contadores blancos... - + Add Blue Counter Agregar contador azul - + Remove Blue Counter Retirar un contador azul... - + Set Blue Counters... Establecer contadores azules... - + Add Black Counter Agregar contador negro - + Remove Black Counter Quitar contador negro - + Set Black Counters... Establecer contadores negros... - + Add Colorless Counter Agregar contador incoloro - + Remove Colorless Counter Retirar contador incoloro - + Set Colorless Counters... Establecer contadores incoloros... - + Add Other Counter Añadir otro contador - + Remove Other Counter Borrar otro contador - + Set Other Counters... Colocar otros contadores... - + Increment all card counters - + Add Power (+1/+0) Agregar fuerza (+1/+0) - + Remove Power (-1/-0) Reducir fuerza (-1/-0) - + Move Toughness to Power (+1/-1) Pasar de resistencia a fuerza (+1/-1) - + Add Toughness (+0/+1) Agregar resistencia (+0/+1) - + Remove Toughness (-0/-1) Reducir resistencia (-0/-1) - + Move Power to Toughness (-1/+1) Pasar de fuerza a resistencia (-1/+1) - + Add Power and Toughness (+1/+1) Agregar fuerza y resistencia (+1/+1) - + Remove Power and Toughness (-1/-1) Reducir fuerza y resistencia (-1/-1) - + Set Power and Toughness... Establecer fuerza y resistencia... - + Reset Power and Toughness Restablecer fuerza y resistencia - + Untap Enderezar - + Upkeep Mantenimiento - + Draw Robo - + First Main Phase Primera fase principal - + Start Combat Comenzar combate - + Attack Ataque - + Block Bloqueo - + Damage Daño - + End Combat Terminar combate - + Second Main Phase Segunda fase principal - + End Final - + Next Phase Próxima fase - + Next Phase Action Próxima fase de acción - + Next Turn Próximo turno - + Hide Card in Reveal Window - + Tap / Untap Card Girar / Enderezar Carta - + Untap All Enderezar todas - + Toggle Skip Untapping Toggle Untap - + Turn Card Over Girar carta - + Peek Card Mirar carta - + Play Card Jugar carta - + Play Card, Face Down - Jugar Carta, Boca Abajo + - + Attach Card... Anexar carta... - + Unattach Card Desanexar carta... - + Clone Card Clonar carta - + Create Token... Crear ficha... - + Create All Related Tokens Crear todas las fichas relacionadas - + Create Another Token Crear otra ficha - + Set Annotation... Escribir anotación... - - Reduce Life by Power - - - - + Select All Cards in Zone - + Select All Cards in Row - + Select All Cards in Column - + Reveal Selected Cards to All Players - - + + Bottom of Library Parte inferior de la biblioteca - - - - + + + + Exile Exilio - - - - + + + + Graveyard Cementerio - - + + Hand Mano - - + + Top of Library Parte superior de la biblioteca - - + + Battlefield, Face Down Campo de batalla, boca abajo - + Battlefield Campo de batalla - + Library Biblioteca - + Sideboard Banquillo - + Top Cards of Library Carta de la parte superior de la biblioteca - + Bottom Cards of Library - + Close Recent View Cerrar vista reciente - - + + Stack Apilar - - + + Graveyard (Multiple) Cementerio (Multiple) - - + + Graveyard (Multiple), Face Down - Cementerio (Multiple), Boca Abajo + - - + + Exile (Multiple) Exiliar (Multiple) - - + + Exile (Multiple), Face Down - Exilio (Multiple), Boca Abajo + - + Stack Until Found - + Draw Bottom Card Robar carta de la parte inferior - + Draw Multiple Cards from Bottom... Robar múltiples cartas de la parte inferior... - + Draw Arrow... Dibujar flecha - + Remove Local Arrows Eliminar flechas - + Leave Game Abandonar partida - + Concede Conceder - + Roll Dice... Lanzar dado... - - Flip Coin - - - - + Shuffle Library Barajar biblioteca - + Shuffle Top Cards of Library - + Shuffle Bottom Cards of Library - + Mulligan Mulligan - + Mulligan (Same hand size) - + Mulligan (Hand size - 1) - + Draw a Card Robar una carta - + Draw Multiple Cards... Robar múltiples cartas... - + Undo Draw Deshacer último robo - + Always Reveal Top Card Mostrar siempre la carta superior - + Always Look At Top Card Mirar siempre la carta superior - + Sort Hand by Name - + Sort Hand by Type - + Sort Hand by Mana Value - + Reveal Hand to All Players - + Reveal Random Card to All Players - + Rotate View Clockwise Rotar vista en sentido horario - + Rotate View Counterclockwise Rotar vista en sentido antihorario - + Unfocus Text Box No resaltar la caja de texto - + Focus Chat Resaltar el chat - + Clear Chat Borrar chat - + Refresh Actualizar - + Skip Forward - + Skip Backward - + Skip Forward by a lot - + Skip Backward by a lot - + Play/Pause - + Toggle Fast Forward - + Home Inicio - + Visual Deck Storage - Almacén de mazos visual + - + Deck Storage Almacenamiento de mazos - + Server Servidor - + Account Cuenta - + Administration Administración - + Logs Historial diff --git a/cockatrice/translations/cockatrice_fi.ts b/cockatrice/translations/cockatrice_fi.ts index c317d967a..1202e1f1e 100644 --- a/cockatrice/translations/cockatrice_fi.ts +++ b/cockatrice/translations/cockatrice_fi.ts @@ -2,7 +2,7 @@ AbstractCounter - + &Set counter... &Lisää countteri... @@ -10,12 +10,12 @@ AbstractCounterDialog - + Set counter Lisää countteri - + New value for counter '%1': Countterin uusi arvo '%1': @@ -36,60 +36,60 @@ AbstractTabDeckEditor - + Open in new tab - + Are you sure? - + The decklist has been modified. Do you want to save the changes? - - - - - - + + + + + + Error - + Could not open deck at %1 - + Could not save remote deck - - + + The deck could not be saved. Please check that the directory is writable and try again. - + Save deck - + The deck could not be saved. - + There are no cards in your deck to be exported @@ -105,12 +105,12 @@ Please check that the directory is writable and try again. AdminNotesDialog - + Update Notes - + Admin Notes for %1 @@ -127,227 +127,172 @@ Please check that the directory is writable and try again. Sideboard - - - Tokens - - AppearanceSettingsPage - + seconds - + Error - + Could not create themes directory at '%1'. - + Theme settings Teeman asetukset - + Current theme: Nykyinen teema: - + Open themes folder - + Home tab background source: - + Home tab background shuffle frequency: - + Disabled - + + Display card name of background in bottom right: + + + + Menu settings - + Show keyboard shortcuts in right-click menus - + Show game filter toolbar above list in room tab - + Card rendering Kortin renderöinti - + Display card names on cards having a picture Näytä kortin nimi korteissa, joissa on kuva - + Auto-Rotate cards with sideways layout - + Override all card art with personal set preference (Pre-ProviderID change behavior) - - Light - - - - - Dark - - - - - System - - - - - Active theme palette: - - - - - Edit theme palette - - - - - Home tab settings - - - - - Display card name of background in bottom right - - - - - Styling settings - - - - - Style user list - - - - - Card printings - - - - + Bump sets that the deck contains cards from to the top in the printing selector - + Scale cards on mouse over Suurenna kortti kun hiiri on kortin päällä - + Use rounded card corners - - Card layout - - - - + Minimum overlap percentage of cards on the stack and in vertical hand - + Maximum initial height for card view window: - - + + rows - + Maximum expanded height for card view window: - + Card counters - + Counter %1 - + Hand layout Käden layout - + Display hand horizontally (wastes space) Näytä käsikortit vierekkäin vaakatasossa (vie enemmän tilaa) - + Enable left justification Järjestä vasemmalta - + Table grid layout Pöydän grid-asetelma - + Invert vertical coordinate Käänteiset pystykoordinaatit - + Minimum player count for multi-column layout: Pelaajien vähimmäismäärä moniosaisessa layoutissa: - + Maximum font size for information displayed on cards: Suurin fonttikoko korteissa näkyville infoteksteille: @@ -355,12 +300,12 @@ Please check that the directory is writable and try again. ArchidektApiResponseDeckDisplayWidget - + Back to results - + Open Deck in Deck Editor @@ -386,112 +331,112 @@ Please check that the directory is writable and try again. BanDialog - + ban &user name Bännää &käyttäjä - + ban &IP address Bännää &IP osoite - + ban client I&D Bännää client I&D - + Ban type Bännäyksen tyyppi - + &permanent ban Bännätty pysyvästi - + &temporary ban Bännätty väliaikaisesti - + &Days: Päivät: - + &Hours: Tunnit: - + &Minutes: Minuutit: - + Duration of the ban Bännin kesto - + Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. Kerro bännäyksen syy. Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. - + Please enter the reason for the ban that will be visible to the banned person. Kerro bännäyksen syy. Tämä näkyy bännätylle henkilölle. - + Redact all messages from this user in all rooms - + &OK &OK - + &Cancel &Peruuta - + Ban user from server Bännää pelaaja serveriltä - - - - + + + + Error Virhe - + You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. Valitse nimi, IP -osoite, clientid tai joku näiden yhdistelmä asettaaksesi bännin. - + You must have a value in the name ban when selecting the name ban checkbox. Bännää nimi kentässä pitää olla arvo ennen valintaruudun valitsemista - + You must have a value in the ip ban when selecting the ip ban checkbox. Bännää ip kentässä pitää olla arvo ennen valintaruudun valitsemista. - + You must have a value in the clientid ban when selecting the clientid ban checkbox. Bännää ClientID kentässä pitää olla arvo ennen valintaruudun valitsemista. @@ -499,123 +444,59 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. BetaReleaseChannel - + Beta - + No reply received from the release update server. Ei vastausta päivitysserveriltä. - + Invalid reply received from the release update server. Päivitysserveri vastasi virheellisesti - + No reply received from the file update server. Ei vastausta tiedoston päivitysserveriltä. - - CardArtPreviewWidget - - - No card selected - - - - - CardArtRulesModel - - - Card - - - - - ProviderId - - - - - Mode - - - - - Reason - - - CardDatabaseModel - + Name Nimi - + Sets Setit - + Mana cost Mana cost - + Card type Korttityyppi - + P/T P/T - + Color(s) Väri(t) - - CardDatabaseView - - - Add to Deck - - - - - Add to Sideboard - - - - - Select Printing - - - - - Show on EDHRec (Commander) - - - - - Show on EDHRec (Card) - - - - - Show Related cards - - - CardFilter @@ -744,22 +625,22 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. CardInfoPictureWidget - + View related cards - + Add card to deck - + Mainboard - + Sideboard @@ -782,12 +663,12 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. - + Related cards: - + Unknown card: @@ -795,146 +676,128 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. CardMenu - + Re&veal to... - + &All players - + View related cards - + Token: - + All tokens - + &Select All - + S&elect Row - + S&elect Column - + &Play - + &Hide - + Play &Face Down - + &Tap / Untap Turn sideways or back again - + Skip &untapping - + T&urn Over Turn face up/face down - + &Peek at card face - + &Clone - + Attac&h to card... - + Unattac&h - + &Draw arrow... - + &Set annotation... - - Reduce life by power - - - - + Ca&rd counters - + &Add counter (%1) - + &Remove counter (%1) - + &Set counters (%1)... - - CardPictureLoaderCacheMethod - - - Network Cache - - - - - Filesystem - - - CardSizeWidget @@ -946,133 +809,133 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. CardZoneLogic - + their hand nominative - + %1's hand nominative - + their library look at zone - + %1's library look at zone - + of their library top cards of zone, - + of %1's library top cards of zone - + their library reveal zone - + %1's library reveal zone - + their library shuffle - + %1's library shuffle - + their library nominative - + %1's library nominative - + their graveyard nominative - + %1's graveyard nominative - + their exile nominative - + %1's exile nominative - + their sideboard look at zone - + %1's sideboard look at zone - + their sideboard nominative - + %1's sideboard nominative - + their custom zone '%1' nominative - + %1's custom zone '%2' nominative @@ -1094,421 +957,16 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. - - ColorButton - - - Click to pick a color - - - - - Pick colour - - - - - ConnectionController - - - - The server has reached its maximum user capacity, please check back later. - - - - - There are too many concurrent connections from your address. - - - - - Banned by moderator - - - - - Expected end time: %1 - - - - - This ban lasts indefinitely. - - - - - Scheduled server shutdown. - - - - - - Invalid username. - - - - - You have been logged out due to logging in at another location. - - - - - Connection closed - - - - - The server has terminated your connection. -Reason: %1 - - - - - The server is going to be restarted in %n minute(s). -All running games will be lost. -Reason for shutdown: %1 - - - - - Scheduled server shutdown - - - - - Failed Login - - - - - Your client seems to be missing features this server requires for connection. - - - - - To update your client, go to 'Help -> Check for Client Updates'. - - - - - - - - - - - - - - - - - - - - - - Error - - - - - Incorrect username or password. Please check your authentication information and try again. - - - - - There is already an active session using this user name. -Please close that session first and re-login. - - - - - - You are banned until %1. - - - - - - You are banned indefinitely. - - - - - This server requires user registration. Do you want to register now? - - - - - This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. -Please close and reopen your client to try again. - - - - - An internal error has occurred, please close and reopen Cockatrice before trying again. -If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - - - - Account activation - - - - - Your account has not been activated yet. -You need to provide the activation token received in the activation email. - - - - - Server Full - - - - - Unknown login error: %1 - - - - - - -This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - - - - - - - - - Registration denied - - - - - Registration is currently disabled on this server - - - - - There is already an existing account with the same user name. - - - - - It's mandatory to specify a valid email address when registering. - - - - - It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. - - - - - Password too short. - - - - - Registration failed for a technical problem on the server. - - - - - The connection to the server has been lost. - - - - - Unknown registration error: %1 - - - - - Account activation failed - - - - - Socket error: %1 - - - - - Server timeout - - - - - You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. -Local version is %1, remote version is %2. - - - - - Your Cockatrice client is obsolete. Please update your Cockatrice version. -Local version is %1, remote version is %2. - - - - - - Success - - - - - Registration accepted. -Will now login. - - - - - Account activation accepted. -Will now login. - - - - - Information - - - - - This server supports additional features that your client doesn't have. -This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. - -To update your client, go to Help -> Check for Updates. - - - - - - - Reset Password - - - - - Your password has been reset successfully, you can now log in using the new credentials. - - - - - Failed to reset user account password, please contact the server operator to reset your password. - - - - - Activation request received, please check your email for an activation token. - - - - - Connecting to %1... - - - - - Registering to %1 as %2... - - - - - Disconnected - - - - - Connected, logging in at %1 - - - - - Requesting forgotten password to %1 as %2... - - - - - Your username must respect these rules: - - - - - is %1 - %2 characters long - - - - - can %1 contain lowercase characters - - - - - - - - NOT - - - - - can %1 contain uppercase characters - - - - - can %1 contain numeric characters - - - - - can contain the following punctuation: %1 - - - - - first character can %1 be a punctuation mark - - - - - no unacceptable language as specified by these server rules: - note that the following lines will not be translated - - - - - can not contain any of the following words: %1 - - - - - can not match any of the following expressions: %1 - - - - - You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - - CustomZoneMenu - + C&ustom Zones - - + + View custom zone '%1' @@ -1516,35 +974,30 @@ To update your client, go to Help -> Check for Updates. DeckAnalyticsWidget - + Add Panel - + Remove Panel - + Save Layout - + Load Layout - - - Include Sideboard - - DeckEditorCardDatabaseDockWidget - + Card Database @@ -1560,17 +1013,47 @@ To update your client, go to Help -> Check for Updates. DeckEditorDatabaseDisplayWidget - + Search by card name (or search expressions) - + + Add to Deck + + + + + Add to Sideboard + + + + + Select Printing + + + + + Show on EDHRec (Commander) + + + + + Show on EDHRec (Card) + + + + + Show Related cards + + + + Add card to &maindeck - + Add card to &sideboard @@ -1603,72 +1086,72 @@ To update your client, go to Help -> Check for Updates. - + Select Printing - + Deck - + Deck &name: - + Banner Card/Tags Visibility Settings - + Show banner card selection menu - + Show tags selection menu - + &Comments: - + Group by: - + Format: - + Hash: - + &Increment number - + &Decrement number - + &Remove row - + Swap card to/from sideboard @@ -1676,17 +1159,17 @@ To update your client, go to Help -> Check for Updates. DeckEditorFilterDockWidget - + Filters - + &Clear all filters - + Delete selected @@ -1817,113 +1300,169 @@ To update your client, go to Help -> Check for Updates. DeckEditorSettingsPage - - + + Update Spoilers Päivitä spoilerit - + + Success Onnistui - + Download URLs have been reset. Latauksen URL:t on resetoitu - + + Downloaded card pictures have been reset. + Ladattujen korttien kuvat on resetoitu. + + + + Error + Virhe + + + + One or more downloaded card pictures could not be cleared. + Ei voitu poistaa yhtä tai useampaa kortin kuvaa + + + Add URL Lisää URL - - + + URL: URL: - - + + Edit URL Muokkaa URL - + + Network Cache Size: + + + + + Redirect Cache TTL: + + + + + How long cached redirects for urls are valid for. + + + + + Picture Cache Size: + + + + Add New URL - + Remove URL - + + Day(s) + + + + Updating... Päivitetään... - + Choose path Valitse polku - + URL Download Priority URL Latausprioriteetti - + Spoilers Spoilerit - + Download Spoilers Automatically Lataa spoilerit automaattisesti - + Spoiler Location: Spoilerien sijainti: - + Last Change Muokattu viimeksi - + Spoilers download automatically on launch Lataa spoilerit latauksen yhteydessä - + Press the button to manually update without relaunching Lataa spoilerit manuaalisesti ilman uudelleenkäynnistystä - + Do not close settings until manual update is complete Älä sulje asetuksia, ennen kuin manuaalinen päivitys on valmis - + Download card pictures on the fly Lataa korttikuvat kun niitä tarvitaan - + How to add a custom URL Miten lisään oman URL:n - + + Delete Downloaded Images + Poista ladatut kuvat + + + Reset Download URLs Resetoi latausten URL:t + + + On-disk cache for downloaded pictures + + + + + In-memory cache for pictures not currently on screen + + DeckListHistoryManagerWidget @@ -1989,12 +1528,12 @@ To update your client, go to Help -> Check for Updates. DeckLoader - + Common deck formats (%1) - + All files (*.*) @@ -2216,27 +1755,27 @@ To update your client, go to Help -> Check for Updates. - + Moved to %1 1 × "%2" (%3) - + Removed "%1" (all copies) - + %1 1 × "%2" (%3) - + Added - + Removed @@ -2258,74 +1797,74 @@ To update your client, go to Help -> Check for Updates. DeckViewContainer - + Load deck... Lataa pakka... - + Load remote deck... Lataa remote pakka... - + Load from clipboard... - + Load from website... - + Unload deck - + Ready to start Ready to start - + Force start - + Sideboard unlocked Sideboard unlocked - + Sideboard locked Sideboard locked - - + + Error Virhe - + The selected file could not be loaded. Valittua tiedostoa ei voi avata. - + Deck is greater than maximum file size. - + Are you sure you want to force start? This will kick all non-ready players from the game. - + Cockatrice @@ -2424,7 +1963,7 @@ This will kick all non-ready players from the game. - + Webpage Websivu @@ -2464,37 +2003,37 @@ This will kick all non-ready players from the game. Yhdistä serveriin - + Server URL Serverin URL - + Communication Port Tietoliikenneportti - + Unique Server Name Uniikki serverin nimi - + Connection Warning Yhteysvaroitus - + You need to name your new connection profile. Anna nimi uudelle yhteysprofiilillesi - + Connect Warning Yhdistämisvaroitus - + The player name can't be empty. Pelaajan nimi ei voi olla tyhjä. @@ -2607,17 +2146,17 @@ This will kick all non-ready players from the game. Luo peli - + Game information Tietoa pelistä - + Error Virhe - + Server error. Serverivirhe. @@ -2625,97 +2164,97 @@ This will kick all non-ready players from the game. DlgCreateToken - + &Name: &Nimi: - + Token Tokeni - + C&olor: &Väri - + white valkoinen - + blue sininen - + black musta - + red punainen - + green vihreä - + multicolor monivärinen - + colorless väritön - + &P/T: P/T: - + &Annotation: &Kommentti: - + &Destroy token when it leaves the table &Tuhoa tokeni kun se lähtee pöydästä - + Create face-down (Only hides name) - + Token data Tokenin data - + Show &all tokens Näytä &kaikki tokenit - + Show tokens from this &deck Näytä kaikki tämän &pakan tokenit - + Choose token from list Valitse tokeni listasta - + Create token Luo token @@ -2749,7 +2288,7 @@ This will kick all non-ready players from the game. - + ✖ @@ -2764,12 +2303,12 @@ This will kick all non-ready players from the game. - + Duplicate Tag - + This tag already exists. @@ -2956,12 +2495,12 @@ Poistaaksesi nykyisen avatarisi: Hyväksy valitsematta uutta kuvaa.Anna tokenin nimi: - + Error Virhe - + The chosen name conflicts with an existing card or token. Make sure to enable the 'Token' set in the "Manage sets" dialog to display them correctly. Nimi on ristiriidassa olemassaolevan kortin tai tokenin kanssa. @@ -2986,12 +2525,12 @@ Varmista että 'Token' setti on asetettu näkyväksi 'Muokkaa set Ei määritelty - + Real name: Oikea nimi: - + Edit user profile Muokkaa käyttäjäprofiilia @@ -3029,113 +2568,113 @@ Varmista että 'Token' setti on asetettu näkyväksi 'Muokkaa set - + Hide 'buddies only' games - + Hide full games - + Hide games that have started - + Hide password protected games - + Hide 'ignored user' games - + Hide games not created by buddies Hide games not created by buddy - + Hide games with forced open decklists - + &Newer than: - + Game &description: Pelin &kuvaus: - + &Creator name: &Tekijän nimi: - + General Yleinen - + &Game types &Pelimuodot - + at &least: &vähintään: - + at &most: &enintään: - + Maximum player count Suurin pelaajamäärä - + Restrictions Ehdot - + Show games only if &spectators can watch - + Show spectator password p&rotected games - + Show only if spectators can ch&at - + Show only if spectators can see &hands - + Spectators - + Filter games Suodata pelit @@ -3438,37 +2977,37 @@ https://tappedout.net/mtg-decks/your-deck-name/ DlgMoveTopCardsUntil - + Card name (or search expressions): - + Number of hits: - + Auto play hits - + Put top cards on stack until... - + No cards matching the search expression exists in the card database. Proceed anyways? - + Cockatrice - + Invalid filter @@ -3527,40 +3066,40 @@ Your email will be used to verify your account. Ei määritelty - + Real name: Oikea nimi: - + Register to server Rekisteröidy serverille - - - - + + + + Registration Warning Rekisteröintivaroitus - + Your password is too short. - + Your passwords do not match, please try again. Salasanat eivät täsmää, yritä uudelleen - + Your email addresses do not match, please try again. Sähköpostiosoitteet eivät täsmää, yritä uudelleen. - + The player name can't be empty. Pelaajan nimi ei voi olla tyhjä. @@ -3568,17 +3107,17 @@ Your email will be used to verify your account. DlgRollDice - + Number of sides: - + Number of dice: - + Roll Dice @@ -3629,12 +3168,12 @@ Your email will be used to verify your account. DlgSettings - + Unknown Error loading card database Tuntematon virhe ladattaessa korttitietokantaa - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -3651,7 +3190,7 @@ Voit joutua ajamaan Oraclen ja päivittämään korttitietokannan uudelleen Haluatko vaihtaa tietokantasi sijaintia? - + Your card database version is too old. This can cause problems loading card information or images @@ -3668,7 +3207,7 @@ Yleensä tämä voidaan korjata palaamalla oracleen päivittämään korttitieto Haluatko vaihtaa tietokantasi sijaintia? - + Your card database did not finish loading Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached @@ -3677,7 +3216,7 @@ Would you like to change your database location setting? - + File Error loading your card database. Would you like to change your database location setting? @@ -3686,7 +3225,7 @@ Would you like to change your database location setting? Haluatko vaihtaa tietokantasi sijaintia? - + Your card database was loaded but contains no cards. Would you like to change your database location setting? @@ -3695,7 +3234,7 @@ Would you like to change your database location setting? Haluatko vaihtaa tietokantasi sijaintia? - + Unknown card database load status Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues @@ -3704,64 +3243,59 @@ Would you like to change your database location setting? - - - + + + Error Virhe - + The path to your deck directory is invalid. Would you like to go back and set the correct path? Pakkojen tiedostosijainti on väärä. Haluatko palata takaisin ja asettaa oikean sijainnin pakat -kansiolle? - + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? Kuvien tiedostosijainti on väärä. Haluatko palata takaisin ja asettaa oikean sijainnin kuvat -kansiolle? - + Settings Asetukset - + General Yleinen - + Appearance Ulkonäkö - + User Interface Käyttöliittymä - - Storage - - - - + Card Sources Korttien lähteet - + Chat Chat - + Sound Äänet - + Shortcuts Pikanäppäimet @@ -3853,9 +3387,9 @@ You can always change this behavior in the 'General' settings tab. - - - + + + Error Virhe @@ -3908,31 +3442,31 @@ Vieraile lataussivulla päivittääksesi ohjelman manuaalisesti. - + Update Available Päivitys Saatavilla - + A new version of Cockatrice is available! Uusi versio Cockatricesta on saatavilla! - + New version Uusi versio - + Released Julkaistu - + Changelog Muutosloki @@ -3942,50 +3476,50 @@ Vieraile lataussivulla päivittääksesi ohjelman manuaalisesti. Haluatko päivittää nyt? - + Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. - + Please check the <a href="%1">releases page</a> on our Github and download the build for your system. - - - + + + Update Error Päivitysvirhe - + An error occurred while checking for updates: Virhe päivityksiä tarkistettaessa: - + An error occurred while downloading an update: Virhe tiedostoa ladatessa: - + Installing... Asennetaan... - + Cockatrice is unable to open the installer. Cockatrice ei voi avata asennustiedostoa. - + Try to update manually by closing Cockatrice and running the installer. Yritä asentaa manuaalisesti sulkemalla Cockatrice ja käynnistämällä asennusohjelma. - + Download location Latausten sijainti @@ -4075,67 +3609,67 @@ You may have to manually download the new version. DrawProbabilityWidget - + Draw Probability - + Probability of drawing - + Card Name - + Type - + Subtype - + Mana Value - + At least - + Exactly - + card(s) having drawn at least - + cards - + Category - + Qty - + Odds (%) @@ -4249,7 +3783,7 @@ You may have to manually download the new version. FilterBuilder - + Type your filter here Anna suodatin tähän @@ -4280,22 +3814,22 @@ You may have to manually download the new version. GameEventHandler - + kicked by game host or moderator - + player left the game - + player disconnected from server - + reason unknown @@ -4303,140 +3837,140 @@ You may have to manually download the new version. GameSelector - - - - - - - - - + + + + + + + + + Error Virhe - + Please join the appropriate room first. Liity ensin oikeaan huoneeseen. - + Wrong password. Väärä salasana. - + Spectators are not allowed in this game. Tähän peliin ei päästetä katsojia. - + The game is already full. Peli on jo täynnä. - + The game does not exist any more. Peliä ei enää ole. - + This game is only open to registered users. Peli on tarkoitettu vain rekisteröityneille käyttäjille. - + This game is only open to its creator's buddies. Peli on tarkoitettu vain sen tekijän kavereille. - + You are being ignored by the creator of this game. Pelin luoja ei huomioi sinua. - + Join Game - + Spectate Game - + Game Information - + Join Game as Judge - + Spectate Game as Judge - + Join game Liity peliin - + Password: Salasana: - + Please join the respective room first. Liity ensin asianmukaiseen huoneeseen. - + &Filter games &Suodata pelit - + C&lear filter &Poista suodattimet - + C&reate &Luo - + &Join &Liity - + Join as judge - + J&oin as spectator Liity &katsojana - + Join as judge spectator - + Games shown: %1 / %2 Games shown: %1 / %2 - + Games Pelit @@ -4444,32 +3978,32 @@ You may have to manually download the new version. GameSelectorQuickFilterToolBar - + All types - + Filter by game name... - + Filter by game type/format - + Hide games not created by buddies - + Hide full games - + Hide started games @@ -4477,105 +4011,105 @@ You may have to manually download the new version. GamesModel - + >1 day - + %1%2 hr short age in hours - + new - + %1%2 min short age in minutes - + password salasana - + buddies only vain kaverit - + reg. users only vain rekisteröityneet käyttäjät - + open decklists + - can chat voi jutella - + see hands katso käsikortit - + can see hands voi nähdä käsikortit - + not allowed ei sallittu - + Room Huone - + Age Ikä - + Description Kuvaus - + Creator Luoja - + Type Muoto - + Restrictions Ehdot - + Players Pelaajat - + Spectators Katsojat @@ -4583,158 +4117,143 @@ You may have to manually download the new version. GeneralSettingsPage - + Reset all paths - + All paths have been reset - - - - - - - + + + + + + + Choose path Valitse polku - - Language settings - + + Personal settings + Henkilökohtaiset asetukset - + Language: Kieli: - - Version settings - - - - - Card database - - - - - Startup settings - - - - + Paths (editing disabled in portable mode) Polut (editoiminen poistettu käytöstä kannettavassa versiossa) - + Paths Polut - + How to help with translations - + Decks directory: Pakkojen kansio: - + Filters directory: - + Replays directory: Replay kansio: - + Pictures directory: Kuvakansio: - + Card database: Korttitietokanta: - + Custom database directory: - + Token database: Tokenitietokanta: - + Update channel Päivitykset - + Check for client updates on startup - + Check for card database updates on startup - + Don't check - + Prompt for update - + Always update in the background - + Check for card database updates every - + days - + Notify if a feature supported by the server is missing in my client Ilmoita jos ohjelmastani puuttuu jokin serverin tarjoama ominaisuus - + Automatically run Oracle when running a new version of Cockatrice Suorita Oracle automaattisesti kun Cockatricen uusi versio on asennettu - + Show tips on startup Näytä vinkit käynnistyksen yhteydessä - + Last update check on %1 (%2 days ago) @@ -4742,47 +4261,47 @@ You may have to manually download the new version. GraveyardMenu - + &Graveyard - + &View graveyard - + &Move graveyard to... - + &Top of library - + &Bottom of library - + &All players - + &Hand - + &Exile - + Reveal random card to... @@ -4790,88 +4309,88 @@ You may have to manually download the new version. HandMenu - + &Hand - + &View hand - + Sort hand by... - + Name - + Type - + Mana Value - + Take &mulligan (Choose hand size) - + Take mulligan (Same hand size) - + Take mulligan (Hand size - 1) - + &Move hand to... - + &Top of library - + &Bottom of library - + &Graveyard - + &Exile - + &Reveal hand to... - - + + All players - + Reveal r&andom card to... @@ -4879,52 +4398,52 @@ You may have to manually download the new version. HomeWidget - + Create New Deck - + Browse Decks - + Browse Card Database - + Browse EDHRec - + Browse Archidekt - + View Replays - + Quit - + Connecting... - + Connect - + Play @@ -4932,213 +4451,213 @@ You may have to manually download the new version. LibraryMenu - + &Library - + &View library - + View &top cards of library... - + View bottom cards of library... - + Reveal &library to... - + Lend library to... - + Reveal &top cards to... - + &Top of library... - + &Bottom of library... - + &Always reveal top card - + &Always look at top card - + &Open deck in deck editor - + &Draw card - + D&raw cards... - + &Undo last draw - + Shuffle - + &Play top card - + Play top card &face down - + Put top card on &bottom - + Move top card to grave&yard - + Move top card to e&xile - + Move top cards to &graveyard... - + Move top cards to graveyard face down... - + Move top cards to &exile... - + Move top cards to exile face down... - + Put top cards on stack &until... - + Shuffle top cards... - + &Draw bottom card - + D&raw bottom cards... - + &Play bottom card - + Play bottom card &face down - + Move bottom card to grave&yard - + Move bottom card to e&xile - + Move bottom cards to &graveyard... - + Move bottom cards to graveyard face down... - + Move bottom cards to &exile... - + Move bottom cards to exile face down... - + Put bottom card on &top - + Shuffle bottom cards... - - + + &All players - + Reveal top cards of library - + Number of cards: (max. %1) @@ -5146,273 +4665,638 @@ You may have to manually download the new version. MainWindow - - + + + The server has reached its maximum user capacity, please check back later. + Serveri on täynnä, yritä myöhemmin uudelleen. + + + + There are too many concurrent connections from your address. + Liian monta samanaikaista yhteyttä osoitteestasi. + + + + Banned by moderator + Bännätty moderaattorin toimesta + + + + Expected end time: %1 + Arvioitu päättymisaika: %1 + + + + This ban lasts indefinitely. + Bänni kestää loputtomasti. + + + + Scheduled server shutdown. + Ajastettu serverin sammutus. + + + + + Invalid username. + Väärä käyttäjänimi. + + + + You have been logged out due to logging in at another location. + Sinut kirjattiin ulos koska kirjauduit sisään toisesta paikasta. + + + + Connection closed + Yhteys suljettu + + + + The server has terminated your connection. +Reason: %1 + Serveri katkaisi yhteyden. +Syy: %1 + + + + The server is going to be restarted in %n minute(s). +All running games will be lost. +Reason for shutdown: %1 + Serveri käynnistetään uudelleen minuutin kuluttua( ) +Kaikki pelit joudutaan lopettamaan +Syy: %1Serveri käynnistetään uudelleen %n minuutin kuluttua( ) +Kaikki pelit joudutaan lopettamaan +Syy: %1 + + + + Scheduled server shutdown + Ajastettu serverin sammutus. + + + + + Success + Onnistui + + + + Registration accepted. +Will now login. + Rekisteröinti hyväksytty +Kirjautuu. + + + + Account activation accepted. +Will now login. + Tilin aktivointi hyväksytty. +Kirjautuu. + + + + Player %1 Pelaaja %1 - + Load replay Lataa replay - + About Cockatrice Tieto sovelluksesta - + Version Versio - + Cockatrice Webpage Cockatricen Webbsivut - + Project Manager: Projektipäällikkö: - + Past Project Managers: Edelliset projektipäälliköt: - + Developers: Kehittäjät: - + Our Developers Kehittäjämme - + Help Develop! Auta kehittämään! - + Translators: Kääntäjät: - + Our Translators Kääntäjät - + Help Translate! Auta Kääntämään! - + Support: Tuki: - + Report an Issue Ilmoita puute - + Troubleshooting Vianhaku - + F.A.Q. F.A.Q. - - + + + + + + + + + + + + + + + + + + + + Error Virhe - + + Server timeout + Serverin aikakatkaisu + + + + Failed Login + Kirjautuminen epäonnistui + + + + Your client seems to be missing features this server requires for connection. + Sovelluksestasi puuttuu ominaisuuksia, joita serveri vaatii yhteyden muodostamiseksi. + + + + To update your client, go to 'Help -> Check for Client Updates'. + Päivitä sovellus: 'Apua' -> 'Tarkasta onko päivityksiä'. + + + + Incorrect username or password. Please check your authentication information and try again. + Väärä käyttäjänimi tai salasana. Tarkista todennustietosi ja yritä uudelleen. + + + + There is already an active session using this user name. +Please close that session first and re-login. + Tällä käyttäjänimellä on jo aktiivinen sessio käynnissä. Sulje se ensin ja kirjaudu sisään uudelleen + + + + + You are banned until %1. + Sinut on bännätty %1 saakka. + + + + + You are banned indefinitely. + Sinut on bännätty lopullisesti + + + + This server requires user registration. Do you want to register now? + Serveri vaatii rekisteröitymisen. Haluatko rekisteröityä nyt? + + + + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. + + + + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. + Sisäinen virhe! Sulje ja käynnistä Cockatrice uudelleen ennenkuin yrität uudestaan. +Jos ongelma jatkuu, tarkasta että käytössäsi on sovelluksen uusin versio ja tarvittaessa ota yhteyttä sovelluksen kehittäjiin. + + + + Account activation + Tilin aktivointi + + + + Your account has not been activated yet. +You need to provide the activation token received in the activation email. + Tiliäsi ei ole vielä aktivoitu +Ole hyvä ja anna aktivointikoodi, jonka sait sähköpostiisi. + + + + Server Full + Serveri on täynnä + + + + Unknown login error: %1 + Tuntematon kirjautumisvirhe: %1 + + + + + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. + +Yleensä tämä tarkoittaa, että sovelluksesi on päivittämättä ja serveri lähetti vastauksen, jota sovellus ei ymmärrä. + + + + Your username must respect these rules: + Käyttäjänimesi täytyy olla näiden sääntöjen mukainen: + + + + is %1 - %2 characters long + %1 - %2 merkkiä pitkä + + + + can %1 contain lowercase characters + voi sisältää %1 pientä kirjainta + + + + + + + NOT + EI + + + + can %1 contain uppercase characters + voi sisältää %1 isoa kirjainta + + + + can %1 contain numeric characters + voi sisältää %1 numeroa + + + + can contain the following punctuation: %1 + voi sisältää seuraavat merkit: %1 + + + + first character can %1 be a punctuation mark + ensimmäinen kirjain ei voi olla %1 merkki + + + + no unacceptable language as specified by these server rules: + note that the following lines will not be translated + + + + + can not contain any of the following words: %1 + ei voi sisältää näitä sanoja: %1 + + + + can not match any of the following expressions: %1 + ei voi sisältää seuraavia asioita: %1 + + + + You may only use A-Z, a-z, 0-9, _, ., and - in your username. + Voit käyttää käyttäjänimessä merkkejä A-Z, a-z, 0-9, _, ., ja - + + + + + + + + + Registration denied + Rekisteröinti evätty + + + + Registration is currently disabled on this server + Tämä serveri ei ota tällä hetkellä vastaan rekisteröintejä + + + + There is already an existing account with the same user name. + Käyttäjänimi on jo olemassa + + + + It's mandatory to specify a valid email address when registering. + Rekisteröintiin on annettava toimiva sähköpostiosoite. + + + + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + Näyttää siltä että yrität rekisteröidä uutta tiliä tälle serverille, vaikka sinulla on tällä sähköpostilla jo olemassaoleva tili. Tämä serveri rajoittaa tilien määrää, jotka tulevat samasta osoitteesta. Ota yhteyttä serverin tukeen pyytääksesi apua tai saadaksesi kirjautumistietosi. + + + + Password too short. + Salasana on liian lyhyt. + + + + Registration failed for a technical problem on the server. + Rekisteröinti epäonnistui serverin vian vuoksi. + + + + The connection to the server has been lost. + + + + + Unknown registration error: %1 + Tuntematon rekisteröintivirhe: %1 + + + + Account activation failed + Tilin aktivointi epäonnistui + + + + Socket error: %1 + Pistokevirhe: %1 + + + + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + Yritit yhdistää vanhentuneeseen palvelimeen. Käytä vanhempaa versiota Cockatricesta tai yhdistä sopivaan palvelimeen. +Paikallinen versio on %1, etäversio on %2. + + + + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + Cockatrice-ohjelmasi on vanhentunut. Päivitä Cockatrice-versiosi. +Paikallinen versio on %1, etäversio on %2. + + + + Connecting to %1... + Yhdistetään: %1... + + + + Registering to %1 as %2... + Rekisteröidytään %1:een %2:na + + + + Disconnected + Yhteys katkaistu + + + + Connected, logging in at %1 + Yhteys luotu, kirjaudutaan %1:n + + + + + + Requesting forgotten password to %1 as %2... + Requesting forgotten password to %1 as %2... + + + &Connect... &Yhdistä... - + &Disconnect &Katkaise yhteys - + Start &local game... Aloita &paikallinen peli... - + &Watch replay... &Katso replay... - + &Full screen K&oko näyttö - + &Register to server... &Rekisteröidy serverille... - + &Restore password... - + &Settings... &Asetukset - + &Exit &Exit - + A&ctions &Toiminnot - + &Cockatrice &Cockatrice - + C&ard Database &Korttitietokanta - + &Manage sets... &Manage sets... - + Edit custom &tokens... Edit custom &tokens... - + Open custom image folder Avaa mukautettu kuvakansio - + Open custom sets folder Avaa mukautettu setit -kansio - + Add custom sets/cards Lisää mukautettuja settejä/kortteja - + Reload card database - + Tabs - + &Help &Apua - + &About Cockatrice &Tietoa Cockatricesta - + &Tip of the Day &Päivän vinkki - + Check for Client Updates Etsi päivityksiä - + Check for Card Updates... - + Check for Card Updates (Automatic) - + Show Status Bar - + View &Debug Log - + Open Settings Folder - + Show/Hide - + New Version Uusi versio - + Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. - + Cockatrice installed Cockatrice asennettu - + Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. - + Card database Korttitietokanta - + Cockatrice is unable to load the card database. Do you want to update your card database now? If unsure or first time user, choose "Yes" @@ -5421,51 +5305,46 @@ Do you want to update your card database now? If unsure or first time user, choose "Yes" - - + + Yes Kyllä - - + + No Ei - + Open settings Avaa asetukset - + New sets found Löytyi uusia settejä! - + %n new set(s) found in the card database Set code(s): %1 Do you want to enable it/them? - - Yes, always enable - - - - + View sets Näytä setit - + Welcome Tervetuloa - + Hi! It seems like you're running this version of Cockatrice for the first time. All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. @@ -5474,132 +5353,166 @@ All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. - + + Information Tietoa - + A card database update is already running. Korttitietokannan päivitys on jo käynnissä - + Unable to run the card database updater: Unable to run the card database updater: - + Card database update running. - + Failed to start. The file might be missing, or permissions might be incorrect. - + The process crashed some time after starting successfully. - + Timed out. The process took too long to respond. The last waitFor...() function timed out. - + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. - + An error occurred when attempting to read from the process. For example, the process may not be running. - + Unknown error occurred. - + The card database updater exited with an error: %1 - - - - - + + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + + + + + + + Load sets/cards Lataa setit/kortit - + Selected file cannot be found. Selected file cannot be found. - + You can only import XML databases at this time. You can only import XML databases at this time. - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. The new sets/cards have been added successfully. Cockatrice will now reload the card database. - + Sets/cards failed to import. Sets/cards failed to import. + + + + + Reset Password + + + + + Your password has been reset successfully, you can now log in using the new credentials. + Salasanasi on muutettu, voit nyt kirjautua sisään uudella salasanallasi. + + + + Failed to reset user account password, please contact the server operator to reset your password. + Failed to reset user account password, please contact the server operator to reset your password. + + + + Activation request received, please check your email for an activation token. + Activation request received, please check your email for an activation token. + ManaBaseConfigDialog - + Mana Base Configuration - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): - + OK - + Cancel @@ -5671,27 +5584,27 @@ Cockatrice will now reload the card database. ManaDevotionConfigDialog - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): @@ -5761,615 +5674,610 @@ Cockatrice will now reload the card database. MessageLogWidget - + from play pelistä - + from their graveyard Graveyardilta - + from exile exilestä - + from their hand kädestään - + the top card of %1's library %1n pakan päällimmäinen kortti - + the top card of their library pakan päällimmäisen kortin - + from the top of %1's library %1n pakan päältä - + from the top of their library Pakkansa päältä - + the bottom card of %1's library %1n pakan alimmainen kortti - + the bottom card of their library pakan alimmaisen kortin - + from the bottom of %1's library %1n pakan pohjalta - + from the bottom of their library pakan alta - + from %1's library %1n pakasta - + from their library pakasta - + from sideboard sideboardilta - + from the stack stäkistä - + from custom zone '%1' - + %1 is now keeping the top card %2 revealed. %1 pelaa pakan päällimmäinen kortti %2 esillä. - + %1 is not revealing the top card %2 any longer. %1 ei pelaa enää pakan päällimmäinen kortti %2 esillä, - + %1 can now look at top card %2 at any time. - + %1 no longer can look at top card %2 at any time. - + %1 attaches %2 to %3's %4. %1 attaches %2 to %3's %4. - + %1 has conceded the game. %1 luovutti. - + %1 has unconceded the game. %1 has unconceded the game. - + %1 has restored connection to the game. %1 on jälleen yhteydessä peliin. - + %1 has lost connection to the game. %1 menetti yhteyden peliin. - + %1 points from their %2 to themselves. %1 osoittaa kortista %2 itseensä. - + %1 points from their %2 to %3. %1 osoittaa kortista %2 korttiin %3. - + %1 points from %2's %3 to themselves. %1 osoittaa %2n kortista %3 itseensä. - + %1 points from %2's %3 to %4. %1 osoittaa %2n kortista %3 korttiin %4 - + %1 points from their %2 to their %3. %1 osoittaa kortistaan %2 korttiin %3. - + %1 points from their %2 to %3's %4. %1 osoittaa kortistaan %2 pelaajan %3 korttiin %4. - + %1 points from %2's %3 to their own %4. %1 osoittaa pelaajan %2 kortista %3 korttiin %4. - + %1 points from %2's %3 to %4's %5. %1 points from %2's %3 to %4's %5. - + %1 creates a face down token. - + %1 creates token: %2%3. %1 tekee tokenin: %2%3. - + %1 has loaded a deck (%2). %1 on ladannut pakan (%2). - + %1 has loaded a deck with %2 sideboard cards (%3). %1 on ladannut pakan, jossa on %2 sideboard korttia (%3) - + %1 destroys %2. %1 tuhoaa kortin %2. - + a card kortti - + %1 gives %2 control over %3. %1 antaa pelaajalle %2 kontrollin korttiin %3. - + %1 puts %2 into play%3 face down. - + %1 puts %2 into play%3. %1 laittaa kortin %2 peliin%3. - + %1 puts %2%3 into their graveyard face down. - + %1 puts %2%3 into their graveyard. %1 laittaa kortin %2%3 graveyardille - + %1 exiles %2%3 face down. - + %1 exiles %2%3. %1 laittaa exileen kortin %2%3. - + %1 moves %2%3 to their hand. %1 laittaa kortin %2%3 käteen. - + %1 puts %2%3 into their library. %1 laittaa kortin %2%3 pakkaan. - + %1 puts %2%3 onto the bottom of their library. - + %1 puts %2%3 on top of their library. %1 laittaa kortin %2%3 pakan päälle. - + %1 puts %2%3 into their library %4 cards from the top. %1 laittaa kortin %2%3 pakkaansa %4 kortiksi päältä lukien. - + %1 moves %2%3 to sideboard. %1 siirtää kortin %2%3 sideboardille. - + %1 plays %2%3 face down. - + %1 plays %2%3. %1 pelaa kortin %2%3. - + %1 moves %2%3 to custom zone '%4' face down. - + %1 moves %2%3 to custom zone '%4'. - + %1 tries to draw from an empty library - + %1 draws %2 card(s). - + %1 is looking at %2. %1 is looking at %2. - + %1 is looking at the %4 %3 card(s) %2. top card for singular, top %3 cards for plural - + bottom - + top - + %1 turns %2 face-down. %1 turns %2 face-down. - + %1 turns %2 face-up. %1 turns %2 face-up. - + The game has been closed. Peli on suljettu. - + The game has started. Peli alkaa. - + You are flooding the game. Please wait a couple of seconds. - + %1 has joined the game. %1 on liittynyt peliin. - + %1 is now watching the game. %1 seuraa peliä. - + You have been kicked out of the game. Sinut on kickattu pois pelistä. - + %1 has left the game (%2). %1 on lähtenyt pelistä. (%2). - + %1 is not watching the game any more (%2). %1 ei enää seuraa peliä (%2) - + %1 is not ready to start the game any more. %1 ei ole enää valmis aloittamaan peliä. - + %1 shuffles their deck and draws a new hand of %2 card(s). - + %1 shuffles their deck and draws a new hand. %1 sekoittaa pakkansa ja nostaa uuden käden. - + You are watching a replay of game #%1. Katsot pelin #%1 replayta. - + %1 is ready to start the game. %1 on valmis aloittamaan pelin. - + cards an unknown amount of cards cards - + %1 card(s) a card for singular, %1 cards for plural - + %1 lends %2 to %3. - + %1 reveals %2 to %3. %1 reveals %2 to %3. - + %1 reveals %2. %1 reveals %2. - + %1 randomly reveals %2%3 to %4. %1 randomly reveals %2%3 to %4. - + %1 randomly reveals %2%3. %1 randomly reveals %2%3. - + %1 peeks at face down card #%2. %1 peeks at face down card #%2. - + %1 peeks at face down card #%2: %3. %1 peeks at face down card #%2: %3. - + %1 reveals %2%3 to %4. %1 reveals %2%3 to %4. - + %1 reveals %2%3. %1 reveals %2%3. - + %1 reversed turn order, now it's %2. %1 käänsi vuorojärjestyksen; nyt se on %2. - + reversed käänteinen - + normal normaali - + Heads Kruuna - + Tails Klaava - + %1 flipped a coin. It landed as %2. %1 heitti kolikkoa ja tulokseksi tuli %2. - + %1 rolls a %2 with a %3-sided die. %1 heitti tuloksen %2. %3 -sivuisella nopalla - + %1 flips %2 coins. There are %3 heads and %4 tails. - + %1 rolls a %2-sided dice %3 times: %4. - + %1's turn. %1n vuoro. - + %1 sets annotation of %2 to %3. %1 sets annotation of %2 to %3. - - %1 places %2 %3%4 counter(s) on %5 (now %6). + + %1 places %2 "%3" counter(s) on %4 (now %5). - - %1 removes %2 %3%4 counter(s) from %5 (now %6). + + %1 removes %2 "%3" counter(s) from %4 (now %5). - - %1 failed to undo their last draw. - - - - + %1 sets counter %2 to %3 (%4%5). %1 asettaa countterin %2 arvoon %3 (%4%5). - + %1 sets %2 to not untap normally. %1 sets %2 to not untap normally. - + %1 sets %2 to untap normally. %1 sets %2 to untap normally. - + %1 removes the PT of %2. %1 removes the PT of %2. - + %1 changes the PT of %2 from nothing to %4. %1 changes the PT of %2 from nothing to %4. - + %1 changes the PT of %2 from %3 to %4. %1 changes the PT of %2 from %3 to %4. - + %1 has locked their sideboard. %1 on lukinnut sideboardinsa. - + %1 has unlocked their sideboard. %1 on avannut sideboardinsa. - + %1 taps their permanents. %1 täppää kaikki permanentit. - + %1 untaps their permanents. %1 untäppää kaikki permanentit. - + %1 taps %2. %1 täppää kortin %2. - + %1 untaps %2. %1 untäppää kortin %2. - + %1 shuffles %2. %1 sekoittaa %2. - + %1 shuffles the bottom %3 cards of %2. %1 shuffles the bottom %3 cards of %2. - + %1 shuffles the top %3 cards of %2. %1 shuffles the top %3 cards of %2. - + %1 shuffles cards %3 - %4 of %2. %1 shuffles cards %3 - %4 of %2. - + %1 unattaches %2. %1 irrottaa kortin %2. - + %1 undoes their last draw. %1 peruuttaa viimeisimmän kortinnostonsa. - + %1 undoes their last draw (%2). %1 peruuttaa viimeisimmän kortinnostonsa. (%2). @@ -6377,115 +6285,110 @@ Cockatrice will now reload the card database. MessagesSettingsPage - + Word1 Word2 Word3 Word1 Word2 Word3 - + Add New Message - + Edit Message - + Remove Message - + Add message Lisää viesti - - + + Message: Viesti: - + Edit message Edit message - + Chat settings Keskusteluasetukset - + Custom alert words Custom alert words - + Enable chat mentions Salli keskustelumaininnat - + Enable mention completer Enable mention completer - + In-game message macros Pelinsisäiset viestimakrot - + How to use in-game message macros - + Ignore chat room messages sent by unregistered users Ignore chat room messages sent by unregistered users - + Ignore private messages sent by unregistered users Ignore private messages sent by unregistered users - - Ignore private messages sent by non-buddy users - - - - - + + Invert text color Käänteinen tekstin väri - + Enable desktop notifications for private messages Enable desktop notifications for private messages - + Enable desktop notification for mentions Enable desktop notification for mentions - + Enable room message history on join Enable room message history on join - - + + (Color is hexadecimal) (Väri on heksadesimaaliluku) - + Separate words with a space, alphanumeric characters only Separate words with a space, alphanumeric characters only @@ -6493,42 +6396,42 @@ Cockatrice will now reload the card database. MoveMenu - + Move to - + &Top of library in random order - + X cards from the top of library... - + &Bottom of library in random order - + T&able - + &Hand - + &Graveyard - + &Exile @@ -6541,47 +6444,47 @@ Cockatrice will now reload the card database. Card Type - + Mana Value - + Color(s) Color(s) - + Loyalty Loyalty - + Main Card Type Main Card Type - + Mana Cost Mana Cost - + P/T P/T - + Side Side - + Layout Layout - + Color Identity Color Identity @@ -6604,152 +6507,6 @@ Cockatrice will now reload the card database. - - PaletteEditorDialog - - - - Reset - - - - - - Apply - - - - - - Save && Apply - - - - - ▼ Edit Palette - - - - - - ▶ Edit Palette - - - - - Palette Editor — %1 - - - - - <b>Palette Editor</b> &nbsp;·&nbsp; %1 - - - - - This theme ships no default palette files - - - - - Replace current colours with the theme author's defaults - - - - - Switch between the light and dark palette files - - - - - Editing: - - - - - Show or hide the per-role colour grid for manual tweaks - - - - - ↺ Revert to theme default - - - - - Discard unsaved edits and restore the last saved palette - - - - - Preview this palette without saving to disk - - - - - Write palette-%1.toml and reload the theme - - - - - Cannot save: this theme has no directory on disk - - - - - Save failed - - - - - Could not write %1 to: -%2 - - - - - No default found - - - - - No default palette file found for the "%1" scheme. - - - - - PaletteGridWidget - - - Active - - - - - Disabled - - - - - Inactive - - - - - Normal interactive state - - - - - Widget is disabled / not interactive - - - - - Window is in background / unfocused - - - Phase @@ -6816,57 +6573,57 @@ Cockatrice will now reload the card database. PhasesToolbar - + Untap step Untap-kohta - + Upkeep step Upkeep-kohta - + Draw step Nostokohta - + First main phase First main phase - + Beginning of combat step Beginning of combat step - + Declare attackers step Declare attackers step - + Declare blockers step Declare blockers step - + Combat damage step Combat damage step - + End of combat step End of combat step - + Second main phase Second main phase - + End of turn step End of turn step @@ -6874,7 +6631,7 @@ Cockatrice will now reload the card database. PictureLoader - + en code for scryfall's language property, not available for all languages @@ -6883,142 +6640,151 @@ Cockatrice will now reload the card database. PlayerActions - - - - - grave - - - - - - - - exile - - - - - PlayerDialogs - - + View top cards of library - - - - - - - - - + + + + + + + + + Number of cards: (max. %1) - + View bottom cards of library - + Shuffle top cards of library - + Shuffle bottom cards of library - + Draw hand - + 0 and lower are in comparison to current hand size - + Draw cards - + + + + + grave + + + + + + + + exile + + + + Move top cards to %1 - + Move bottom cards to %1 - + Draw bottom cards - + + + C&reate another %1 token + + + + Create tokens - + + Number: - + Place card X cards from top of library - + Which position should this card be placed: - + (max. %1) - + Change power/toughness - + Change stats to: - + Set annotation - + Please enter the new annotation: + + + Set counters + + PlayerMenu - + Player "%1" - + &Counters @@ -7048,7 +6814,7 @@ This setting means you'll only see the default printing for each card, instead o - + Printing Selector @@ -7056,22 +6822,22 @@ This setting means you'll only see the default printing for each card, instead o PrintingSelectorCardOverlayWidget - + Preference - + Pin Printing - + Unpin Printing - + Show Related cards @@ -7142,57 +6908,57 @@ This setting means you'll only see the default printing for each card, instead o PtMenu - + Power / toughness - + &Increase power - + &Decrease power - + I&ncrease toughness - + D&ecrease toughness - + In&crease power and toughness - + Dec&rease power and toughness - + Increase power and decrease toughness - + Decrease power and increase toughness - + Set &power and toughness... - + Reset p&ower and toughness @@ -7200,37 +6966,37 @@ This setting means you'll only see the default printing for each card, instead o QMenuBar - + Services Services - + Hide %1 Hide %1 - + Hide Others Hide Others - + Show All Show All - + Preferences... Preferences... - + Quit %1 Quit %1 - + About %1 About %1 @@ -7238,17 +7004,17 @@ This setting means you'll only see the default printing for each card, instead o QObject - + Cockatrice card database (*.xml) Cockatrice card database (*.xml) - + All files (*.*) All files (*.*) - + Cockatrice replays (*.cor) Cockatrice replays (*.cor) @@ -7308,177 +7074,110 @@ Are you sure you would like to disable this feature? QPlatformTheme - + OK OK - + Save Save - + Save All Save All - + Open Avaa - + &Yes &Yes - + Yes to &All Yes to &All - + &No &Ei - + N&o to All N&o to All - + Abort Abort - + Retry Retry - + Ignore Sivuuta - + Close Close - + Cancel Cancel - + Discard Discard - + Help Help - + Apply Apply - + Reset Nollaa - + Restore Defaults Restore Defaults - - QuickSetupPanel - - - %1% - - - - - <b>Quick Setup</b> - - - - - Generate all palette roles automatically from a single accent colour - - - - - Accent: - - - - - Primary hue. Used directly for highlights and links. -At high intensity it also tints buttons and backgrounds. - - - - - Intensity: - - - - - Subtle - - - - - Full colour - - - - - 0–30 Subtle tint — only highlights and links change hue -30–70 Accented — buttons, tooltips, and borders join in -70–100 Full colour — backgrounds, everything - - - - - 70% - - - - - Generate ↓ - - - - - Derive all palette roles from the accent colour above. -Fine-tune individual colours in the grid afterwards. - - - RemoteDeckList_TreeModel - + Name Nimi - + ID ID - + Upload time Upload time @@ -7486,32 +7185,32 @@ Fine-tune individual colours in the grid afterwards. RemoteReplayList_TreeModel - + ID ID - + Name Nimi - + Players Players - + Keep Keep - + Time started Time started - + Duration (sec) Duration (sec) @@ -7519,37 +7218,37 @@ Fine-tune individual colours in the grid afterwards. RfgMenu - + &Exile - + &View exile - + &Move exile to... - + &Top of library - + &Bottom of library - + &Hand - + &Graveyard @@ -7595,7 +7294,7 @@ Fine-tune individual colours in the grid afterwards. SayMenu - + S&ay @@ -7636,27 +7335,27 @@ Fine-tune individual colours in the grid afterwards. SetsModel - + Enabled Enabled - + Set type Set type - + Set code Set code - + Long name Long name - + Release date Release date @@ -7664,53 +7363,53 @@ Fine-tune individual colours in the grid afterwards. ShortcutSettingsPage - - + + Restore all default shortcuts Restore all default shortcuts - + Do you really want to restore all default shortcuts? Do you really want to restore all default shortcuts? - + Clear all default shortcuts Clear all default shortcuts - + Do you really want to clear all shortcuts? Do you really want to clear all shortcuts? - + Section: Section: - + Action: Action: - + Shortcut: Shortcut: - + How to set custom shortcuts How to set custom shortcuts - + Clear all shortcuts - + Search by shortcut name @@ -7766,12 +7465,12 @@ Please check your shortcut settings! SideboardMenu - + &Sideboard - + &View sideboard @@ -7779,27 +7478,27 @@ Please check your shortcut settings! SoundSettingsPage - + Enable &sounds Enable &sounds - + Current sounds theme: Current sounds theme: - + Test system sound engine Test system sound engine - + Sound settings Sound settings - + Master volume Master volume @@ -7871,146 +7570,16 @@ Please check your shortcut settings! Invalid reply received from the release update server. - + No reply received from the tag update server. No reply received from the tag update server. - + Invalid reply received from the tag update server. Invalid reply received from the tag update server. - - StorageSettingsPage - - - - - Success - - - - - Cached card pictures have been reset. - - - - - Downloaded card pictures have been reset. - - - - - Error - - - - - One or more downloaded card pictures could not be cleared. - - - - - In-memory (currently loaded) card pictures have been reset. - - - - - Card Picture Loader Caching Method: - - - - - The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size. - - - - - Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while. - - - - - This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk. - - - - - Delete Cached Images - - - - - Delete Saved Images - - - - - Clear In-Memory Images - - - - - Card Picture Loader Cache Method - - - - - Network Cache - - - - - Filesystem - - - - - In-Memory Picture Cache - - - - - Network Cache Size: - - - - - On-disk cache for downloaded pictures - - - - - Redirect Cache TTL: - - - - - How long cached redirects for urls are valid for. - - - - - Picture Cache Size: - - - - - In-memory cache for pictures not currently on screen - - - - - Naming scheme: - - - - - Day(s) - - - TabAccount @@ -8146,117 +7715,117 @@ Please check your shortcut settings! TabArchidekt - - + + Desc. - - + + AND - - + + Require ALL selected colors - - + + Deck name... - - + + Owner... - - + + Packages - - + + Advanced Filters - + Bracket: - - + + Any - - + + Contains card... - - + + Commander... - - + + Tag... - - + + Deck Size - + Cards: - - + + Asc. - + Sort by: - + Filter by: - + Display Settings - - + + Search - - + + Formats @@ -8266,54 +7835,6 @@ Please check your shortcut settings! - - TabCardArtRules - - - Card: - - - - - ProviderId: - - - - - Mode: - - - - - Reason: - - - - - Type a card name... - - - - - Add rule - - - - - Remove rule - - - - - Refresh - - - - - Card Art Rules - - - TabDeckEditor @@ -8362,7 +7883,7 @@ Please check your shortcut settings! Reset layout - + Deck: %1 Deck: %1 @@ -8370,49 +7891,55 @@ Please check your shortcut settings! TabDeckEditorVisual - + Visual Deck: %1 - + &Visual Deck Editor - - + + Card Info - - + + Deck - + + + Filters + + + + &View - + Printing - + Visible - + Floating - + Reset layout @@ -8420,22 +7947,22 @@ Please check your shortcut settings! TabDeckEditorVisualTabWidget - + Visual Deck View - + Visual Database Display - + Deck Analytics - + Sample Hand @@ -8443,134 +7970,134 @@ Please check your shortcut settings! TabDeckStorage - + Local file system Local file system - + Server deck storage Server deck storage - - + + Open in deck editor Open in deck editor - + Rename deck or folder - + Upload deck Upload deck - + Download deck Download deck + - - - + + New folder New folder + - Delete Delete - + Open decks folder - + Rename local folder - + Rename local file - + New name: - - - - + + + + Error - + Rename failed - - + + Invalid deck file - + Enter deck name Enter deck name - + This decklist does not have a name. Please enter a name: This decklist does not have a name. Please enter a name: - + Unnamed deck Unnamed deck - + Failed to upload deck to server - + Delete local file Delete local file - + Are you sure you want to delete the selected files? - + Delete remote decks - + Are you sure you want to delete the selected decks? - - + + Name of new folder: Name of new folder: @@ -8642,191 +8169,191 @@ Please enter a name: TabGame - - - + + + Replay Replay - - + + Game Game - - + + Player List Player List - - + + Card Info Card Info - - + + Messages Messages - - + + Replay Timeline Replay Timeline - + &Phases &Phases - + &Game &Game - + Next &phase Next &phase - + Next phase with &action Next phase with &action - + Next &turn Next &turn - + Reverse turn order Käännä vuorojärjestys - + &Remove all local arrows &Remove all local arrows - + Rotate View Cl&ockwise Rotate View Cl&ockwise - + Rotate View Co&unterclockwise Rotate View Co&unterclockwise - + Game &information Game &information - + Un&concede - - - + + + &Concede &Concede - + &Leave game &Leave game - + C&lose replay C&lose replay - + &Focus Chat &Focus Chat - + &Say: &Say: - + Selected cards - + &View &View - + Visible Visible - + Floating Floating - + Reset layout Reset layout - + Concede Concede - + Are you sure you want to concede this game? Are you sure you want to concede this game? - + Unconcede Unconcede - + You have already conceded. Do you want to return to this game? You have already conceded. Do you want to return to this game? - + Leave game Poistu pelistä - + Are you sure you want to leave this game? Haluatko varmasti poistua pelistä? - + A player has joined game #%1 Pelaaja on littynyt peliin #%1 - + %1 has joined the game - + You have been kicked out of the game. You have been kicked out of the game. @@ -8885,115 +8412,115 @@ Please enter a name: You have to select a valid number of days to locate. - + Username: Käyttäjätunnus: - + IP Address: IP-osoite: - + Game Name: Pelin Nimi: - + GameID: Peli-ID: - + Message: Viesti: - + Main Room Main Room - + Game Room Game Room - + Private Chat Private Chat - + Past X Days: Past X Days: - + Today Tänään - + Last Hour Last Hour - + Maximum Results: Maximum Results: - + At least one filter is required. The more information you put in, the more specific your results will be. At least one filter is required. The more information you put in, the more specific your results will be. - + Get User Logs Get User Logs - + Clear Filters Clear Filters - + Filters Filters - + Log Locations Log Locations - + Date Range Date Range - + Maximum Results Maximum Results - - + + Message History Message History - + Failed to collect message history information. Failed to collect message history information. - + There are no messages for the selected filters. There are no messages for the selected filters. @@ -9011,27 +8538,27 @@ The more information you put in, the more specific your results will be.&Leave - + %1 - Private chat %1 - Private chat - + This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. - + Private message from Private message from - + %1 has left the server. %1 has left the server. - + %1 has joined the server. %1 has joined the server. @@ -9039,180 +8566,180 @@ The more information you put in, the more specific your results will be. TabReplays - + Local file system Local file system - + Server replay storage Server replay storage - - + + Watch replay Watch replay - + Rename - - + + New folder - - + + Delete Delete - + Open replays folder - + Download replay Download replay - + Toggle expiration lock Toggle expiration lock - + Get replay share code - - + + Look up replay by share code - + Rename local folder - + Rename local file - + New name: - + Error - + Rename failed - + Name of new folder: - + Delete local file Delete local file - + Are you sure you want to delete the selected files? - + Are you sure you want to delete the selected replays? - + Failed to get code - - + + Either this server does not support replay sharing, or does not permit replay sharing for you. - - - + + + Failed - + Could not get replay code - + Replay Share Code - + Others can use this code to add the replay to their list of remote replays: %1 - + Copy to clipboard - + Replay share code - + Replay code found - + Replay was added, or you already had access to it. - + Replay code not found - + Failed to submit code - + Unexpected error - + Delete remote replay Delete remote replay @@ -9225,62 +8752,47 @@ The more information you put in, the more specific your results will be. TabRoom - - Friends - - - - - Online - - - - - Ignored - - - - + &Say: &Say: - + Chat Chat - + &Room &Room - + &Leave room &Leave room - + &Clear chat &Clear chat - + Chat Settings... Chat Settings... - + mentioned you. mentioned you. - + Click to view Click to view - + You are flooding the chat. Please wait a couple of seconds. You are flooding the chat. Please wait a couple of seconds. @@ -9293,30 +8805,30 @@ The more information you put in, the more specific your results will be.Server - - - - + + + + Error Virhe - + Failed to join the server room: it doesn't exist on the server. - + The server thinks you are in the server room but your client is unable to display it. Try restarting your client. - + You do not have the required permission to join this server room. - + Failed to join the server room due to an unknown error: %1. @@ -9324,97 +8836,97 @@ The more information you put in, the more specific your results will be. TabSupervisor - + Deck Editor - + Visual Deck Editor - + EDHRec - + Archidekt - + Home - + &Visual Deck Storage - + Visual Database Display - + Server - + Account - + Deck Storage - + Game Replays - + Administration - + Logs - + Are you sure? Oletko varma? - + There are still open games. Are you sure you want to quit? There are still open games. Are you sure you want to quit? - + Click to view Click to view - + Your buddy %1 has signed on! Your buddy %1 has signed on! - + Unknown Event Tuntematon Tapahtuma - + The server has sent you a message that your client does not understand. This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. @@ -9425,39 +8937,39 @@ This message might mean there is a new version of Cockatrice available or this s To update your client, go to Help -> Check for Updates. - + Idle Timeout Idle Timeout - + You are about to be logged out due to inactivity. You are about to be logged out due to inactivity. - + Promotion Promotion - + You have been promoted. Please log out and back in for changes to take effect. You have been promoted. Please log out and back in for changes to take effect. - + Warned Warned - + You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. - + You have received the following message from the server. (custom messages like these could be untranslated) You have received the following message from the server. @@ -9467,12 +8979,12 @@ Please refrain from engaging in this activity or further actions may be taken ag TabVisualDatabaseDisplay - + Database Display - + Visual Database Display @@ -9511,42 +9023,42 @@ Please refrain from engaging in this activity or further actions may be taken ag TranslateCounterName - + Life Life - + White Valkoinen - + Blue Sininen - + Black Musta - + Red Punainen - + Green Vihreä - + Colorless Väritön - + Other Muu @@ -9554,69 +9066,11 @@ Please refrain from engaging in this activity or further actions may be taken ag UpdateDownloader - + Could not open the file for reading. Could not open the file for reading. - - UserCardArtSettingsDialog - - - Card Art Settings - - - - - Type a card name... - - - - - Card name: - - - - - Card ProviderId: - - - - - Left margin (%): - - - - - Right margin (%): - - - - - Vertical offset: - - - - - Zoom: - - - - - Parameters - - - - - Preview - - - - - Remove Banner Card - - - UserContextMenu @@ -9734,7 +9188,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Ban History Ban History @@ -9749,87 +9203,77 @@ Please refrain from engaging in this activity or further actions may be taken ag User has never been banned. - + Failed to collect ban information. Failed to collect ban information. - - - + + + Warning History Warning History - + Warning Time;Moderator;User Name;Reason Warning Time;Moderator;User Name;Reason - + User has never been warned. User has never been warned. - + Failed to collect warning information. Failed to collect warning information. - + Failed to get admin notes. - - + + Success Success - + Successfully promoted user. Successfully promoted user. - + Successfully demoted user. Successfully demoted user. - - Kick Player - - - - - Are you sure you want to kick this player from the game? - - - - - - + + + Failed Failed - + Failed to promote user. Failed to promote user. - + Failed to demote user. Failed to demote user. - + Copy hash to clipboard Copy hash to clipboard - + Remove this user's messages @@ -9837,554 +9281,326 @@ Please refrain from engaging in this activity or further actions may be taken ag UserInfoBox - + Location: Location: - + Account Age: Account Age: - + Edit Muokkaa - + Change password Vaihda Salasana - + Change avatar Vaihda avatar - + Administrator Administrator - + Moderator Moderator - + Registered user Registered user - - + + Unregistered user Unregistered user - + Judge Judge - + Unknown Unknown - + The entered password does not match your account. - - - - + + + Information Information - + User information updated. User information updated. - - - - - - - - - - - + + + + + + + + + + Error Virhe - + User Information - + Real Name: - + User Level: - - - Edit Banner Card - - - + %n Year(s), amount of years (only shown if more than 0) - + %10%n Day(s) %20 amount of years (if more than 0), amount of days, date in local short format - + Enter Password - + Password verification is required in order to change your email address - - - + + + An error occurred while trying to update your user information. - - The selected card is blacklisted on this server or another error occurred. - - - - - Banner card removed. - - - - - Banner card updated. - - - - + This server does not permit you to update your user informations. This server does not permit you to update your user informations. - + Password changed. Password changed. - + This server does not permit you to change your password. This server does not permit you to change your password. - + The new password is too short. The new password is too short. - + The old password is incorrect. The old password is incorrect. - + Avatar updated. Avatar updated. - + This server does not permit you to update your avatar. This server does not permit you to update your avatar. - - - An error occured while trying to update your avatar. - - - This server does not permit you to update your user informations. - An error occured while trying to updater your avatar. - This server does not permit you to update your user informations. - - - - UserInfoPopup - - - - Games - - - - - Chat - - - - - Open private chat - - - - - Profile - - - - - View user profile - - - - - Show this user's games - - - - - − Buddy - - - - - Remove from buddy list - - - - - + Buddy - - - - - Add to buddy list - - - - - − Ignore - - - - - Remove from ignore list - - - - - + Ignore - - - - - Add to ignore list - - - - - Ban - - - - - Ban from server - - - - - Warn - - - - - Warn user - - - - - Ban log - - - - - View ban history - - - - - Warn log - - - - - View warning history - - - - - Notes - - - - - View admin notes - - - - - − Mod - - - - - Demote from moderator - - - - - + Mod - - - - - Promote to moderator - - - - - − Judge - - - - - Demote from judge - - - - - + Judge - - - - - Promote to judge - - - - - Join game - - - - - Spectate - - - - - - Loading games… - - - - - Could not load games. - - - - - No active games. - + An error occured while trying to updater your avatar. + An error occured while trying to updater your avatar. UserInterfaceSettingsPage - + General interface settings General interface settings - + &Double-click cards to play them (instead of single-click) &Double-click cards to play them (instead of single-click) - + &Clicking plays all selected cards (instead of just the clicked card) - + &Play all nonlands onto the stack (not the battlefield) by default &Play all nonlands onto the stack (not the battlefield) by default - + Do not delete &arrows inside of subphases - + Close card view window when last card is removed - + Auto focus search bar when card view window is opened - + Annotate card text on tokens Annotate card text on tokens - - Show selection count during drag selection + + Show selection counter during drag selection - - Show total selection count + + Show total selection counter - - Show subtype breakdown in selection tally - - - - + Use tear-off menus, allowing right click menus to persist on screen Use tear-off menus, allowing right click menus to persist on screen - - Keep game chat focused when clicking in game (Note: disables card view search bar) - - - - + Notifications settings Ilmoitusasetukset - + Enable notifications in taskbar Ota tehtäväpalkin ilmoitukset käyttöön - + Notify in the taskbar for game events while you are spectating Notify in the taskbar for game events while you are spectating - + Notify in the taskbar when users in your buddy list connect Notify in the taskbar when users in your buddy list connect - + Animation settings Animaatioasetukset - + &Tap/untap animation &Tap/untap animation - + Deck editor/storage settings - + Open deck in new tab by default - + Use visual deck storage in game lobby - + Use selection animation for Visual Deck Storage - + When adding a tag in the visual deck storage to a .txt deck: - + do nothing - + ask to convert to .cod - + always convert to .cod - + Default deck editor type - + Classic Deck Editor - + Visual Deck Editor - + Replay settings - + Buffer time for backwards skip via shortcut: @@ -10392,22 +9608,22 @@ Please refrain from engaging in this activity or further actions may be taken ag UserListWidget - + Users connected to server: %1 - + Users in this room: %1 - + Buddies online: %1 / %2 - + Ignored users online: %1 / %2 @@ -10415,45 +9631,35 @@ Please refrain from engaging in this activity or further actions may be taken ag UtilityMenu - + Increment all card counters - + &Untap all permanents - + R&oll die... - - Flip coin - - - - + &Create token... - + C&reate another token - + Cr&eate predefined token - - - C&reate another %1 token - - VisualDatabaseDisplayColorFilterWidget @@ -10505,72 +9711,72 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFilterToolbarWidget - + Sort by - + Filter by - + Save and load filters - + Filter by exact card name - + Filter by card main-type - + Filter by card sub-type - + Filter by set - + Filter by format legality - + Save/Load - + Name - + Main Type - + Sub Type - + Sets - + Formats @@ -10578,22 +9784,22 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFormatLegalityFilterWidget - + Show formats with at least: - + cards - + Do not display formats with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) @@ -10611,32 +9817,32 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayMainTypeFilterWidget - + Show main types with at least: - + cards - + Do not display card main-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10644,27 +9850,27 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayNameFilterWidget - + Filter by name... (Exact match) - + Load from Deck - + Apply all card names in currently loaded deck as exact match name filters - + Load from Clipboard - + Apply all card names in clipboard as exact match name filters @@ -10672,7 +9878,7 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayRecentSetFilterSettingsWidget - + Filter to most recent sets @@ -10680,19 +9886,19 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySetFilterWidget - + Search sets... - - + + Mode: Exact Match - - + + Mode: Includes @@ -10700,37 +9906,37 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySubTypeFilterWidget - + Search subtypes... - + Show sub types with at least: - + cards - + Do not display card sub-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10738,23 +9944,23 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayWidget - + Search by card name (or search expressions) - + Visual - + Loading database ... - + Clear all filters @@ -10793,17 +9999,17 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Toggle Layout: Overlap - + Change how cards are displayed within zones (i.e. overlapped or fully visible.) - + Toggle Layout: Flat @@ -10832,17 +10038,17 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDeckEditorWidget - + Type a card name here for suggestions from the database... - + Quick search and add card - + Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter @@ -10960,43 +10166,43 @@ Please refrain from engaging in this activity or further actions may be taken ag WarningDialog - + Which warning would you like to send? Which warning would you like to send? - + Redact all messages from this user in all rooms - + &OK &OK - + &Cancel &Cancel - + Warn user for misconduct Warn user for misconduct - - + + Error Virhe - + User name to send a warning to can not be blank, please specify a user to warn. User name to send a warning to can not be blank, please specify a user to warn. - + Warning to use can not be blank, please select a valid warning to send. Warning to use can not be blank, please select a valid warning to send. @@ -11004,133 +10210,133 @@ Please refrain from engaging in this activity or further actions may be taken ag WndSets - + Move selected set to the top Move selected set to the top - + Move selected set up Move selected set up - + Move selected set down Move selected set down - + Move selected set to the bottom Move selected set to the bottom - + Search by set name, code, or type Search by set name, code, or type - + Default order Default order - + Restore original art priority order Restore original art priority order - + Enable all sets Enable all sets - + Disable all sets Disable all sets - + Enable selected set(s) Enable selected set(s) - + Disable selected set(s) Disable selected set(s) - + Deck Editor Deck Editor - + Use CTRL+A to select all sets in the view. - + Only cards in enabled sets will appear in the card list of the deck editor. - + Image priority is decided in the following order: - + first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) %1 is a link to the wiki - + Include cards rebalanced for Alchemy [requires restart] - + Card Art Card Art - + How to use custom card art How to use custom card art - + Hints Hints - + Note Note - + Sorting by column allows you to find a set while not changing set priority. Sorting by column allows you to find a set while not changing set priority. - + To enable ordering again, click the column header until this message disappears. To enable ordering again, click the column header until this message disappears. - + Use the current sorting as the set priority instead Use the current sorting as the set priority instead - + Sorts the set priority using the same column Sorts the set priority using the same column - + Manage sets Manage sets @@ -11138,72 +10344,72 @@ Please refrain from engaging in this activity or further actions may be taken ag ZoneViewWidget - + Search by card name (or search expressions) - + Ungrouped - + Group by Type - + Group by Mana Value - + Group by Color - + Unsorted - + Sort by Name - + Sort by Type - + Sort by Mana Cost - + Sort by Colors - + Sort by P/T - + Sort by Set - + shuffle when closing shuffle when closing - + pile view pile view @@ -11211,7 +10417,7 @@ Please refrain from engaging in this activity or further actions may be taken ag i18n - + English Suomi (Finnish) @@ -11219,12 +10425,12 @@ Please refrain from engaging in this activity or further actions may be taken ag main - + Connect on startup Connect on startup - + Debug to file Debug to file @@ -11238,7 +10444,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Deck Editor Deck Editor @@ -11319,7 +10525,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Replays @@ -11434,129 +10640,129 @@ Please refrain from engaging in this activity or further actions may be taken ag Load Deck... - - + + Load Deck from Clipboard... Load Deck from Clipboard... - + Edit Deck in Clipboard, Annotated - + Edit Deck in Clipboard - + New Deck New Deck - + Open Custom Pictures Folder Open Custom Pictures Folder - + Print Deck... Print Deck... - + Delete Card Delete Card - - + + Reset Layout Reset Layout - + Save Deck Tallenna Pakka - + Save Deck as... Save Deck as... - + Save Deck to Clipboard, Annotated Save Deck to Clipboard, Annotated - + Save Deck to Clipboard, Annotated (No Set Info) - + Save Deck to Clipboard Save Deck to Clipboard - + Save Deck to Clipboard (No Set Info) - + Load Local Deck... Load Local Deck... - + Load Remote Deck... Load Remote Deck... - + Set Ready to Start Set Ready to Start - + Toggle Sideboard Lock Toggle Sideboard Lock - + Add Green Counter Add Green Counter - + Remove Green Counter Remove Green Counter - + Set Green Counters... Set Green Counters... - + Add Red Counter Add Red Counter - + Remove Red Counter Remove Red Counter - + Set Red Counters... Set Red Counters... - + Add Life Counter Add Life Counter @@ -11566,744 +10772,724 @@ Please refrain from engaging in this activity or further actions may be taken ag - - Load deck from online service... - - - - - Load from website... - - - - + Unload Deck - + Force Start - + Add Card Counter (F) - + Remove Card Counter (F) - + Set Card Counters (F)... - + Add Card Counter (E) - + Remove Card Counter (E) - + Set Card Counters (E)... - + Add Card Counter(D) - + Remove Card Counter (D) - + Set Card Counters (D)... - + Add Card Counter (C) - + Remove Card Counter (C) - + Set Card Counters (C)... - + Add Card Counter (B) - + Remove Card Counter (B) - + Set Card Counters (B)... - + Add Card Counter (A) - + Remove Card Counter (A) - + Set Card Counters (A)... - + Remove Life Counter Remove Life Counter - + Set Life Counters... Set Life Counters... - + Add White Counter Add White Counter - + Remove White Counter Remove White Counter - + Set White Counters... Set White Counters... - + Add Blue Counter Add Blue Counter - + Remove Blue Counter Remove Blue Counter - + Set Blue Counters... Set Blue Counters... - + Add Black Counter Add Black Counter - + Remove Black Counter Remove Black Counter - + Set Black Counters... Set Black Counters... - + Add Colorless Counter Add Colorless Counter - + Remove Colorless Counter Remove Colorless Counter - + Set Colorless Counters... Set Colorless Counters... - + Add Other Counter - + Remove Other Counter - + Set Other Counters... - + Increment all card counters - + Add Power (+1/+0) Add Power (+1/+0) - + Remove Power (-1/-0) Remove Power (-1/-0) - + Move Toughness to Power (+1/-1) Move Toughness to Power (+1/-1) - + Add Toughness (+0/+1) Add Toughness (+0/+1) - + Remove Toughness (-0/-1) Remove Toughness (-0/-1) - + Move Power to Toughness (-1/+1) Move Power to Toughness (-1/+1) - + Add Power and Toughness (+1/+1) Add Power and Toughness (+1/+1) - + Remove Power and Toughness (-1/-1) Remove Power and Toughness (-1/-1) - + Set Power and Toughness... Set Power and Toughness... - + Reset Power and Toughness Reset Power and Toughness - + Untap Untap - + Upkeep Upkeep - + Draw Draw - + First Main Phase First Main Phase - + Start Combat Start Combat - + Attack Attack - + Block Block - + Damage Damage - + End Combat End Combat - + Second Main Phase Second Main Phase - + End End - + Next Phase Next Phase - + Next Phase Action Next Phase Action - + Next Turn Next Turn - + Hide Card in Reveal Window - + Tap / Untap Card Tap / Untap Card - + Untap All Untap All - + Toggle Skip Untapping Toggle Untap - + Turn Card Over Turn Card Over - + Peek Card Peek Card - + Play Card Play Card - + Play Card, Face Down - + Attach Card... Attach Card... - + Unattach Card Unattach Card - + Clone Card Clone Card - + Create Token... Create Token... - + Create All Related Tokens Create All Related Tokens - + Create Another Token Create Another Token - + Set Annotation... Set Annotation... - - Reduce Life by Power - - - - + Select All Cards in Zone - + Select All Cards in Row - + Select All Cards in Column - + Reveal Selected Cards to All Players - - + + Bottom of Library Bottom of Library - - - - + + + + Exile Exile - - - - + + + + Graveyard Graveyard - - + + Hand Hand - - + + Top of Library Top of Library - - + + Battlefield, Face Down Battlefield, Face Down - + Battlefield Battlefield - + Library Library - + Sideboard Sideboard - + Top Cards of Library Top Cards of Library - + Bottom Cards of Library - + Close Recent View Close Recent View - - + + Stack Stack - - + + Graveyard (Multiple) Graveyard (Multiple) - - + + Graveyard (Multiple), Face Down - - + + Exile (Multiple) Exile (Multiple) - - + + Exile (Multiple), Face Down - + Stack Until Found - + Draw Bottom Card - + Draw Multiple Cards from Bottom... - + Draw Arrow... Draw Arrow... - + Remove Local Arrows Remove Local Arrows - + Leave Game Leave Game - + Concede Concede - + Roll Dice... Roll Dice... - - Flip Coin - - - - + Shuffle Library Shuffle Library - + Shuffle Top Cards of Library - + Shuffle Bottom Cards of Library - + Mulligan Mulligan - + Mulligan (Same hand size) - + Mulligan (Hand size - 1) - + Draw a Card Draw a Card - + Draw Multiple Cards... Draw Multiple Cards... - + Undo Draw Undo Draw - + Always Reveal Top Card Always Reveal Top Card - + Always Look At Top Card - + Sort Hand by Name - + Sort Hand by Type - + Sort Hand by Mana Value - + Reveal Hand to All Players - + Reveal Random Card to All Players - + Rotate View Clockwise Rotate View Clockwise - + Rotate View Counterclockwise Rotate View Counterclockwise - + Unfocus Text Box Unfocus Text Box - + Focus Chat Focus Chat - + Clear Chat Clear Chat - + Refresh Refresh - + Skip Forward - + Skip Backward - + Skip Forward by a lot - + Skip Backward by a lot - + Play/Pause - + Toggle Fast Forward - + Home - + Visual Deck Storage - + Deck Storage - + Server - + Account - + Administration - + Logs diff --git a/cockatrice/translations/cockatrice_fr.ts b/cockatrice/translations/cockatrice_fr.ts index c85b6fbdd..f50d3afd6 100644 --- a/cockatrice/translations/cockatrice_fr.ts +++ b/cockatrice/translations/cockatrice_fr.ts @@ -2,7 +2,7 @@ AbstractCounter - + &Set counter... Nombre de marqueur&s… @@ -10,12 +10,12 @@ AbstractCounterDialog - + Set counter Nombre de marqueurs - + New value for counter '%1': Nouvelle valeur des marqueurs « %1 » : @@ -36,62 +36,62 @@ AbstractTabDeckEditor - + Open in new tab Ouvrir dans un nouvel onglet - + Are you sure? Êtes-vous sûr ? - + The decklist has been modified. Do you want to save the changes? La liste de deck a été modifiée. Voulez-vous enregistrer les modifications ? - - - - - - + + + + + + Error Erreur - + Could not open deck at %1 N'a pas pu ouvrir le deck à %1 - + Could not save remote deck N'a pas pu sauvegarder le deck distant - - + + The deck could not be saved. Please check that the directory is writable and try again. Le deck n'a pas pu être enregistré. Vérifiez que le répertoire ne soit pas en lecture seule et réessayez. - + Save deck Sauvegarder le deck - + The deck could not be saved. Le deck n'a pas pu être enregistré. - + There are no cards in your deck to be exported Il n'y a pas de cartes dans le deck à exporter @@ -101,18 +101,18 @@ Vérifiez que le répertoire ne soit pas en lecture seule et réessayez. Add Analytics Panel - Ajouter un panneau d'analyse + AdminNotesDialog - + Update Notes Notes de mises à jour - + Admin Notes for %1 Notes d'administrateur pour %1 @@ -129,227 +129,172 @@ Vérifiez que le répertoire ne soit pas en lecture seule et réessayez.Sideboard Réserve - - - Tokens - Jetons - AppearanceSettingsPage - + seconds secondes - + Error Erreur - + Could not create themes directory at '%1'. N'a pas pu créer le dossier Thèmes à '%1' - + Theme settings Paramètres du thème - + Current theme: Thème actuel : - + Open themes folder Ouvrir le dossier des thèmes - + Home tab background source: Source d'arrière-plan de l'onglet Accueil: - + Home tab background shuffle frequency: Fréquence de mélange de l'arrière-plan de l'onglet Accueil: - + Disabled Désactivé - + + Display card name of background in bottom right: + + + + Menu settings Options du Menu - + Show keyboard shortcuts in right-click menus Montrer les raccourcis clavier dans les menus clic-droit - + Show game filter toolbar above list in room tab - Afficher les barres d'outil et de recherche au-dessus de la liste des parties dans l'onglet salon. + - + Card rendering Rendu des cartes - + Display card names on cards having a picture Afficher les noms des cartes ayant une image - + Auto-Rotate cards with sideways layout Rotation automatique des cartes avec disposition horizontale - + Override all card art with personal set preference (Pre-ProviderID change behavior) Remplacer toutes les illustrations de cartes par les préférences personnelles (comportement avant modification du ProviderID) - - Light - - - - - Dark - - - - - System - Système - - - - Active theme palette: - - - - - Edit theme palette - - - - - Home tab settings - - - - - Display card name of background in bottom right - Afficher le nom de la carte d'arrière-plan en bas à droite - - - - Styling settings - - - - - Style user list - - - - - Card printings - Images de la carte - - - + Bump sets that the deck contains cards from to the top in the printing selector Mettre en avant que ce deck contient des cartes depuis le sommet, dans le sélecteur d'impression - + Scale cards on mouse over Agrandir les cartes lors du survol du curseur - + Use rounded card corners Utiliser des bords de cartes arrondis - - Card layout - Disposition de la carte - - - + Minimum overlap percentage of cards on the stack and in vertical hand Pourcentage minimum de chevauchement des cartes dans la pile et dans la main verticale - + Maximum initial height for card view window: Hauteur initiale maximale pour la fenêtre d'affichage des cartes : - - + + rows lignes - + Maximum expanded height for card view window: Hauteur étendue maximale pour la fenêtre d'affichage des cartes : - + Card counters Marqueurs sur la carte - + Counter %1 Marqueur %1 - + Hand layout Disposition de la main - + Display hand horizontally (wastes space) Afficher la main horizontalement (perte d'espace) - + Enable left justification Activer la justification à gauche - + Table grid layout Disposition en forme de grille - + Invert vertical coordinate Inverser la disposition du champ de bataille - + Minimum player count for multi-column layout: Nombre minimum de joueurs pour la disposition multi-colonnes : - + Maximum font size for information displayed on cards: Taille maximale de la police pour les informations affichées sur les cartes  : @@ -357,14 +302,14 @@ Vérifiez que le répertoire ne soit pas en lecture seule et réessayez. ArchidektApiResponseDeckDisplayWidget - + Back to results - Retour aux résultats + - + Open Deck in Deck Editor - Ouvrir le deck dans l'éditeur de deck + @@ -388,112 +333,112 @@ Vérifiez que le répertoire ne soit pas en lecture seule et réessayez. BanDialog - + ban &user name bannir &nom d'utilisateur - + ban &IP address bannir &adresse IP - + ban client I&D bannir &ID du client - + Ban type Type du bannissement - + &permanent ban &bannissement permanent - + &temporary ban bannissement &temporaire - + &Days: &Jours : - + &Hours: &Heures : - + &Minutes: &Minutes : - + Duration of the ban Durée du bannissement - + Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. Veuillez expliquer la raison du bannissement. Cette information sera consultable uniquement par les modérateurs et ne sera pas visible par la personne bannie. - + Please enter the reason for the ban that will be visible to the banned person. Veuillez expliquer la raison du bannissement. Cette information sera visible par la personne bannie. - + Redact all messages from this user in all rooms Censurer tous les messages de cet utilisateur dans toutes les salles - + &OK &OK - + &Cancel &Annuler - + Ban user from server Bannir le joueur du serveur - - - - + + + + Error Erreur - + You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. Vous devez choisir un bannissement à partir du nom, de l'adresse IP, de l'ID du client, ou une combinaison des trois. - + You must have a value in the name ban when selecting the name ban checkbox. Vous devez remplir le champ du nom du banni en le choisissant dans la liste. - + You must have a value in the ip ban when selecting the ip ban checkbox. Vous devez saisir l'adresse IP du banni en le choisissant dans la liste. - + You must have a value in the clientid ban when selecting the clientid ban checkbox. Vous devez saisir l'ID du client banni en le choisissant dans la liste. @@ -501,123 +446,59 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa BetaReleaseChannel - + Beta Beta - + No reply received from the release update server. Le serveur de mise à jour ne répond pas. - + Invalid reply received from the release update server. Réponse reçue du serveur de mise à jour de version invalide . - + No reply received from the file update server. Le serveur de mise à jour de fichier ne répond pas. - - CardArtPreviewWidget - - - No card selected - Aucune carte sélectionné - - - - CardArtRulesModel - - - Card - Carte - - - - ProviderId - - - - - Mode - Mode - - - - Reason - Raison - - CardDatabaseModel - + Name Nom - + Sets Éditions - + Mana cost Coût de mana - + Card type Type de carte - + P/T F/E - + Color(s) Couleur(s) - - CardDatabaseView - - - Add to Deck - Ajouter au deck - - - - Add to Sideboard - - - - - Select Printing - Choisir l'image - - - - Show on EDHRec (Commander) - - - - - Show on EDHRec (Card) - - - - - Show Related cards - - - CardFilter @@ -652,7 +533,7 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa Name (Exact) - Nom (Exact) + @@ -746,22 +627,22 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa CardInfoPictureWidget - + View related cards Voir les cartes associées - + Add card to deck Ajouter la carte au deck - + Mainboard Deck principal - + Sideboard Réserve @@ -776,7 +657,7 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa Set: - Édition : + @@ -784,12 +665,12 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa - + Related cards: Cartes associées : - + Unknown card: Carte inconnue : @@ -797,146 +678,128 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa CardMenu - + Re&veal to... Révéler à... - + &All players &Tous les joueurs - + View related cards Voir les cartes associées - + Token: Jeton : - + All tokens Tout les jetons - + &Select All &Sélectionner Tout - + S&elect Row Sél&ectionne une ligne - + S&elect Column Sél&ectionne une colonne - + &Play &Jouer - + &Hide &Cacher - + Play &Face Down Jouer &Face Cachée - + &Tap / Untap Turn sideways or back again &Engager / Dégager - + Skip &untapping - Ne pas dégager + - + T&urn Over Turn face up/face down Reto&urner - + &Peek at card face &Regarder furtivement la carte face cachée - + &Clone &Cloner - + Attac&h to card... Attac&her à une carte... - + Unattac&h Détac&her - + &Draw arrow... &Tracer une flèche... - + &Set annotation... &Annoter... - - Reduce life by power - - - - + Ca&rd counters Ma&rqueurs sur la carte - + &Add counter (%1) &Ajouter un marqueur (%1) - + &Remove counter (%1) &Retirer un marqueur (%1) - + &Set counters (%1)... &Changer le nombre de marqueurs (%1)... - - CardPictureLoaderCacheMethod - - - Network Cache - - - - - Filesystem - - - CardSizeWidget @@ -948,133 +811,133 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa CardZoneLogic - + their hand nominative sa main - + %1's hand nominative main de %1 - + their library look at zone sa bibliothèque - + %1's library look at zone bibliothèque de %1 - + of their library top cards of zone, de sa bibliothèque - + of %1's library top cards of zone de la bibliothèque de %1 - + their library reveal zone sa bibliothèque - + %1's library reveal zone bibliothèque de %1 - + their library shuffle sa bibliothèque - + %1's library shuffle bibliothèque de %1 - + their library nominative sa bibliothèque - + %1's library nominative bibliothèque de %1 - + their graveyard nominative son cimetière - + %1's graveyard nominative le cimetière de %1 - + their exile nominative sa zone d'exil - + %1's exile nominative la zone d'exil de %1 - + their sideboard look at zone sa réserve - + %1's sideboard look at zone la réserve de %1 - + their sideboard nominative sa réserve - + %1's sideboard nominative la réserve de %1 - + their custom zone '%1' nominative sa zone personnalisée '%1' - + %1's custom zone '%2' nominative La zone personnalisée '%2' de %1 @@ -1096,421 +959,16 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa Erreur de lecture à la ligne %1 (colonne %2) - - ColorButton - - - Click to pick a color - - - - - Pick colour - Choisir la couleur - - - - ConnectionController - - - - The server has reached its maximum user capacity, please check back later. - - - - - There are too many concurrent connections from your address. - - - - - Banned by moderator - Banni par le modérateur - - - - Expected end time: %1 - Heure de fin estimé: %1 - - - - This ban lasts indefinitely. - Ce bannissement dure indéfiniment. - - - - Scheduled server shutdown. - - - - - - Invalid username. - - - - - You have been logged out due to logging in at another location. - - - - - Connection closed - - - - - The server has terminated your connection. -Reason: %1 - - - - - The server is going to be restarted in %n minute(s). -All running games will be lost. -Reason for shutdown: %1 - - - - - Scheduled server shutdown - - - - - Failed Login - - - - - Your client seems to be missing features this server requires for connection. - - - - - To update your client, go to 'Help -> Check for Client Updates'. - - - - - - - - - - - - - - - - - - - - - - Error - - - - - Incorrect username or password. Please check your authentication information and try again. - - - - - There is already an active session using this user name. -Please close that session first and re-login. - - - - - - You are banned until %1. - - - - - - You are banned indefinitely. - - - - - This server requires user registration. Do you want to register now? - - - - - This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. -Please close and reopen your client to try again. - - - - - An internal error has occurred, please close and reopen Cockatrice before trying again. -If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - - - - Account activation - - - - - Your account has not been activated yet. -You need to provide the activation token received in the activation email. - - - - - Server Full - - - - - Unknown login error: %1 - - - - - - -This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - - - - - - - - - Registration denied - - - - - Registration is currently disabled on this server - - - - - There is already an existing account with the same user name. - - - - - It's mandatory to specify a valid email address when registering. - - - - - It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. - - - - - Password too short. - - - - - Registration failed for a technical problem on the server. - - - - - The connection to the server has been lost. - - - - - Unknown registration error: %1 - - - - - Account activation failed - - - - - Socket error: %1 - - - - - Server timeout - - - - - You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. -Local version is %1, remote version is %2. - - - - - Your Cockatrice client is obsolete. Please update your Cockatrice version. -Local version is %1, remote version is %2. - - - - - - Success - - - - - Registration accepted. -Will now login. - - - - - Account activation accepted. -Will now login. - - - - - Information - Information - - - - This server supports additional features that your client doesn't have. -This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. - -To update your client, go to Help -> Check for Updates. - - - - - - - Reset Password - Réinitialiser le mot de passe - - - - Your password has been reset successfully, you can now log in using the new credentials. - Votre mot de passe à été réinitialisé avec succes, vous pouvez maintenant vous connecter avec le nouveau mot de passe. - - - - Failed to reset user account password, please contact the server operator to reset your password. - Échec de la réinitialisation du mot de passe. Veuillez contacter l'administrateur du serveur pour réinitialiser votre mot de passe. - - - - Activation request received, please check your email for an activation token. - - - - - Connecting to %1... - - - - - Registering to %1 as %2... - - - - - Disconnected - - - - - Connected, logging in at %1 - - - - - Requesting forgotten password to %1 as %2... - - - - - Your username must respect these rules: - - - - - is %1 - %2 characters long - - - - - can %1 contain lowercase characters - - - - - - - - NOT - - - - - can %1 contain uppercase characters - - - - - can %1 contain numeric characters - - - - - can contain the following punctuation: %1 - - - - - first character can %1 be a punctuation mark - - - - - no unacceptable language as specified by these server rules: - note that the following lines will not be translated - - - - - can not contain any of the following words: %1 - - - - - can not match any of the following expressions: %1 - - - - - You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - - CustomZoneMenu - + C&ustom Zones Zones pe&rsonnalisés - - + + View custom zone '%1' Voir la zone personnalisée '%1' @@ -1518,37 +976,32 @@ To update your client, go to Help -> Check for Updates. DeckAnalyticsWidget - + Add Panel - Ajouter un panneau + - + Remove Panel - Enlever un Panneau + - + Save Layout - Sauver cette disposition + - + Load Layout - Charger une disposition - - - - Include Sideboard DeckEditorCardDatabaseDockWidget - + Card Database - Base de données de cartes + @@ -1562,17 +1015,47 @@ To update your client, go to Help -> Check for Updates. DeckEditorDatabaseDisplayWidget - + Search by card name (or search expressions) Rechercher par nom de carte (ou expression de recherche) - + + Add to Deck + Ajouter au deck + + + + Add to Sideboard + Ajouter à la réserve + + + + Select Printing + Choisir l'impression + + + + Show on EDHRec (Commander) + Afficher sur EDHRec (Commandant) + + + + Show on EDHRec (Card) + Afficher sur EDHRec (carte) + + + + Show Related cards + Afficher les cartes associées + + + Add card to &maindeck Ajouter la carte au &deck - + Add card to &sideboard Ajouter carte à la ré&serve @@ -1582,7 +1065,7 @@ To update your client, go to Help -> Check for Updates. Loading Database... - Chargement de la base de données... + @@ -1605,72 +1088,72 @@ To update your client, go to Help -> Check for Updates. Couleurs - + Select Printing Choisir l'impression - + Deck Deck - + Deck &name: &Nom du deck : - + Banner Card/Tags Visibility Settings Paramètres de visibilité de la carte bannière et des étiquettes - + Show banner card selection menu Montrer le menu de sélection de carte bannière - + Show tags selection menu Montrer le menu de sélection d'étiquettes - + &Comments: &Commentaires : - + Group by: Grouper par : - + Format: - Format : + - + Hash: Empreinte : - + &Increment number Augmenter quant&ité - + &Decrement number &Diminuer quantité - + &Remove row &Retirer la ligne - + Swap card to/from sideboard Échanger la carte vers/depuis la réserve @@ -1678,17 +1161,17 @@ To update your client, go to Help -> Check for Updates. DeckEditorFilterDockWidget - + Filters Filtres - + &Clear all filters &Effacer tous les filtres - + Delete selected Enlever la sélection @@ -1819,145 +1302,201 @@ To update your client, go to Help -> Check for Updates. DeckEditorSettingsPage - - + + Update Spoilers Mettre à jour les spoilers - + + Success Réussite - + Download URLs have been reset. Les URLs de téléchargement ont été réinitialisées. - + + Downloaded card pictures have been reset. + Les images des cartes téléchargées ont été supprimées. + + + + Error + Erreur + + + + One or more downloaded card pictures could not be cleared. + Une ou plusieurs images de cartes téléchargées n'ont pas pu être supprimées. + + + Add URL Ajouter une URL - - + + URL: URL : - - + + Edit URL Modifier l'URL - + + Network Cache Size: + Taille du cache du réseau : + + + + Redirect Cache TTL: + Rediriger le TTL du cache : + + + + How long cached redirects for urls are valid for. + Combien de temps les redirections mises en cache pour les URL sont-elles valides. + + + + Picture Cache Size: + Taille du cache des images : + + + Add New URL Ajouter Nouveau Lien - + Remove URL Effacer Lien - + + Day(s) + Jour(s) + + + Updating... Mise à jour... - + Choose path Choisir le chemin - + URL Download Priority URL de téléchargement prioritaire - + Spoilers Spoilers - + Download Spoilers Automatically Télécharger automatiquement les spoilers - + Spoiler Location: Emplacement des spoilers : - + Last Change Dernier changement - + Spoilers download automatically on launch Télécharger automatiquement les spoilers au lancement - + Press the button to manually update without relaunching Appuyez sur le bouton pour mettre à jour manuellement sans redémarrer. - + Do not close settings until manual update is complete Ne pas fermer la fenêtre des paramètres avant la mise à jour manuelle complète. - + Download card pictures on the fly Télécharger les images des cartes à la volée - + How to add a custom URL Comment ajouter une URL personnalisée - + + Delete Downloaded Images + Supprimer les images téléchargées + + + Reset Download URLs Réinitialiser les URL de téléchargement + + + On-disk cache for downloaded pictures + Cache pour les images téléchargées + + + + In-memory cache for pictures not currently on screen + Cache en mémoire pour les imges non affichées actuellement + DeckListHistoryManagerWidget Undo - Défaire + Redo - Refaire + Undo/Redo history - Historique + Click on an entry to revert to that point in the history. - Clickez sur une ligne pour retourner à ce point dans l'historique. + [redo] - [refaire] + [undo] - [défaire] + @@ -1991,12 +1530,12 @@ To update your client, go to Help -> Check for Updates. DeckLoader - + Common deck formats (%1) Formats de decks courants (%1) - + All files (*.*) Tous les fichiers (*.*) @@ -2190,57 +1729,57 @@ To update your client, go to Help -> Check for Updates. Rename deck to "%1" from "%2" - Renommer le deck de "%2" à "%1" + Updated comments (was %1 chars, now %2 chars) - Mis à jour les commentaires (étaient %1 caractères, maintenant %2) + Set banner card to %1 (%2) - Définir %1 (%2) comme carte de couverture + Tags changed - Tags modifiés + Set format to %1 - Changer le format à %1 + Added (%1): %2 (%3) %4 - Ajouté (%1): %2 (%3) %4 + - + Moved to %1 1 × "%2" (%3) - Bougé %1 1 × "%2" (%3) + - + Removed "%1" (all copies) - Retiré "%1" (toutes les copies) + - + %1 1 × "%2" (%3) - %1 1 × "%2" (%3) + - + Added - Ajoutée + - + Removed - Retirée + @@ -2260,75 +1799,75 @@ To update your client, go to Help -> Check for Updates. DeckViewContainer - + Load deck... Charger un deck... - + Load remote deck... Charger un deck distant... - + Load from clipboard... Charger depuis le presse-papier... - + Load from website... Charger depuis un site web... - + Unload deck Annuler le chargement du deck - + Ready to start Prêt à démarrer - + Force start Forcer le démarrage - + Sideboard unlocked Réserve déverrouillée - + Sideboard locked Réserve verrouillée - - + + Error Erreur - + The selected file could not be loaded. Le fichier sélectionné n'a pas pu être chargé. - + Deck is greater than maximum file size. Le deck est plus grand que la taille maximum de fichier. - + Are you sure you want to force start? This will kick all non-ready players from the game. Êtes-vous sûr de vouloir forcer le démarrage ? Cela va éjecter de la partie tous les joueurs non prêts à démarrer. - + Cockatrice Cockatrice @@ -2429,7 +1968,7 @@ Voulez-vous convertir le deck au format .cod ? - + Webpage Page web @@ -2469,37 +2008,37 @@ Voulez-vous convertir le deck au format .cod ? Se connecter au serveur - + Server URL URL du serveur - + Communication Port Port de communication - + Unique Server Name Nom de serveur unique - + Connection Warning Avertissement de connexion - + You need to name your new connection profile. Vous devez attribuer un nom à votre nouveau profil de connexion. - + Connect Warning Avertissement de connexion - + The player name can't be empty. Le nom du joueur ne peut être vide. @@ -2594,7 +2133,7 @@ Voulez-vous convertir le deck au format .cod ? Create game as judge - Créer une partie en tant que juge + @@ -2612,17 +2151,17 @@ Voulez-vous convertir le deck au format .cod ? Créer une partie - + Game information Informations sur la partie - + Error Erreur - + Server error. Erreur serveur. @@ -2630,97 +2169,97 @@ Voulez-vous convertir le deck au format .cod ? DlgCreateToken - + &Name: &Nom : - + Token Jeton - + C&olor: C&ouleur : - + white blanc - + blue bleu - + black noir - + red rouge - + green vert - + multicolor multicolore - + colorless incolore - + &P/T: &F/E : - + &Annotation: &Annotation : - + &Destroy token when it leaves the table &Detruire le jeton lorsqu'il quitte le champ de bataille - + Create face-down (Only hides name) Créer face-cachée (cache seulement le nom) - + Token data Données du jeton - + Show &all tokens Afficher &tous les jetons - + Show tokens from this &deck Afficher les jetons présents dans ce &deck - + Choose token from list Choisir un jeton dans la liste - + Create token Créer un jeton @@ -2754,7 +2293,7 @@ Voulez-vous convertir le deck au format .cod ? - + ✖ ✖ @@ -2769,12 +2308,12 @@ Voulez-vous convertir le deck au format .cod ? Le nom de l'étiquette ne peut pas être vide ! - + Duplicate Tag Étiquette dupliquée - + This tag already exists. Cette étiquette existe déjà. @@ -2961,12 +2500,12 @@ Pour enlever votre avatar actuel, confirmez sans choisir une nouvelle image.Entrez le nom du jeton : - + Error Erreur - + The chosen name conflicts with an existing card or token. Make sure to enable the 'Token' set in the "Manage sets" dialog to display them correctly. Le nom choisi est en conflit avec une carte ou un jeton existant. @@ -2991,12 +2530,12 @@ Assurez-vous d'activer l'édition « Fausse édition contenant les je Indéfini - + Real name: Nom réel : - + Edit user profile Modifier le profil utilisateur @@ -3034,113 +2573,113 @@ Assurez-vous d'activer l'édition « Fausse édition contenant les je 2 heures - + Hide 'buddies only' games Ne pas afficher les parties « amis uniquement » - + Hide full games Cacher les parties pleines - + Hide games that have started Cacher les parties qui ont commencées - + Hide password protected games Cacher les parties protégées par un mot de passe - + Hide 'ignored user' games Cacher les parties des utilisateurs ignorés - + Hide games not created by buddies Hide games not created by buddy - Cacher les parties non-crées par vos amis + - + Hide games with forced open decklists Masquer les parties avec les listes de decks ouvertes forcées - + &Newer than: &Créées avant : - + Game &description: &Description de la partie : - + &Creator name: Nom du &créateur : - + General Général - + &Game types Types de &partie - + at &least: au &moins : - + at &most: au &plus : - + Maximum player count Nombre de joueurs maximum - + Restrictions Restrictions - + Show games only if &spectators can watch Montrer les parties uniquement si les %spectateurs peuvent observer - + Show spectator password p&rotected games Montrer les parties où les spectateurs doivent ent&rer un mot de passe - + Show only if spectators can ch&at Montrer uniquement si les spectateurs peuvent p&arler - + Show only if spectators can see &hands Montrer uniquement si les spectateurs peuvent voir les &mains - + Spectators Spectateurs - + Filter games Flitrer les parties @@ -3418,68 +2957,68 @@ https://tappedout.net/mtg-decks/your-deck-name/ Players: - Joueurs : + General - Général + Starting life total: - Total de vie initial : + Game setup options - Options de configuration de la partie + Remember settings - Conserver les paramètres + Local game options - Options de configuration de partie locale + DlgMoveTopCardsUntil - + Card name (or search expressions): Nom de la carte (ou expression de recherche) : - + Number of hits: Nombre de cartes trouvées : - + Auto play hits Jouer les cartes trouvées automatiquement - + Put top cards on stack until... Placer la carte du dessus sur la pile jusqu'à... - + No cards matching the search expression exists in the card database. Proceed anyways? Aucune carte ne correspondant à l'expression recherchée n'existe dans la base de données de cartes. Continuer malgré tout ? - + Cockatrice Cockatrice - + Invalid filter Filtre invalide @@ -3538,40 +3077,40 @@ Your email will be used to verify your account. Indéfini - + Real name: Nom réel : - + Register to server S'enregistrer sur le serveur - - - - + + + + Registration Warning Avertissement d'enregistrement - + Your password is too short. Mot de passe trop court - + Your passwords do not match, please try again. Vos mots de passe ne correspondent pas, veuillez réessayer. - + Your email addresses do not match, please try again. Vos adresses mail ne correspondent pas, veuillez réessayer. - + The player name can't be empty. Le nom du joueur ne peut pas être vide. @@ -3579,17 +3118,17 @@ Your email will be used to verify your account. DlgRollDice - + Number of sides: Nombre de faces: - + Number of dice: Nombre de dés: - + Roll Dice Lancer les dés @@ -3624,28 +3163,28 @@ Your email will be used to verify your account. Bulk modified printings. - Impressions modifiées en groupe. + Cleared all printing information. - Toutes les informations d'impressions ont été supprimées. + Set all printings to preferred. - Définir toutes les impressions comme préférées. + DlgSettings - + Unknown Error loading card database Erreur inconnue lors du chargement de la base de données de cartes. - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -3662,7 +3201,7 @@ Vous devrez peut-être redémarrer Oracle pour mettre à jour votre base de donn Voulez-vous changer l'emplacement de votre base de données ? - + Your card database version is too old. This can cause problems loading card information or images @@ -3679,7 +3218,7 @@ Généralement, il suffit de redémarrer oracle pour mettre à jour votre base d Voulez-vous changer l'emplacement de votre base de données ? - + Your card database did not finish loading Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached @@ -3692,7 +3231,7 @@ Veuillez ouvrir un ticket sur https://github.com/Cockatrice/Cockatrice/issues av Voulez-vous changer l'emplacement des données ? - + File Error loading your card database. Would you like to change your database location setting? @@ -3701,7 +3240,7 @@ Would you like to change your database location setting? Voulez-vous changer l'emplacement de votre base de données ? - + Your card database was loaded but contains no cards. Would you like to change your database location setting? @@ -3710,7 +3249,7 @@ Would you like to change your database location setting? Voulez-vous changer l'emplacement de votre base de données ? - + Unknown card database load status Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues @@ -3723,64 +3262,59 @@ Veuillez ouvrir un ticket sur https://github.com/Cockatrice/Cockatrice/issues Voulez-vous changer l'emplacement de votre base de données ? - - - + + + Error Erreur - + The path to your deck directory is invalid. Would you like to go back and set the correct path? Le chemin d'accès vers votre répertoire de decks est invalide. Voulez-vous redéfinir le chemin d'accès ? - + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? Le chemin d'accès vers votre répertoire d'illustrations de cartes est invalide. Voulez-vous redéfinir le chemin d'accès ? - + Settings Paramètres - + General Général - + Appearance Apparence - + User Interface Interface utilisateur - - Storage - - - - + Card Sources Origine de carte - + Chat Chat - + Sound Son - + Shortcuts Raccourcis @@ -3874,9 +3408,9 @@ Vous pouvez toujours modifier ce comportement dans l'onglet « Général » - - - + + + Error Erreur @@ -3929,31 +3463,31 @@ Veuillez s'il vous plaît visiter la page de téléchargement, pour mettre - + Update Available Mise à jour disponible - + A new version of Cockatrice is available! Une nouvelle version de Cockatrice est disponible ! - + New version Nouvelle version - + Released Sortie - + Changelog Notes de version @@ -3963,51 +3497,51 @@ Veuillez s'il vous plaît visiter la page de téléchargement, pour mettre Voulez-vous mettre à jour maintenant ? - + Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. Malheureusement, la mise à jour automatique n'a pas pu trouver un téléchargement compatible. Vous allez peut-être devoir télécharger manuellement la nouvelle version. - + Please check the <a href="%1">releases page</a> on our Github and download the build for your system. Veuillez vérifier la <a href="%1">page "releases"</a> sur notre Github et télécharger le programme pour votre système. - - - + + + Update Error Erreur de mise à jour - + An error occurred while checking for updates: Une erreur est survenur pendant la vérification des mises à jour : - + An error occurred while downloading an update: Une erreur est survenue pendant le téléchargement de la mise à jour : - + Installing... Installation... - + Cockatrice is unable to open the installer. Cockatrice n'a pas pu ouvrir l'installateur. - + Try to update manually by closing Cockatrice and running the installer. Essayer de mettre à jour manuellement en fermant Cockatrice et en exécutant l'installateur. - + Download location Répertoire de téléchargement @@ -4035,131 +3569,131 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version. Draw Probability Settings - Options de probabilité de pioche + Criteria: - Critère : + Card Name - Nom de la carte + Type - Type + Subtype - Sous-type + Mana Value - Valeur de Mana + Exactness: - Exactitude : + At least - Au moins + Exactly - Exactement + Quantity (N): - Quantité (N) : + Cards drawn (M): - Cartes piochées (M) : + cards - cartes + DrawProbabilityWidget - - - Draw Probability - Probabilité de pioche - - Probability of drawing - Probabilité de piocher + Draw Probability + - Card Name - Nom de la carte - - - - Type - Type + Probability of drawing + - Subtype - Sous-type + Card Name + - Mana Value - Valeur de Mana + Type + + + + + Subtype + - At least - Au moins + Mana Value + - - Exactly - Exactement + + At least + + Exactly + + + + card(s) having drawn at least - Carte(s) ayant au moins pioché + - + cards - cartes + - + Category - Catégorie + - + Qty - Qté + - + Odds (%) - Chances (%) + @@ -4236,7 +3770,7 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version. Game Changers - Cartes à impact + @@ -4244,7 +3778,7 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version. Budget - Budget + @@ -4271,7 +3805,7 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version. FilterBuilder - + Type your filter here Tapez votre filtre ici @@ -4302,22 +3836,22 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version. GameEventHandler - + kicked by game host or moderator Éjecté par l'hôte de la partie ou un modérateur - + player left the game joueur a quitté la partie - + player disconnected from server joueur déconnecté du serveur - + reason unknown raison inconnue @@ -4325,140 +3859,140 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version. GameSelector - - - - - - - - - + + + + + + + + + Error Erreur - + Please join the appropriate room first. Veuillez d'abord rejoindre le bon salon. - + Wrong password. Mot de passe incorrect. - + Spectators are not allowed in this game. Les spectateurs ne sont pas autorisés dans cette partie. - + The game is already full. Cette partie est déjà complète. - + The game does not exist any more. La partie n'existe plus. - + This game is only open to registered users. Cette partie n'est accessible qu'aux joueurs enregistrés. - + This game is only open to its creator's buddies. Cette partie n'est accessible qu'aux amis de son créateur. - + You are being ignored by the creator of this game. Vous avez été ignoré par le créateur de la partie. - + Join Game Rejoindre la partie - + Spectate Game Rejoindre la partie comme spectateur - + Game Information Informations sur la partie - + Join Game as Judge - Joindre la partie comme juge + - + Spectate Game as Judge - Joindre la partie comme juge spectateur + - + Join game Rejoindre partie - + Password: Mot de passe : - + Please join the respective room first. Veuillez d'abord rejoindre le bon salon. - + &Filter games &Filtrer les jeux - + C&lear filter Effacer les fi&ltres - + C&reate C&réer - + &Join Re&joindre - + Join as judge - Joindre en tant que juge + - + J&oin as spectator Rej&oindre en tant que spectateur - + Join as judge spectator - Joindre comme juge spectateur + - + Games shown: %1 / %2 Parties affichées : %1 / %2 - + Games Parties @@ -4466,138 +4000,138 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version. GameSelectorQuickFilterToolBar - + All types - Tous les types + - + Filter by game name... - Filtrer par nom de partie... + - + Filter by game type/format - Filtrer par type/format de partie.... + - + Hide games not created by buddies - Cacher les parties non-crées par vos amis + - + Hide full games - Cacher les parties pleines + - + Hide started games - Cacher les parties commencées + GamesModel - + >1 day > 1 jour - + %1%2 hr short age in hours %1%2 h%1%2 h%1%2 h - + new Nouveau - + %1%2 min short age in minutes %1%2 min%1%2 min%1%2 min - + password mot de passe - + buddies only amis uniquement - + reg. users only joueurs enregistrés uniquement - + open decklists Ouvrir les listes de deck + - can chat peut discuter - + see hands voir les mains - + can see hands peut voir les mains - + not allowed non autorisé - + Room Salon - + Age Âge - + Description Description - + Creator Créateur - + Type Type - + Restrictions Restrictions - + Players Joueurs - + Spectators Spectateurs @@ -4605,158 +4139,143 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version. GeneralSettingsPage - + Reset all paths Réinitialiser tous les chemins - + All paths have been reset Les chemins ont été réinitialisés - - - - - - - + + + + + + + Choose path Choisir un chemin d'accès - - Language settings - + + Personal settings + Paramètres personnels - + Language: Langue : - - Version settings - - - - - Card database - - - - - Startup settings - - - - + Paths (editing disabled in portable mode) Chemins (édition impossible en mode portable) - + Paths Chemins d’accès - + How to help with translations Comment aider avec les traductions - + Decks directory: Répertoire des decks : - + Filters directory: Répertoire des filtres : - + Replays directory: Répertoire des replays : - + Pictures directory: Répertoire des images : - + Card database: Base de données des cartes : - + Custom database directory: Répertoire de la base de données personnalisé - + Token database: Bases de données des jetons : - + Update channel Branche de la mise à jour : - + Check for client updates on startup Vérifier les mises à jour du client au démarrage - + Check for card database updates on startup Vérifier les mises à jour de la base de données des cartes au démarrage... - + Don't check Ne pas vérifier - + Prompt for update Confirmer les mises à jour - + Always update in the background Toujours mettre à jour en tâche de fond - + Check for card database updates every Vérifier les mises à jour de la base de données des cartes tous les - + days jour(s) - + Notify if a feature supported by the server is missing in my client M'avertir si une fonctionnalité supportée par le serveur est manquante sur mon client. - + Automatically run Oracle when running a new version of Cockatrice Lancer Oracle automatiquement quand Cockatrice a été mis à jour. - + Show tips on startup Afficher les astuces au démarrage. - + Last update check on %1 (%2 days ago) Dernière vérification de mise à jour le %1 (il y a %2 jours) @@ -4764,47 +4283,47 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version. GraveyardMenu - + &Graveyard &Cimetière - + &View graveyard &Voir le cimetière - + &Move graveyard to... &Déplacer le cimetière vers... - + &Top of library &Dessus de la bibliothèque - + &Bottom of library &Dessous de la bibliothèque - + &All players &Tous les joueurs - + &Hand &Main - + &Exile &Exil - + Reveal random card to... Révéler une carte au hasard à... @@ -4812,88 +4331,88 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version. HandMenu - + &Hand &Main - + &View hand &Voir la main - + Sort hand by... - Trier la main par... + - + Name - Nom + - + Type - Type + - + Mana Value - Valeur de Mana + - + Take &mulligan (Choose hand size) - Mulligan (choix du nombre de cartes) + - + Take mulligan (Same hand size) - Mulligan (Même nombre de cartes) + - + Take mulligan (Hand size - 1) - Mulligan (-1 carte) + - + &Move hand to... &Déplacer la main vers… - + &Top of library &Dessus de la bibliothèque - + &Bottom of library &Dessous de la bibliothèque - + &Graveyard &Cimetière - + &Exile &Exil - + &Reveal hand to... &Révéler la main à... - - + + All players - Tous les joueurs + - + Reveal r&andom card to... Révéler une c&arte au hasard à... @@ -4901,52 +4420,52 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version. HomeWidget - + Create New Deck Créer un Nouveau Deck - + Browse Decks Parcourir les Decks - + Browse Card Database Parcourir la Base de Carte - + Browse EDHRec Parcourir EDHRec - + Browse Archidekt - Parcourir Archidekt + - + View Replays Voir les replays - + Quit Quitter - + Connecting... Connection... - + Connect Se connecter - + Play Jouer @@ -4954,213 +4473,213 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version. LibraryMenu - + &Library &Bibliothèque - + &View library &Voir la bibliothèque - + View &top cards of library... Voir les cartes du &dessus de la bibliothèque... - + View bottom cards of library... Voir les cartes du dessous de la bibliothèque... - + Reveal &library to... Révéler la &bibliothèque à... - + Lend library to... Prêter la bibliothèque à... - + Reveal &top cards to... Révéler les cartes du &dessus à... - + &Top of library... &Dessus de la bibliothèque... - + &Bottom of library... &Dessous de la bibliothèque... - + &Always reveal top card &Toujours révéler la carte du dessus - + &Always look at top card &Toujours voir la carte du dessus - + &Open deck in deck editor &Ouvrir le deck dans l'éditeur - + &Draw card &Piocher une carte - + D&raw cards... P&iocher plusieurs cartes... - + &Undo last draw &Annuler la dernière pioche - + Shuffle Mélanger - + &Play top card &Jouer la carte du dessus - + Play top card &face down Jouer la carte du dessus &face cachée - + Put top card on &bottom Placer la carte du dessus au-&dessous - + Move top card to grave&yard Mettre la carte du dessus dans le cime&tière - + Move top card to e&xile E&xiler la carte du dessus - + Move top cards to &graveyard... Mettre les cartes du dessus dans le &cimetière... - + Move top cards to graveyard face down... - Mettre les cartes du dessus dans le cimetière face cachées... + - + Move top cards to &exile... &Exiler les cartes du dessus... - + Move top cards to exile face down... - Exiler les cartes du dessus face cachées... + - + Put top cards on stack &until... Placer les cartes du dessus sur la pile &jusqu'à... - + Shuffle top cards... Mélanger les cartes du dessus... - + &Draw bottom card &Piocher la carte du dessous - + D&raw bottom cards... P&iocher les cartes du dessous... - + &Play bottom card &Jouer la carte du dessous - + Play bottom card &face down Jouer la carte du dessous &face cachée - + Move bottom card to grave&yard Mettre la carte du dessous dans le cime&tière - + Move bottom card to e&xile E&xiler la carte du dessous - + Move bottom cards to &graveyard... Mettre les cartes du dessus dans le &cimetière... - + Move bottom cards to graveyard face down... - Mettre les cartes du dessous dans le cimetières face cachées... + - + Move bottom cards to &exile... &Exiler les cartes du dessous... - + Move bottom cards to exile face down... - Exiler les cartes du dessous face cachées... + - + Put bottom card on &top Placer la carte du dessous au-&dessus - + Shuffle bottom cards... Mélanger les cartes du dessous... - - + + &All players &Tous les joueurs - + Reveal top cards of library Révéler les cartes du dessus de la bibliothèque - + Number of cards: (max. %1) Nombre de cartes : (max. %1) @@ -5168,273 +4687,641 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version. MainWindow - - + + + The server has reached its maximum user capacity, please check back later. + Le serveur a atteint sa capacité maximale de joueurs simultanés, veuillez réessayer plus tard. + + + + There are too many concurrent connections from your address. + Il y a trop de connexions simultanées depuis votre ordinateur. + + + + Banned by moderator + Banni par un modérateur + + + + Expected end time: %1 + Fin théorique : %1 + + + + This ban lasts indefinitely. + Banni définitivement. + + + + Scheduled server shutdown. + Fermeture prévue du serveur. + + + + + Invalid username. + Nom d'utilisateur non valide. + + + + You have been logged out due to logging in at another location. + Vous avez avez été déconnecté pour avoir changé d'endroit. + + + + Connection closed + Connexion fermée + + + + The server has terminated your connection. +Reason: %1 + Le serveur a coupé votre connexion. +Raison: %1 + + + + The server is going to be restarted in %n minute(s). +All running games will be lost. +Reason for shutdown: %1 + Le serveur redémarrera dans %n minute. +Aucune partie en cours ne sera sauvegardée. +Raison de la fermeture : %1Le serveur redémarrera dans %n minutes. +Aucune partie en cours ne sera sauvegardée. +Raison de la fermeture : %1Le serveur redémarrera dans %n minutes. +Aucune partie en cours ne sera sauvegardée. +Raison de la fermeture : %1 + + + + Scheduled server shutdown + Fermeture prévue du serveur + + + + + Success + Réussite + + + + Registration accepted. +Will now login. + Enregistrement accepté. +Connexion en cours. + + + + Account activation accepted. +Will now login. + Activation du compte acceptée. +Connexion en cours. + + + + Player %1 Joueur %1 - + Load replay Charger replay - + About Cockatrice À propos de Cockatrice - + Version Version - + Cockatrice Webpage Page web de Cockatrice - + Project Manager: Chef de projet: - + Past Project Managers: Anciens chefs de projet: - + Developers: Développeurs : - + Our Developers Nos développeurs - + Help Develop! Aidez à développer ! - + Translators: Traducteurs : - + Our Translators Nos traducteurs - + Help Translate! Aidez à traduire ! - + Support: Assistance : - + Report an Issue Signaler un problème - + Troubleshooting Dépannage - + F.A.Q. F.À.Q. - - + + + + + + + + + + + + + + + + + + + + Error Erreur - + + Server timeout + Délai de la demande dépassé + + + + Failed Login + Connexion échouée + + + + Your client seems to be missing features this server requires for connection. + Il semble que certaines fonctionnalités nécessaires à la connexion à ce serveur sont absentes de votre client. + + + + To update your client, go to 'Help -> Check for Client Updates'. + Pour mettre à jour Cockatrice, allez dans « Aide -> Vérifier les mises à jour' ». + + + + Incorrect username or password. Please check your authentication information and try again. + Nom d'utilisateur ou mot de passe incorrect. Veuillez vérifier vos identifiants et réessayer. + + + + There is already an active session using this user name. +Please close that session first and re-login. + Il y a déjà une session ouverte avec le même nom d'utilisateur. +Fermez cette session puis reconnectez vous. + + + + + You are banned until %1. + Vous êtes banni jusqu'au %1 + + + + + You are banned indefinitely. + Vous êtes banni indéfiniment. + + + + This server requires user registration. Do you want to register now? + Vous devez être enregistré pour accéder à ce serveur. Voulez-vous vous enregistrer ? + + + + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. + Ce serveur requiert un ID de client. Soit votre client a échoué lors de la génération d'un ID, soit vous utilisez un client modifié. +Veuillez fermer et rouvrir votre client pour réessayer. + + + + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. + Une erreur interne est survenue. Veuillez fermer et rouvrir Cockatrice avant de réessayer. +Si l'erreur persiste, vérifiez que utilisez la dernière version du logiciel, ou contactez les développeurs si nécessaire. + + + + Account activation + Activation du compte + + + + Your account has not been activated yet. +You need to provide the activation token received in the activation email. + Votre compte n'a pas encore été activé. +Vous devez activer le jeton de l'activation reçu dans le mail d'activation. + + + + Server Full + Serveur complet + + + + Unknown login error: %1 + Erreur de connexion inconnue : %1 + + + + + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. + +Cela veut généralement dire que votre client n'est plus à jour, et que le serveur a envoyé une réponse que votre client ne comprend pas. + + + + Your username must respect these rules: + Votre nom d'utilisateur doit respecter ces règles : + + + + is %1 - %2 characters long + est long de %1 - %2 caractères + + + + can %1 contain lowercase characters + peut %1 contenir des caractères minuscules + + + + + + + NOT + PAS + + + + can %1 contain uppercase characters + peut %1 contenir des caractères majuscules + + + + can %1 contain numeric characters + peut %1 contenir des caractères numériques + + + + can contain the following punctuation: %1 + peut contenir la ponctuation suivante : %1 + + + + first character can %1 be a punctuation mark + le premier caractère peut %1 être une marque de ponctuation + + + + no unacceptable language as specified by these server rules: + note that the following lines will not be translated + Pas de langage inacceptable comme spécifié par ces règles du serveur: + + + + can not contain any of the following words: %1 + ne peut contenir les mots suivants : %1 + + + + can not match any of the following expressions: %1 + ne correspond à aucune des expressions suivantes : %1 + + + + You may only use A-Z, a-z, 0-9, _, ., and - in your username. + Vous pouvez utiliser seulement A-Z, a-z, 0-9, _, ., et - dans votre nom d'utilisateur + + + + + + + + + Registration denied + Enregistrement refusé + + + + Registration is currently disabled on this server + L'enregistrement est désactivé sur ce serveur + + + + There is already an existing account with the same user name. + Il existe déjà un compte avec le même nom d'utilisateur. + + + + It's mandatory to specify a valid email address when registering. + Il est obligatoire de spécifier une adresse e-mail valide lors de l'enregistrement. + + + + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + Il semble que vous essayez d'enregistrer un nouveau compte alors que vous en avez déjà un enregistré avec cet e-mail sur ce serveur. Ce serveur restreint le nombre de comptes par e-mail. Veuillez contacter l'administrateur du serveur pour obtenir vos identifiants ou plus d'informations. + + + + Password too short. + Mot de passe trop court. + + + + Registration failed for a technical problem on the server. + Enregistrement échoué lié à un problème technique du serveur. + + + + The connection to the server has been lost. + La connexion au serveur a été perdue. + + + + Unknown registration error: %1 + Erreur d'enregistrement inconnue : %1 + + + + Account activation failed + Activation du compte échouée + + + + Socket error: %1 + Erreur de socket : %1 + + + + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + Vous tentez de vous connecter à un serveur obsolète. Veuillez utiliser une ancienne version de Cockatrice, ou connectez-vous à un serveur approprié. +La version locale est %1, la version distante est %2. + + + + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + Votre client Cockatrice est obsolète. Veuillez mettre à jour votre version de Cockatrice. +La version locale est %1, la nouvelle version est %2. + + + + Connecting to %1... + Connexion à %1... + + + + Registering to %1 as %2... + Enregistrement de %1 en tant que %2... + + + + Disconnected + Déconnecté + + + + Connected, logging in at %1 + Connecté, connexion à %1 + + + + + + Requesting forgotten password to %1 as %2... + Envoi de la requête de mot de passe oublié à %1 en tant que %2... + + + &Connect... &Connecter... - + &Disconnect &Déconnecter - + Start &local game... Démarrer une partie &locale... - + &Watch replay... &Regarder un replay... - + &Full screen &Plein écran - + &Register to server... S'enregistrer sur le serveur... - + &Restore password... &Restaurer le mot de passe... - + &Settings... &Paramètres... - + &Exit &Quitter - + A&ctions Actions - + &Cockatrice &Cockatrice - + C&ard Database B&ase de données de cartes - + &Manage sets... &Gérer les éditions... - + Edit custom &tokens... Éditer les &jetons personnalisés… - + Open custom image folder Ouvrir le dossier d'images personnalisées - + Open custom sets folder Ouvrir le dossier d'éditions personnalisées - + Add custom sets/cards Ajouter des éditions / cartes personnalisées - + Reload card database Recharger la base de cartes - + Tabs Onglets - + &Help A&ide - + &About Cockatrice À propos de Cock&atrice - + &Tip of the Day &Conseil du jour - + Check for Client Updates Vérifier les mises à jour - + Check for Card Updates... Vérifier les mises à jour des cartes… - + Check for Card Updates (Automatic) Vérifier les mises à jour des cartes (automatiquement) - + Show Status Bar Montrer la barre de statut - + View &Debug Log Voir journal de &Debug - + Open Settings Folder Ouvrir le dossier des paramètres - + Show/Hide Montrer/Cacher - + New Version Nouvelle version - + Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. Bravo pour avoir mis à jour Cockatrice %1 ! Oracle va maintenant se lancer pour mettre à jour votre base de données de cartes. - + Cockatrice installed Installation de Cockatrice terminée - + Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. Félicitations ! Vous venez d'installer Cockatrice %1 ! Oracle va maintenant se lancer pour installer la base de données de cartes initiale. - + Card database Base de données de cartes - + Cockatrice is unable to load the card database. Do you want to update your card database now? If unsure or first time user, choose "Yes" @@ -5443,29 +5330,29 @@ Voulez-vous la mettre à jour maintenant ? Si vous n’êtes pas sûr, ou si c'est la première fois que vous jouez, choisissez « Oui ». - - + + Yes Oui - - + + No Non - + Open settings Ouvrir les paramètres - + New sets found Nouvelles éditions détectées - + %n new set(s) found in the card database Set code(s): %1 Do you want to enable it/them? @@ -5478,22 +5365,17 @@ Code(s) d'édition(s) : %1 Voulez-vous l'(les) activer ? - - Yes, always enable - - - - + View sets Voir les éditions - + Welcome Bienvenue - + Hi! It seems like you're running this version of Cockatrice for the first time. All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. @@ -5502,135 +5384,169 @@ Toutes les éditions de la base de données de cartes ont été activées. Pour plus d'informations sur la modification de l'ordre des éditions, la désactivation d'éditions spécifiques, et leurs effets, consultez le menu « Gérer les éditions… ». - + + Information Informations - + A card database update is already running. Une mise à jour de la base de données de cartes est déjà en cours. - + Unable to run the card database updater: Impossible de lancer la mise à jour de la base de données de cartes : - + Card database update running. Une mise à jour de la base de données de cartes est en cours. - + Failed to start. The file might be missing, or permissions might be incorrect. Échec au démarrage. Le fichier peut être manquant, ou les permissions sont incorrectes. - + The process crashed some time after starting successfully. Le processus a échoué quelque temps après avoir démarré avec succès. - + Timed out. The process took too long to respond. The last waitFor...() function timed out. Temps limite dépassé. Le processus a pris trop longtemps pour répondre. La dernière fonction waitFor...() a terminé. - + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. Une erreur a eu lieu en essayant d'écrire vers le processus. Par exemple, le processus pourrait ne pas tourner, ou il pourrait avoir son canal d'entrée fermé. - + An error occurred when attempting to read from the process. For example, the process may not be running. Une erreur a eu lieu en essayant d'écrire vers le processus. Par exemple, le processus pourrait ne pas tourner, ou il pourrait avoir son canal de sortie inactif. - + Unknown error occurred. Une erreur inconnue est arrivée. - + The card database updater exited with an error: %1 L'outil de mise à jour de la base de données de cartes s'est arrêté avec l'erreur : %1 - - - - - + + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + Le serveur supporte des fonctionnalités que votre client n'a pas. +Ce n'est probablement pas un problème, mais ce message peut signifier qu'il y a une nouvelle version de Cockatrice disponible, ou que ce serveur utilise une version pre-release ou personnalisée. + +Pour mettre à jour votre client, allez dans « Aide -> Vérifier les mises à jour ». + + + + + + + Load sets/cards Charger des éditions/cartes - + Selected file cannot be found. Le fichier sélectionné n'a pas pu être trouvé. - + You can only import XML databases at this time. Il n'est actuellement possible que d'importer des bases de données XML. - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. Les nouvelles éditions/cartes ont été ajoutées avec succès. Cockactrice va maintenant recharger la base de données de cartes. - + Sets/cards failed to import. Échec de l'importation des éditions/cartes. + + + + + Reset Password + Réinitialiser le mot de passe + + + + Your password has been reset successfully, you can now log in using the new credentials. + Votre mot de passe a été réinitialisé avec succès. Vous pouvez maintenant vous connecter en utilisant vos nouveaux identifiants. + + + + Failed to reset user account password, please contact the server operator to reset your password. + Échec de la réinitialisation du mot de passe du compte. Veuillez contacter l'administrateur du serveur pour réinitialiser votre mot de passe. + + + + Activation request received, please check your email for an activation token. + Demande d'activation reçue, vérifiez votre courrier électronique pour un jeton d'activation. + ManaBaseConfigDialog - + Mana Base Configuration - + Display type: - + pie - camembert + - + bar - barre + - + combinedBar - barreCombinée + - + Filter Colors (optional): - Filtrer par couleurs (optionnel) : + + + + + OK + - OK - OK - - - Cancel - Annuler + @@ -5646,47 +5562,47 @@ Cockactrice va maintenant recharger la base de données de cartes. Group By: - Grouper par : + type - type + color - couleur + subtype - sous-type + power - force + toughness - endurance + Filters (optional): - Filtres (optionnel) : + Show main bar row - Montrer la ligne d'aggrégat principale + Show per-category rows - Monter les lignes de chaque catégorie + @@ -5700,29 +5616,29 @@ Cockactrice va maintenant recharger la base de données de cartes. ManaDevotionConfigDialog - + Display type: - Type de charte : + + + + + pie + - pie - camembert + bar + - bar - barre - - - combinedBar - barre combinée + - + Filter Colors (optional): - Filtrer par couleurs (optionnel) : + @@ -5743,22 +5659,22 @@ Cockactrice va maintenant recharger la base de données de cartes. pie - camembert + bar - barre + Colors: - Couleurs : + Show per-color rows - Montrer une ligne par couleur + @@ -5771,7 +5687,7 @@ Cockactrice va maintenant recharger la base de données de cartes. %1 mana (%2 cards) - %1 mana (%2 cartes) + @@ -5779,626 +5695,621 @@ Cockactrice va maintenant recharger la base de données de cartes. Mana Production + Devotion - Production de Mana + Dévotion + Mana Distribution Settings - Options pour Distribution de Mana + MessageLogWidget - + from play depuis le jeu - + from their graveyard depuis son cimetière - + from exile depuis l'exil - + from their hand depuis sa main - + the top card of %1's library la carte du dessus de la bibliothèque de %1 - + the top card of their library le carte du dessus de sa bibliothèque - + from the top of %1's library à partir du dessus de la bibliothèque de %1 - + from the top of their library du dessus de sa bibliothèque - + the bottom card of %1's library la carte du dessous de la bibliothèque de %1 - + the bottom card of their library la carte du dessous de sa bibliothèque - + from the bottom of %1's library à partir du dessous de la bibliothèque de %1 - + from the bottom of their library du dessous de sa bibliothèque - + from %1's library de la bibliothèque de %1 - + from their library depuis sa bibliothèque - + from sideboard depuis sa réserve - + from the stack depuis la pile - + from custom zone '%1' depuis la zone personnalisée '%1' - + %1 is now keeping the top card %2 revealed. %1 garde maintenant la carte du dessus de sa bibliothèque %2 révélée. - + %1 is not revealing the top card %2 any longer. %1 ne révèle plus la carte du dessus de sa bibliothèque %2. - + %1 can now look at top card %2 at any time. %1 peut maintenant regarder la carte du dessus de sa bibliothèque %2 à n'importe quel moment. - + %1 no longer can look at top card %2 at any time. %1 ne peut plus regarder la carte du dessus de sa bibliothèque %2 à n'importe quel moment. - + %1 attaches %2 to %3's %4. %1 attache %2 à %4 de %3. - + %1 has conceded the game. %1 a concédé la partie. - + %1 has unconceded the game. %1 reste dans la partie. - + %1 has restored connection to the game. %1 est revenu dans la partie. - + %1 has lost connection to the game. %1 a perdu la connexion à la partie. - + %1 points from their %2 to themselves. %1 se cible avec son %2. - + %1 points from their %2 to %3. %1 cible %3 avec son %2. - + %1 points from %2's %3 to themselves. %1 se cible avec %3 de %2. - + %1 points from %2's %3 to %4. %1 cible %4 avec %3 de %2. - + %1 points from their %2 to their %3. %1 cible de son %3 vers son %2. - + %1 points from their %2 to %3's %4. %1 cible %3 de %4 avec %2. - + %1 points from %2's %3 to their own %4. %1 cible son %4 avec %3 de %2. - + %1 points from %2's %3 to %4's %5. %1 cible %5 de %4 avec %3 de %2. - + %1 creates a face down token. %1 crée un jeton face-cachée. - + %1 creates token: %2%3. %1 crée un jeton %2%3. - + %1 has loaded a deck (%2). %1 a chargé un deck (%2). - + %1 has loaded a deck with %2 sideboard cards (%3). %1 a chargé un deck avec %2 cartes en réserve (%3). - + %1 destroys %2. %1 détruit %2. - + a card une carte - + %1 gives %2 control over %3. %1 donne le contrôle de %2 à %3. - + %1 puts %2 into play%3 face down. %1 met %2 en jeu%3 face cachée. - + %1 puts %2 into play%3. %1 met %2 en jeu %3. - + %1 puts %2%3 into their graveyard face down. - %1 met %2%3 dans leur cimetière face cachée. + - + %1 puts %2%3 into their graveyard. %1 met %2%3 dans son cimetière. - + %1 exiles %2%3 face down. - %1 exile %2%3 face cachée. + - + %1 exiles %2%3. %1 exile %2%3. - + %1 moves %2%3 to their hand. %1 met %2%3 dans sa main. - + %1 puts %2%3 into their library. %1 met %2%3 dans sa bibliothèque. - + %1 puts %2%3 onto the bottom of their library. %1 met %2%3 au-dessous de sa bibliothèque. - + %1 puts %2%3 on top of their library. %1 met %2%3 au-dessus de sa bibliothèque. - + %1 puts %2%3 into their library %4 cards from the top. %1 met %2%3 dans sa bibliothèque %4 cartes depuis le dessus - + %1 moves %2%3 to sideboard. %1 met %2%3 à sa réserve. - + %1 plays %2%3 face down. - %1 joue %2%3 face cachée. + - + %1 plays %2%3. %1 joue %2%3. - + %1 moves %2%3 to custom zone '%4' face down. - %1 déplace %2%3 vers la zone personnalisée %4 face cachée. + - + %1 moves %2%3 to custom zone '%4'. %1 déplace %2%3 vers la zone personnalisée '%4'. - + %1 tries to draw from an empty library %1 essaie de piocher dans une bibliothèque vide - + %1 draws %2 card(s). %1 pioche %2 carte.%1 pioche %2 cartes.%1 pioche %2 carte(s). - + %1 is looking at %2. %1 regarde %2. - + %1 is looking at the %4 %3 card(s) %2. top card for singular, top %3 cards for plural %1 regarde la %4 %3 carte %2.%1 regarde les %4 %3 cartes %2.%1 regarde la / les %4 %3 carte(s) %2. - + bottom dessous - + top dessus - + %1 turns %2 face-down. %1 retourne %2 face cachée. - + %1 turns %2 face-up. %1 retourne %2 face visible. - + The game has been closed. La partie a été fermée. - + The game has started. La partie commence. - + You are flooding the game. Please wait a couple of seconds. Vous floodez la partie. Veuillez patienter quelques secondes. - + %1 has joined the game. %1 a rejoint la partie. - + %1 is now watching the game. %1 est maintenant spectateur. - + You have been kicked out of the game. Vous avez été expulsé de la partie. - + %1 has left the game (%2). %1 a quitté la partie (%2). - + %1 is not watching the game any more (%2). %1 n'observe plus la partie (%2). - + %1 is not ready to start the game any more. %1 n'est plus prêt à démarrer la partie. - + %1 shuffles their deck and draws a new hand of %2 card(s). %1 mélange son deck et pioche une nouvelle main de %2 carte.%1 mélange sa bibliothèque et pioche une nouvelle main de %2 cartes.%1 mélange sa bibliothèque et pioche une nouvelle main de %2 carte(s). - + %1 shuffles their deck and draws a new hand. %1 mélange sa bibliothèque et pioche une nouvelle main. - + You are watching a replay of game #%1. Vous regardez un replay de la partie n° %1. - + %1 is ready to start the game. %1 est prêt à démarrer la partie. - + cards an unknown amount of cards cartes - + %1 card(s) a card for singular, %1 cards for plural %1 carte%1 cartes%1 carte(s) - + %1 lends %2 to %3. %1 prêtes %2 à %3. - + %1 reveals %2 to %3. %1 révèle %2 à %3. - + %1 reveals %2. %1 révèle %2. - + %1 randomly reveals %2%3 to %4. %1 révèle au hasard %2%3 à %4. - + %1 randomly reveals %2%3. %1 révèle au hasard %2%3. - + %1 peeks at face down card #%2. %1 regarde furtivement la carte face cachée n° %2. - + %1 peeks at face down card #%2: %3. %1 regarde furtivement la carte face cachée n° %2 : %3. - + %1 reveals %2%3 to %4. %1 révèle %2%3 à %4. - + %1 reveals %2%3. %1 révèle %2%3. - + %1 reversed turn order, now it's %2. %1 a inversé l'ordre des tours, c'est maintenant %2. - + reversed inversé - + normal normal - + Heads Face - + Tails Pile - + %1 flipped a coin. It landed as %2. %1 a lancé une pièce. Il a fait %2. - + %1 rolls a %2 with a %3-sided die. %1 a fait %2 avec un dé %3 faces. - + %1 flips %2 coins. There are %3 heads and %4 tails. %1 lances %2 pièces. Il y'a %3 faces et %4 piles. - + %1 rolls a %2-sided dice %3 times: %4. %1 lances un dé à %2-faces %3 fois: %4. - + %1's turn. Tour de %1 - + %1 sets annotation of %2 to %3. %1 met l'annotation %3 à %2. - - %1 places %2 %3%4 counter(s) on %5 (now %6). - + + %1 places %2 "%3" counter(s) on %4 (now %5). + %1 place %2 "%3" compteur sur %4 (désormais %5).%1 place %2 "%3" compteurs sur %4 (désormais %5).%1 place %2 "%3" compteur(s) sur %4 (désormais %5). - - %1 removes %2 %3%4 counter(s) from %5 (now %6). - + + %1 removes %2 "%3" counter(s) from %4 (now %5). + %1 retire %2 "%3" compteur sur %4 (désormais %5).%1 retire %2 "%3" compteurs sur %4 (désormais %5).%1 retire %2 "%3" compteur(s) sur %4 (désormais %5). - - %1 failed to undo their last draw. - - - - + %1 sets counter %2 to %3 (%4%5). %1 met les marqueurs %2 à %3 (%4%5). - + %1 sets %2 to not untap normally. %2 de %1 ne se dégagera pas lors de l'étape de dégagement. - + %1 sets %2 to untap normally. %2 de %1 se dégagera lors de l'étape de dégagement. - + %1 removes the PT of %2. %1 retire la F/E de %2. - + %1 changes the PT of %2 from nothing to %4. %1 met la F/E de %2 à %4. - + %1 changes the PT of %2 from %3 to %4. %1 passe la F/E de %2 de %3 à %4. - + %1 has locked their sideboard. %1 a verrouillé sa réserve. - + %1 has unlocked their sideboard. %1 a déverrouillé sa réserve. - + %1 taps their permanents. %1 engage ses permanents. - + %1 untaps their permanents. %1 dégage ses permanents. - + %1 taps %2. %1 engage %2. - + %1 untaps %2. %1 dégage %2. - + %1 shuffles %2. %1 mélange %2. - + %1 shuffles the bottom %3 cards of %2. %1 mélange les %3 cartes du dessous de la bibliothèque de %2. - + %1 shuffles the top %3 cards of %2. %1 mélange les %3 cartes du dessus de la bibliothèque de %2. - + %1 shuffles cards %3 - %4 of %2. %1 mélange les cartes %3 - %4 de %2. - + %1 unattaches %2. %1 détache %2. - + %1 undoes their last draw. %1 annule sa dernière pioche. - + %1 undoes their last draw (%2). %1 annule sa dernière pioche (%2). @@ -6406,115 +6317,110 @@ Cockactrice va maintenant recharger la base de données de cartes. MessagesSettingsPage - + Word1 Word2 Word3 Mot1 Mot2 Mot3 - + Add New Message Ajouter un message - + Edit Message Éditer le message - + Remove Message Supprimer le message - + Add message Ajouter message - - + + Message: Message : - + Edit message Éditer le message - + Chat settings Paramètres du chat - + Custom alert words Mots d'alertes personnalisées - + Enable chat mentions Activer les mentions dans le chat - + Enable mention completer Activer les mentions dans le chat - + In-game message macros Macros de message en jeu - + How to use in-game message macros Comment utiliser les macro pour les messages en jeu - + Ignore chat room messages sent by unregistered users Ignorer les messages dans le chat principal envoyés par des joueurs non enregistrés. - + Ignore private messages sent by unregistered users Ignorer les messages privés envoyés par des joueurs non enregistrés. - - Ignore private messages sent by non-buddy users - - - - - + + Invert text color Inverser la couleur du texte - + Enable desktop notifications for private messages Activer les notifications de bureau pour les messages privés. - + Enable desktop notification for mentions Activer les notifications de bureau pour les mentions. - + Enable room message history on join Activer l'historique des messages du chat principal dès la connexion - - + + (Color is hexadecimal) (La couleur est hexadécimale) - + Separate words with a space, alphanumeric characters only Séparer les mots avec un espace, seulement les caractères alphanumériques @@ -6522,42 +6428,42 @@ Cockactrice va maintenant recharger la base de données de cartes. MoveMenu - + Move to Déplacer vers - + &Top of library in random order &Dessus de la bibliothèque dans un ordre aléatoire - + X cards from the top of library... X cartes du dessus de la bibliothèque... - + &Bottom of library in random order &Dessous de la bibliothèque dans un ordre aléatoire - + T&able - Tableau + - + &Hand &Main - + &Graveyard &Cimetière - + &Exile &Exil @@ -6570,47 +6476,47 @@ Cockactrice va maintenant recharger la base de données de cartes. Type de carte - + Mana Value Valeur de Mana - + Color(s) Couleur(s) - + Loyalty Loyauté - + Main Card Type Type de carte principal - + Mana Cost Coût de mana - + P/T F/E - + Side Côté - + Layout Design - + Color Identity Identité couleur @@ -6633,152 +6539,6 @@ Cockactrice va maintenant recharger la base de données de cartes. Direction de superposition : - - PaletteEditorDialog - - - - Reset - Réinitialiser - - - - - Apply - Appliquer - - - - - Save && Apply - Sauvegarder && Appliquer - - - - ▼ Edit Palette - - - - - - ▶ Edit Palette - - - - - Palette Editor — %1 - - - - - <b>Palette Editor</b> &nbsp;·&nbsp; %1 - - - - - This theme ships no default palette files - - - - - Replace current colours with the theme author's defaults - - - - - Switch between the light and dark palette files - - - - - Editing: - - - - - Show or hide the per-role colour grid for manual tweaks - - - - - ↺ Revert to theme default - - - - - Discard unsaved edits and restore the last saved palette - - - - - Preview this palette without saving to disk - - - - - Write palette-%1.toml and reload the theme - - - - - Cannot save: this theme has no directory on disk - - - - - Save failed - - - - - Could not write %1 to: -%2 - - - - - No default found - - - - - No default palette file found for the "%1" scheme. - - - - - PaletteGridWidget - - - Active - Actif - - - - Disabled - Désactivé - - - - Inactive - Inactif - - - - Normal interactive state - - - - - Widget is disabled / not interactive - - - - - Window is in background / unfocused - - - Phase @@ -6845,57 +6605,57 @@ Cockactrice va maintenant recharger la base de données de cartes. PhasesToolbar - + Untap step Étape de dégagement - + Upkeep step Étape d'entretien - + Draw step Étape de pioche - + First main phase Première phase principale - + Beginning of combat step Étape de début de combat - + Declare attackers step Étape de déclaration des attaquants - + Declare blockers step Étape de déclaration des bloqueurs - + Combat damage step Étape d'assignation des blessures de combat - + End of combat step Étape de fin de combat - + Second main phase Seconde phase principale - + End of turn step Phase de fin de tour @@ -6903,7 +6663,7 @@ Cockactrice va maintenant recharger la base de données de cartes. PictureLoader - + en code for scryfall's language property, not available for all languages fr @@ -6912,142 +6672,151 @@ Cockactrice va maintenant recharger la base de données de cartes. PlayerActions - - - - - grave - cimetière - - - - - - - exile - exile - - - - PlayerDialogs - - + View top cards of library - + Voir les cartes du dessus de la bibliothèque - - - - - - - - - + + + + + + + + + Number of cards: (max. %1) - + Nombre de cartes : (max. %1) - + View bottom cards of library - + Voir les cartes du dessous de la bibliothèque - + Shuffle top cards of library - + Mélanger les cartes du dessus de la bibliothèque - + Shuffle bottom cards of library - + Mélanger les cartes du dessous de la bibliothèque - + Draw hand - + Piocher une main - + 0 and lower are in comparison to current hand size - + 0 et moins sont en comparaison avec la taille actuelle de la main - + Draw cards + Piocher des cartes + + + + + + + grave - + + + + + exile + + + + Move top cards to %1 - + Move bottom cards to %1 - + Draw bottom cards - + Piocher les cartes du dessous - + + + C&reate another %1 token + C&réer un autre jeton %1 + + + Create tokens - + Créer des jetons - + + Number: - + Nombre : - + Place card X cards from top of library - + Placer les X cartes depuis le dessus de la bibliothèque - + Which position should this card be placed: - + Dans quelle position cette carte doit-elle être placée : - + (max. %1) - + (max. %1) - + Change power/toughness - + Changer la force/l'endurance - + Change stats to: - + Changer les stats pour : - + Set annotation - + Annoter - + Please enter the new annotation: - + Veuillez entrer la nouvelle annotation : + + + + Set counters + Définir les marqueurs PlayerMenu - + Player "%1" Joueur "%1" - + &Counters &Marqueurs @@ -7061,16 +6830,12 @@ Cockactrice va maintenant recharger la base de données de cartes. This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected. - Le sélecteur d'impressions est désactivé car l'option d'écraser toutes les impressions avec des éditions personnalisées est activée. - -Cette option fait que vous ne verrez que l'impression par défaut pour chaque carte, au lieu de pouvoir sélectionner une impression. Vous ne verrez pas les impressions que les autres joueurs ont sélectionnés pour eux-mêmes. - - + Enable printings again - Ré-activer les impressions + @@ -7081,30 +6846,30 @@ Cette option fait que vous ne verrez que l'impression par défaut pour chaq Afficher les boutons de navigation - + Printing Selector - Sélection d'impression + PrintingSelectorCardOverlayWidget - + Preference Préférence - + Pin Printing Épingler Imprimer - + Unpin Printing Désépingler Imprimer - + Show Related cards Afficher les cartes associées @@ -7169,63 +6934,63 @@ Cette option fait que vous ne verrez que l'impression par défaut pour chaq Select a card to view its available printings - Sélectionnez une carte pour voir ses impressions + PtMenu - + Power / toughness Force / Endurance - + &Increase power &Augmenter la force - + &Decrease power &Diminuer la force - + I&ncrease toughness A&ugmenter l'endurance - + D&ecrease toughness D&iminuer l'endurance - + In&crease power and toughness Au&gmenter la force et l'endurance - + Dec&rease power and toughness Dim&inuer la force et l'endurance - + Increase power and decrease toughness Augmenter la force et diminuer l'endurance - + Decrease power and increase toughness Diminuer la force et augmenter l'endurance - + Set &power and toughness... Changer la &force et l'endurance... - + Reset p&ower and toughness Réinitialiser la f&orce et l'endurance @@ -7233,37 +6998,37 @@ Cette option fait que vous ne verrez que l'impression par défaut pour chaq QMenuBar - + Services Services - + Hide %1 Cacher %1 - + Hide Others Cacher les autres - + Show All Montrer tout - + Preferences... Préférences... - + Quit %1 Quitter %1 - + About %1 À propos %1 @@ -7271,17 +7036,17 @@ Cette option fait que vous ne verrez que l'impression par défaut pour chaq QObject - + Cockatrice card database (*.xml) Base de données de cartes Cockatrice (*.xml) - + All files (*.*) Tous les fichiers (*.*) - + Cockatrice replays (*.cor) Replays Cockatrice (*.cor) @@ -7319,13 +7084,7 @@ You will not be able to manage printing preferences on a per-deck basis, or see You will have to use the Set Manager, available through Card Database -> Manage Sets. Are you sure you would like to enable this feature? - L'activation de cette option désactivera l'utilisation du sélecteur d'impression. - -Vous ne pourrez plus gérer les préférences d'impression pour chaque deck ni voir les impressions sélectionnées par d'autres joueurs. - -Vous devrez utiliser le Gestionnaire d'extensions, accessible via : Base de données de cartes -> Gérer les extensions. - -Êtes-vous sûr de vouloir activer cette option ? + @@ -7336,194 +7095,121 @@ You can now choose printings on a per-deck basis in the Deck Editor and configur You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available). Are you sure you would like to disable this feature? - Désactiver cette option activera la sélection d'impression. - -Vous pouvez désormais choisir les impressions pour chaque deck dans l'éditeur de deck et configurer l'impression ajoutée par défaut en l'épinglant dans la sélection d'impression. - -Vous pouvez également utiliser le gestionnaire de d'extension pour personnaliser l'ordre de tri des impressions dans la sélection d'impression (d'autres ordres de tri, comme l'ordre alphabétique ou la date de parution, sont disponibles). - -Êtes-vous sûr de vouloir désactiver cette option ? + Confirm Change - Confirmer le changement + QPlatformTheme - + OK OK - + Save Sauvegarder - + Save All Sauvegarder tout - + Open Ouvrir - + &Yes &Oui - + Yes to &All Dire oui à tout - + &No &Non - + N&o to All Dire non à tout - + Abort Abandonner - + Retry Réessayer - + Ignore Ignorer - + Close Fermer - + Cancel Annuler - + Discard Effacer - + Help Aide - + Apply Appliquer - + Reset Réinitialiser - + Restore Defaults Remettre à zéro - - QuickSetupPanel - - - %1% - - - - - <b>Quick Setup</b> - - - - - Generate all palette roles automatically from a single accent colour - - - - - Accent: - - - - - Primary hue. Used directly for highlights and links. -At high intensity it also tints buttons and backgrounds. - - - - - Intensity: - - - - - Subtle - - - - - Full colour - - - - - 0–30 Subtle tint — only highlights and links change hue -30–70 Accented — buttons, tooltips, and borders join in -70–100 Full colour — backgrounds, everything - - - - - 70% - - - - - Generate ↓ - - - - - Derive all palette roles from the accent colour above. -Fine-tune individual colours in the grid afterwards. - - - RemoteDeckList_TreeModel - + Name Nom - + ID ID - + Upload time Temps de chargement @@ -7531,32 +7217,32 @@ Fine-tune individual colours in the grid afterwards. RemoteReplayList_TreeModel - + ID ID - + Name Nom - + Players Joueurs - + Keep Garder - + Time started Le temps a commencé - + Duration (sec) Durée (sec) @@ -7564,37 +7250,37 @@ Fine-tune individual colours in the grid afterwards. RfgMenu - + &Exile &Exil - + &View exile &Voir la zone d'exil - + &Move exile to... &Déplacer la zone d'exil vers... - + &Top of library &Dessus de la bibliothèque - + &Bottom of library &Dessous de la bibliothèque - + &Hand &Main - + &Graveyard &Cimetière @@ -7640,9 +7326,9 @@ Fine-tune individual colours in the grid afterwards. SayMenu - + S&ay - Dire + @@ -7681,27 +7367,27 @@ Fine-tune individual colours in the grid afterwards. SetsModel - + Enabled Activée - + Set type Type - + Set code Code - + Long name Nom complet - + Release date Date de sortie @@ -7709,53 +7395,53 @@ Fine-tune individual colours in the grid afterwards. ShortcutSettingsPage - - + + Restore all default shortcuts Réinitialiser tous les raccourcis - + Do you really want to restore all default shortcuts? Êtes-vous sûr de vouloir réinitialiser tous les raccourcis ? - + Clear all default shortcuts Effacer tous les raccourcis par défaut - + Do you really want to clear all shortcuts? Êtes-vous sûr de vouloir effacer tous les raccourcis ? - + Section: Section : - + Action: Action : - + Shortcut: Raccourci : - + How to set custom shortcuts Comment assigner des raccourcis personnalisés - + Clear all shortcuts Effacer tous les raccourcis - + Search by shortcut name Rechercher par nom de raccourci @@ -7810,12 +7496,12 @@ Please check your shortcut settings! SideboardMenu - + &Sideboard &Réserve - + &View sideboard &Voir la réserve @@ -7823,27 +7509,27 @@ Please check your shortcut settings! SoundSettingsPage - + Enable &sounds Activer les &sons - + Current sounds theme: Thème sonore actuel: - + Test system sound engine Tester les effets sonores - + Sound settings Paramètres de son - + Master volume Volume principal @@ -7915,146 +7601,16 @@ Please check your shortcut settings! Réponse invalide reçue de la part du serveur de mise à jour. - + No reply received from the tag update server. Aucune réponse reçue de la part du serveur de mise à jour des tags. - + Invalid reply received from the tag update server. Réponse invalide reçue de la part du serveur de mise à jour des tags. - - StorageSettingsPage - - - - - Success - - - - - Cached card pictures have been reset. - - - - - Downloaded card pictures have been reset. - - - - - Error - - - - - One or more downloaded card pictures could not be cleared. - - - - - In-memory (currently loaded) card pictures have been reset. - - - - - Card Picture Loader Caching Method: - - - - - The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size. - - - - - Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while. - - - - - This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk. - - - - - Delete Cached Images - - - - - Delete Saved Images - - - - - Clear In-Memory Images - - - - - Card Picture Loader Cache Method - - - - - Network Cache - - - - - Filesystem - - - - - In-Memory Picture Cache - - - - - Network Cache Size: - - - - - On-disk cache for downloaded pictures - - - - - Redirect Cache TTL: - - - - - How long cached redirects for urls are valid for. - - - - - Picture Cache Size: - - - - - In-memory cache for pictures not currently on screen - - - - - Naming scheme: - - - - - Day(s) - Jour(s) - - TabAccount @@ -8190,171 +7746,123 @@ Please check your shortcut settings! TabArchidekt - - + + Desc. - Desc. + + + + + + AND + - - AND - ET - - - - + Require ALL selected colors - TOUTES les couleurs sélectionnées obligatoires + - - + + Deck name... - Nom du deck... + - - + + Owner... - Propriétaire... + - - + + Packages - - + + Advanced Filters - Filtres avancés + - + Bracket: - Catégorie : + - - + + Any - Tous + - - + + Contains card... - Contient la carte... + - - + + Commander... - Commandant... + - - + + Tag... - Tag... + - - + + Deck Size - Taille du deck + - + Cards: - Cartes : + - - + + Asc. - Asc. + + + + + Sort by: + - Sort by: - Trier par : - - - Filter by: - Filtrer par : + - + Display Settings - Options d'affichage + - - - Search - Rechercher - - - + + Search + + + + + Formats - Formats + Archidekt: - Archidekt : - - - - TabCardArtRules - - - Card: - Carte: - - - - ProviderId: - - - - - Mode: - - - - - Reason: - - - - - Type a card name... - - - - - Add rule - - - - - Remove rule - - - - - Refresh - - - - - Card Art Rules @@ -8383,7 +7891,7 @@ Please check your shortcut settings! Card Database - Base de données de cartes + @@ -8406,7 +7914,7 @@ Please check your shortcut settings! Réinitialiser l'interface - + Deck: %1 Deck : %1 @@ -8414,49 +7922,55 @@ Please check your shortcut settings! TabDeckEditorVisual - + Visual Deck: %1 Deck visuel : %1 - + &Visual Deck Editor &Éditeur de deck visuel - - + + Card Info Infos de la carte - - + + Deck Deck - + + + Filters + Filtres + + + &View &Voir - + Printing Imprimer - + Visible Visible - + Floating Flottant - + Reset layout Réinitialiser l'interface @@ -8464,22 +7978,22 @@ Please check your shortcut settings! TabDeckEditorVisualTabWidget - + Visual Deck View Vue de deck visuel - + Visual Database Display Affichage visuel de la base de données - + Deck Analytics Analyse de deck - + Sample Hand Exemple de main @@ -8487,134 +8001,134 @@ Please check your shortcut settings! TabDeckStorage - + Local file system Système de fichier local - + Server deck storage Serveur de stockage de deck - - + + Open in deck editor Ouvrir dans l'éditeur de deck - + Rename deck or folder Renommer le deck ou le dossier - + Upload deck Envoyer deck - + Download deck Télécharger deck + - - - + + New folder Nouveau dossier + - Delete Supprimer - + Open decks folder Ouvrir le dossier des decks - + Rename local folder Renommer le dossier local - + Rename local file Renommer le fichier local - + New name: Nouveau nom : - - - - + + + + Error Érreur - + Rename failed Renommage échoué - - + + Invalid deck file Fichier de deck invalide - + Enter deck name Entrez le nom du deck - + This decklist does not have a name. Please enter a name: Ce deck n'a pas de nom. Veuillez entrer un nom: - + Unnamed deck Deck sans nom - + Failed to upload deck to server Erreur lors de l'importation du deck sur le serveur - + Delete local file Supprimer fichier local - + Are you sure you want to delete the selected files? Êtes-vous certain de vouloir supprimer les fichiers sélectionnés ? - + Delete remote decks Supprimer les decks dinstants - + Are you sure you want to delete the selected decks? Êtes-vous certain de vouloir supprimer les decks sélectionnés ? - - + + Name of new folder: Nom du nouveau dossier : @@ -8686,191 +8200,191 @@ Veuillez entrer un nom: TabGame - - - + + + Replay Replay - - + + Game Partie - - + + Player List Liste des joueurs - - + + Card Info Infos de la carte - - + + Messages Messages - - + + Replay Timeline Historique des replays - + &Phases &Phases - + &Game &Partie - + Next &phase Étape &suivante - + Next phase with &action Étape suivante avec &action - + Next &turn &Tour suivant - + Reverse turn order Inverser l'ordre des tours - + &Remove all local arrows &Retirer toutes les flèches locales - + Rotate View Cl&ockwise Pivoter la vue dans le sens h&oraire - + Rotate View Co&unterclockwise Pivoter la vue dans le sens &anti-horaire - + Game &information &Informations sur la partie - + Un&concede Annuler la &concession - - - + + + &Concede &Concéder - + &Leave game &Quitter la partie - + C&lose replay Fermer &le replay - + &Focus Chat &Focus sur le chat - + &Say: &Dire : - + Selected cards Cartes sélectionnées - + &View &Voir - + Visible Visible - + Floating Flottant - + Reset layout Réinitialiser l'interface - + Concede Concéder - + Are you sure you want to concede this game? Êtes-vous sûr de vouloir concéder la partie ? - + Unconcede Rester dans la partie - + You have already conceded. Do you want to return to this game? Vous avez déjà concédé la partie. Voulez-vous la reprendre ? - + Leave game Quitter la partie - + Are you sure you want to leave this game? Êtes-vous sûr de vouloir quitter la partie ? - + A player has joined game #%1 Un joueur a rejoint la partie #%1. - + %1 has joined the game %1 a rejoint la partie. - + You have been kicked out of the game. Vous avez été expulsé de la partie. @@ -8929,115 +8443,115 @@ Veuillez entrer un nom: Vous devez sélectionner un nombre valide de jours à identifier. - + Username: Nom d'utilisateur: - + IP Address: Adresse IP : - + Game Name: Nom de la partie : - + GameID: ID de la partie : - + Message: Message : - + Main Room Salon principal - + Game Room Salon de jeu - + Private Chat Chat privé - + Past X Days: Les X derniers jours : - + Today Aujourd'hui - + Last Hour La dernière heure - + Maximum Results: Résultats maximum : - + At least one filter is required. The more information you put in, the more specific your results will be. Au moins un filtre est requis. Plus vous entrez d'informations, meilleurs seront les résultats. - + Get User Logs Obtenir les journaux de l'utilisateur - + Clear Filters Effacer les filtres - + Filters Filtres - + Log Locations Emplacement des journaux - + Date Range Intervalle de dates - + Maximum Results Résultats maximum - - + + Message History Historique des messages - + Failed to collect message history information. Impossible de récupérer l'historique des messages. - + There are no messages for the selected filters. Il n'y a pas de messages pour les filtres sélectionnés. @@ -9055,27 +8569,27 @@ Plus vous entrez d'informations, meilleurs seront les résultats.&Quitter - + %1 - Private chat %1 - Chat privé - + This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. Cet utilisateur vous ignore, il ne peut pas voir vos messages dans le chat principal et vous ne pouvez pas rejoindre ses parties. - + Private message from Message privé de - + %1 has left the server. %1 a quitté le serveur. - + %1 has joined the server. %1 a rejoint le serveur. @@ -9083,180 +8597,180 @@ Plus vous entrez d'informations, meilleurs seront les résultats. TabReplays - + Local file system Système de fichier local - + Server replay storage Stockage du serveur de replays - - + + Watch replay Voir replay - + Rename Renommer - - + + New folder Nouveau fichier - - + + Delete Supprimer - + Open replays folder Ouvrir le dossier des Replays - + Download replay Télécharger replay - + Toggle expiration lock Changer le verrouillage de l'expiration - + Get replay share code Obtenir le code de partage du replay - - + + Look up replay by share code Regarder un replay depuis un code de partage - + Rename local folder Renommer le dossier local - + Rename local file Renommer le fichier local - + New name: Nouveau nom: - + Error Erreur - + Rename failed Renommage échoué - + Name of new folder: Nom du nouveau fichier: - + Delete local file Supprimer fichier local - + Are you sure you want to delete the selected files? Êtes-vous certain de vouloir supprimer les fichiers sélectionnés? - + Are you sure you want to delete the selected replays? Êtes-vous certain de vouloir supprimer cet enregistrement? - + Failed to get code Echec d'obtention du code - - + + Either this server does not support replay sharing, or does not permit replay sharing for you. Soit ce serveur ne prend pas en charge le partage de replay, soit il ne vous autorise pas à partager des replays. - - - + + + Failed Échec - + Could not get replay code Impossible d'obtenir le code de replay - + Replay Share Code Code de Partage de Replay - + Others can use this code to add the replay to their list of remote replays: %1 D'autres peuvent utiliser ce code pour ajouter la replay à leur liste de replay distantes :%1 - + Copy to clipboard Copier vers le presse-papier - + Replay share code Code de partage de replay - + Replay code found Code de replay trouvé - + Replay was added, or you already had access to it. Le replay a été ajoutée, ou vous y aviez déjà accès. - + Replay code not found Code de replay non trouvé - + Failed to submit code Échec de l'envoi du code - + Unexpected error Erreur inattendue - + Delete remote replay Supprimer le replay distant @@ -9269,62 +8783,47 @@ Plus vous entrez d'informations, meilleurs seront les résultats. TabRoom - - Friends - - - - - Online - - - - - Ignored - - - - + &Say: &Dire : - + Chat Chat - + &Room &Salon - + &Leave room &Quitter le salon - + &Clear chat Effacer le &Chat - + Chat Settings... Paramètres du chat... - + mentioned you. vous a mentionné. - + Click to view Cliquer pour voir - + You are flooding the chat. Please wait a couple of seconds. Vous floodez le chat. Veuillez patienter quelques secondes. @@ -9337,30 +8836,30 @@ Plus vous entrez d'informations, meilleurs seront les résultats.Serveur - - - - + + + + Error Erreur - + Failed to join the server room: it doesn't exist on the server. Impossible de rejoindre le salon: il n'existe pas sur le serveur - + The server thinks you are in the server room but your client is unable to display it. Try restarting your client. Le serveur considère que vous êtes dans le salon mais votre client est incapable de l'afficher. Essayez en relançant votre client. - + You do not have the required permission to join this server room. Vous n'avez pas la permission requise pour rejoindre ce salon. - + Failed to join the server room due to an unknown error: %1. Impossible de rejoindre le salon à cause d'un erreur inconnue: %1 @@ -9368,97 +8867,97 @@ Plus vous entrez d'informations, meilleurs seront les résultats. TabSupervisor - + Deck Editor Éditeur de deck - + Visual Deck Editor Éditeur de deck visuel - + EDHRec EDHrec - + Archidekt - Archidekt + - + Home Accueil - + &Visual Deck Storage Stockage &visuel de decks - + Visual Database Display Affichage visuel de la base de données - + Server Serveur - + Account Compte - + Deck Storage Stockage de deck - + Game Replays Replays de parties - + Administration Administration - + Logs Journaux - + Are you sure? Êtes-vous sûr ? - + There are still open games. Are you sure you want to quit? Il y a encore des parties en cours. Êtes-vous sûr de vouloir quitter ? - + Click to view Cliquer pour regarder - + Your buddy %1 has signed on! Votre ami %1 s'est inscrit ! - + Unknown Event Événement inconnu - + The server has sent you a message that your client does not understand. This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. @@ -9469,39 +8968,39 @@ Ce message peut signifier qu'il y a une nouvelle version de Cockatrice disp Pour mettre à jour votre client, allez dans « Aide -> Vérifier les mises à jour ». - + Idle Timeout Temporisation inactive - + You are about to be logged out due to inactivity. Vous allez d'être déconnecté en raison de l'inactivité. - + Promotion Promotion - + You have been promoted. Please log out and back in for changes to take effect. Vous avez été promu modérateur. Veuillez vous reloguer pour que les changements prennent effet. - + Warned Averti - + You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. You avez reçu un avertissement pour la raison : %1. Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre vous. Si vous avez des questions, veuillez contacter un modérateur en privé. - + You have received the following message from the server. (custom messages like these could be untranslated) Vous avez reçu le message suivant du serveur. @@ -9511,12 +9010,12 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre TabVisualDatabaseDisplay - + Database Display - Affichage visuel de la bade de données + - + Visual Database Display Affichage visuel de la base de données @@ -9555,42 +9054,42 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre TranslateCounterName - + Life Points de vie - + White Blanc - + Blue Bleu - + Black Noir - + Red Rouge - + Green Vert - + Colorless Incolore - + Other Autre @@ -9598,69 +9097,11 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre UpdateDownloader - + Could not open the file for reading. Impossible d'ouvrir le fichier en lecture. - - UserCardArtSettingsDialog - - - Card Art Settings - - - - - Type a card name... - - - - - Card name: - - - - - Card ProviderId: - - - - - Left margin (%): - - - - - Right margin (%): - - - - - Vertical offset: - - - - - Zoom: - - - - - Parameters - - - - - Preview - - - - - Remove Banner Card - - - UserContextMenu @@ -9778,7 +9219,7 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre - + Ban History Historique des bannissements @@ -9793,87 +9234,77 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre Le joueur n'a jamais été banni. - + Failed to collect ban information. Impossible de collecter les informations de bannissement. - - - + + + Warning History Historique des avertissements - + Warning Time;Moderator;User Name;Reason Heure d'avertissement;Modérateur;Nom d'utilisateur;Raison - + User has never been warned. Le joueur n'a jamais reçu d'avertissement. - + Failed to collect warning information. Impossible de collecter les informations d'avertissements. - + Failed to get admin notes. Impossible de récupérer les notes d'administrateur. - - + + Success Succès - + Successfully promoted user. L'utilisateur a été promu avec succès. - + Successfully demoted user. L'utilisateur a été rétrogradé avec succès. - - Kick Player - - - - - Are you sure you want to kick this player from the game? - - - - - - + + + Failed Échec - + Failed to promote user. L'utilisateur n'a pas été promu. - + Failed to demote user. L'utilisateur n'a pas été rétrogradé. - + Copy hash to clipboard Copier le hash - + Remove this user's messages Supprimer les messages de cet utilisateur @@ -9881,554 +9312,326 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre UserInfoBox - + Location: Localisation : - + Account Age: Ancienneté du compte : - + Edit Éditer - + Change password Changer le mot de passe - + Change avatar Changer l'avatar - + Administrator Administrateur - + Moderator Modérateur - + Registered user Joueur enregistré - - + + Unregistered user Joueur non enregistré - + Judge Arbitre - + Unknown Inconnu - + The entered password does not match your account. Le mot de passe est incorrect - - - - + + + Information Information - + User information updated. Informations de l'utilisateur mises à jour. - - - - - - - - - - - + + + + + + + + + + Error Erreur - + User Information Informations utilisateur - + Real Name: Nom réel : - + User Level: Rang : - - - Edit Banner Card - - - + %n Year(s), amount of years (only shown if more than 0) %n année.%n années.%n année(s). - + %10%n Day(s) %20 amount of years (if more than 0), amount of days, date in local short format %10%n jour %20%10%n jours %20%10%n jour(s) %20 - + Enter Password Saisir le mot de passe - + Password verification is required in order to change your email address La vérification du mot de passe est requise pour changer votre adresse e-mail - - - + + + An error occurred while trying to update your user information. Une erreur est survenue lors de la mise à jour de vos informations personnelles. - - The selected card is blacklisted on this server or another error occurred. - - - - - Banner card removed. - - - - - Banner card updated. - - - - + This server does not permit you to update your user informations. Ce serveur ne vous permet pas de mettre à jour vos informations personnelles. - + Password changed. Mot de passe changé. - + This server does not permit you to change your password. Ce serveur ne vous permet pas de changer votre mot de passe. - + The new password is too short. Le nouveau mot de passe est trop court. - + The old password is incorrect. L'ancien mot de passe est incorrect. - + Avatar updated. Avatar mis à jour. - + This server does not permit you to update your avatar. Ce serveur ne vous permet pas de mettre à jour votre avatar. - - - An error occured while trying to update your avatar. - - - This server does not permit you to update your user informations. - An error occured while trying to updater your avatar. - Ce serveur ne vous permet pas de mettre à jour vos informations personnelles. - - - - UserInfoPopup - - - - Games - - - - - Chat - - - - - Open private chat - - - - - Profile - - - - - View user profile - - - - - Show this user's games - - - - - − Buddy - - - - - Remove from buddy list - - - - - + Buddy - - - - - Add to buddy list - - - - - − Ignore - - - - - Remove from ignore list - - - - - + Ignore - - - - - Add to ignore list - - - - - Ban - - - - - Ban from server - - - - - Warn - - - - - Warn user - - - - - Ban log - - - - - View ban history - Voir l'historique de bannissements - - - - Warn log - - - - - View warning history - Voir l'historique d'avertissements - - - - Notes - - - - - View admin notes - - - - - − Mod - - - - - Demote from moderator - - - - - + Mod - - - - - Promote to moderator - - - - - − Judge - - - - - Demote from judge - - - - - + Judge - - - - - Promote to judge - - - - - Join game - - - - - Spectate - - - - - - Loading games… - - - - - Could not load games. - - - - - No active games. - + An error occured while trying to updater your avatar. + Une erreur est survenue lors de la mise à jour de votre avatar. UserInterfaceSettingsPage - + General interface settings Paramètres généraux de l'interface - + &Double-click cards to play them (instead of single-click) &Double cliquer sur les cartes pour les jouer (au lieu d'un simple clic) - + &Clicking plays all selected cards (instead of just the clicked card) &Cliquer joue toutes les cartes sélectionnées (à la place de seulement la carte cliquée) - + &Play all nonlands onto the stack (not the battlefield) by default &Jouer toutes les cartes non terrain dans la pile (pas sur le champ de bataille) par défaut - + Do not delete &arrows inside of subphases - Ne pas effacer les flèches lors de sous-phases + - + Close card view window when last card is removed Fermer la fenêtre d'affichage des cartes lorsque la dernière carte est supprimée - + Auto focus search bar when card view window is opened Focalise automatiquement la barre de recherche lorsque la fenêtre d'affichage des cartes est ouverte - + Annotate card text on tokens Annoter le texte des cartes sur les jetons - - Show selection count during drag selection + + Show selection counter during drag selection - - Show total selection count + + Show total selection counter - - Show subtype breakdown in selection tally - - - - + Use tear-off menus, allowing right click menus to persist on screen Utiliser les menus détachables, permettant les clics droits sur les rendre persistants - - Keep game chat focused when clicking in game (Note: disables card view search bar) - - - - + Notifications settings Paramètres des notifications - + Enable notifications in taskbar Activer les notifications dans la barre des tâches - + Notify in the taskbar for game events while you are spectating Notifier dans la barre des tâches pour les évènements des parties quand vous y êtes spectateur - + Notify in the taskbar when users in your buddy list connect Notifier dans la barre des tâches quand un ami se connecte - + Animation settings Paramètres des animations - + &Tap/untap animation &Animation d'engagement / dégagement - + Deck editor/storage settings Paramètres d'éditeur et de stockage de deck - + Open deck in new tab by default Ouvre le deck dans un nouvel onglet par défaut - + Use visual deck storage in game lobby Utiliser le stockage visuel de decks dans le lobby des parties - + Use selection animation for Visual Deck Storage Utilisez l'animation de sélection pour le stockage visuel des deck - + When adding a tag in the visual deck storage to a .txt deck: Lorsque vous ajoutez une étiquette dans le stockage visuel du deck à un deck stocké comme un fichier .txt : - + do nothing ne rien faire - + ask to convert to .cod demander à convertir en fichier .cod - + always convert to .cod toujours convertir en fichier .cod - + Default deck editor type Type d'éditeur de deck par défaut - + Classic Deck Editor Éditeur de deck classique - + Visual Deck Editor Éditeur de deck visuel - + Replay settings Paramètres du replay - + Buffer time for backwards skip via shortcut: Temps de tampon pour les sauts en arrière via un raccourci : @@ -10436,22 +9639,22 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre UserListWidget - + Users connected to server: %1 Joueurs connectés au serveur : %1 - + Users in this room: %1 Joueurs dans ce salon : %1 - + Buddies online: %1 / %2 Amis connectés : %1 / %2 - + Ignored users online: %1 / %2 Joueurs sur liste noire connectés : %1 / %2 @@ -10459,68 +9662,58 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre UtilityMenu - + Increment all card counters Incrémenter tous les marqueurs de la carte - + &Untap all permanents &Dégager tous les permanents - + R&oll die... L&ancer un dé... - - Flip coin - - - - + &Create token... &Créer un jeton... - + C&reate another token C&réer un autre jeton - + Cr&eate predefined token C&réer un jeton prédéfini - - - C&reate another %1 token - - VisualDatabaseDisplayColorFilterWidget Exact match - Correspondance exacte + Includes - Inclus + Include / Exclude Mode: Includes - Inclure / Exclure + How selected and unselected colors are combined in the filter - Comment les couleurs sélectionnées ou non sont combinées dans le filtre + @@ -10528,7 +9721,7 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre Search filter... - Filtre de recherche... + @@ -10549,138 +9742,138 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre VisualDatabaseDisplayFilterToolbarWidget - + Sort by - Trier par + + + + + Filter by + - Filter by - Filtrer par + Save and load filters + + + + + Filter by exact card name + - Save and load filters - Sauvegarder et charger les filtres + Filter by card main-type + - Filter by exact card name - Filtrer par nom exact de carte + Filter by card sub-type + - Filter by card main-type - Filtrer par type principal de carte + Filter by set + - Filter by card sub-type - Filtrer par sous-type de carte - - - - Filter by set - Filtrer par extension + Filter by format legality + - Filter by format legality - Filtrer par légalité dans le format + Save/Load + + + + + Name + - Save/Load - Sauvegarder/Charger + Main Type + - Name - Nom + Sub Type + - Main Type - Type Principal + Sets + - Sub Type - Sous-type - - - - Sets - Éditions - - - Formats - Formats + VisualDatabaseDisplayFormatLegalityFilterWidget - + Show formats with at least: - Montrer les formats avec au moins : + + + + + cards + - cards - cartes + Do not display formats with less than this amount of cards in the database + - Do not display formats with less than this amount of cards in the database - Ne pas afficher les formats dont le nombre est inférieur à ce nombre dans la base de données - - - Filter mode (AND/OR/NOT conjunctions of filters) - Mode de filtre (conjonctions AND/OR/NOT de filtres) + Mode: Exact Match - Mode : correspondance exacte + Mode: Includes - Mode : inclure + VisualDatabaseDisplayMainTypeFilterWidget - + Show main types with at least: - Montrer les types principaux avec au moins : + + + + + cards + - cards - cartes - - - Do not display card main-types with less than this amount of cards in the database Ne pas afficher les types principaux de cartes dont le nombre est inférieur à ce montant dans la base de données - + Filter mode (AND/OR/NOT conjunctions of filters) Mode de filtre (conjonctions AND/OR/NOT de filtres) - + Mode: Exact Match Mode : correspondance exacte - + Mode: Includes Mode : inclure @@ -10688,27 +9881,27 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre VisualDatabaseDisplayNameFilterWidget - + Filter by name... (Exact match) - Filtrer par nom... (Correspondance exacte) + - + Load from Deck Charger depuis un deck - + Apply all card names in currently loaded deck as exact match name filters Appliquer tous les noms de cartes du deck actuellement chargé comme filtres de nom exacts - + Load from Clipboard Charger depuis le presse-papier... - + Apply all card names in clipboard as exact match name filters Appliquer tous les noms de cartes du presse-papier comme filtres de nom exacts @@ -10716,7 +9909,7 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre VisualDatabaseDisplayRecentSetFilterSettingsWidget - + Filter to most recent sets Filtrer par extensions récentes @@ -10724,19 +9917,19 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre VisualDatabaseDisplaySetFilterWidget - + Search sets... Rechercher les extensions... - - + + Mode: Exact Match Mode : correspondance exacte - - + + Mode: Includes Mode : inclure @@ -10744,37 +9937,37 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre VisualDatabaseDisplaySubTypeFilterWidget - + Search subtypes... Rechercher par sous-types... - + Show sub types with at least: - Montrer les sous-types avec au moins : + + + + + cards + - cards - cartes - - - Do not display card sub-types with less than this amount of cards in the database Ne pas afficher les sous-types de cartes dont le nombre est inférieur à ce montant dans la base de données - + Filter mode (AND/OR/NOT conjunctions of filters) Mode de filtre (conjonctions AND/OR/NOT de filtres) - + Mode: Exact Match Mode : correspondance exacte - + Mode: Includes Mode : inclure @@ -10782,30 +9975,30 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre VisualDatabaseDisplayWidget - + Search by card name (or search expressions) Rechercher par nom de carte (ou expression de recherche) - + Visual - Visuel + - + Loading database ... Chargement de la base de données... - + Clear all filters Effacer tous les filtres Table - Tableau + @@ -10813,43 +10006,43 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre Group by: - Grouper par : + Change how cards are divided into categories/groups. - Configurez comment les cartes sont divisées en groupes/catégories. + Sort by: - Trier par : + Click and drag to change the sort order within the groups - Cliquer et glisser pour changer l'ordre de tri dans les groupes. + Configure how cards are sorted within their groups - Configurez le mode de tri des cartes dans leurs groupes + - + Toggle Layout: Overlap - Mode d'affichage : Superposé + - + Change how cards are displayed within zones (i.e. overlapped or fully visible.) - Modifier l'affichage des cartes dans les zones (i.e. superposées ou entièrement visibles). + - + Toggle Layout: Flat - Mode d'affichage : Plat + @@ -10857,7 +10050,7 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre Add cards using the search bar or database tab to have them appear here - Ajouter des cartes via la barre de recherche ou l'onglet base de données pour qu'elles apparaissent ici + @@ -10876,17 +10069,17 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre VisualDeckEditorWidget - + Type a card name here for suggestions from the database... - Tapez un nom de carte ici pour des suggestions de la base de données... + - + Quick search and add card Recherche et ajout rapide d'une carte - + Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter Recherchez la correspondance la plus proche dans la base de données (avec suggestions automatiques) et ajoutez l'impression souhaitée au deck en appuyant sur Entrée @@ -10914,7 +10107,7 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre Show Color Identity - Montrer l'identité de couleur + @@ -11004,43 +10197,43 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre WarningDialog - + Which warning would you like to send? Quel avertissement voudriez-vous envoyer ? - + Redact all messages from this user in all rooms Censurer tous les messages de cet utilisateur dans toutes les salles - + &OK &OK - + &Cancel &Annuler - + Warn user for misconduct Envoyer un avertissement au joueur pour mauvaise conduite - - + + Error Erreur - + User name to send a warning to can not be blank, please specify a user to warn. Le nom d'utilisateur du joueur à avertir ne peut pas être vide, merci d'entrer un joueur à avertir. - + Warning to use can not be blank, please select a valid warning to send. L'avertissement à utiliser ne peut pas être vide, merci de sélectionner un avertissement valide à envoyer. @@ -11048,133 +10241,133 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre WndSets - + Move selected set to the top Déplacer l'édition sélectionnée tout en haut - + Move selected set up Déplacer l'édition sélectionnée vers le haut - + Move selected set down Déplacer l'édition sélectionnée vers le bas - + Move selected set to the bottom Déplacer l'édition sélectionnée tout en bas - + Search by set name, code, or type Rechercher par ensemble de nom, code ou type - + Default order Ordre par défaut - + Restore original art priority order Restaurer l'ordre original de priorité artistique - + Enable all sets Activer toutes les éditions - + Disable all sets Désactiver toutes les éditions - + Enable selected set(s) Activer l(es) édition(s) sélectionnée(s) - + Disable selected set(s) Désactiver l(es) éditions(s) sélectionné(s) - + Deck Editor Éditeur de deck - + Use CTRL+A to select all sets in the view. Utiliser Ctrl+A pour sélectionner toutes les éditions dans la vue actuelle. - + Only cards in enabled sets will appear in the card list of the deck editor. Seules les cartes des éditions activées apparaitront dans la liste de cartes de l'éditeur de deck. - + Image priority is decided in the following order: La priorité des images est décidé dans l'ordre suivant: - + first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) %1 is a link to the wiki D'abord le dossier PERSONNALISÉ (%1), puis les éditions activées dans cette fenêtre (de haut en bas) - + Include cards rebalanced for Alchemy [requires restart] Inclure les cartes rééquilibrées pour Alchemy [nécessite un redémarrage] - + Card Art Images des cartes - + How to use custom card art Comment utiliser une illustration personnalisée de carte - + Hints Astuces - + Note Note - + Sorting by column allows you to find a set while not changing set priority. Trier par colonne vous permet de trouver une édition sans changer la priorité des éditions. - + To enable ordering again, click the column header until this message disappears. Pour trier à nouveau, cliquez sur l'entête de la colonne jusqu'à ce que ce message disparaisse. - + Use the current sorting as the set priority instead Utiliser le tri actuel comme ordre de priorité des éditions - + Sorts the set priority using the same column Sortir la priorité sur la même colonne - + Manage sets Gérer les éditions @@ -11182,72 +10375,72 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre ZoneViewWidget - + Search by card name (or search expressions) Rechercher par nom de carte (ou expression de recherche) - + Ungrouped Non groupé - + Group by Type Grouper par Types - + Group by Mana Value Grouper par Valeur de Mana - + Group by Color Grouper par Couleurs - + Unsorted Non trié - + Sort by Name Trier par Nom - + Sort by Type Trier par Type - + Sort by Mana Cost Trier par Coût de Mana - + Sort by Colors Trier par Couleurs - + Sort by P/T Trier par F/E - + Sort by Set Trier par extension - + shuffle when closing mélanger en quittant - + pile view vue de la pile @@ -11255,7 +10448,7 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre i18n - + English Français (French) @@ -11263,12 +10456,12 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre main - + Connect on startup Connecter au démarrage - + Debug to file Débuguer dans journal @@ -11282,7 +10475,7 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre - + Deck Editor Éditeur de deck @@ -11363,7 +10556,7 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre - + Replays Replays @@ -11478,129 +10671,129 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre Charger un deck… - - + + Load Deck from Clipboard... Charger un deck depuis le presse-papier… - + Edit Deck in Clipboard, Annotated Éditer le deck dans le presse-papier, avec annotations - + Edit Deck in Clipboard Éditer le deck dans le presse-papier - + New Deck Nouveau deck - + Open Custom Pictures Folder Ouvrir le dossier d'images personnalisées - + Print Deck... Imprimer le deck… - + Delete Card Supprimer la carte - - + + Reset Layout Réinitialiser l'interface - + Save Deck Sauvegarder le deck - + Save Deck as... Sauvegarder le deck sous… - + Save Deck to Clipboard, Annotated Copier le deck annoté - + Save Deck to Clipboard, Annotated (No Set Info) Copier le deck, avec annotations (sans information d'extension) - + Save Deck to Clipboard Copier le deck - + Save Deck to Clipboard (No Set Info) Copier le deck (sans information d'extension) - + Load Local Deck... Charger un deck local… - + Load Remote Deck... Charger un deck distant… - + Set Ready to Start Marquer prêt à démarrer - + Toggle Sideboard Lock Verrouiller / déverrouiller la réserve - + Add Green Counter Ajouter un marqueur vert - + Remove Green Counter Retirer un marqueur vert - + Set Green Counters... Nombre de marqueurs verts… - + Add Red Counter Ajouter un marqueur rouge - + Remove Red Counter Retirer un marqueur rouge - + Set Red Counters... Nombre de marqueurs rouges… - + Add Life Counter Gagner 1 point de vie @@ -11610,744 +10803,724 @@ Merci de ne pas recommencer ou d'autres mesures peuvent être prises contre Montrer la barre de statut - - Load deck from online service... - - - - - Load from website... - - - - + Unload Deck Annuler le chargement du deck - + Force Start Forcer le démarrage - + Add Card Counter (F) Ajouter un marqueur de carte (F) - + Remove Card Counter (F) Retirer un marqueur de carte (F) - + Set Card Counters (F)... Nombre de marqueurs de carte (F)... - + Add Card Counter (E) Ajouter un marqueur de carte (E) - + Remove Card Counter (E) Retirer un marqueur de carte (E) - + Set Card Counters (E)... Nombre de marqueurs de carte (E)... - + Add Card Counter(D) Ajouter un marqueur de carte (D) - + Remove Card Counter (D) Retirer un marqueur de carte (D) - + Set Card Counters (D)... Nombre de marqueurs de carte (D)... - + Add Card Counter (C) Ajouter un marqueur de carte (C) - + Remove Card Counter (C) Retirer un marqueur de carte (C) - + Set Card Counters (C)... Nombre de marqueurs de carte (C)... - + Add Card Counter (B) Ajouter un marqueur de carte (B) - + Remove Card Counter (B) Retirer un marqueur de carte (B) - + Set Card Counters (B)... Nombre de marqueurs de carte (B)... - + Add Card Counter (A) Ajouter un marqueur de carte (A) - + Remove Card Counter (A) Retirer un marqueur de carte (A) - + Set Card Counters (A)... Nombre de marqueurs de carte (A)... - + Remove Life Counter Perdre 1 point de vie - + Set Life Counters... Nombre de points de vie… - + Add White Counter Ajouter un marqueur blanc - + Remove White Counter Retirer un marqueur blanc - + Set White Counters... Nombre de marqueurs blancs… - + Add Blue Counter Ajouter un marqueur bleu - + Remove Blue Counter Retirer un marqueur bleu - + Set Blue Counters... Nombre de marqueurs bleus… - + Add Black Counter Ajouter un marqueur noir - + Remove Black Counter Retirer un marqueur noir - + Set Black Counters... Nombre de marqueurs noirs… - + Add Colorless Counter Ajouter un marqueur incolore - + Remove Colorless Counter Retirer un marqueur incolore - + Set Colorless Counters... Nombre de marqueurs incolores… - + Add Other Counter Ajouter un autre marqueur - + Remove Other Counter Supprimer un autre marqueur - + Set Other Counters... Mettre d'autres compteurs... - + Increment all card counters Incrémenter tous les marqueurs de la carte - + Add Power (+1/+0) Augmenter la force (+1/+0) - + Remove Power (-1/-0) Diminuer la force (-1/-0) - + Move Toughness to Power (+1/-1) Endurance vers force (+1/-1) - + Add Toughness (+0/+1) Augmenter l'endurance (+0/+1) - + Remove Toughness (-0/-1) Diminuer l'endurance (-0/-1) - + Move Power to Toughness (-1/+1) Force vers endurance (-1/+1) - + Add Power and Toughness (+1/+1) Augmenter la force et l'endurance (+1/+1) - + Remove Power and Toughness (-1/-1) Diminuer la force et l'endurance (-1/-1) - + Set Power and Toughness... Changer la force et l'endurance… - + Reset Power and Toughness Réinitialiser la force et l'endurance - + Untap Dégager - + Upkeep Entretien - + Draw Piocher - + First Main Phase Première phase principale - + Start Combat Début de combat - + Attack Attaquer - + Block Bloquer - + Damage Blessures - + End Combat Fin de combat - + Second Main Phase Seconde phase principale - + End Fin - + Next Phase Phase suivante - + Next Phase Action Étape suivante avec action - + Next Turn Tour suivant - + Hide Card in Reveal Window Cache la carte dans la fenêtre Révéler - + Tap / Untap Card Engage / dégager la carte - + Untap All Tout dégager - + Toggle Skip Untapping Toggle Untap - Activer / désactiver le désengagment + - + Turn Card Over Retourner la carte - + Peek Card Regarder la carte - + Play Card Jouer la carte - + Play Card, Face Down - Jouer la carte, face cachée + - + Attach Card... Attacher la carte… - + Unattach Card Détacher la carte - + Clone Card Cloner la carte - + Create Token... Créer un jeton… - + Create All Related Tokens Créer tous les jetons associés - + Create Another Token Créer un autre jeton - + Set Annotation... Annoter… - - Reduce Life by Power - - - - + Select All Cards in Zone Sélectionne toutes les cartes dans la zone - + Select All Cards in Row Sélectionne toutes les cartes dans la ligne - + Select All Cards in Column Sélectionne toutes les cartes dans la colonne - + Reveal Selected Cards to All Players - Révéler les cartes sélectionnées à tous les joueurs + - - + + Bottom of Library Dessous de la bibliothèque - - - - + + + + Exile Exil - - - - + + + + Graveyard Cimetière - - + + Hand Main - - + + Top of Library Dessus de la bibliothèque - - + + Battlefield, Face Down Champ de bataille, face cachée - + Battlefield Champ de bataille - + Library Bibliothèque - + Sideboard Réserve - + Top Cards of Library Cartes du dessus de la bibliothèque - + Bottom Cards of Library Cartes du dessous de la bibliothèque - + Close Recent View Fermer la vue récente - - + + Stack Pile - - + + Graveyard (Multiple) Cimetière (plusieurs) - - + + Graveyard (Multiple), Face Down - Cimetière (plusieurs), faces cachées + - - + + Exile (Multiple) Exil (plusieurs) - - + + Exile (Multiple), Face Down - Exiler(plusieurs), faces cachées + - + Stack Until Found Empiler jusqu'à ce que trouvé - + Draw Bottom Card Piocher la carte du dessous - + Draw Multiple Cards from Bottom... Piocher plusieurs cartes du dessous... - + Draw Arrow... Tracer une flèche… - + Remove Local Arrows Retirer les flèches locales - + Leave Game Quitter la partie - + Concede Concéder - + Roll Dice... Lancer un dé… - - Flip Coin - - - - + Shuffle Library Mélanger la bibliothèque - + Shuffle Top Cards of Library Mélanger les cartes du dessus de la bibliothèque - + Shuffle Bottom Cards of Library Mélanger les cartes du dessous de la bibliothèque - + Mulligan Mulligan - + Mulligan (Same hand size) - Mulligan (Même nombre de cartes) + - + Mulligan (Hand size - 1) - Mulligan (-1 carte) + - + Draw a Card Piocher une carte - + Draw Multiple Cards... Piocher plusieurs cartes… - + Undo Draw Annuler la dernière pioche - + Always Reveal Top Card Toujours révéler la carte du dessus - + Always Look At Top Card Toujours révéler la carte du dessus - + Sort Hand by Name - Trier la main par nom + - + Sort Hand by Type - Trier la main par type + - + Sort Hand by Mana Value - Trier la main par Valeur de Mana + - + Reveal Hand to All Players - Révéler la main à tous les joueurs + - + Reveal Random Card to All Players - Révéler une carte aléatoire à tous les joueurs + - + Rotate View Clockwise Pivoter la vue dans le sens horaire - + Rotate View Counterclockwise Pivoter la vue dans le sens anti-horaire - + Unfocus Text Box Lâcher le focus de la boîte de texte - + Focus Chat Focus sur le chat - + Clear Chat Effacer le chat - + Refresh Rafraichir - + Skip Forward Avance en avant - + Skip Backward Avant en arrière - + Skip Forward by a lot Avance beaucoup en avant - + Skip Backward by a lot Avance beaucoup en arrière - + Play/Pause Jouer/Pause - + Toggle Fast Forward Activer l'avance rapide - + Home Accueil - + Visual Deck Storage Stockage visuel de deck - + Deck Storage Stockage de deck - + Server Serveur - + Account Compte - + Administration Administration - + Logs Journaux diff --git a/cockatrice/translations/cockatrice_it.ts b/cockatrice/translations/cockatrice_it.ts index e370878b9..8356063d6 100644 --- a/cockatrice/translations/cockatrice_it.ts +++ b/cockatrice/translations/cockatrice_it.ts @@ -2,7 +2,7 @@ AbstractCounter - + &Set counter... Imposta &contatore... @@ -10,12 +10,12 @@ AbstractCounterDialog - + Set counter Imposta contatore - + New value for counter '%1': Nuovo valore per il contatore '%1': @@ -36,62 +36,62 @@ AbstractTabDeckEditor - + Open in new tab Apri in una nuova scheda - + Are you sure? Sei sicuro? - + The decklist has been modified. Do you want to save the changes? La lista del mazzo è stata modificata. Vuoi salvare i cambiamenti? - - - - - - + + + + + + Error Errore - + Could not open deck at %1 Impossibile aprire il mazzo a %1 - + Could not save remote deck Impossibile salvare mazzo remoto - - + + The deck could not be saved. Please check that the directory is writable and try again. Il mazzo non può essere salvato. Controlla se la cartella è valida e prova ancora. - + Save deck Salva mazzo - + The deck could not be saved. Il mazzo non può essere salvato. - + There are no cards in your deck to be exported Non ci sono carte da esportare nel tuo mazzo @@ -107,12 +107,12 @@ Controlla se la cartella è valida e prova ancora. AdminNotesDialog - + Update Notes Aggiorna note - + Admin Notes for %1 Note amministratori su %1 @@ -129,227 +129,172 @@ Controlla se la cartella è valida e prova ancora. Sideboard Sideboard - - - Tokens - - AppearanceSettingsPage - + seconds secondi - + Error Errore - + Could not create themes directory at '%1'. Impossibile creare la cartella dei temi in '%1'. - + Theme settings Impostazioni temi - + Current theme: Tema attuale: - + Open themes folder Apri cartella temi - + Home tab background source: Sorgente dello sfondo della Home: - + Home tab background shuffle frequency: Frequenza di modifica dello sfondo della Home: - + Disabled Disattivato - + + Display card name of background in bottom right: + + + + Menu settings Impostazioni menù - + Show keyboard shortcuts in right-click menus Mostra scorciatoie da tastiera nel menù del tasto destro del mouse - + Show game filter toolbar above list in room tab Mostra barra di filtro sopra la lista delle partite - + Card rendering Visualizzazione delle carte - + Display card names on cards having a picture Visualizza nome delle carte sopra le immagini - + Auto-Rotate cards with sideways layout Ruota automaticamente carte con disposizione orizzontale - + Override all card art with personal set preference (Pre-ProviderID change behavior) Determina l'illustrazione della carta attraverso la priorità dei set (come prima dell'implementazione del ProviderID) - - Light - - - - - Dark - - - - - System - - - - - Active theme palette: - - - - - Edit theme palette - - - - - Home tab settings - - - - - Display card name of background in bottom right - - - - - Styling settings - - - - - Style user list - - - - - Card printings - - - - + Bump sets that the deck contains cards from to the top in the printing selector Nel selettore di stampa, mostra per primi i set delle carte che il mazzo contiene - + Scale cards on mouse over Ingrandisci la carta sotto il mouse - + Use rounded card corners Usa i bordi delle carte arrotondati - - Card layout - - - - + Minimum overlap percentage of cards on the stack and in vertical hand Sovrapposizione % minima delle carte in pila e nella mano verticale: - + Maximum initial height for card view window: Altezza iniziale massima per la finestra di visualizzazione delle carte: - - + + rows file - + Maximum expanded height for card view window: Altezza massima per la finestra di visualizzazione delle carte: - + Card counters Segnalini della carta - + Counter %1 Segnalino %1 - + Hand layout Disposizione della mano - + Display hand horizontally (wastes space) Disponi la mano orizzontalmente (spreca spazio) - + Enable left justification Allinea a sinistra - + Table grid layout Disposizione delle aree di gioco - + Invert vertical coordinate Inverti disposizione verticale - + Minimum player count for multi-column layout: Numero di giocatori minimo per disposizione multicolonna: - + Maximum font size for information displayed on cards: Dimensione massima carattere per le informazioni mostrate sulle carte: @@ -357,12 +302,12 @@ Controlla se la cartella è valida e prova ancora. ArchidektApiResponseDeckDisplayWidget - + Back to results Torna ai risultati - + Open Deck in Deck Editor Apri mazzo nell'editor dei mazzi @@ -388,112 +333,112 @@ Controlla se la cartella è valida e prova ancora. BanDialog - + ban &user name Banna &user name - + ban &IP address Banna indirizzo &IP - + ban client I&D Banna client I&D - + Ban type Tipo di ban - + &permanent ban Ban &permanente - + &temporary ban Ban &temporaneo - + &Days: &Giorni: - + &Hours: &Ore: - + &Minutes: &Minuti: - + Duration of the ban Durata del ban - + Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. Per favore inserisci la ragione del ban. Questa è visibile solo ai moderatori e non alla persona bannata. - + Please enter the reason for the ban that will be visible to the banned person. Per favore inserisci la ragione del ban che sarà visibile alla persona bannata. - + Redact all messages from this user in all rooms Elimina tutti i messaggi di questo utente in tutte le stanze - + &OK &OK - + &Cancel &Annulla - + Ban user from server Banna utente dal server - - - - + + + + Error Errore - + You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. Seleziona un nome, un IP, un client ID o una combinazione di questi per impostare un ban. - + You must have a value in the name ban when selecting the name ban checkbox. Devi inserire un valore nel campo nome quando il ban per nome è selezionato. - + You must have a value in the ip ban when selecting the ip ban checkbox. Devi inserire un valore nel campo ip quando il ban per ip è selezionato. - + You must have a value in the clientid ban when selecting the clientid ban checkbox. Devi inserire un valore nel campo clientid quando il ban per clientid è selezionato. @@ -501,123 +446,59 @@ Questa è visibile solo ai moderatori e non alla persona bannata. BetaReleaseChannel - + Beta Beta - + No reply received from the release update server. Nessuna risposta ricevuta dal server degli aggiornamenti. - + Invalid reply received from the release update server. Risposta non valida ricevuta dal server degli aggiornamenti. - + No reply received from the file update server. Nessuna risposta ricevuta dal server degli aggiornamenti. - - CardArtPreviewWidget - - - No card selected - - - - - CardArtRulesModel - - - Card - - - - - ProviderId - - - - - Mode - - - - - Reason - - - CardDatabaseModel - + Name Nome - + Sets Set - + Mana cost Costo - + Card type Tipo - + P/T F/C - + Color(s) Colore - - CardDatabaseView - - - Add to Deck - - - - - Add to Sideboard - - - - - Select Printing - - - - - Show on EDHRec (Commander) - - - - - Show on EDHRec (Card) - - - - - Show Related cards - - - CardFilter @@ -746,22 +627,22 @@ Questa è visibile solo ai moderatori e non alla persona bannata. CardInfoPictureWidget - + View related cards Guarda carte correlate - + Add card to deck Aggiungi la carta al &mazzo - + Mainboard Mazzo - + Sideboard Sideboard @@ -784,12 +665,12 @@ Questa è visibile solo ai moderatori e non alla persona bannata. Numero di collezione: - + Related cards: Carte correlate: - + Unknown card: Carta sconosciuta: @@ -797,146 +678,128 @@ Questa è visibile solo ai moderatori e non alla persona bannata. CardMenu - + Re&veal to... Ri&vela a... - + &All players &Tutti i giocatori - + View related cards Guarda carte correlate - + Token: Pedina: - + All tokens Tutte le pedine - + &Select All &Seleziona tutto - + S&elect Row S&eleziona fila - + S&elect Column S&eleziona colonna - + &Play &Gioca - + &Hide &Nascondi - + Play &Face Down Gioca a &faccia in giù - + &Tap / Untap Turn sideways or back again &TAPpa/STAPpa - + Skip &untapping Salta lo &STAP - + T&urn Over Turn face up/face down Capovolgi - + &Peek at card face &Sbircia la faccia della carta - + &Clone &Copia - + Attac&h to card... Asse&gna alla carta... - + Unattac&h Tog&li - + &Draw arrow... &Disegna una freccia... - + &Set annotation... &Imposta note... - - Reduce life by power - - - - + Ca&rd counters Segnalini delle ca&rte - + &Add counter (%1) &Aggiungi segnalino (%1) - + &Remove counter (%1) &Rimuovi segnalino (%1) - + &Set counters (%1)... Imposta &segnalini (%1)... - - CardPictureLoaderCacheMethod - - - Network Cache - - - - - Filesystem - - - CardSizeWidget @@ -948,133 +811,133 @@ Questa è visibile solo ai moderatori e non alla persona bannata. CardZoneLogic - + their hand nominative la sua mano - + %1's hand nominative Mano di %1 - + their library look at zone il suo grimorio - + %1's library look at zone Grimorio di %1 - + of their library top cards of zone, del suo grimorio - + of %1's library top cards of zone del grimorio di %1 - + their library reveal zone il suo grimorio - + %1's library reveal zone Grimorio di %1 - + their library shuffle il suo grimorio - + %1's library shuffle Grimorio di %1 - + their library nominative il suo grimorio - + %1's library nominative Grimorio di %1 - + their graveyard nominative il suo cimitero - + %1's graveyard nominative Cimitero di %1 - + their exile nominative la sua zona di esilio - + %1's exile nominative Esilio di %1 - + their sideboard look at zone la sua sideboard - + %1's sideboard look at zone Sideboard di %1 - + their sideboard nominative la sua sideboard - + %1's sideboard nominative Sideboard di %1 - + their custom zone '%1' nominative la sua zona personalizzata '%1' - + %1's custom zone '%2' nominative la zona personalizzata '%2' di %1 @@ -1096,421 +959,16 @@ Questa è visibile solo ai moderatori e non alla persona bannata. Errore di lettura alla riga %1 posizione %2: - - ColorButton - - - Click to pick a color - - - - - Pick colour - - - - - ConnectionController - - - - The server has reached its maximum user capacity, please check back later. - - - - - There are too many concurrent connections from your address. - - - - - Banned by moderator - - - - - Expected end time: %1 - - - - - This ban lasts indefinitely. - - - - - Scheduled server shutdown. - - - - - - Invalid username. - - - - - You have been logged out due to logging in at another location. - - - - - Connection closed - - - - - The server has terminated your connection. -Reason: %1 - - - - - The server is going to be restarted in %n minute(s). -All running games will be lost. -Reason for shutdown: %1 - - - - - Scheduled server shutdown - - - - - Failed Login - - - - - Your client seems to be missing features this server requires for connection. - - - - - To update your client, go to 'Help -> Check for Client Updates'. - - - - - - - - - - - - - - - - - - - - - - Error - - - - - Incorrect username or password. Please check your authentication information and try again. - - - - - There is already an active session using this user name. -Please close that session first and re-login. - - - - - - You are banned until %1. - - - - - - You are banned indefinitely. - - - - - This server requires user registration. Do you want to register now? - - - - - This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. -Please close and reopen your client to try again. - - - - - An internal error has occurred, please close and reopen Cockatrice before trying again. -If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - - - - Account activation - - - - - Your account has not been activated yet. -You need to provide the activation token received in the activation email. - - - - - Server Full - - - - - Unknown login error: %1 - - - - - - -This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - - - - - - - - - Registration denied - - - - - Registration is currently disabled on this server - - - - - There is already an existing account with the same user name. - - - - - It's mandatory to specify a valid email address when registering. - - - - - It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. - - - - - Password too short. - - - - - Registration failed for a technical problem on the server. - - - - - The connection to the server has been lost. - - - - - Unknown registration error: %1 - - - - - Account activation failed - - - - - Socket error: %1 - - - - - Server timeout - - - - - You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. -Local version is %1, remote version is %2. - - - - - Your Cockatrice client is obsolete. Please update your Cockatrice version. -Local version is %1, remote version is %2. - - - - - - Success - - - - - Registration accepted. -Will now login. - - - - - Account activation accepted. -Will now login. - - - - - Information - - - - - This server supports additional features that your client doesn't have. -This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. - -To update your client, go to Help -> Check for Updates. - - - - - - - Reset Password - - - - - Your password has been reset successfully, you can now log in using the new credentials. - - - - - Failed to reset user account password, please contact the server operator to reset your password. - - - - - Activation request received, please check your email for an activation token. - - - - - Connecting to %1... - - - - - Registering to %1 as %2... - - - - - Disconnected - - - - - Connected, logging in at %1 - - - - - Requesting forgotten password to %1 as %2... - - - - - Your username must respect these rules: - - - - - is %1 - %2 characters long - - - - - can %1 contain lowercase characters - - - - - - - - NOT - - - - - can %1 contain uppercase characters - - - - - can %1 contain numeric characters - - - - - can contain the following punctuation: %1 - - - - - first character can %1 be a punctuation mark - - - - - no unacceptable language as specified by these server rules: - note that the following lines will not be translated - - - - - can not contain any of the following words: %1 - - - - - can not match any of the following expressions: %1 - - - - - You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - - CustomZoneMenu - + C&ustom Zones &Zone personalizzate - - + + View custom zone '%1' Visualizza la zona personalizzata '%1' @@ -1518,35 +976,30 @@ To update your client, go to Help -> Check for Updates. DeckAnalyticsWidget - + Add Panel Aggiungi pannello - + Remove Panel Rimuovi pannello - + Save Layout Salva disposizione - + Load Layout Carica disposizione - - - Include Sideboard - - DeckEditorCardDatabaseDockWidget - + Card Database Database carte @@ -1562,17 +1015,47 @@ To update your client, go to Help -> Check for Updates. DeckEditorDatabaseDisplayWidget - + Search by card name (or search expressions) Cerca per nome della carta (o espressioni di ricerca) - + + Add to Deck + Aggiungi al mazzo + + + + Add to Sideboard + Aggiungi alla sideboard + + + + Select Printing + Seleziona stampa + + + + Show on EDHRec (Commander) + Mostra su EDHRec (Commander) + + + + Show on EDHRec (Card) + Mostra su EDHRec (Carta) + + + + Show Related cards + Mostra carte correlate + + + Add card to &maindeck Aggiungi carta al &mazzo - + Add card to &sideboard Aggiungi carta alla &sideboard @@ -1605,72 +1088,72 @@ To update your client, go to Help -> Check for Updates. Colori - + Select Printing Seleziona stampa - + Deck Mazzo - + Deck &name: &Nome mazzo: - + Banner Card/Tags Visibility Settings Impostazioni carta copertina/etichette - + Show banner card selection menu Visualizza menu di selezione carta copertina - + Show tags selection menu Visualizza menu di selezione etichette - + &Comments: &Commenti: - + Group by: Raggruppa per: - + Format: Formato: - + Hash: Hash: - + &Increment number &Aumenta il numero - + &Decrement number &Diminuisci il numero - + &Remove row &Rimuovi carta - + Swap card to/from sideboard Sposta carta in maindeck/sideboard @@ -1678,17 +1161,17 @@ To update your client, go to Help -> Check for Updates. DeckEditorFilterDockWidget - + Filters Filtri - + &Clear all filters &Elimina tutti i filtri - + Delete selected Elimina filtro @@ -1819,113 +1302,169 @@ To update your client, go to Help -> Check for Updates. DeckEditorSettingsPage - - + + Update Spoilers Aggiorna Spoiler - + + Success Fatto - + Download URLs have been reset. Gli indirizzi di download sono stati resettati. - + + Downloaded card pictures have been reset. + Le immagini delle carte scaricate sono state eliminate. + + + + Error + Errore + + + + One or more downloaded card pictures could not be cleared. + Non è stato possibile eliminare alcune delle immagini delle carte scaricate. + + + Add URL Aggiungi indirizzo - - + + URL: Indirizzo: - - + + Edit URL Modifica indirizzo: - + + Network Cache Size: + Dimensione cache di rete: + + + + Redirect Cache TTL: + TTL cache dei reindirizzamenti: + + + + How long cached redirects for urls are valid for. + Per quanto tempo sono validi i reindirizzamenti per gli URL memorizzati nella cache. + + + + Picture Cache Size: + Dimensione cache immagini: + + + Add New URL Aggiungi indirizzo URL - + Remove URL Elimina indirizzo URL - + + Day(s) + Giorno/i + + + Updating... Aggiornando... - + Choose path Scegli il percorso - + URL Download Priority Ordine di priorità degli indirizzi - + Spoilers Spoiler - + Download Spoilers Automatically Scarica spoiler automaticamente - + Spoiler Location: Indirizzo spoiler: - + Last Change Ultima modifica - + Spoilers download automatically on launch Scarica spoiler automaticamente all'avvio - + Press the button to manually update without relaunching Premi il pulsante per aggiornare manualmente senza riavviare - + Do not close settings until manual update is complete Non chiudere le impostazioni fino a che l'aggiornamento manuale sia completato - + Download card pictures on the fly Scarica immagini delle carte in tempo reale - + How to add a custom URL Come aggiungere indirizzi personalizzati - + + Delete Downloaded Images + Elimina immagini scaricate + + + Reset Download URLs Resetta indirizzi di download + + + On-disk cache for downloaded pictures + Cache su disco immagini scaricate + + + + In-memory cache for pictures not currently on screen + Cache in memoria per immagini non attualmente su schermo + DeckListHistoryManagerWidget @@ -1991,12 +1530,12 @@ To update your client, go to Help -> Check for Updates. DeckLoader - + Common deck formats (%1) Formati di mazzo comuni (%1) - + All files (*.*) Tutti i file (*.*) @@ -2218,27 +1757,27 @@ To update your client, go to Help -> Check for Updates. Aggiunto (%1): %2 (%3) %4 - + Moved to %1 1 × "%2" (%3) Spostato in %1 1 × "%2" (%3) - + Removed "%1" (all copies) Rimosso "%1" (tutte le copie) - + %1 1 × "%2" (%3) %1 1 × "%2" (%3) - + Added Aggiunto - + Removed Rimosso @@ -2260,75 +1799,75 @@ To update your client, go to Help -> Check for Updates. DeckViewContainer - + Load deck... Carica mazzo... - + Load remote deck... Carica mazzo remoto... - + Load from clipboard... Carica dagli appunti... - + Load from website... Carica dal sito... - + Unload deck Deseleziona mazzo - + Ready to start Pronto ad iniziare - + Force start Forza avvio - + Sideboard unlocked Sideboard sbloccata - + Sideboard locked Sideboard bloccata - - + + Error Errore - + The selected file could not be loaded. I file selezionati non posso essere caricati. - + Deck is greater than maximum file size. Il mazzo è più grande della dimensione massima del file consentita. - + Are you sure you want to force start? This will kick all non-ready players from the game. Sicuro di voler forzare l'avvio? Ciò espellerà dalla partita tutti i giocatori che non sono pronti. - + Cockatrice Cockatrice @@ -2429,7 +1968,7 @@ Vuoi convertire il mazzo al formato .cod? - + Webpage Sito web @@ -2469,37 +2008,37 @@ Vuoi convertire il mazzo al formato .cod? Connetti al server - + Server URL URL Server - + Communication Port Numero porta - + Unique Server Name Nome univoco del server - + Connection Warning Avviso di connessione - + You need to name your new connection profile. È necessario impostare un nome per il nuovo profilo di connessione. - + Connect Warning Problema di connessione - + The player name can't be empty. Il nome del giocatore non può essere vuoto. @@ -2612,17 +2151,17 @@ Vuoi convertire il mazzo al formato .cod? Crea partita - + Game information Informazioni partita - + Error Errore - + Server error. Errore del server. @@ -2630,97 +2169,97 @@ Vuoi convertire il mazzo al formato .cod? DlgCreateToken - + &Name: &Nome: - + Token Pedina - + C&olor: C&olore: - + white bianco - + blue blu - + black nero - + red rosso - + green verde - + multicolor multicolore - + colorless incolore - + &P/T: &F/C: - + &Annotation: &Note: - + &Destroy token when it leaves the table &Elimina la pedina quando lascia il campo - + Create face-down (Only hides name) Crea a faccia in giù (nasconde solo il nome) - + Token data Dati pedina - + Show &all tokens Mostra &tutte le pedine - + Show tokens from this &deck Mostra pedine di questo &mazzo - + Choose token from list Scegli pedina dalla lista - + Create token Crea pedina @@ -2754,7 +2293,7 @@ Vuoi convertire il mazzo al formato .cod? - + ✖ ✖ @@ -2769,12 +2308,12 @@ Vuoi convertire il mazzo al formato .cod? Il nome dell'etichetta non può essere vuoto! - + Duplicate Tag Duplica Etichetta - + This tag already exists. Questa etichetta esiste già. @@ -2961,12 +2500,12 @@ Per rimuovere il tuo avatar attuale, conferma senza scegliere una nuova immagine Inserisci il nome della pedina: - + Error Errore - + The chosen name conflicts with an existing card or token. Make sure to enable the 'Token' set in the "Manage sets" dialog to display them correctly. Il nome scelto è in conflitto con una carta o pedina esistente. @@ -2991,12 +2530,12 @@ Assicurati di abilitare il set "Pedine" nella finestra "Gestisci Non definito - + Real name: Nome reale: - + Edit user profile Modifica profilo utente @@ -3034,113 +2573,113 @@ Assicurati di abilitare il set "Pedine" nella finestra "Gestisci 2 ore - + Hide 'buddies only' games Nascondi partite 'solo per amici' - + Hide full games Nascondi partite al completo - + Hide games that have started Nascondi partite iniziate - + Hide password protected games Nascondi partite protette da password - + Hide 'ignored user' games Nascondi partite degli utenti ignorati - + Hide games not created by buddies Hide games not created by buddy Nascondi partite non create dagli amici - + Hide games with forced open decklists Nascondi partite con liste di mazzo rivelate - + &Newer than: &Più nuovo di: - + Game &description: &Descrizione partita: - + &Creator name: Nome &creatore: - + General Generale - + &Game types Tipi di &partita - + at &least: Minimo: - + at &most: Massimo: - + Maximum player count Numero di giocatori - + Restrictions Restrizioni - + Show games only if &spectators can watch Mostra le partite solo se &gli spettatori possono guardare - + Show spectator password p&rotected games Mostra partite protette da password - + Show only if spectators can ch&at Mostra le partite solo se gli spettatori possono guardare - + Show only if spectators can see &hands Mostra le partite solo se gli spettatori possono guardare le mani - + Spectators Spettatori - + Filter games Filtro partite @@ -3451,37 +2990,37 @@ https://tappedout.net/mtg-decks/nome-del-tuo-mazzo/ DlgMoveTopCardsUntil - + Card name (or search expressions): Nome della carta (o ricerca espressioni): - + Number of hits: Numero di risultati: - + Auto play hits Riproduzione automatica dei successi - + Put top cards on stack until... Metti le carte in cima alla pila fino a... - + No cards matching the search expression exists in the card database. Proceed anyways? Non esiste alcuna carta corrispondente agli estremi di ricerca nel database. Procedere comunque? - + Cockatrice Cockatrice - + Invalid filter Filtro non valido @@ -3541,40 +3080,40 @@ La tua email verrà utilizzata per verificare il tuo account. Non definito - + Real name: Nome reale: - + Register to server Registrati sul server - - - - + + + + Registration Warning Avviso Registrazione - + Your password is too short. La tua password è troppo corta. - + Your passwords do not match, please try again. Le password non combaciano, riprova. - + Your email addresses do not match, please try again. Gli indirizzi email non combaciano, riprova. - + The player name can't be empty. Il nome del giocatore non può essere vuoto. @@ -3582,17 +3121,17 @@ La tua email verrà utilizzata per verificare il tuo account. DlgRollDice - + Number of sides: Numero di facce: - + Number of dice: Numero di dadi: - + Roll Dice Lancia dado @@ -3643,12 +3182,12 @@ La tua email verrà utilizzata per verificare il tuo account. DlgSettings - + Unknown Error loading card database Errore sconosciuto durante il caricamento del database delle carte - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -3665,7 +3204,7 @@ Ti consigliamo di avviare oracle per aggiornare il tuo database delle carte. Vuoi modificare le impostazioni della posizione del database della carte? - + Your card database version is too old. This can cause problems loading card information or images @@ -3682,7 +3221,7 @@ Ti consigliamo di avviare oracle per aggiornare il tuo database delle carte. Vuoi modificare le impostazioni della posizione del database della carte? - + Your card database did not finish loading Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached @@ -3694,7 +3233,7 @@ Per favore crea un ticket di assistenza su https://github.com/Cockatrice/Cockatr Desideri modificare l'impostazione della posizione del database? - + File Error loading your card database. Would you like to change your database location setting? @@ -3703,7 +3242,7 @@ Would you like to change your database location setting? Vuoi modificare le impostazioni della posizione del database della carte? - + Your card database was loaded but contains no cards. Would you like to change your database location setting? @@ -3712,7 +3251,7 @@ Would you like to change your database location setting? Vuoi modificare le impostazioni della posizione del database della carte? - + Unknown card database load status Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues @@ -3725,64 +3264,59 @@ https://github.com/Cockatrice/Cockatrice/issues Desideri modificare l'impostazione della posizione del database? - - - + + + Error Errore - + The path to your deck directory is invalid. Would you like to go back and set the correct path? Il percorso della cartella del mazzo non è valido. Vuoi tornare in dietro e impostare il percorso corretto? - + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? Il percorso della cartella delle immagini delle carte è invilido. Vuoi tornare indietro e impostare il percorso corretto? - + Settings Impostazioni - + General Generale - + Appearance Aspetto - + User Interface Interfaccia - - Storage - - - - + Card Sources Immagini carte - + Chat Chat - + Sound Suoni - + Shortcuts Scorciatoie @@ -3876,9 +3410,9 @@ Potrai comunque cambiarla in seguito dalle impostazioni, nella scheda 'Gene - - - + + + Error Errore @@ -3932,31 +3466,31 @@ Per favore, visitate la pagina di download per aggiornare manualmente. - + Update Available Aggiornamento disponibile - + A new version of Cockatrice is available! Una nuova versione di Cockatrice è disponibile! - + New version Nuova versione - + Released Data di rilascio - + Changelog Changelog @@ -3966,51 +3500,51 @@ Per favore, visitate la pagina di download per aggiornare manualmente.Vuoi aggiornare adesso? - + Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. Purtroppo l'aggiornamento automatico non è riuscito a trovare una versione compatibile. Dovrai scaricare la nuova versione manualmente. - + Please check the <a href="%1">releases page</a> on our Github and download the build for your system. Per favore, controlla la <a href="%1">pagina delle release</a> sul nostro Github e scarica la versione giusta per il tuo sistema. - - - + + + Update Error Errore durante l'aggiornamento - + An error occurred while checking for updates: Errore durante il controllo degli aggiornamenti: - + An error occurred while downloading an update: Errore durante il download di un aggiornamento: - + Installing... Installazione... - + Cockatrice is unable to open the installer. Cockatrice non riesce ad aprire il file di installazione. - + Try to update manually by closing Cockatrice and running the installer. Prova ad aggiornare manualmente chiudendo Cockatrice ed eseguento il file di installazione. - + Download location Percorso download @@ -4100,67 +3634,67 @@ Dovrai scaricare la nuova versione manualmente. DrawProbabilityWidget - + Draw Probability Probabilità di pescare - + Probability of drawing Probabilità di pescare - + Card Name Nome carta - + Type Tipo - + Subtype Sottotipo - + Mana Value Valore di mana - + At least Almeno - + Exactly Esattamente - + card(s) having drawn at least carta/e avendo pescato almeno - + cards carte - + Category Categoria - + Qty Quantità - + Odds (%) Probabilità (%) @@ -4274,7 +3808,7 @@ Dovrai scaricare la nuova versione manualmente. FilterBuilder - + Type your filter here Scrivi il filtro qui @@ -4305,22 +3839,22 @@ Dovrai scaricare la nuova versione manualmente. GameEventHandler - + kicked by game host or moderator espulso da proprietario del gioco o moderatore - + player left the game il giocatore ha lasciato la partita - + player disconnected from server il giocatore si è disconnesso dal server - + reason unknown ragione sconosciuta @@ -4328,140 +3862,140 @@ Dovrai scaricare la nuova versione manualmente. GameSelector - - - - - - - - - + + + + + + + + + Error Errore - + Please join the appropriate room first. Si prega di entrare prima in una stanza adeguata. - + Wrong password. Password errata. - + Spectators are not allowed in this game. Spettatori non ammessi in questa partita. - + The game is already full. La partita è piena. - + The game does not exist any more. Questa partita non esiste più. - + This game is only open to registered users. Questa partita è solo per utenti registrati. - + This game is only open to its creator's buddies. Questa stanza è aperta solo agli amici del suo creatore. - + You are being ignored by the creator of this game. Sei stato ingnorato dal creatore di questa partita. - + Join Game Entra nella partita - + Spectate Game Osserva partita - + Game Information Informazioni partita - + Join Game as Judge Unisciti a una partita come arbitro - + Spectate Game as Judge Osserva partita come arbitro - + Join game Entra nella partita - + Password: Password: - + Please join the respective room first. Si prega di entrare prima nella rispettiva stanza. - + &Filter games &Filtra partite - + C&lear filter E&limina filtri - + C&reate Cr&ea - + &Join &Entra - + Join as judge Unisciti come arbitro - + J&oin as spectator Entra c&ome spettatore - + Join as judge spectator Unisciti come arbitro spettatore - + Games shown: %1 / %2 Partite mostrate: %1 / %2 - + Games Partite @@ -4469,32 +4003,32 @@ Dovrai scaricare la nuova versione manualmente. GameSelectorQuickFilterToolBar - + All types Tutti i tipi - + Filter by game name... Filtra per nome della partita... - + Filter by game type/format Filtra per tipo / formato di partita - + Hide games not created by buddies Nascondi le partite non create da amici - + Hide full games Nascondi partite al completo - + Hide started games Nascondi partite iniziate @@ -4502,105 +4036,105 @@ Dovrai scaricare la nuova versione manualmente. GamesModel - + >1 day >1 giorno - + %1%2 hr short age in hours %1%2 ora%1%2 ore%1%2 ora(e) - + new nuovo - + %1%2 min short age in minutes %1%2 min%1%2 min%1%2 min - + password password - + buddies only solo amici - + reg. users only solo utenti registrati - + open decklists Apri impostazioni + - can chat può chattare - + see hands vede mani - + can see hands può vedere mani - + not allowed non ammessi - + Room Stanza - + Age Età - + Description Descrizione - + Creator Creatore - + Type Tipo - + Restrictions Restrizioni - + Players Giocatori - + Spectators Spettatori @@ -4608,158 +4142,143 @@ Dovrai scaricare la nuova versione manualmente. GeneralSettingsPage - + Reset all paths Reimposta tutti i percorsi - + All paths have been reset I percorsi sono stati resettati - - - - - - - + + + + + + + Choose path Seleziona il percorso - - Language settings - + + Personal settings + Impostazioni personali - + Language: Lingua: - - Version settings - - - - - Card database - - - - - Startup settings - - - - + Paths (editing disabled in portable mode) Destinazioni (non si può personalizzare in modalità portatile) - + Paths Percorsi - + How to help with translations Come aiutare con le traduzioni - + Decks directory: Cartella mazzi: - + Filters directory: Cartella filtri: - + Replays directory: Cartella replay: - + Pictures directory: Cartella immagini: - + Card database: Database carte: - + Custom database directory: Cartella database personalizzata: - + Token database: Database pedine: - + Update channel Canale di aggiornamento: - + Check for client updates on startup Controlla gli aggiornamenti del client all'avvio - + Check for card database updates on startup Controlla gli aggiornamenti delle carte all'avvio - + Don't check Non controllare - + Prompt for update Chiedi se aggiornare - + Always update in the background Aggiorna sempre in background - + Check for card database updates every Controlla gli aggiornamenti delle carte ogni - + days giorni - + Notify if a feature supported by the server is missing in my client Avvisami se una funzionalità supportata dal server manca nel mio programma - + Automatically run Oracle when running a new version of Cockatrice Avvia automaticamente Oracle se Cockatrice è stato aggiornato - + Show tips on startup Mostra suggerimenti all'avvio - + Last update check on %1 (%2 days ago) Ultimo controllo %1 (%2 giorni fa) @@ -4767,47 +4286,47 @@ Dovrai scaricare la nuova versione manualmente. GraveyardMenu - + &Graveyard &Cimitero - + &View graveyard &Guarda il cimitero - + &Move graveyard to... &Muovi cimitero in... - + &Top of library &Cima al grimorio - + &Bottom of library &Fondo al grimorio - + &All players &Tutti i giocatori - + &Hand &Mano - + &Exile &Esilio - + Reveal random card to... Rivela carta casuale a... @@ -4815,88 +4334,88 @@ Dovrai scaricare la nuova versione manualmente. HandMenu - + &Hand &Mano - + &View hand &Vedi mano - + Sort hand by... Ordina mano per... - + Name Nome - + Type Tipo - + Mana Value Valore di mana - + Take &mulligan (Choose hand size) Effettua un &mulligan (Scegli numero di carte) - + Take mulligan (Same hand size) Effettua un mulligan (Stessa dimensione della mano) - + Take mulligan (Hand size - 1) Effettua un mulligan (Dimensione della mano - 1) - + &Move hand to... &Sposta mano in... - + &Top of library &Cima al grimorio - + &Bottom of library &Fondo al grimorio - + &Graveyard &Cimitero - + &Exile &Esilio - + &Reveal hand to... &Rivela mano a... - - + + All players Tutti i giocatori - + Reveal r&andom card to... Rivela carta c&asuale a... @@ -4904,52 +4423,52 @@ Dovrai scaricare la nuova versione manualmente. HomeWidget - + Create New Deck Crea un nuovo mazzo - + Browse Decks Esplora i mazzi - + Browse Card Database Esplora il database delle carte - + Browse EDHRec Esplora EDHRec - + Browse Archidekt Esplora Archidekt - + View Replays Guarda i replay - + Quit Esci - + Connecting... Connessione in corso... - + Connect Connetti - + Play Gioca @@ -4957,213 +4476,213 @@ Dovrai scaricare la nuova versione manualmente. LibraryMenu - + &Library &Grimorio - + &View library &Guarda il grimorio - + View &top cards of library... Guarda &le carte in cima al grimorio... - + View bottom cards of library... Guarda le carte in fondo al grimorio... - + Reveal &library to... Rive&la grimorio a... - + Lend library to... Presta il grimorio a... - + Reveal &top cards to... Rivela le &prime carte a... - + &Top of library... - &Dalla cima del grimorio... + &In cima al grimorio... - + &Bottom of library... - &Dal fondo del grimorio... + &In fondo al grimorio... - + &Always reveal top card Rivela &sempre la prima carta - + &Always look at top card &Guarda sempre la prima carta - + &Open deck in deck editor &Apri il mazzo nell'editor dei mazzi - + &Draw card &Pesca una carta - + D&raw cards... P&esca carte... - + &Undo last draw &Annulla l'ultima pescata - + Shuffle Mescola - + &Play top card &Gioca la prima carta - + Play top card &face down Gioca la prima carta a &faccia in giù - + Put top card on &bottom Metti la prima carta in fondo - + Move top card to grave&yard Metti la prima carta nel c&imitero - + Move top card to e&xile E&silia la prima carta - + Move top cards to &graveyard... Metti le prime carte nel &cimitero... - + Move top cards to graveyard face down... Metti le prime carte nel cimitero a faccia in giù... - + Move top cards to &exile... &Esilia le prime carte... - + Move top cards to exile face down... Metti le prime carte in esilio a faccia in giù... - + Put top cards on stack &until... Metti le carte in cima alla pila fino a... - + Shuffle top cards... Mescola le carte in cima... - + &Draw bottom card &Pesca l'ultima carta dal fondo - + D&raw bottom cards... P&esca carte dal fondo... - + &Play bottom card &Gioca la carta in fondo - + Play bottom card &face down Gioca la carta in fondo a &faccia in giù - + Move bottom card to grave&yard Metti l'ultima carta nel c&imitero - + Move bottom card to e&xile Metti l'ultima carta in esilio - + Move bottom cards to &graveyard... Metti le ultime carte nel cimitero... - + Move bottom cards to graveyard face down... Metti le ultime carte nel cimitero a faccia in giù... - + Move bottom cards to &exile... &Esilia le ultime carte... - + Move bottom cards to exile face down... Metti le ultime carte in esilio a faccia in giù... - + Put bottom card on &top Metti l'ultima carta in cima - + Shuffle bottom cards... Mescola le carte in fondo... - - + + &All players &Tutti i giocatori - + Reveal top cards of library Rivela le carte in cima al grimorio - + Number of cards: (max. %1) Numero di carte: (max. %1) @@ -5171,273 +4690,641 @@ Dovrai scaricare la nuova versione manualmente. MainWindow - - + + + The server has reached its maximum user capacity, please check back later. + Il server ha raggiunto la sua massima capacità di utenti, riprova più tardi. + + + + There are too many concurrent connections from your address. + Ci sono troppe connessioni contemporanee dal tuo indirizzo. + + + + Banned by moderator + Bannato dal moderatore + + + + Expected end time: %1 + Fine prevista: %1 + + + + This ban lasts indefinitely. + Questo ban dura a tempo indeterminato. + + + + Scheduled server shutdown. + Spegnimento del server in programma. + + + + + Invalid username. + Nome utente non valido. + + + + You have been logged out due to logging in at another location. + Sei stato disconnesso: ti sei connesso da un'altra postazione. + + + + Connection closed + Connessione chiusa + + + + The server has terminated your connection. +Reason: %1 + Hai perso la connessione con il server. +Ragione: %1 + + + + The server is going to be restarted in %n minute(s). +All running games will be lost. +Reason for shutdown: %1 + Il server si riavvierà in un minuto. +Tutti le partite saranno perse. +Ragione dello spegnimento: %1Il server si riavvierà in %n minuti. +Tutti le partite saranno perse. +Ragione dello spegnimento: %1Il server si riavvierà in %n minuti. +Tutti le partite saranno perse. +Ragione dello spegnimento: %1 + + + + Scheduled server shutdown + Spegnimento del server in programma + + + + + Success + Successo + + + + Registration accepted. +Will now login. + Registrazione accettata. +Login in corso. + + + + Account activation accepted. +Will now login. + Attivazione account accettata. +Login in corso. + + + + Player %1 Giocatore %1 - + Load replay Carica replay - + About Cockatrice Info su Cockatrice - + Version Versione - + Cockatrice Webpage Sito di Cockatrice - + Project Manager: Manager del progetto: - + Past Project Managers: Manager precedenti: - + Developers: Sviluppatori: - + Our Developers I nostri sviluppatori - + Help Develop! Aiutaci nello sviluppo! - + Translators: Traduttori: - + Our Translators I nostri traduttori - + Help Translate! Aiutaci nella traduzione! - + Support: Supporto: - + Report an Issue Segnala un problema - + Troubleshooting Risoluzione dei problemi - + F.A.Q. F.A.Q. - - + + + + + + + + + + + + + + + + + + + + Error Errore - + + Server timeout + Timeout del server + + + + Failed Login + Login fallito + + + + Your client seems to be missing features this server requires for connection. + La tua versione del programma non supporta funzionalità richieste dal server, aggiorna il programma e riprova. + + + + To update your client, go to 'Help -> Check for Client Updates'. + Per aggiornare la tua versione di Cockatrice, vai su 'Aiuto -> Controlla aggiornamenti client' + + + + Incorrect username or password. Please check your authentication information and try again. + Nome utente o password non validi. Ricontrolla i tuoi dati di accesso e riprova. + + + + There is already an active session using this user name. +Please close that session first and re-login. + Sei già loggato in un'altra sessione con questo username. +Chiudi prima quella sessione e riprova a loggare. + + + + + You are banned until %1. + Sei bannato fino a %1. + + + + + You are banned indefinitely. + Sei stato bannato per tempo indeterminato. + + + + This server requires user registration. Do you want to register now? + Questo server richiede la registrazione degli utenti. Vuoi registrarti adesso? + + + + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. + Il server richiede un client ID. Il tuo programma non ha generato un client ID. +Riprova dopo aver chiuso e riaperto il programma. + + + + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. + Si è verificato un errore, riprova dopo aver chiuso e riaperto il programma. +Se l'errore persiste, aggiorna il programma all'ultima versione e se necessario chiedi assistenza agli sviluppatori. + + + + Account activation + Attivazione account + + + + Your account has not been activated yet. +You need to provide the activation token received in the activation email. + Il tuo account non è ancora stato attivato. +Per attivarlo inserisci il codice di attivazione ricevuto tramite email, + + + + Server Full + Server pieno + + + + Unknown login error: %1 + Errore di login sconosciuto: %1 + + + + + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. + +Solitamente questo significa che stai usando una vecchia versione del programma, e il server ha inviato un messaggio che il tuo programma non è in grado di comprendere. + + + + Your username must respect these rules: + Il nome utente deve seguire queste regole: + + + + is %1 - %2 characters long + essere lungo %1 - %2 caratteri + + + + can %1 contain lowercase characters + %1 può contenere caratteri minuscoli + + + + + + + NOT + NON + + + + can %1 contain uppercase characters + %1 può contenere caratteri maiuscoli + + + + can %1 contain numeric characters + %1 può contenere numeri + + + + can contain the following punctuation: %1 + può contenere la punteggiatura: %1 + + + + first character can %1 be a punctuation mark + il primo carattere %1 può essere punteggiatura + + + + no unacceptable language as specified by these server rules: + note that the following lines will not be translated + non usare un linguaggio inaccettabile, come specificato nelle regole del server: + + + + can not contain any of the following words: %1 + non può contenere le seguenti parole: %1 + + + + can not match any of the following expressions: %1 + non può corrispondere alle seguenti espressioni: %1 + + + + You may only use A-Z, a-z, 0-9, _, ., and - in your username. + Puoi usare solo i caratteri A-Z, a-z, 0-9, _, ., e - nel tuo nome utente. + + + + + + + + + Registration denied + Registrazione negata + + + + Registration is currently disabled on this server + La registrazione è disabilitata su questo server + + + + There is already an existing account with the same user name. + Esiste già un account con lo stesso nome utente. + + + + It's mandatory to specify a valid email address when registering. + E' obbligatorio specificare un indirizzo email valido per la registrazione. + + + + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + Sembra che tu stia tentando di registrare un nuovo account su questo server ma hai già un account registrato sull'indirizzo email fornito. Questo server restringe il numero di account un utente più avere per indirizzo. Per favore contatta l'amministratore del server per ulteriore assistenza o per ottenere le tue credenziali di accesso. + + + + Password too short. + Password troppo corta. + + + + Registration failed for a technical problem on the server. + La registrazione è fallita a causa di un problema tecnico sul server. + + + + The connection to the server has been lost. + La connessione al server è stata interrotta. + + + + Unknown registration error: %1 + Errore di registrazione sconosciuto: %1 + + + + Account activation failed + Attivazione account fallita + + + + Socket error: %1 + Errore nella connessione: %1 + + + + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + Stai cercando di connetterti a un server obsoleto. Declassa la versione di Cockatrice per farlo funzionare o connetti ad un altro server. +La tua versione è la %1, la versione remota è la %2. + + + + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + La tua versione di Cockatrice è obsoleta. Aggiorna la tua versione di Cockatrice. +La tua versione è la %1, la versione online è la %2. + + + + Connecting to %1... + Connessione a %1... + + + + Registering to %1 as %2... + Registrazione su %1 come %2... + + + + Disconnected + Disconnesso + + + + Connected, logging in at %1 + Connesso, login in corso su %1 + + + + + + Requesting forgotten password to %1 as %2... + Richiesta recupero password su %1 come %2... + + + &Connect... &Connetti... - + &Disconnect &Disconnetti - + Start &local game... Inizia partita in &locale... - + &Watch replay... &Guarda replay... - + &Full screen &Schermo intero - + &Register to server... &Registrati sul server... - + &Restore password... Recupera &password... - + &Settings... &Impostazioni... - + &Exit &Esci - + A&ctions A&zioni - + &Cockatrice &Cockatrice - + C&ard Database &Database carte - + &Manage sets... &Gestisci Espansioni... - + Edit custom &tokens... Modifica pedine personalizzate - + Open custom image folder Apri cartella immagini personalizzate - + Open custom sets folder Apri cartella set personalizzati - + Add custom sets/cards Aggiungi set di carte personalizzato - + Reload card database Ricarica database carte - + Tabs &Schede - + &Help &Aiuto - + &About Cockatrice &Info su Cockatrice - + &Tip of the Day Suggerimento del giorno - + Check for Client Updates Controlla aggiornamenti client - + Check for Card Updates... Controlla aggiornamenti carte... - + Check for Card Updates (Automatic) Controlla aggiornamenti carte in background - + Show Status Bar Mostra barra di stato - + View &Debug Log Vedi Registro di &debug - + Open Settings Folder Apri cartella impostazioni - + Show/Hide Mostra/Nascondi - + New Version Nuova versione - + Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. Congratulazioni per aver aggiornato Cockatrice alla versione %1! Oracle verrà avviato per aggiornare anche il database delle carte. - + Cockatrice installed Cockatrice installata - + Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. Congratulazioni per aver installato Cockatrice %1! Oracle verrà avviato per installare il database delle carte. - + Card database Database carte - + Cockatrice is unable to load the card database. Do you want to update your card database now? If unsure or first time user, choose "Yes" @@ -5446,29 +5333,29 @@ Vuoi provare ad aggiornare il database adesso? Se è la prima volta che usi Cockatrice o non sei sicuro, scegli "Sì" - - + + Yes Sì - - + + No No - + Open settings Apri impostazioni - + New sets found Nuovi set trovati - + %n new set(s) found in the card database Set code(s): %1 Do you want to enable it/them? @@ -5481,22 +5368,17 @@ Codici dei set: %1 Desideri attivarli? - - Yes, always enable - - - - + View sets Vedi set - + Welcome Benvenuto - + Hi! It seems like you're running this version of Cockatrice for the first time. All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. @@ -5505,133 +5387,167 @@ Tutti i set nell'archivio delle carte sono stati abilitati. Scopri metodi alternativi per visualizzare i set o disabilitare set ed effetti nella finestra "Gestisci Espansioni". - + + Information Informazione - + A card database update is already running. L'aggiornamento delle carte è già in corso. - + Unable to run the card database updater: Impossibile avviare l'aggiornamento delle carte: - + Card database update running. Aggiornamento delle carte in corso. - + Failed to start. The file might be missing, or permissions might be incorrect. Avvio non riuscito. Il file potrebbe essere assente, o i permessi errati. - + The process crashed some time after starting successfully. Il processo si è arrestato in modo anomalo poco dopo essersi avviato con successo. - + Timed out. The process took too long to respond. The last waitFor...() function timed out. Richiesta scaduta. Il processo ci ha messo troppo a rispondere. L'ultima funzione waitFor...() è scaduta. - + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. Si è verificato un errore nel cercare di scrivere al processo. Ad esempio, il processo potrebbe non essere in esecuzione, o potrebbe aver chiuso il suo canale di input. - + An error occurred when attempting to read from the process. For example, the process may not be running. Si è verificato un errore nel cercare di leggere dal processo. Ad esempio, il processo potrebbe non essere in esecuzione. - + Unknown error occurred. Si è verificato un errore sconosciuto. - + The card database updater exited with an error: %1 L'aggiornamento del database delle carte è terminato con un errore: %1 - - - - - + + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + Questo server supporta funzioni aggiuntive non previste dalla tua versione dell'applicazione. +Solitamente non si dovrebbe incorrere in problemi, ma questo messaggio può significare che è disponibile una nuova versione di Cockatrice o che il server si basi su una versione personalizzata o una non ancora rilasciata. + +Per aggiornare il tuo client, vai su Aiuto -> Controlla aggiornamenti client + + + + + + + Load sets/cards Carica set di carte - + Selected file cannot be found. Il file selezionato non può essere caricato. - + You can only import XML databases at this time. E' possibile importare solamente database XML. - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. Il nuovo set di carte è stato aggiunto correttamente. Il database delle carte verrà ricaricato. - + Sets/cards failed to import. Il nuovo set di carte non è stato importato a causa di un errore. + + + + + Reset Password + Reimposta Password + + + + Your password has been reset successfully, you can now log in using the new credentials. + La tua password è stata reimpostata correttamente, ora puoi accedere utilizzando le nuove credenziali. + + + + Failed to reset user account password, please contact the server operator to reset your password. + La reimpostazione della password è fallita, contatta l'amministratore del server per reimpostare la password. + + + + Activation request received, please check your email for an activation token. + Richiesta di attivazione ricevuta, controlla il tuo indirizzo email per il codice di attivazione. + ManaBaseConfigDialog - + Mana Base Configuration Configurazione Base di mana - + Display type: Modalità di visualizzazione: - + pie a torta - + bar a barre - + combinedBar a barre combinate - + Filter Colors (optional): Filtra per colori (opzionale): - + OK OK - + Cancel Annulla @@ -5703,27 +5619,27 @@ Il database delle carte verrà ricaricato. ManaDevotionConfigDialog - + Display type: Modalità di visualizzazione: - + pie A torta - + bar A barre - + combinedBar A barra combinata - + Filter Colors (optional): Filtri per colore (opzionali): @@ -5793,615 +5709,610 @@ Il database delle carte verrà ricaricato. MessageLogWidget - + from play dal campo di battaglia - + from their graveyard dal suo cimitero - + from exile dall'esilio - + from their hand dalla sua mano - + the top card of %1's library la prima carta del grimorio di %1 - + the top card of their library la prima carta del suo grimorio - + from the top of %1's library dalla cima del grimorio di %1 - + from the top of their library dalla cima del suo grimorio - + the bottom card of %1's library l'ultima carta del grimorio di %1 - + the bottom card of their library l'ultima carta del suo grimorio - + from the bottom of %1's library dal fondo del grimorio di %1 - + from the bottom of their library dal fondo del suo grimorio - + from %1's library dal grimorio di %1 - + from their library dal suo grimorio - + from sideboard dalla sideboard - + from the stack dalla pila - + from custom zone '%1' dalla zona personalizzata '%1' - + %1 is now keeping the top card %2 revealed. %1 sta tenendo la prima carta %2 rivelata. - + %1 is not revealing the top card %2 any longer. %1 non sta più rivelando la prima carta %2. - + %1 can now look at top card %2 at any time. %1 può guardare la prima carta %2 della libreria in qualunque momento. - + %1 no longer can look at top card %2 at any time. %1 non può più guardare la prima carta %2 del mazzo in qualunque momento. - + %1 attaches %2 to %3's %4. %1 assegna %2 a %4 di %3. - + %1 has conceded the game. %1 ha concesso la partita. - + %1 has unconceded the game. %1 ha annullato la concessione della partita. - + %1 has restored connection to the game. %1 ha ripristinato il collegamento alla partita. - + %1 has lost connection to the game. %1 ha perso il collegamento alla partita. - + %1 points from their %2 to themselves. %1 disegna una freccia dal suo %2 a sé stesso. - + %1 points from their %2 to %3. %1 disegna una freccia dal suo %2 a %3. - + %1 points from %2's %3 to themselves. %1 disegna una freccia dal %3 di %2 a sé stesso. - + %1 points from %2's %3 to %4. %1 disegna una freccia dal %3 di %2 a %4. - + %1 points from their %2 to their %3. %1 disegna una freccia dal suo %2 al suo %3. - + %1 points from their %2 to %3's %4. %1 disegna una freccia dal suo %2 a %4 di %3. - + %1 points from %2's %3 to their own %4. %1 disegna una freccia da %3 di %2 al suo %4. - + %1 points from %2's %3 to %4's %5. %1 disegna una freccia dal %3 di %2 al %5 di %4. - + %1 creates a face down token. %1 crea una pedina a faccia in giù. - + %1 creates token: %2%3. %1 crea una pedina: %2%3. - + %1 has loaded a deck (%2). %1 ha caricato un mazzo (%2). - + %1 has loaded a deck with %2 sideboard cards (%3). %1 ha caricato un mazzo con %2 carte nella sideboard (%3). - + %1 destroys %2. %1 distrugge %2. - + a card una carta - + %1 gives %2 control over %3. %1 da il controllo di %3 a %2. - + %1 puts %2 into play%3 face down. %1 mette %2 sul campo di battaglia %3 a faccia in giù. - + %1 puts %2 into play%3. %1 mette %2 sul campo di battaglia%3. - + %1 puts %2%3 into their graveyard face down. %1 mette %2%3 nel suo cimitero a faccia in giù. - + %1 puts %2%3 into their graveyard. %1 mette %2 nel suo cimitero%3. - + %1 exiles %2%3 face down. %1 esilia %2%3 a faccia in giù. - + %1 exiles %2%3. %1 esilia %2%3. - + %1 moves %2%3 to their hand. %1 mette %2 in mano%3. - + %1 puts %2%3 into their library. %1 mette %2 nel suo grimorio%3. - + %1 puts %2%3 onto the bottom of their library. %1 mette %2%3 in fondo al proprio grimorio. - + %1 puts %2%3 on top of their library. %1 mette %2 in cima al suo grimorio%3. - + %1 puts %2%3 into their library %4 cards from the top. %1 mette %2%3 nel suo grimorio %4 carte dalla cima. - + %1 moves %2%3 to sideboard. %1 mette %2 nella sideboard%3. - + %1 plays %2%3 face down. %1 gioca %2%3 a faccia in giù. - + %1 plays %2%3. %1 gioca %2%3. - + %1 moves %2%3 to custom zone '%4' face down. %1 mette %2 nella zona personalizzata '%4'%3 a faccia in giù. - + %1 moves %2%3 to custom zone '%4'. %1 mette %2 nella zona personalizzata '%4'%3. - + %1 tries to draw from an empty library %1 prova a pescare da un grimorio vuoto - + %1 draws %2 card(s). %1 pesca una carta.%1 pesca %2 carte.%1 pesca %2 carte. - + %1 is looking at %2. %1 sta guardando %2. - + %1 is looking at the %4 %3 card(s) %2. top card for singular, top %3 cards for plural %1 sta guardando %3 carta %4 %2.%1 sta guardando %3 carte %4 %2.%1 sta guardando %3 carte %4 %2. - + bottom in fondo - + top in cima - + %1 turns %2 face-down. %1 gira %2 a faccia in giù. - + %1 turns %2 face-up. %1 gira %2 a faccia in su. - + The game has been closed. La partita è stata chiusa. - + The game has started. La partita è iniziata. - + You are flooding the game. Please wait a couple of seconds. Stai spammando la partita. Attendi un paio di secondi. - + %1 has joined the game. %1 è entrato nella partita. - + %1 is now watching the game. %1 sta osservando la partita. - + You have been kicked out of the game. Sei stato cacciato dalla partita. - + %1 has left the game (%2). %1 ha abbandonato la partita (%2). - + %1 is not watching the game any more (%2). %1 non sta più guardando la partita (%2). - + %1 is not ready to start the game any more. %1 non è più pronto a iniziare la partita. - + %1 shuffles their deck and draws a new hand of %2 card(s). %1 mischia il proprio mazzo e pesca una nuova mano di %2 carta.%1 mischia il proprio mazzo e pesca una nuova mano di %2 carte.%1 mischia il proprio mazzo e pesca una nuova mano di %2 carte. - + %1 shuffles their deck and draws a new hand. %1 mischia il proprio mazzo e pesca una nuova mano. - + You are watching a replay of game #%1. Stai guardando il replay della partita #%1. - + %1 is ready to start the game. %1 è pronto a iniziare la partita. - + cards an unknown amount of cards carte - + %1 card(s) a card for singular, %1 cards for plural una carta%1 carte%1 carte - + %1 lends %2 to %3. %1 presta %2 a %3. - + %1 reveals %2 to %3. %1 rivela %2 a %3. - + %1 reveals %2. %1 rivela %2. - + %1 randomly reveals %2%3 to %4. %1 rivela a caso %2%3 a %4. - + %1 randomly reveals %2%3. %1 rivela a caso %2%3. - + %1 peeks at face down card #%2. %1 sbircia la carta a faccia in giù #%2. - + %1 peeks at face down card #%2: %3. %1 sbircia la carta a faccia in giù #%2: %3. - + %1 reveals %2%3 to %4. %1 rivela %2%3 a %4. - + %1 reveals %2%3. %1 rivela %2%3. - + %1 reversed turn order, now it's %2. %1 ha rovesciato l'ordine dei turni, ora è %2. - + reversed invertito - + normal normale - + Heads Testa - + Tails Croce - + %1 flipped a coin. It landed as %2. %1 ha lanciato una moneta. Il risultato è %2. - + %1 rolls a %2 with a %3-sided die. %1 lancia un dado a %3 facce e ottiene %2. - + %1 flips %2 coins. There are %3 heads and %4 tails. %1 lancia %2 monete. Sono uscite %3 teste e %4 croci. - + %1 rolls a %2-sided dice %3 times: %4. %1 lancia un dado a %2 facce %3 volte: %4. - + %1's turn. Turno di %1 - + %1 sets annotation of %2 to %3. %1 imposta le note di %2 a %3. - - %1 places %2 %3%4 counter(s) on %5 (now %6). - + + %1 places %2 "%3" counter(s) on %4 (now %5). + %1 mette %2 segnalino "%3" su %4 (totale %5).%1 mette %2 segnalini "%3" su %4 (totale %5).%1 mette %2 segnalino(i) "%3" su %4 (totale %5). - - %1 removes %2 %3%4 counter(s) from %5 (now %6). - + + %1 removes %2 "%3" counter(s) from %4 (now %5). + %1 toglie %2 segnalino "%3" su %4 (totale %5).%1 toglie %2 segnalini "%3" su %4 (totale %5).%1 toglie %2 segnalino(i) "%3" su %4 (totale %5). - - %1 failed to undo their last draw. - - - - + %1 sets counter %2 to %3 (%4%5). %1 imposta il contatore %2 a %3 (%4%5). - + %1 sets %2 to not untap normally. %1 imposta che %2 non STAPpi normalmente. - + %1 sets %2 to untap normally. %1 imposta che %2 STAPpi normalmente. - + %1 removes the PT of %2. %1 elimina i valori F/C di %2. - + %1 changes the PT of %2 from nothing to %4. %1 cambia F/C di %2 da vuota a %4. - + %1 changes the PT of %2 from %3 to %4. %1 cambia F/C di %2 da %3 a %4. - + %1 has locked their sideboard. %1 ha bloccato la sua sideboard. - + %1 has unlocked their sideboard. %1 ha sbloccato la sua sideboard. - + %1 taps their permanents. %1 TAPpa i suoi permanenti. - + %1 untaps their permanents. %1 STAPpa i suoi permanenti. - + %1 taps %2. %1 TAPpa %2. - + %1 untaps %2. %1 STAPpa %2. - + %1 shuffles %2. %1 mescola %2. - + %1 shuffles the bottom %3 cards of %2. %1 mescola le %3 carte sul fondo da %2. - + %1 shuffles the top %3 cards of %2. %1 mescola le prime %3 carte da %2. - + %1 shuffles cards %3 - %4 of %2. %1 mescola le carte %3 - %4 da %2. - + %1 unattaches %2. %1 toglie %2. - + %1 undoes their last draw. %1 annulla la sua ultima pescata. - + %1 undoes their last draw (%2). %1 annulla la sua ultima pescata (%2). @@ -6409,115 +6320,110 @@ Il database delle carte verrà ricaricato. MessagesSettingsPage - + Word1 Word2 Word3 Parola1 Parola2 Parola3 - + Add New Message Aggiungi Nuovo Messaggio - + Edit Message Modifica Messaggio - + Remove Message Rimuovi Messaggio - + Add message Aggiungi messaggio - - + + Message: Messaggio: - + Edit message Modifica messaggio - + Chat settings Impostazioni chat - + Custom alert words Lista parole evidenziate - + Enable chat mentions Abilita menzioni in chat - + Enable mention completer Abilita completamento menzioni - + In-game message macros Messaggi rapidi in partita - + How to use in-game message macros Come usare i messaggi macro in gioco - + Ignore chat room messages sent by unregistered users Ignora i messaggi in chat inviati dagli utenti non registrati - + Ignore private messages sent by unregistered users Ignora i messaggi privati inviati dagli utenti non registrati - - Ignore private messages sent by non-buddy users - - - - - + + Invert text color Inverti colore testo - + Enable desktop notifications for private messages Abilita notifiche desktop per i messaggi privati - + Enable desktop notification for mentions Abilita notifiche sul desktop per le menzioni - + Enable room message history on join Abilita messaggi recenti all'ingresso - - + + (Color is hexadecimal) (Colore in esadecimale) - + Separate words with a space, alphanumeric characters only Separare le parole con uno spazio; solo caratteri alfanumerici @@ -6525,42 +6431,42 @@ Il database delle carte verrà ricaricato. MoveMenu - + Move to &Metti in - + &Top of library in random order - &Cima al grimorio in ordine casuale + &In cima al grimorio in ordine casuale - + X cards from the top of library... Posizione X dalla cima del grimorio... - + &Bottom of library in random order - &Fondo al grimorio in ordine casuale + In &fondo al grimorio in ordine casuale - + T&able Tavolo - + &Hand &Mano - + &Graveyard &Cimitero - + &Exile &Esilio @@ -6573,47 +6479,47 @@ Il database delle carte verrà ricaricato. Tipo - + Mana Value Valore di Mana - + Color(s) Colore - + Loyalty Fedeltà - + Main Card Type Tipo principale - + Mana Cost Costo di mana - + P/T F/C - + Side Lato - + Layout Disposizione - + Color Identity Identità di colore @@ -6636,152 +6542,6 @@ Il database delle carte verrà ricaricato. Direzione di sovrapposizione: - - PaletteEditorDialog - - - - Reset - - - - - - Apply - - - - - - Save && Apply - - - - - ▼ Edit Palette - - - - - - ▶ Edit Palette - - - - - Palette Editor — %1 - - - - - <b>Palette Editor</b> &nbsp;·&nbsp; %1 - - - - - This theme ships no default palette files - - - - - Replace current colours with the theme author's defaults - - - - - Switch between the light and dark palette files - - - - - Editing: - - - - - Show or hide the per-role colour grid for manual tweaks - - - - - ↺ Revert to theme default - - - - - Discard unsaved edits and restore the last saved palette - - - - - Preview this palette without saving to disk - - - - - Write palette-%1.toml and reload the theme - - - - - Cannot save: this theme has no directory on disk - - - - - Save failed - - - - - Could not write %1 to: -%2 - - - - - No default found - - - - - No default palette file found for the "%1" scheme. - - - - - PaletteGridWidget - - - Active - - - - - Disabled - - - - - Inactive - - - - - Normal interactive state - - - - - Widget is disabled / not interactive - - - - - Window is in background / unfocused - - - Phase @@ -6848,57 +6608,57 @@ Il database delle carte verrà ricaricato. PhasesToolbar - + Untap step Sottofase di STAP - + Upkeep step Sottofase di mantenimento - + Draw step Sottofase di acquisizione - + First main phase Prima fase principale - + Beginning of combat step Sottofase di inizio combattimento - + Declare attackers step Sottofase di dichiarazione degli attaccanti - + Declare blockers step Sottofase di dichiarazione dei bloccanti - + Combat damage step Sottofase del danno da combattimento - + End of combat step Sottofase di fine combattimento - + Second main phase Seconda fase principale - + End of turn step Sottofase finale @@ -6906,7 +6666,7 @@ Il database delle carte verrà ricaricato. PictureLoader - + en code for scryfall's language property, not available for all languages it @@ -6915,142 +6675,151 @@ Il database delle carte verrà ricaricato. PlayerActions - - - - + + View top cards of library + Guarda le carte in cima al grimorio + + + + + + + + + + + + Number of cards: (max. %1) + Numero di carte: (max %1) + + + + View bottom cards of library + Guarda le carte in fondo al grimorio + + + + Shuffle top cards of library + Mescola le carte in cima al grimorio + + + + Shuffle bottom cards of library + Mescola le carte in fondo al grimorio + + + + Draw hand + Pesca mano + + + + 0 and lower are in comparison to current hand size + 0 e inferiore sono relativi al numero attuale di carte in mano + + + + Draw cards + Pesca carte + + + + + + grave cimitero - - - - + + + + exile esilio - - - PlayerDialogs - - View top cards of library - - - - - - - - - - - - - Number of cards: (max. %1) - - - - - View bottom cards of library - - - - - Shuffle top cards of library - - - - - Shuffle bottom cards of library - - - - - Draw hand - - - - - 0 and lower are in comparison to current hand size - - - - - Draw cards - - - - + Move top cards to %1 - + Move bottom cards to %1 - + Draw bottom cards - + Pesca le ultime carte - + + + C&reate another %1 token + C&rea un'altra pedina %1 + + + Create tokens - + Crea pedine - + + Number: - + Numero: - + Place card X cards from top of library - + Metti la carta in posizione X dalla cima del grimorio - + Which position should this card be placed: - + In che posizione dovrebbe essere messa questa carta: - + (max. %1) - + (max %1) - + Change power/toughness - + Cambia forza/costituzione - + Change stats to: - + Cambia valori a: - + Set annotation - + Imposta note - + Please enter the new annotation: - + Inserisci le nuove note: + + + + Set counters + Imposta i segnalini PlayerMenu - + Player "%1" Giocatore "%1" - + &Counters &Contatori @@ -7064,15 +6833,12 @@ Il database delle carte verrà ricaricato. This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected. - Il selettore di stampa è disabilitato perchè hai abilitato la funzionalità di sovrascrivere le stampe selezionate con le preferenze personali per set. - -Questo significa che vedrai solo la stampa predefinita per ciascuna scarta anzichè poterle selezionare e che non vedrai le stampe scelte da altri utenti. - + Enable printings again - Abilita il selettore di stampa + @@ -7083,30 +6849,30 @@ Questo significa che vedrai solo la stampa predefinita per ciascuna scarta anzic Visualizza pulsanti di navigazione - + Printing Selector - Selettore di stampa + PrintingSelectorCardOverlayWidget - + Preference Preferenza - + Pin Printing Fissa stampa in cima alla lista - + Unpin Printing Rimuovi stampa dalla cima della lista - + Show Related cards Mostra carte correlate @@ -7171,63 +6937,63 @@ Questo significa che vedrai solo la stampa predefinita per ciascuna scarta anzic Select a card to view its available printings - Seleziona una carta per vedere le stampe disponibili. + PtMenu - + Power / toughness Forza / costituzione - + &Increase power &Aumenta forza - + &Decrease power &Diminuisci forza - + I&ncrease toughness A&umenta costituzione - + D&ecrease toughness D&iminuisci costituzione - + In&crease power and toughness Au&menta forza e costituzione - + Dec&rease power and toughness Dimi&nuisci forza e costituzione - + Increase power and decrease toughness Aumenta forza e diminuisci costituzione - + Decrease power and increase toughness Diminuisci forza e aumenta costituzione - + Set &power and toughness... Imposta &forza e costituzione... - + Reset p&ower and toughness Resetta f&orza e costituzione @@ -7235,37 +7001,37 @@ Questo significa che vedrai solo la stampa predefinita per ciascuna scarta anzic QMenuBar - + Services Servizi - + Hide %1 Nascondi %1 - + Hide Others Nascondi altre - + Show All Mostra tutte - + Preferences... Preferenze... - + Quit %1 Esci da %1 - + About %1 Informazioni su %1 @@ -7273,17 +7039,17 @@ Questo significa che vedrai solo la stampa predefinita per ciascuna scarta anzic QObject - + Cockatrice card database (*.xml) Database delle carte di Cockatrice (*.xml) - + All files (*.*) Tutti i file (*.*) - + Cockatrice replays (*.cor) Replay di Cockatrice (*.cor) @@ -7321,13 +7087,7 @@ You will not be able to manage printing preferences on a per-deck basis, or see You will have to use the Set Manager, available through Card Database -> Manage Sets. Are you sure you would like to enable this feature? - Abilitare questa funzione disattiverà il Selettore di stampa. - -Non potrai gestire le preferenze delle stampe per i singoli mazzi, o vedere le stampe scelte dagli altri giocatori per i loro mazzi. - -Dovrai usare il Gestore dei set, raggiungibile tramite Database carte -> Organizza set. - -Sicuro di voler abilitare questa funzione? + @@ -7338,194 +7098,121 @@ You can now choose printings on a per-deck basis in the Deck Editor and configur You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available). Are you sure you would like to disable this feature? - Disabilitare questa funzione attiverà il Selettore di stampa. - -Potrai gestire le preferenze delle stampe per i singoli mazzi nell'Editor, e configurare quale stampa viene aggiunta di default a un mazzo fissandola nel selettore. - -Potrai anche usare il Gestore dei set per personalizzare l'ordine delle stampe nel Selettore (sono disponibili anche ordinamenti predefiniti come alfabetico o per data di uscita). - -Sicuro di voler disabilitare questa funzione? + Confirm Change - Conferma modifica + QPlatformTheme - + OK Conferma - + Save Salva - + Save All Salva tutto - + Open Apri - + &Yes &Sì - + Yes to &All Sì a &tutto - + &No &No - + N&o to All N&o a tutto - + Abort Interrompi - + Retry Riprova - + Ignore Ignora - + Close Chiudi - + Cancel Annulla - + Discard Abbandona - + Help Aiuto - + Apply Applica - + Reset Resetta - + Restore Defaults Ripristina predefiniti - - QuickSetupPanel - - - %1% - - - - - <b>Quick Setup</b> - - - - - Generate all palette roles automatically from a single accent colour - - - - - Accent: - - - - - Primary hue. Used directly for highlights and links. -At high intensity it also tints buttons and backgrounds. - - - - - Intensity: - - - - - Subtle - - - - - Full colour - - - - - 0–30 Subtle tint — only highlights and links change hue -30–70 Accented — buttons, tooltips, and borders join in -70–100 Full colour — backgrounds, everything - - - - - 70% - - - - - Generate ↓ - - - - - Derive all palette roles from the accent colour above. -Fine-tune individual colours in the grid afterwards. - - - RemoteDeckList_TreeModel - + Name Nome - + ID ID - + Upload time Tempo di upload @@ -7533,32 +7220,32 @@ Fine-tune individual colours in the grid afterwards. RemoteReplayList_TreeModel - + ID ID - + Name Nome - + Players Giocatori - + Keep Tieni - + Time started Inizio - + Duration (sec) Durata (sec) @@ -7566,37 +7253,37 @@ Fine-tune individual colours in the grid afterwards. RfgMenu - + &Exile &Esilio - + &View exile &Guarda la zona di esilio - + &Move exile to... &Muovi esilio in... - + &Top of library &Cima al grimorio - + &Bottom of library &Fondo al grimorio - + &Hand &Mano - + &Graveyard &Cimitero @@ -7642,9 +7329,9 @@ Fine-tune individual colours in the grid afterwards. SayMenu - + S&ay - Invi&a + @@ -7683,27 +7370,27 @@ Fine-tune individual colours in the grid afterwards. SetsModel - + Enabled Abilitato - + Set type Tipo set - + Set code Codice set - + Long name Nome esteso - + Release date Data di rilascio @@ -7711,53 +7398,53 @@ Fine-tune individual colours in the grid afterwards. ShortcutSettingsPage - - + + Restore all default shortcuts Ripristina scorciatoie predefinite - + Do you really want to restore all default shortcuts? Sei scuro di voler ripristinare tutte le scorciatoie predefinite? - + Clear all default shortcuts Rimuovi tutte le scorciatoie predefinite - + Do you really want to clear all shortcuts? Sei sicuro di voler rimuovere tutte le scorciatoie? - + Section: Sezione: - + Action: Azione: - + Shortcut: Scorciatoia: - + How to set custom shortcuts Come impostare scorciatoie personalizzate - + Clear all shortcuts Elimina tutte le scorciatoie - + Search by shortcut name Cerca per nome della scorciatoia @@ -7813,12 +7500,12 @@ Controlla le impostazioni! SideboardMenu - + &Sideboard &Sideboard - + &View sideboard &Guarda la sideboard @@ -7826,27 +7513,27 @@ Controlla le impostazioni! SoundSettingsPage - + Enable &sounds Abilita &suoni - + Current sounds theme: Tema sonoro attuale: - + Test system sound engine Prova il funzionamento dei suoni - + Sound settings Impostazioni suoni - + Master volume Volume @@ -7918,146 +7605,16 @@ Controlla le impostazioni! Risposta non valida ricevuta dal server degli aggiornamenti di versione. - + No reply received from the tag update server. Nessuna risposta ricevuta dal server dei tag di aggiornamento. - + Invalid reply received from the tag update server. Risposta non valida ricevuta dal server dei tag di aggiornamento. - - StorageSettingsPage - - - - - Success - - - - - Cached card pictures have been reset. - - - - - Downloaded card pictures have been reset. - - - - - Error - - - - - One or more downloaded card pictures could not be cleared. - - - - - In-memory (currently loaded) card pictures have been reset. - - - - - Card Picture Loader Caching Method: - - - - - The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size. - - - - - Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while. - - - - - This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk. - - - - - Delete Cached Images - - - - - Delete Saved Images - - - - - Clear In-Memory Images - - - - - Card Picture Loader Cache Method - - - - - Network Cache - - - - - Filesystem - - - - - In-Memory Picture Cache - - - - - Network Cache Size: - - - - - On-disk cache for downloaded pictures - - - - - Redirect Cache TTL: - - - - - How long cached redirects for urls are valid for. - - - - - Picture Cache Size: - - - - - In-memory cache for pictures not currently on screen - - - - - Naming scheme: - - - - - Day(s) - - - TabAccount @@ -8193,117 +7750,117 @@ Controlla le impostazioni! TabArchidekt - - + + Desc. - Decresc. + Decrescente + + + + + AND + - - AND - AND - - - - + Require ALL selected colors - Richiede TUTTI i colori selezionati + - - + + Deck name... - Nome mazzo... + - - + + Owner... - Proprietario... + - - + + Packages - Package + - - + + Advanced Filters - Filtri avanzati + - + Bracket: - Fascia: + - - + + Any - Qualsiasi + - - + + Contains card... - Contiene carta... + - - + + Commander... - Comandante... + - - + + Tag... - Tag... + - - + + Deck Size - Dimensione mazzo + - + Cards: - Carte: + - - + + Asc. - Cresc. + Crescente + + + + Sort by: + - Sort by: - Ordina per: - - - Filter by: - Filtra per: + - + Display Settings - Impostazioni di visualizzazione + - - + + Search Cerca - - + + Formats Formati @@ -8313,54 +7870,6 @@ Controlla le impostazioni! Archidekt: - - TabCardArtRules - - - Card: - - - - - ProviderId: - - - - - Mode: - - - - - Reason: - - - - - Type a card name... - - - - - Add rule - - - - - Remove rule - - - - - Refresh - - - - - Card Art Rules - - - TabDeckEditor @@ -8409,7 +7918,7 @@ Controlla le impostazioni! Reimposta disposizione - + Deck: %1 Mazzo: %1 @@ -8417,49 +7926,55 @@ Controlla le impostazioni! TabDeckEditorVisual - + Visual Deck: %1 Mazzo visuale: %1 - + &Visual Deck Editor Editor &visuale - - + + Card Info Info carta - - + + Deck Mazzo - + + + Filters + Filtri + + + &View &Visualizza - + Printing Stampa - + Visible Mostra - + Floating Separata - + Reset layout Reimposta disposizione @@ -8467,22 +7982,22 @@ Controlla le impostazioni! TabDeckEditorVisualTabWidget - + Visual Deck View Mazzo visuale - + Visual Database Display Database visuale - + Deck Analytics Analisi mazzo - + Sample Hand Mano di esempio @@ -8490,133 +8005,133 @@ Controlla le impostazioni! TabDeckStorage - + Local file system File locali - + Server deck storage Mazzi su server - - + + Open in deck editor Apri nell'editor dei mazzi - + Rename deck or folder Rinomina mazzo o cartella - + Upload deck Upload mazzo - + Download deck Scarica mazzo + - - - + + New folder Nuova cartella + - Delete Elimina - + Open decks folder Apri cartella mazzi - + Rename local folder Rinomina cartella locale - + Rename local file Rinomina file locale - + New name: Nuovo nome: - - - - + + + + Error Errore - + Rename failed Rinomina non riuscita - - + + Invalid deck file File mazzo non valido - + Enter deck name Inserisci il nome del mazzo - + This decklist does not have a name. Please enter a name: Questo mazzo non ha un nome. Per favore inserisci un nome: - + Unnamed deck Mazzo senza nome - + Failed to upload deck to server Impossibile caricare il mazzo sul server - + Delete local file Elimina file locali - + Are you sure you want to delete the selected files? Vuoi davvero eliminare i file selezionati? - + Delete remote decks Elimina i deck remoti - + Are you sure you want to delete the selected decks? Vuoi davvero eliminare i mazzi selezionati? - - + + Name of new folder: Nome della nuova cartella: @@ -8688,191 +8203,191 @@ Please enter a name: TabGame - - - + + + Replay Replay - - + + Game Partita - - + + Player List Giocatori - - + + Card Info Info carta - - + + Messages Messaggi - - + + Replay Timeline Replay - + &Phases &Fasi - + &Game &Partita - + Next &phase Prossima &fase - + Next phase with &action Prossima sottofase + &azione - + Next &turn Prossimo &turno - + Reverse turn order Inverti l'ordine dei turni - + &Remove all local arrows &Rimuovi tutte le frecce - + Rotate View Cl&ockwise Ruota vista in senso &orario - + Rotate View Co&unterclockwise R&uota vista in senso antiorario - + Game &information &Informazioni partita - + Un&concede Rientra in gioco - - - + + + &Concede &Concedi - + &Leave game &Lascia partita - + C&lose replay C&hiudi replay - + &Focus Chat Vai alla &chat - + &Say: &Parla: - + Selected cards Carte selezionate - + &View &Visualizza - + Visible Mostra - + Floating Separata - + Reset layout Reimposta disposizione - + Concede Concedi - + Are you sure you want to concede this game? Vuoi veramente concedere la partita? - + Unconcede Annulla concedi - + You have already conceded. Do you want to return to this game? Hai già concesso. Vuoi ritornare in questa partita? - + Leave game Lascia la partita - + Are you sure you want to leave this game? Sei sicuro di voler lasciare la partita? - + A player has joined game #%1 Un giocatore si è unito alla partita #%1 - + %1 has joined the game %1 si è unito alla partita - + You have been kicked out of the game. Sei stato kickato fuori dalla partita. @@ -8931,115 +8446,115 @@ Please enter a name: Seleziona un numero di giorni valido. - + Username: Nome utente: - + IP Address: Indirizzo IP: - + Game Name: Nome partita: - + GameID: ID Partita: - + Message: Messaggio: - + Main Room Stanza principale - + Game Room Stanza partita - + Private Chat Chat privata - + Past X Days: Ultimi X giorni: - + Today Oggi - + Last Hour Ultima ora - + Maximum Results: Massimo numero di risultati: - + At least one filter is required. The more information you put in, the more specific your results will be. E' richiesto perlomeno un filtro. Più informazioni inserisci, più specifici saranno i risultati. - + Get User Logs Ottieni log utente - + Clear Filters Elimina filtri - + Filters Filtri - + Log Locations Posizioni registro - + Date Range Periodo - + Maximum Results Massimo numero di risultati - - + + Message History Storico messaggi - + Failed to collect message history information. Impossibile recuperare la storia dei ban. - + There are no messages for the selected filters. Nessun messaggio corrisponde ai filtri selezionati. @@ -9057,27 +8572,27 @@ Più informazioni inserisci, più specifici saranno i risultati. &Lascia - + %1 - Private chat %1 - Chat privata - + This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. Questo utente ti sta ignorando, non può vedere i tuoi messaggi nella chat principale e tu non puoi entrare nelle sue partite. - + Private message from Messaggio privato da - + %1 has left the server. %1 è uscito dal server. - + %1 has joined the server. %1 è entrato nel server. @@ -9085,181 +8600,181 @@ Più informazioni inserisci, più specifici saranno i risultati. TabReplays - + Local file system File locali - + Server replay storage Replay sul server - - + + Watch replay Guarda replay - + Rename Rinomina - - + + New folder Nuova cartella - - + + Delete Elimina - + Open replays folder Apri cartella replay - + Download replay Scarica replay - + Toggle expiration lock Metti/togli blocco scadenza - + Get replay share code Ottieni codice di condivisione replay - - + + Look up replay by share code Cerca replay dal codice di condivisione - + Rename local folder Rinomina cartella locale - + Rename local file Rinomina file locale - + New name: Nuovo nome: - + Error Errore - + Rename failed Rinomina non riuscita - + Name of new folder: Nome della nuova cartella: - + Delete local file Elimina il file locale - + Are you sure you want to delete the selected files? Vuoi davvero eliminare i file selezionati? - + Are you sure you want to delete the selected replays? Vuoi davvero eliminare i replay selezionati? - + Failed to get code Impossibile ottenere il codice - - + + Either this server does not support replay sharing, or does not permit replay sharing for you. O questo server non supporta la condivisione dei replay, o non consente la condivisione dei replay per te. - - - + + + Failed Fallito - + Could not get replay code Impossibile ottenere il codice replay - + Replay Share Code Codice di condivisione replay - + Others can use this code to add the replay to their list of remote replays: %1 Altre persone possono usare questo codice per aggiungere il replay alla loro lista di replay remoti: %1 - + Copy to clipboard Copia negli appunti - + Replay share code Codice di condivisione replay - + Replay code found Codice replay trovato - + Replay was added, or you already had access to it. Il replay è stato aggiunto oppure ne avevi già accesso. - + Replay code not found Codice replay non trovato - + Failed to submit code Impossibile inviare il codice - + Unexpected error Errore inatteso - + Delete remote replay Elimina replay remoto @@ -9272,62 +8787,47 @@ Più informazioni inserisci, più specifici saranno i risultati. TabRoom - - Friends - - - - - Online - - - - - Ignored - - - - + &Say: &Parla: - + Chat Chat - + &Room &Stanza - + &Leave room &Lascia stanza - + &Clear chat Pulisci &chat - + Chat Settings... Impostazioni chat... - + mentioned you. ti ha menzionato. - + Click to view Clicca per visualizzare - + You are flooding the chat. Please wait a couple of seconds. Stai spammando la chat. Attendi un paio di secondi. @@ -9340,30 +8840,30 @@ Più informazioni inserisci, più specifici saranno i risultati. Server - - - - + + + + Error Errore - + Failed to join the server room: it doesn't exist on the server. Impossibile unirsi alla stanza: non esiste sul server. - + The server thinks you are in the server room but your client is unable to display it. Try restarting your client. Il server pensa che tu sia nella stanza ma il tuo client non è in grado di mostrarlo. Prova a riavviare il client. - + You do not have the required permission to join this server room. Non hai i requisiti necessari per unirti a questa stanza. - + Failed to join the server room due to an unknown error: %1. Impossibile unirsi alla stanza a causa di un errore sconosciuto: %1. @@ -9371,97 +8871,97 @@ Più informazioni inserisci, più specifici saranno i risultati. TabSupervisor - + Deck Editor &Editor dei mazzi - + Visual Deck Editor Editor visuale - + EDHRec EDHRec - + Archidekt Archidekt - + Home Home - + &Visual Deck Storage &Galleria mazzi - + Visual Database Display Galleria database - + Server Server - + Account Account - + Deck Storage &Archivio mazzi - + Game Replays &Replay partite - + Administration Amministrazione - + Logs Registri - + Are you sure? Sei sicuro? - + There are still open games. Are you sure you want to quit? Ci sono ancora delle partite aperte. Sei sicuro di voler uscire? - + Click to view Clicca per visualizzare - + Your buddy %1 has signed on! Il tuo amico %1 si è collegato - + Unknown Event Evento sconosciuto. - + The server has sent you a message that your client does not understand. This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. @@ -9472,39 +8972,39 @@ Questo messaggio può significare che è disponibile una nuove versione di Cocka Per aggiornare il tuo client, vai su Aiuto -> Controlla aggiornamenti client - + Idle Timeout Timeout inattività - + You are about to be logged out due to inactivity. Stai per essere disconnesso per inattività. - + Promotion Promozione - + You have been promoted. Please log out and back in for changes to take effect. Sei stato promosso. Esci e rientra per dare effetto alle modifiche. - + Warned Avviso - + You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. Hai ricevuto un avviso a causa di %1. Se pregato di evitare di continuare questa attività o potrebbero venire presi ulteriori provvedimenti nel tuoi confronti. Per qualsiasi domanda, manda un messaggio ad un moderatore. - + You have received the following message from the server. (custom messages like these could be untranslated) Hai ricevuto il seguente messaggio dal server. @@ -9514,12 +9014,12 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u TabVisualDatabaseDisplay - + Database Display Visualizzazione Database - + Visual Database Display Galleria database @@ -9558,42 +9058,42 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u TranslateCounterName - + Life Vita - + White Bianco - + Blue Blu - + Black Nero - + Red Rosso - + Green Verde - + Colorless Incolore - + Other Altro @@ -9601,69 +9101,11 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u UpdateDownloader - + Could not open the file for reading. Impossibile aprire il file in lettura. - - UserCardArtSettingsDialog - - - Card Art Settings - - - - - Type a card name... - - - - - Card name: - - - - - Card ProviderId: - - - - - Left margin (%): - - - - - Right margin (%): - - - - - Vertical offset: - - - - - Zoom: - - - - - Parameters - - - - - Preview - - - - - Remove Banner Card - - - UserContextMenu @@ -9781,7 +9223,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u - + Ban History Storico ban @@ -9796,87 +9238,77 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u L'utente non è mai stato bannato. - + Failed to collect ban information. Impossibile recuperare le informazioni sui ban. - - - + + + Warning History Storico avvisi - + Warning Time;Moderator;User Name;Reason Ora Avviso;Moderatore;Nome Utente;Ragione - + User has never been warned. L'utente non ha mai ricevuto avvisi. - + Failed to collect warning information. Impossibile recuperare le informazioni sugli avvisi. - + Failed to get admin notes. Impossibile ottenere le note degli amministratori - - + + Success Successo - + Successfully promoted user. Utente promosso. - + Successfully demoted user. Utente degradato. - - Kick Player - - - - - Are you sure you want to kick this player from the game? - - - - - - + + + Failed Fallito - + Failed to promote user. Promozione fallita. - + Failed to demote user. Degradazione fallita. - + Copy hash to clipboard Copia hash negli appunti - + Remove this user's messages Rimuovi i messaggi di questo utente @@ -9884,554 +9316,326 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u UserInfoBox - + Location: Posizione: - + Account Age: Età account: - + Edit Modifica - + Change password Cambia password - + Change avatar Cambia avatar - + Administrator Amministratore - + Moderator Moderatore - + Registered user Utente registrato - - + + Unregistered user Utente non registrato - + Judge Arbitro - + Unknown Sconosciuta - + The entered password does not match your account. La password inserita non corrisponde al tuo accound. - - - - + + + Information Informazione - + User information updated. Informazioni utente aggiornate. - - - - - - - - - - - + + + + + + + + + + Error Errore - + User Information Informazioni Utente - + Real Name: Nome Reale: - + User Level: Livello dell'Utente: - - - Edit Banner Card - - - + %n Year(s), amount of years (only shown if more than 0) 1 Anno.%n Anni.%n Anno(i). - + %10%n Day(s) %20 amount of years (if more than 0), amount of days, date in local short format %10%n Giorno %20%10%n Giorni %20%10%n Giorno(i) %20 - + Enter Password Inserisci Password - + Password verification is required in order to change your email address La verifica della password è necessaria per cambiare il tuo indirizzo email - - - + + + An error occurred while trying to update your user information. E' stato riscontrato un errore durante l'aggiornamento delle tue informazioni utente. - - The selected card is blacklisted on this server or another error occurred. - - - - - Banner card removed. - - - - - Banner card updated. - - - - + This server does not permit you to update your user informations. Questo server non ti permette di aggiornare le tue informazioni utente. - + Password changed. Password modificata. - + This server does not permit you to change your password. Questo server non ti permette di modificare la password. - + The new password is too short. La nuova password è troppo corta. - + The old password is incorrect. La vecchia password è sbagliata. - + Avatar updated. Avatar modificato. - + This server does not permit you to update your avatar. Questo server non ti permette di aggiornare il tuo avatar. - - - An error occured while trying to update your avatar. - - - This server does not permit you to update your user informations. - An error occured while trying to updater your avatar. - Questo server non ti permette di aggiornare le tue informazioni utente. - - - - UserInfoPopup - - - - Games - - - - - Chat - - - - - Open private chat - - - - - Profile - - - - - View user profile - - - - - Show this user's games - - - - - − Buddy - - - - - Remove from buddy list - - - - - + Buddy - - - - - Add to buddy list - - - - - − Ignore - - - - - Remove from ignore list - - - - - + Ignore - - - - - Add to ignore list - - - - - Ban - - - - - Ban from server - - - - - Warn - - - - - Warn user - - - - - Ban log - - - - - View ban history - - - - - Warn log - - - - - View warning history - - - - - Notes - - - - - View admin notes - - - - - − Mod - - - - - Demote from moderator - - - - - + Mod - - - - - Promote to moderator - - - - - − Judge - - - - - Demote from judge - - - - - + Judge - - - - - Promote to judge - - - - - Join game - - - - - Spectate - - - - - - Loading games… - - - - - Could not load games. - - - - - No active games. - + An error occured while trying to updater your avatar. + Si è verificato un errore durante l'aggiornamento del tuo avatar. UserInterfaceSettingsPage - + General interface settings Impostazioni generali di interfaccia - + &Double-click cards to play them (instead of single-click) &Doppio click sulle carte per giocarle (anzichè un solo click) - + &Clicking plays all selected cards (instead of just the clicked card) &Cliccare gioca tutte le carte selezionate (anziché solo quella cliccata) - + &Play all nonlands onto the stack (not the battlefield) by default Gioca tutte le carte non terra nella &pila (invece che sul campo di battaglia) - + Do not delete &arrows inside of subphases Non eliminare le &freccie al cambio di sottofase - + Close card view window when last card is removed Chiudi la finestra di visualizzazione carte quando l'ultima carta viene rimossa - + Auto focus search bar when card view window is opened Passa alla barra di ricerca quando si apre la finestra di visualizzazione carta - + Annotate card text on tokens Annota il testo della carta sulle pedine - - Show selection count during drag selection + + Show selection counter during drag selection - - Show total selection count + + Show total selection counter - - Show subtype breakdown in selection tally - - - - + Use tear-off menus, allowing right click menus to persist on screen Usa menù a strappo, permettendo ai menù del tasto destro del mouse di rimanere sullo schermo - - Keep game chat focused when clicking in game (Note: disables card view search bar) - - - - + Notifications settings Impostazioni notifiche - + Enable notifications in taskbar Abilita notifiche nella barra delle applicazioni - + Notify in the taskbar for game events while you are spectating Notifica anche per le partite in cui si è solo uno spettatore - + Notify in the taskbar when users in your buddy list connect Notifca quando utenti nella tua lista amici si connettono - + Animation settings Impostazioni delle animazioni - + &Tap/untap animation Animazioni &TAPpa/STAPpa - + Deck editor/storage settings Impostazioni editor/archivio mazzi - + Open deck in new tab by default Apri il mazzo in una nuova scheda automaticamente - + Use visual deck storage in game lobby Usa galleria mazzi nella lobby - + Use selection animation for Visual Deck Storage Mostra animazione al passaggio del mouse nella galleria mazzi - + When adding a tag in the visual deck storage to a .txt deck: Quando aggiungi un'etichetta ad un mazzo in formato .txt nella Galleria mazzi: - + do nothing non fare nulla - + ask to convert to .cod chiedi se convertire in file .cod - + always convert to .cod converti sempre in file .cod - + Default deck editor type Editor dei mazzi predefinito - + Classic Deck Editor Editor classico - + Visual Deck Editor Editor visuale - + Replay settings Impostazioni di riproduzione - + Buffer time for backwards skip via shortcut: Tempo di attesa per saltare indietro dopo aver premuto la scorciatoia @@ -10439,22 +9643,22 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u UserListWidget - + Users connected to server: %1 Utenti connessi al server: %1 - + Users in this room: %1 Utenti in questa stanza: %1 - + Buddies online: %1 / %2 Amici online: %1 / %2 - + Ignored users online: %1 / %2 Utenti ignorati online: %1 / %2 @@ -10462,68 +9666,58 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u UtilityMenu - + Increment all card counters Aumenta tutti i segnalini della carta - + &Untap all permanents &STAPpa tutti i permanenti - + R&oll die... L&ancia un dado... - - Flip coin - - - - + &Create token... &Crea una pedina... - + C&reate another token C&rea un'altra pedina - + Cr&eate predefined token Cr&ea pedina predefinita - - - C&reate another %1 token - - VisualDatabaseDisplayColorFilterWidget Exact match - Corrispondenza esatta + Includes - Include + Include / Exclude Mode: Includes - Include / Esclude + How selected and unselected colors are combined in the filter - Come vengono combinati colori selezionati e non selezionati nel filtro + @@ -10552,72 +9746,72 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u VisualDatabaseDisplayFilterToolbarWidget - + Sort by - Ordina per + + + + + Filter by + - Filter by - Filtra per - - - Save and load filters Salva e carica filtri - + Filter by exact card name Filtra per nome della carta esatto - + Filter by card main-type Filtra per tipo - + Filter by card sub-type Filtra per sottotipo - + Filter by set Filtra per set - + Filter by format legality - Filtra per legalità di formato + - + Save/Load - Salva/Carica + - + Name Nome - + Main Type Tipo - + Sub Type Sottotipo - + Sets Set - + Formats Formati @@ -10625,22 +9819,22 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u VisualDatabaseDisplayFormatLegalityFilterWidget - + Show formats with at least: - Mostra formati con almeno: + - + cards carte - + Do not display formats with less than this amount of cards in the database Non mostrare i formati con meno di questo ammontare di carte nel database - + Filter mode (AND/OR/NOT conjunctions of filters) Modalità di filtraggio (utilizzabile con connettivi logici AND/OR/NOT) @@ -10658,32 +9852,32 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u VisualDatabaseDisplayMainTypeFilterWidget - + Show main types with at least: - Mostra tipi con almeno: + - + cards carte - + Do not display card main-types with less than this amount of cards in the database Non mostrare i tipi di carta che hanno meno occorrenze nel database di questo numero - + Filter mode (AND/OR/NOT conjunctions of filters) Modalità di filtraggio (utilizzabile con connettivi logici AND/OR/NOT) - + Mode: Exact Match Modalità: Corrispondenza esatta - + Mode: Includes Modalità: Include @@ -10691,27 +9885,27 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u VisualDatabaseDisplayNameFilterWidget - + Filter by name... (Exact match) Filtra per nome... (Corrispondenza esatta) - + Load from Deck Carica da mazzo - + Apply all card names in currently loaded deck as exact match name filters Usa i nomi delle carte nel mazzo caricato come insieme di filtri a corrispondenza esatta - + Load from Clipboard Carica dagli appunti - + Apply all card names in clipboard as exact match name filters Usa i nomi delle carte negli appunti come insieme di filtri a corrispondenza esatta @@ -10719,7 +9913,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u VisualDatabaseDisplayRecentSetFilterSettingsWidget - + Filter to most recent sets Filtra per i set più recenti @@ -10727,19 +9921,19 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u VisualDatabaseDisplaySetFilterWidget - + Search sets... Ricerca set... - - + + Mode: Exact Match Modalità: Corrispondenza esatta - - + + Mode: Includes Modalità: Include @@ -10747,37 +9941,37 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u VisualDatabaseDisplaySubTypeFilterWidget - + Search subtypes... Ricerca sottotipi... - + Show sub types with at least: - Mostra sottotipi con almeno: + - + cards carte - + Do not display card sub-types with less than this amount of cards in the database Non mostrare i sottotipi che hanno meno occorrenze nel database di questo numero - + Filter mode (AND/OR/NOT conjunctions of filters) Modalità di filtraggio (utilizzabile con connettivi logici AND/OR/NOT) - + Mode: Exact Match Modalità: Corrispondenza esatta - + Mode: Includes Modalità: Include @@ -10785,23 +9979,23 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u VisualDatabaseDisplayWidget - + Search by card name (or search expressions) Cerca per nome della carta (o espressioni di ricerca) - + Visual Visuale - + Loading database ... Caricamento database... - + Clear all filters Elimina tutti i filtri @@ -10840,17 +10034,17 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u - + Toggle Layout: Overlap Disposizione: Sovrapposta - + Change how cards are displayed within zones (i.e. overlapped or fully visible.) Modifica come le carte vengono mostrate nelle zone (es. sovrapposte o completamente visibili.) - + Toggle Layout: Flat Disposizione: Piatta @@ -10879,17 +10073,17 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u VisualDeckEditorWidget - + Type a card name here for suggestions from the database... Scrivi un nome di carta qui per avere suggerimenti dal database... - + Quick search and add card Cerca e aggiungi carta al mazzo - + Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter Cerca per la corrispondenza più prossima nel database (con auto-completamento) e premendo Invio, aggiungi la stampa preferita della carta al mazzo. @@ -10917,7 +10111,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u Show Color Identity - Mostra identità di colore + @@ -11007,43 +10201,43 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u WarningDialog - + Which warning would you like to send? Che avviso vorresti inviare? - + Redact all messages from this user in all rooms Ottieni tutti i messaggi di questo utente in tutte le stanze - + &OK &OK - + &Cancel &Annulla - + Warn user for misconduct Avvisa l'utente per cattivo comportamento - - + + Error Errore - + User name to send a warning to can not be blank, please specify a user to warn. Il nome utente a cui inviare l'avviso non può essere vuoto. - + Warning to use can not be blank, please select a valid warning to send. L'avviso da inviare non può essere vuoto. @@ -11051,133 +10245,133 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u WndSets - + Move selected set to the top Muovi set selezionato in cima - + Move selected set up Muovi set selezionato su - + Move selected set down Muovi set selezionato giù - + Move selected set to the bottom Muovi set selezionato in fondo - + Search by set name, code, or type Cerca per nome, codice o tipo del set - + Default order Ordine predefinito - + Restore original art priority order Ripristina ordine originale priorità immagini - + Enable all sets Abilita tutti i set - + Disable all sets Disabilita tutti i set - + Enable selected set(s) Abilita i set selezionati - + Disable selected set(s) Disabilita i set selezionati - + Deck Editor Editor dei mazzi - + Use CTRL+A to select all sets in the view. Usa CTRL+A per selezionare le espansioni nella visuale. - + Only cards in enabled sets will appear in the card list of the deck editor. Solo carte in espansioni abilitate appariranno nella lista carte dell'editor di mazzo. - + Image priority is decided in the following order: La priorità di immagine è decisa nell'ordine seguente: - + first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) %1 is a link to the wiki innanzitutto la cartella CUSTOM (%1), poi le Espansioni abilitate in questo dialogo (da cima a fondo) - + Include cards rebalanced for Alchemy [requires restart] Includi carte ribilanciate per Alchemy [richiede riavvio] - + Card Art Immagine carta - + How to use custom card art Come usare immagini personalizzate per le carte - + Hints Suggerimenti - + Note Note - + Sorting by column allows you to find a set while not changing set priority. L'ordinamento per colonne ti permette di trovare un set senza cambiare il loro ordine di priorità. - + To enable ordering again, click the column header until this message disappears. Per riabilitare l'ordinamento, clicca sull'intestazione della colonna finché questo messaggio non scompare. - + Use the current sorting as the set priority instead Usa l'ordinamento corrente per impostare la priorità dei set - + Sorts the set priority using the same column Imposta priorità dei set usando l'ordinamento per colonna - + Manage sets Organizza set @@ -11185,72 +10379,72 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u ZoneViewWidget - + Search by card name (or search expressions) Cerca per nome della carta (o espressioni di ricerca) - + Ungrouped Non raggruppare - + Group by Type Raggruppa per tipo - + Group by Mana Value Raggruppa per costo - + Group by Color Raggruppa per colore - + Unsorted Non ordinato - + Sort by Name Ordina per nome - + Sort by Type Ordina per tipo - + Sort by Mana Cost Ordina per costo - + Sort by Colors Ordina per colori - + Sort by P/T Ordina per F/C - + Sort by Set Ordina per Set - + shuffle when closing Mescola alla chiusura - + pile view Raggruppa per tipo @@ -11258,7 +10452,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u i18n - + English Italiano (Italian) @@ -11266,12 +10460,12 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u main - + Connect on startup Connetti all'avvio - + Debug to file Debug su file @@ -11285,7 +10479,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u - + Deck Editor Editor dei mazzi @@ -11366,7 +10560,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u - + Replays Replay @@ -11481,129 +10675,129 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u Carica Mazzo... - - + + Load Deck from Clipboard... Carica il Mazzo dagli Appunti... - + Edit Deck in Clipboard, Annotated Modifica Mazzo negli Appunti con Annotazioni - + Edit Deck in Clipboard Modifica Mazzo negli Appunti - + New Deck Nuovo Mazzo - + Open Custom Pictures Folder Apri Cartella Immagini Personalizzate - + Print Deck... Stampa Mazzo... - + Delete Card Elimina carta - - + + Reset Layout Reimposta Disposizione - + Save Deck Salva Mazzo - + Save Deck as... Salva Mazzo con Nome... - + Save Deck to Clipboard, Annotated Salva Mazzo in Appunti, Annotato - + Save Deck to Clipboard, Annotated (No Set Info) Salva Mazzo negli Appunti con Annotazioni (Senza Info Set) - + Save Deck to Clipboard Salva Mazzo in Appunti - + Save Deck to Clipboard (No Set Info) Salva Mazzo negli Appunti (Senza Info Set) - + Load Local Deck... Carica Mazzo Locale... - + Load Remote Deck... Carica Mazzo da Remoto... - + Set Ready to Start Imposta Pronto a Iniziare - + Toggle Sideboard Lock Attiva Blocco della Sideboard - + Add Green Counter Aumenta Segnalino Verde - + Remove Green Counter Riduci Segnalino Verde - + Set Green Counters... Imposta Segnalino Verde... - + Add Red Counter Aumenta Segnalino Rosso - + Remove Red Counter Riduci Segnalino Rosso - + Set Red Counters... Imposta Segnalino Rosso... - + Add Life Counter Aumenta Contatore Vita @@ -11613,744 +10807,724 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u Mostra barra di stato - - Load deck from online service... - - - - - Load from website... - - - - + Unload Deck Deseleziona mazzo - + Force Start Forza avvio - + Add Card Counter (F) Aggiungi Segnalino (F) - + Remove Card Counter (F) Togli Segnalino (F) - + Set Card Counters (F)... Imposta Segnalini (F)... - + Add Card Counter (E) Aggiungi Segnalino (E) - + Remove Card Counter (E) Togli Segnalino (E) - + Set Card Counters (E)... Imposta Segnalini (E)... - + Add Card Counter(D) Aggiungi Segnalino(D) - + Remove Card Counter (D) Togli Segnalino (D) - + Set Card Counters (D)... Imposta Segnalini (D)... - + Add Card Counter (C) Aggiungi Segnalino (C) - + Remove Card Counter (C) Togli Segnalino (C) - + Set Card Counters (C)... Imposta Segnalini (C)... - + Add Card Counter (B) Aggiungi Segnalino (B) - + Remove Card Counter (B) Togli Segnalino (B) - + Set Card Counters (B)... Imposta Segnalini (B)... - + Add Card Counter (A) Aggiungi Segnalino (A) - + Remove Card Counter (A) Togli Segnalino (A) - + Set Card Counters (A)... Imposta Segnalini (A)... - + Remove Life Counter Riduci Contatore Vita - + Set Life Counters... Imposta Contatore Vita... - + Add White Counter Aumenta Contatore Bianco - + Remove White Counter Riduci Contatore Bianco - + Set White Counters... Imposta Contatore Bianco... - + Add Blue Counter Aumenta Contatore Blu - + Remove Blue Counter Riduci Contatore Blu - + Set Blue Counters... Imposta Contatore Blu... - + Add Black Counter Aumenta Contatore Nero - + Remove Black Counter Riduci Contatore Nero - + Set Black Counters... Imposta Contatore Nero... - + Add Colorless Counter Aumenta Contatore Incolore - + Remove Colorless Counter Riduci Contatore Incolore - + Set Colorless Counters... Imposta Contatore Incolore... - + Add Other Counter Aumenta Contatore Altro - + Remove Other Counter Riduci Contatore Altro - + Set Other Counters... Imposta Contatore Altro... - + Increment all card counters Aumenta tutti i segnalini della carta - + Add Power (+1/+0) Aumenta Forza (+1/+0) - + Remove Power (-1/-0) Diminuisci Forza (-1/-0) - + Move Toughness to Power (+1/-1) Sposta Costituzione a Forza (+1/-1) - + Add Toughness (+0/+1) Aumenta Costituzione (+0/+1) - + Remove Toughness (-0/-1) Riduci Costituzione (-0/-1) - + Move Power to Toughness (-1/+1) Sposta Forza a Costituzione (-1/+1) - + Add Power and Toughness (+1/+1) Aumenta Forza e Costituzione (+1/+1) - + Remove Power and Toughness (-1/-1) Diminuisci Forza e Costituzione (-1/-1) - + Set Power and Toughness... Imposta Forza e Costituzione... - + Reset Power and Toughness Resetta Forza e Costituzione - + Untap STAP - + Upkeep Mantenimento - + Draw Acquisizione - + First Main Phase Prima Fase Principale - + Start Combat Inizio Combattimento - + Attack Dichiarazione attaccanti - + Block Dichiarazione bloccanti - + Damage Danno da combattimento - + End Combat Fine Combattimento - + Second Main Phase Seconda Fase Principale - + End Finale - + Next Phase Fase Successiva - + Next Phase Action Azione della Fase Successiva - + Next Turn Turno Successivo - + Hide Card in Reveal Window Nascondi Carta nella Finestra di Visualizzazione - + Tap / Untap Card TAPpa / STAPpa carta - + Untap All STAPpa Tutto - + Toggle Skip Untapping Toggle Untap - Salta lo STAP + - + Turn Card Over Gira Carta - + Peek Card Sbircia Carta - + Play Card Gioca Carta - + Play Card, Face Down - Gioca la carta a faccia in giù + - + Attach Card... Assegna Carta... - + Unattach Card Togli Carta - + Clone Card Clona Carta - + Create Token... Crea Pedina... - + Create All Related Tokens Crea Tutte le Pedine Correlate - + Create Another Token Crea un'Altra Pedina - + Set Annotation... Imposta Note... - - Reduce Life by Power - - - - + Select All Cards in Zone Seleziona Tutte le Carte nella Zona - + Select All Cards in Row Seleziona Tutte le Carte nella Riga - + Select All Cards in Column Seleziona Tutte le Carte nella Colonna - + Reveal Selected Cards to All Players Rivela Carta Selezionata a Tutti i Giocatori - - + + Bottom of Library Fondo al Grimorio - - - - + + + + Exile Esilio - - - - + + + + Graveyard Cimitero - - + + Hand Mano - - + + Top of Library Cima al Grimorio - - + + Battlefield, Face Down Campo di Battaglia, faccia in giù - + Battlefield Campo di Battaglia - + Library Grimorio - + Sideboard Sideboard - + Top Cards of Library Carte in Cima al Grimorio - + Bottom Cards of Library Carte in Fondo al Grimorio - + Close Recent View Chiudi Viste di Recente - - + + Stack Pila - - + + Graveyard (Multiple) - Cimitero (Multiple) + Cimitero (multiplo) - - + + Graveyard (Multiple), Face Down - Cimitero (Multiple), a faccia in giù + - - + + Exile (Multiple) - Esilia (Multiple) + Esilia (multiplo) - - + + Exile (Multiple), Face Down - Esilio (Multiple), a faccia in giù + - + Stack Until Found Impila Fino a Trovare - + Draw Bottom Card Pesca Carta in Fondo - + Draw Multiple Cards from Bottom... Pesca Multiple Carte in Fondo - + Draw Arrow... Disegna Freccia... - + Remove Local Arrows Rimuovi Frecce Locali - + Leave Game Abbandona Partita - + Concede Concedi - + Roll Dice... Tira un Dado... - - Flip Coin - - - - + Shuffle Library Mescola il Grimorio - + Shuffle Top Cards of Library Mescola Carte in Cima al Grimorio - + Shuffle Bottom Cards of Library Mescola Carte in Fondo al Grimorio - + Mulligan Mulligan - + Mulligan (Same hand size) Mulligan (Come la mano attuale) - + Mulligan (Hand size - 1) Mulligan (Dimensione della mano - 1) - + Draw a Card Pesca una Carta - + Draw Multiple Cards... Pesca più Carte... - + Undo Draw Annulla Pescata - + Always Reveal Top Card Rivela Sempre la Carta in Cima - + Always Look At Top Card Guarda Sempre la Carta in Cima - + Sort Hand by Name Ordina mano per Nome - + Sort Hand by Type Ordina mano per Tipo - + Sort Hand by Mana Value Ordina mano per Valore di Mana - + Reveal Hand to All Players Rivela Mano a Tutti i Giocatori - + Reveal Random Card to All Players Rivela Carta Casuale a Tutti i Giocatori - + Rotate View Clockwise Ruota Vista in Senso Orario - + Rotate View Counterclockwise Ruota Vista in Senso Antiorario - + Unfocus Text Box Togli Focus dalla Casella di Testo - + Focus Chat Vai alla chat - + Clear Chat Cancella chat - + Refresh Aggiorna - + Skip Forward Salta Avanti - + Skip Backward Salta Indietro - + Skip Forward by a lot Salta Avanti di Molto - + Skip Backward by a lot Salta Indietro di Molto - + Play/Pause Riproduci/Pausa - + Toggle Fast Forward Attiva/Disattiva Avanzamento Rapido - + Home Home - + Visual Deck Storage Galleria mazzi - + Deck Storage Archivio mazzi - + Server Server - + Account Account - + Administration Amministrazione - + Logs Registri diff --git a/cockatrice/translations/cockatrice_ja.ts b/cockatrice/translations/cockatrice_ja.ts index 322c70ac3..a53588fc1 100644 --- a/cockatrice/translations/cockatrice_ja.ts +++ b/cockatrice/translations/cockatrice_ja.ts @@ -2,7 +2,7 @@ AbstractCounter - + &Set counter... (&S)カウンターの数を決める... @@ -10,12 +10,12 @@ AbstractCounterDialog - + Set counter カウンターの設定 - + New value for counter '%1': '%1'カウンターの新しい値: @@ -36,61 +36,61 @@ AbstractTabDeckEditor - + Open in new tab 新しいタブで開く - + Are you sure? よろしいですか？ - + The decklist has been modified. Do you want to save the changes? デッキリストが変更されています。 変更を保存しますか？ - - - - - - + + + + + + Error エラー - + Could not open deck at %1 - + Could not save remote deck - - + + The deck could not be saved. Please check that the directory is writable and try again. - + Save deck - + The deck could not be saved. - + There are no cards in your deck to be exported @@ -106,12 +106,12 @@ Please check that the directory is writable and try again. AdminNotesDialog - + Update Notes リリースノート - + Admin Notes for %1 @@ -128,227 +128,172 @@ Please check that the directory is writable and try again. Sideboard サイドボード - - - Tokens - - AppearanceSettingsPage - + seconds - + Error エラー - + Could not create themes directory at '%1'. '%1' にテーマディレクトリを作成できませんでした。 - + Theme settings テーマ設定 - + Current theme: 現在のテーマ - + Open themes folder テーマフォルダを開く - + Home tab background source: - + Home tab background shuffle frequency: - + Disabled - + + Display card name of background in bottom right: + + + + Menu settings メニュー設定 - + Show keyboard shortcuts in right-click menus 右クリックメニューにキーボードショートカットを表示する - + Show game filter toolbar above list in room tab - + Card rendering カードの描画 - + Display card names on cards having a picture 画像のあるカードにカード名を表示 - + Auto-Rotate cards with sideways layout 横向きレイアウトのカードを自動回転 - + Override all card art with personal set preference (Pre-ProviderID change behavior) - - Light - - - - - Dark - - - - - System - - - - - Active theme palette: - - - - - Edit theme palette - - - - - Home tab settings - - - - - Display card name of background in bottom right - - - - - Styling settings - - - - - Style user list - - - - - Card printings - - - - + Bump sets that the deck contains cards from to the top in the printing selector デッキに含まれるカードを印刷セレクターの一番上に上げる - + Scale cards on mouse over マウスオーバーでカードを拡大 - + Use rounded card corners - - Card layout - - - - + Minimum overlap percentage of cards on the stack and in vertical hand スタックと手札垂直配置時の重なり率の最小値 - + Maximum initial height for card view window: カードビューウィンドウの初期高さの最大値 - - + + rows 行 - + Maximum expanded height for card view window: - + Card counters - + Counter %1 - + Hand layout 手札のレイアウト - + Display hand horizontally (wastes space) 手札を横に並べる - + Enable left justification 左揃えを有効 - + Table grid layout テーブルのレイアウト - + Invert vertical coordinate カード配置の垂直反転 - + Minimum player count for multi-column layout: プレイヤーを複数列レイアウトにする最少人数: - + Maximum font size for information displayed on cards: カードに表示する情報の最大のフォントサイズ: @@ -356,12 +301,12 @@ Please check that the directory is writable and try again. ArchidektApiResponseDeckDisplayWidget - + Back to results - + Open Deck in Deck Editor @@ -387,112 +332,112 @@ Please check that the directory is writable and try again. BanDialog - + ban &user name ユーザー名でBAN - + ban &IP address IPアドレスでBAN - + ban client I&D クライアントIDでBAN - + Ban type BANタイプ - + &permanent ban 永久BAN - + &temporary ban 一時BAN - + &Days: 日 - + &Hours: 時間 - + &Minutes: 分 - + Duration of the ban BAN期間 - + Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. BANの理由を入力してください。 これはモデレーターによって保存されBANされた人には見えません。 - + Please enter the reason for the ban that will be visible to the banned person. BANの理由を入力してください。これはBANされる人に通知されます。 - + Redact all messages from this user in all rooms すべてのルームでこのユーザーからのすべてのメッセージを編集します - + &OK OK - + &Cancel キャンセル - + Ban user from server サーバーからBANされたユーザーです - - - - + + + + Error エラー - + You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. BANの理由を3 つの組み合わせを選択する必要があります:不適切な名前、不適切なIPアドレス、クライアントID - + You must have a value in the name ban when selecting the name ban checkbox. 名前BANチェックボックスを選択するときは、名前BANの値を持っている必要があります。 - + You must have a value in the ip ban when selecting the ip ban checkbox. IP BANチェックボックスを選択するときは、IP BANの値を持っている必要があります。 - + You must have a value in the clientid ban when selecting the clientid ban checkbox. クライアントID BANチェックボックスを選択するときは、クライアントID BANに値を持っている必要があります。 @@ -500,123 +445,59 @@ This is only saved for moderators and cannot be seen by the banned person. BetaReleaseChannel - + Beta Beta（開発中バージョン） - + No reply received from the release update server. リリース更新サーバーから応答がありませんでした。 - + Invalid reply received from the release update server. リリース更新サーバーから無効な応答が受信されました。 - + No reply received from the file update server. ファイル更新サーバーからの応答がありませんでした。 - - CardArtPreviewWidget - - - No card selected - - - - - CardArtRulesModel - - - Card - - - - - ProviderId - - - - - Mode - - - - - Reason - - - CardDatabaseModel - + Name カード名 - + Sets カードセット - + Mana cost マナ・コスト - + Card type カード・タイプ - + P/T P/T - + Color(s) 色 - - CardDatabaseView - - - Add to Deck - - - - - Add to Sideboard - - - - - Select Printing - - - - - Show on EDHRec (Commander) - - - - - Show on EDHRec (Card) - - - - - Show Related cards - - - CardFilter @@ -745,22 +626,22 @@ This is only saved for moderators and cannot be seen by the banned person. CardInfoPictureWidget - + View related cards 関連カードを見る - + Add card to deck デッキにカードを追加 - + Mainboard メインボード - + Sideboard サイドボード @@ -783,12 +664,12 @@ This is only saved for moderators and cannot be seen by the banned person. - + Related cards: 関連カード: - + Unknown card: 謎のカード: @@ -796,146 +677,128 @@ This is only saved for moderators and cannot be seen by the banned person. CardMenu - + Re&veal to... - + &All players - + View related cards - + Token: - + All tokens - + &Select All - + S&elect Row - + S&elect Column - + &Play - + &Hide - + Play &Face Down - + &Tap / Untap Turn sideways or back again - + Skip &untapping - + T&urn Over Turn face up/face down - + &Peek at card face - + &Clone - + Attac&h to card... - + Unattac&h - + &Draw arrow... - + &Set annotation... - - Reduce life by power - - - - + Ca&rd counters - + &Add counter (%1) - + &Remove counter (%1) - + &Set counters (%1)... - - CardPictureLoaderCacheMethod - - - Network Cache - - - - - Filesystem - - - CardSizeWidget @@ -947,133 +810,133 @@ This is only saved for moderators and cannot be seen by the banned person. CardZoneLogic - + their hand nominative - + %1's hand nominative - + their library look at zone - + %1's library look at zone - + of their library top cards of zone, - + of %1's library top cards of zone - + their library reveal zone - + %1's library reveal zone - + their library shuffle - + %1's library shuffle - + their library nominative - + %1's library nominative - + their graveyard nominative - + %1's graveyard nominative - + their exile nominative - + %1's exile nominative - + their sideboard look at zone - + %1's sideboard look at zone - + their sideboard nominative - + %1's sideboard nominative - + their custom zone '%1' nominative - + %1's custom zone '%2' nominative @@ -1095,421 +958,16 @@ This is only saved for moderators and cannot be seen by the banned person. - - ColorButton - - - Click to pick a color - - - - - Pick colour - - - - - ConnectionController - - - - The server has reached its maximum user capacity, please check back later. - - - - - There are too many concurrent connections from your address. - - - - - Banned by moderator - - - - - Expected end time: %1 - - - - - This ban lasts indefinitely. - - - - - Scheduled server shutdown. - - - - - - Invalid username. - - - - - You have been logged out due to logging in at another location. - - - - - Connection closed - - - - - The server has terminated your connection. -Reason: %1 - - - - - The server is going to be restarted in %n minute(s). -All running games will be lost. -Reason for shutdown: %1 - - - - - Scheduled server shutdown - - - - - Failed Login - - - - - Your client seems to be missing features this server requires for connection. - - - - - To update your client, go to 'Help -> Check for Client Updates'. - - - - - - - - - - - - - - - - - - - - - - Error - - - - - Incorrect username or password. Please check your authentication information and try again. - - - - - There is already an active session using this user name. -Please close that session first and re-login. - - - - - - You are banned until %1. - - - - - - You are banned indefinitely. - - - - - This server requires user registration. Do you want to register now? - - - - - This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. -Please close and reopen your client to try again. - - - - - An internal error has occurred, please close and reopen Cockatrice before trying again. -If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - - - - Account activation - - - - - Your account has not been activated yet. -You need to provide the activation token received in the activation email. - - - - - Server Full - - - - - Unknown login error: %1 - - - - - - -This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - - - - - - - - - Registration denied - - - - - Registration is currently disabled on this server - - - - - There is already an existing account with the same user name. - - - - - It's mandatory to specify a valid email address when registering. - - - - - It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. - - - - - Password too short. - - - - - Registration failed for a technical problem on the server. - - - - - The connection to the server has been lost. - - - - - Unknown registration error: %1 - - - - - Account activation failed - - - - - Socket error: %1 - - - - - Server timeout - - - - - You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. -Local version is %1, remote version is %2. - - - - - Your Cockatrice client is obsolete. Please update your Cockatrice version. -Local version is %1, remote version is %2. - - - - - - Success - - - - - Registration accepted. -Will now login. - - - - - Account activation accepted. -Will now login. - - - - - Information - - - - - This server supports additional features that your client doesn't have. -This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. - -To update your client, go to Help -> Check for Updates. - - - - - - - Reset Password - - - - - Your password has been reset successfully, you can now log in using the new credentials. - - - - - Failed to reset user account password, please contact the server operator to reset your password. - - - - - Activation request received, please check your email for an activation token. - - - - - Connecting to %1... - - - - - Registering to %1 as %2... - - - - - Disconnected - - - - - Connected, logging in at %1 - - - - - Requesting forgotten password to %1 as %2... - - - - - Your username must respect these rules: - - - - - is %1 - %2 characters long - - - - - can %1 contain lowercase characters - - - - - - - - NOT - - - - - can %1 contain uppercase characters - - - - - can %1 contain numeric characters - - - - - can contain the following punctuation: %1 - - - - - first character can %1 be a punctuation mark - - - - - no unacceptable language as specified by these server rules: - note that the following lines will not be translated - - - - - can not contain any of the following words: %1 - - - - - can not match any of the following expressions: %1 - - - - - You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - - CustomZoneMenu - + C&ustom Zones - - + + View custom zone '%1' @@ -1517,35 +975,30 @@ To update your client, go to Help -> Check for Updates. DeckAnalyticsWidget - + Add Panel - + Remove Panel - + Save Layout - + Load Layout - - - Include Sideboard - - DeckEditorCardDatabaseDockWidget - + Card Database @@ -1561,17 +1014,47 @@ To update your client, go to Help -> Check for Updates. DeckEditorDatabaseDisplayWidget - + Search by card name (or search expressions) - + + Add to Deck + + + + + Add to Sideboard + + + + + Select Printing + + + + + Show on EDHRec (Commander) + + + + + Show on EDHRec (Card) + + + + + Show Related cards + + + + Add card to &maindeck - + Add card to &sideboard @@ -1604,72 +1087,72 @@ To update your client, go to Help -> Check for Updates. - + Select Printing - + Deck - + Deck &name: - + Banner Card/Tags Visibility Settings - + Show banner card selection menu - + Show tags selection menu - + &Comments: - + Group by: - + Format: - + Hash: - + &Increment number - + &Decrement number - + &Remove row - + Swap card to/from sideboard @@ -1677,17 +1160,17 @@ To update your client, go to Help -> Check for Updates. DeckEditorFilterDockWidget - + Filters - + &Clear all filters - + Delete selected @@ -1818,113 +1301,169 @@ To update your client, go to Help -> Check for Updates. DeckEditorSettingsPage - - + + Update Spoilers スポイラーを更新 - + + Success 完了 - + Download URLs have been reset. ダウンロードURLをリセットしました。 - + + Downloaded card pictures have been reset. + ダウンロードしたカード画像を削除しました。 + + + + Error + エラー + + + + One or more downloaded card pictures could not be cleared. + 一部のカード画像が削除できませんでした。 + + + Add URL URLを追加 - - + + URL: URL: - - + + Edit URL URLを編集 - + + Network Cache Size: + ネットワークキャッシュサイズ: + + + + Redirect Cache TTL: + リダイレクトキャッシュの有効期限: + + + + How long cached redirects for urls are valid for. + キャッシュされたURLの転送の有効期間。 + + + + Picture Cache Size: + 画像キャッシュサイズ: + + + Add New URL 新しいURLを追加 - + Remove URL URLを削除 - + + Day(s) + 日 + + + Updating... 更新中... - + Choose path パスを選ぶ - + URL Download Priority ダウンロードURL優先設定 - + Spoilers スポイラー - + Download Spoilers Automatically スポイラーを自動的にダウンロード - + Spoiler Location: スポイラーの保存場所: - + Last Change 最新に更新 - + Spoilers download automatically on launch スポイラーは起動時に自動的にダウンロードされます。 - + Press the button to manually update without relaunching ボタンを押すと再起動せずに手動で更新します。 - + Do not close settings until manual update is complete 手動更新が完了するまでこのウィンドウを閉じないでください。 - + Download card pictures on the fly カード画像を自動的にダウンロード（英語） - + How to add a custom URL URLの追加方法について（英語） - + + Delete Downloaded Images + ダウンロードした画像を削除 + + + Reset Download URLs ダウンロードURLをデフォルトに戻す + + + On-disk cache for downloaded pictures + ダウンロードした画像のディスク上キャッシュ + + + + In-memory cache for pictures not currently on screen + 現在画面に表示されていない画像のメモリ内キャッシュ + DeckListHistoryManagerWidget @@ -1990,12 +1529,12 @@ To update your client, go to Help -> Check for Updates. DeckLoader - + Common deck formats (%1) - + All files (*.*) @@ -2217,27 +1756,27 @@ To update your client, go to Help -> Check for Updates. - + Moved to %1 1 × "%2" (%3) - + Removed "%1" (all copies) - + %1 1 × "%2" (%3) - + Added - + Removed @@ -2259,74 +1798,74 @@ To update your client, go to Help -> Check for Updates. DeckViewContainer - + Load deck... デッキを開く... - + Load remote deck... サーバーのデッキを開く... - + Load from clipboard... - + Load from website... - + Unload deck デッキを撤去 - + Ready to start 準備完了！( ･`д･´) - + Force start 強制開始 - + Sideboard unlocked サイドボード使用可能 - + Sideboard locked サイドボードロック中 - - + + Error エラー - + The selected file could not be loaded. 選択したファイルが開けませんでした。 - + Deck is greater than maximum file size. - + Are you sure you want to force start? This will kick all non-ready players from the game. - + Cockatrice @@ -2427,7 +1966,7 @@ This will kick all non-ready players from the game. - + Webpage ウェブページ @@ -2467,37 +2006,37 @@ This will kick all non-ready players from the game. サーバーに接続 - + Server URL サーバーURL - + Communication Port 通信ポート - + Unique Server Name ユニークサーバー名 - + Connection Warning 接続の警告 - + You need to name your new connection profile. 新しい接続プロファイルに名前を付ける必要があります。 - + Connect Warning 接続の警告 - + The player name can't be empty. プレイヤー名を入力して下さい。 @@ -2610,17 +2149,17 @@ This will kick all non-ready players from the game. ゲームを作成 - + Game information ゲーム情報 - + Error エラー - + Server error. サーバーエラー。 @@ -2628,97 +2167,97 @@ This will kick all non-ready players from the game. DlgCreateToken - + &Name: トークン名: - + Token トークン - + C&olor: 色: - + white 白 - + blue 青 - + black 黒 - + red 赤 - + green 緑 - + multicolor 多色 - + colorless 無色 - + &P/T: P/T: - + &Annotation: 注釈: - + &Destroy token when it leaves the table 戦場を離れる際に破棄 - + Create face-down (Only hides name) - + Token data トークン設定 - + Show &all tokens すべてのトークンを見る - + Show tokens from this &deck このデッキのトークンを見る - + Choose token from list 一覧からトークンを作成 - + Create token トークンを作成 @@ -2752,7 +2291,7 @@ This will kick all non-ready players from the game. - + ✖ @@ -2767,12 +2306,12 @@ This will kick all non-ready players from the game. - + Duplicate Tag - + This tag already exists. @@ -2959,12 +2498,12 @@ To remove your current avatar, confirm without choosing a new image. トークン名を入力: - + Error エラー - + The chosen name conflicts with an existing card or token. Make sure to enable the 'Token' set in the "Manage sets" dialog to display them correctly. 選択された名前は、既存のカードやトークンと競合しています。 @@ -2989,12 +2528,12 @@ Make sure to enable the 'Token' set in the "Manage sets" dia 指定なし - + Real name: 本名: - + Edit user profile ユーザー情報編集 @@ -3032,113 +2571,113 @@ Make sure to enable the 'Token' set in the "Manage sets" dia 2時間 - + Hide 'buddies only' games 「フレンドのみ」のゲームを非表示 - + Hide full games 満員のゲームを非表示 - + Hide games that have started 進行中のゲームを非表示 - + Hide password protected games パスワードが必要なゲームを非表示 - + Hide 'ignored user' games 無視ユーザーのゲームを非表示 - + Hide games not created by buddies Hide games not created by buddy - + Hide games with forced open decklists - + &Newer than: 部屋の経過時間: - + Game &description: 説明でフィルター: - + &Creator name: 作成者でフィルター: - + General 全般 - + &Game types ゲームタイプ - + at &least: 最少: - + at &most: 最大: - + Maximum player count プレイヤー人数: - + Restrictions 制限 - + Show games only if &spectators can watch 観戦できるゲームのみを表示 - + Show spectator password p&rotected games 観戦にパスワードが必要なゲームも表示 - + Show only if spectators can ch&at 観戦者がチャットできるゲームのみを表示 - + Show only if spectators can see &hands 手札が閲覧できるゲームのみを表示 - + Spectators 観戦 - + Filter games ゲームフィルタ @@ -3441,37 +2980,37 @@ https://tappedout.net/mtg-decks/your-deck-name/ DlgMoveTopCardsUntil - + Card name (or search expressions): カード名または検索条件: - + Number of hits: 枚数 - + Auto play hits 自動的にプレイ - + Put top cards on stack until... 見つかるまで上からスタックに置く... - + No cards matching the search expression exists in the card database. Proceed anyways? 条件に一致するカードはデータベースに存在しません。続行しますか？ - + Cockatrice 悪魔からの助言 - + Invalid filter 不正な条件 @@ -3531,40 +3070,40 @@ Your email will be used to verify your account. 指定なし - + Real name: 本名: - + Register to server サーバーに登録 - - - - + + + + Registration Warning 登録に関する警告 - + Your password is too short. パスワードが短すぎます。 - + Your passwords do not match, please try again. パスワードが一致しませんでした。もう一度入力して下さい。 - + Your email addresses do not match, please try again. メールアドレスが一致しませんでした。もう一度入力して下さい。 - + The player name can't be empty. プレイヤー名を入力して下さい。 @@ -3572,17 +3111,17 @@ Your email will be used to verify your account. DlgRollDice - + Number of sides: 面の数: - + Number of dice: ダイスの数 - + Roll Dice 賽は投げられそう @@ -3633,12 +3172,12 @@ Your email will be used to verify your account. DlgSettings - + Unknown Error loading card database カードデータベース読み込みの不明なエラー。 - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -3655,7 +3194,7 @@ Oracle Importerでデータベースを更新する必要があります。 データベースの場所の設定を変更してみてください。 - + Your card database version is too old. This can cause problems loading card information or images @@ -3672,7 +3211,7 @@ Oracle Importerでデータベースを更新する必要があります。 データベースの場所の設定を変更してみてください。 - + Your card database did not finish loading Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached @@ -3685,7 +3224,7 @@ Would you like to change your database location setting? データベースの場所の設定を変更しますか？ - + File Error loading your card database. Would you like to change your database location setting? @@ -3694,7 +3233,7 @@ Would you like to change your database location setting? データベースの場所の設定を変更してみてください。 - + Your card database was loaded but contains no cards. Would you like to change your database location setting? @@ -3703,7 +3242,7 @@ Would you like to change your database location setting? データベースの場所の設定を変更してみてください。 - + Unknown card database load status Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues @@ -3716,64 +3255,59 @@ Would you like to change your database location setting? データベースの場所設定を変更しますか？ - - - + + + Error エラー - + The path to your deck directory is invalid. Would you like to go back and set the correct path? あなたのデッキディレクトリへのパスは無効です。前に戻って正しいパスを設定してください。 - + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? あなたのカード画像ディレクトリへのパスは無効です。前に戻って正しいパスを設定してください。 - + Settings 設定 - + General 全般 - + Appearance 外観 - + User Interface UI - - Storage - - - - + Card Sources カードダウンロード - + Chat チャット - + Sound サウンド - + Shortcuts ショートカット @@ -3867,9 +3401,9 @@ You can always change this behavior in the 'General' settings tab. - - - + + + Error エラー @@ -3922,31 +3456,31 @@ Please visit the download page to update manually. - + Update Available 更新できます！！！ - + A new version of Cockatrice is available! 新しいバージョンのCockatriceが利用できます！ - + New version 新しいバージョン - + Released 公開日時 - + Changelog 変更履歴 @@ -3956,51 +3490,51 @@ Please visit the download page to update manually. 今すぐ更新しますか？ - + Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. 残念ながら、自動アップデータは互換性のあるダウンロードを見つけることができませんでした。 You may have to manually download the new version. - + Please check the <a href="%1">releases page</a> on our Github and download the build for your system. - - - + + + Update Error 更新エラー - + An error occurred while checking for updates: 更新のチェック中にエラーが発生しました: - + An error occurred while downloading an update: 更新のダウンロード中にエラーが発生しました: - + Installing... インストール中... - + Cockatrice is unable to open the installer. インストーラーが開けませんでした。 - + Try to update manually by closing Cockatrice and running the installer. Cockatriceを終了した後、インストーラーから手動で更新してください。 - + Download location ダウンロード場所 @@ -4090,67 +3624,67 @@ You may have to manually download the new version. DrawProbabilityWidget - + Draw Probability - + Probability of drawing - + Card Name - + Type - + Subtype - + Mana Value - + At least - + Exactly - + card(s) having drawn at least - + cards - + Category - + Qty - + Odds (%) @@ -4264,7 +3798,7 @@ You may have to manually download the new version. FilterBuilder - + Type your filter here ここにフィルタを入力 @@ -4295,22 +3829,22 @@ You may have to manually download the new version. GameEventHandler - + kicked by game host or moderator - + player left the game - + player disconnected from server - + reason unknown @@ -4318,140 +3852,140 @@ You may have to manually download the new version. GameSelector - - - - - - - - - + + + + + + + + + Error エラー - + Please join the appropriate room first. 適切な部屋に参加してください。 - + Wrong password. パスワードが間違っています。 - + Spectators are not allowed in this game. このゲームは観戦出来ません。 - + The game is already full. このゲームはすでに満員です。 - + The game does not exist any more. このゲームはすでに存在しません。 - + This game is only open to registered users. このゲームは登録済みプレイヤーのみ参加できます。 - + This game is only open to its creator's buddies. このゲームは作成者のフレンドのみ参加できます。 - + You are being ignored by the creator of this game. あなたはゲームの作成者によって参加拒否されています。 - + Join Game 参加 - + Spectate Game 観戦 - + Game Information ゲーム情報 - + Join Game as Judge - + Spectate Game as Judge - + Join game 参加 - + Password: パスワード: - + Please join the respective room first. 最初にルームに参加してください。 - + &Filter games ゲームフィルタ - + C&lear filter フィルタ解除 - + C&reate ゲームを作成 - + &Join 参加 - + Join as judge - + J&oin as spectator 観戦 - + Join as judge spectator - + Games shown: %1 / %2 表示されているゲーム: %1 / %2 - + Games ゲーム @@ -4459,32 +3993,32 @@ You may have to manually download the new version. GameSelectorQuickFilterToolBar - + All types - + Filter by game name... - + Filter by game type/format - + Hide games not created by buddies - + Hide full games - + Hide started games @@ -4492,105 +4026,105 @@ You may have to manually download the new version. GamesModel - + >1 day >1 日 - + %1%2 hr short age in hours %1%2 時 - + new できたて - + %1%2 min short age in minutes %1%2 分 - + password パスワード - + buddies only フレンドのみ - + reg. users only 登録ユーザーのみ - + open decklists + - can chat チャット可 - + see hands 手札閲覧可 - + can see hands 手札閲覧可 - + not allowed 観戦不可 - + Room ルーム - + Age 作成時 - + Description 説明 - + Creator 作成者 - + Type タイプ - + Restrictions 制限 - + Players 人数 - + Spectators 観戦者 @@ -4598,158 +4132,143 @@ You may have to manually download the new version. GeneralSettingsPage - + Reset all paths すべてのパスをリセット - + All paths have been reset すべてのパスをリセットしました - - - - - - - + + + + + + + Choose path パスを選択 - - Language settings - + + Personal settings + 個人設定 - + Language: 言語: - - Version settings - - - - - Card database - - - - - Startup settings - - - - + Paths (editing disabled in portable mode) パス（ポータブルモードでの編集は無効） - + Paths パス - + How to help with translations - + Decks directory: デッキフォルダ: - + Filters directory: - + Replays directory: リプレイフォルダ: - + Pictures directory: カード画像フォルダ: - + Card database: カードデータベース: - + Custom database directory: カスタムデータベースフォルダ: - + Token database: トークンデータベース: - + Update channel 更新チャンネル - + Check for client updates on startup 起動時にクライアントの更新をチェック - + Check for card database updates on startup - + Don't check - + Prompt for update - + Always update in the background - + Check for card database updates every - + days - + Notify if a feature supported by the server is missing in my client サーバーでサポートされている機能がクライアントに存在しない場合に通知する - + Automatically run Oracle when running a new version of Cockatrice 新バージョンのCockatriceを起動したら自動的にOracleも起動する - + Show tips on startup 起動時にヒントを表示 - + Last update check on %1 (%2 days ago) @@ -4757,47 +4276,47 @@ You may have to manually download the new version. GraveyardMenu - + &Graveyard - + &View graveyard - + &Move graveyard to... - + &Top of library - + &Bottom of library - + &All players - + &Hand - + &Exile - + Reveal random card to... @@ -4805,88 +4324,88 @@ You may have to manually download the new version. HandMenu - + &Hand - + &View hand - + Sort hand by... - + Name - + Type - + Mana Value - + Take &mulligan (Choose hand size) - + Take mulligan (Same hand size) - + Take mulligan (Hand size - 1) - + &Move hand to... - + &Top of library - + &Bottom of library - + &Graveyard - + &Exile - + &Reveal hand to... - - + + All players - + Reveal r&andom card to... @@ -4894,52 +4413,52 @@ You may have to manually download the new version. HomeWidget - + Create New Deck - + Browse Decks - + Browse Card Database - + Browse EDHRec - + Browse Archidekt - + View Replays - + Quit - + Connecting... - + Connect - + Play @@ -4947,213 +4466,213 @@ You may have to manually download the new version. LibraryMenu - + &Library - + &View library - + View &top cards of library... - + View bottom cards of library... - + Reveal &library to... - + Lend library to... - + Reveal &top cards to... - + &Top of library... - + &Bottom of library... - + &Always reveal top card - + &Always look at top card - + &Open deck in deck editor - + &Draw card - + D&raw cards... - + &Undo last draw - + Shuffle - + &Play top card - + Play top card &face down - + Put top card on &bottom - + Move top card to grave&yard - + Move top card to e&xile - + Move top cards to &graveyard... - + Move top cards to graveyard face down... - + Move top cards to &exile... - + Move top cards to exile face down... - + Put top cards on stack &until... - + Shuffle top cards... - + &Draw bottom card - + D&raw bottom cards... - + &Play bottom card - + Play bottom card &face down - + Move bottom card to grave&yard - + Move bottom card to e&xile - + Move bottom cards to &graveyard... - + Move bottom cards to graveyard face down... - + Move bottom cards to &exile... - + Move bottom cards to exile face down... - + Put bottom card on &top - + Shuffle bottom cards... - - + + &All players - + Reveal top cards of library - + Number of cards: (max. %1) @@ -5161,273 +4680,638 @@ You may have to manually download the new version. MainWindow - - + + + The server has reached its maximum user capacity, please check back later. + サーバーが満員です。 + + + + There are too many concurrent connections from your address. + あなたのアドレスからの同時接続が多すぎます。 + + + + Banned by moderator + モデレーターによるBAN + + + + Expected end time: %1 + 予想終了時間: %1 + + + + This ban lasts indefinitely. + 永久BANされています。 + + + + Scheduled server shutdown. + サーバーシャットダウン予定時間。 + + + + + Invalid username. + ユーザー名が無効です。 + + + + You have been logged out due to logging in at another location. + 別の場所でログインしているため、ログアウトしました。 + + + + Connection closed + 通信切断 + + + + The server has terminated your connection. +Reason: %1 + サーバーはあなたの接続を切断しました。 +理由: %1 + + + + The server is going to be restarted in %n minute(s). +All running games will be lost. +Reason for shutdown: %1 + このサーバーは%n分で再起動します。 +全ての進行中のゲームは失われます。 +シャットダウンの理由: %1 + + + + Scheduled server shutdown + サーバーシャットダウン予定時刻 + + + + + Success + 成功 + + + + Registration accepted. +Will now login. + 登録が完了しました。 +ログインします。 + + + + Account activation accepted. +Will now login. + アカウント有効化が完了しました。 +ログインします。 + + + + Player %1 プレイヤー %1 - + Load replay リプレイを開く - + About Cockatrice Cockatriceについて - + Version バージョン - + Cockatrice Webpage Cockatriceウェブページ - + Project Manager: プロジェクトマネージャ: - + Past Project Managers: 元プロジェクトマネージャ: - + Developers: デベロッパ: - + Our Developers リンク先参照 - + Help Develop! 開発者募集中！ - + Translators: 翻訳者: - + Our Translators 翻訳者一覧 - + Help Translate! 翻訳者募集中！ - + Support: サポート: - + Report an Issue 問題を報告 - + Troubleshooting トラブルシューティング - + F.A.Q. F.A.Q. - - + + + + + + + + + + + + + + + + + + + + Error エラー - + + Server timeout + サーバータイムアウト + + + + Failed Login + ログイン失敗 + + + + Your client seems to be missing features this server requires for connection. + あなたのクライアントは、サーバーが必要とする機能をサポートしていません。クライアントを更新して再度お試しください。 + + + + To update your client, go to 'Help -> Check for Client Updates'. + クライアントをアップデートするには、メニューの「ヘルプ」から「クライアントの更新チェック」をクリックします。 + + + + Incorrect username or password. Please check your authentication information and try again. + ユーザー名かパスワードが正しくありません。 + + + + There is already an active session using this user name. +Please close that session first and re-login. + 既にこのユーザー名を使用しているアクティブなセッションが存在します。 +アクティブなセッションを閉じて再ログインしてください。 + + + + + You are banned until %1. + あなたは%1までBANされています。 + + + + + You are banned indefinitely. + あなたは無期限BANされています。 + + + + This server requires user registration. Do you want to register now? + このサーバーはユーザー登録が必要です。 +今すぐ登録しますか？ + + + + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. + このサーバはクライアントのIDを必要とします。あなたのクライアントはIDの生成に失敗しているか、変更されたクライアントを実行しています。 +クライアントを再起動してもう一度お試し下さい。 + + + + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. + 内部エラーが発生しました。Cockatriceを再起動して再度お試しください。 +エラーが解決しない場合は、ソフトウェアの最新バージョンを実行していることを確認し、必要に応じてソフトウェア開発者にお問い合わせください。 + + + + Account activation + アカウント有効化 + + + + Your account has not been activated yet. +You need to provide the activation token received in the activation email. + このアカウントはまだ有効化されていません。 +登録されたアドレスに送信されているアクティベーショントークンを入力して下さい。 + + + + Server Full + サーバーが満員です。 + + + + Unknown login error: %1 + 不明なログインエラー: %1 + + + + + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. + +これは通常、あなたのクライアントのバージョンが古くなっていて、サーバーがあなたのクライアントを認識できないと返答してきていることを意味しています。 + + + + Your username must respect these rules: + ユーザー名は、これらの規則を遵守する必要があります： + + + + is %1 - %2 characters long + 文字数は%1～%2文字まで + + + + can %1 contain lowercase characters + 小文字%1可 + + + + + + + NOT + 不 + + + + can %1 contain uppercase characters + 大文字％1可 + + + + can %1 contain numeric characters + 数字％1可 + + + + can contain the following punctuation: %1 + 次の記号が使用可：％1 + + + + first character can %1 be a punctuation mark + 最初の文字を記号にすることは%1可能 + + + + no unacceptable language as specified by these server rules: + note that the following lines will not be translated + サーバールールで定められている不適切な言葉は使用できません: + + + + can not contain any of the following words: %1 + 次の単語を含めることは不可能：%1 + + + + can not match any of the following expressions: %1 + 次の文字列を含めることは不可能：%1 + + + + You may only use A-Z, a-z, 0-9, _, ., and - in your username. + ユーザー名には『半角英数字』、および半角の「_」「.」「-」のみが使えます。 + + + + + + + + + Registration denied + 登録が拒否されました。 + + + + Registration is currently disabled on this server + 現在このサーバーでは登録が無効になっています。 + + + + There is already an existing account with the same user name. + 既に同じユーザー名のアカウントが登録されています。 + + + + It's mandatory to specify a valid email address when registering. + 登録時に有効な電子メールアドレスを指定する必要があります。 + + + + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + このサーバーに新しいアカウントを登録しようとしていますが、提供されたメールアドレスに登録されているアカウントが既に存在しています。このサーバーは、ユーザーがアドレスごとに登録できるアカウントの数を制限しています。詳細なサポートや資格情報の入手については、サーバーのオペレーターにお問い合わせください。 + + + + Password too short. + パスワードが短すぎます。 + + + + Registration failed for a technical problem on the server. + ユーザー登録に失敗しました（サーバーの技術的問題）。 + + + + The connection to the server has been lost. + + + + + Unknown registration error: %1 + 不明な登録エラー: %1 + + + + Account activation failed + アカウントの有効化に失敗しました。 + + + + Socket error: %1 + ソケットエラー: %1 + + + + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + あなたは古いバージョンのサーバーに接続しようとしています。Cockatriceのバージョンをダウングレードするか適切なサーバーに接続してください。 +ローカルVer %1，サーバーVer %2 + + + + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + あなたのCockatriceのバージョンがサーバーのバージョンより古いです。Cockatriceをアップデートしてください。 +ローカルVer %1，サーバーVer %2 + + + + Connecting to %1... + %1へ接続しています... + + + + Registering to %1 as %2... + %1に%2として登録中... + + + + Disconnected + 切断されました + + + + Connected, logging in at %1 + 接続完了、%1にログイン中 + + + + + + Requesting forgotten password to %1 as %2... + 忘れたパスワードを %1 に %2 として要求しています... + + + &Connect... サーバーに接続... - + &Disconnect サーバーから切断 - + Start &local game... ローカルゲームを開始... - + &Watch replay... リプレイを見る... - + &Full screen フルスクリーン - + &Register to server... サーバーに登録する - + &Restore password... パスワードリセット... - + &Settings... 設定... - + &Exit 終了 - + A&ctions アクション - + &Cockatrice Cockatrice - + C&ard Database カードデータベース - + &Manage sets... セットを管理... - + Edit custom &tokens... カスタムトークンを編集... - + Open custom image folder カスタム画像フォルダを開く - + Open custom sets folder カスタムセットフォルダを開く - + Add custom sets/cards カスタムセット/カードを追加 - + Reload card database カードデータベースを再読み込み - + Tabs タブ - + &Help ヘルプ - + &About Cockatrice Cockatriceについて - + &Tip of the Day 今日のヒント - + Check for Client Updates クライアントの更新チェック - + Check for Card Updates... カードデータベース更新 - + Check for Card Updates (Automatic) - + Show Status Bar - + View &Debug Log デバッグログを見る - + Open Settings Folder 設定フォルダを開く - + Show/Hide 表示/非表示 - + New Version 新しいバージョン - + Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. Cockatrice %1へのアップデートおめでとうございます！ Oracleが起動し、カードデータベースが更新されます。 - + Cockatrice installed Cockatriceがインストールされました - + Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. Cockatrice %1のインストールおめでとうございます！ Oracleを起動して、初期カードデータベースをインストールします。 - + Card database カードデータベース - + Cockatrice is unable to load the card database. Do you want to update your card database now? If unsure or first time user, choose "Yes" @@ -5436,29 +5320,29 @@ If unsure or first time user, choose "Yes" よくわからない場合、初回起動時などは「はい」を押して下さい。 - - + + Yes はい - - + + No いいえ - + Open settings 設定を開く - + New sets found 新しいセットが見つかりました - + %n new set(s) found in the card database Set code(s): %1 Do you want to enable it/them? @@ -5467,22 +5351,17 @@ Do you want to enable it/them? 有効にしますか？ - - Yes, always enable - - - - + View sets セットを見る - + Welcome ようこそ - + Hi! It seems like you're running this version of Cockatrice for the first time. All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. @@ -5491,132 +5370,165 @@ Read more about changing the set order or disabling specific sets and consequent 「セットの設定」ウィンドウ内の特定のセットを無効にしたり、順序を変更をする方法の詳細をお読みください。 - + + Information 情報 - + A card database update is already running. データベース更新は既に起動中です。 - + Unable to run the card database updater: データベース更新が実行できませんでした: - + Card database update running. - + Failed to start. The file might be missing, or permissions might be incorrect. - + The process crashed some time after starting successfully. - + Timed out. The process took too long to respond. The last waitFor...() function timed out. - + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. プロセスへの書き込み中にエラーが発生しました。プロセスが実行されていないか、入力チャネルが閉じられている等の可能性があります。 - + An error occurred when attempting to read from the process. For example, the process may not be running. - + Unknown error occurred. - + The card database updater exited with an error: %1 - - - - - + + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + このサーバーは、クライアントにはない追加機能をサポートしています。通常、これは問題ではありませんが、新しいバージョンのCockatriceが使用可能であるか、このサーバーがカスタム版またはプレリリース版を実行している可能性があります。 + +クライアントを更新するには、ヘルプ→クライアントの更新のチェックをクリックしてください。 + + + + + + + Load sets/cards セット/カードを読み込む - + Selected file cannot be found. 選択したファイルが見つかりませんでした。 - + You can only import XML databases at this time. ここではXMLデータベースのみをインポートできます。 - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. 新しいセット/カードが正常に追加されました。 データベースが再読込されます。 - + Sets/cards failed to import. セット/カードのインポートに失敗 + + + + + Reset Password + パスワードリセット + + + + Your password has been reset successfully, you can now log in using the new credentials. + パスワードをリセットしました。 + + + + Failed to reset user account password, please contact the server operator to reset your password. + パスワードをリセットできませんでした。サーバー管理者にリセットしてもらってください。 + + + + Activation request received, please check your email for an activation token. + アクティベーションリクエストを受信しました。メールでアクティベーショントークンを確認してください。 + ManaBaseConfigDialog - + Mana Base Configuration - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): - + OK - + Cancel @@ -5688,27 +5600,27 @@ Cockatrice will now reload the card database. ManaDevotionConfigDialog - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): @@ -5778,615 +5690,610 @@ Cockatrice will now reload the card database. MessageLogWidget - + from play スタックから - + from their graveyard 墓地から - + from exile 追放領域から - + from their hand 手札から - + the top card of %1's library %1のライブラリーの一番上のカード - + the top card of their library ライブラリーの一番上のカード - + from the top of %1's library %1のライブラリーの一番上から - + from the top of their library ライブラリーの一番上から - + the bottom card of %1's library %1のライブラリーの一番下のカード - + the bottom card of their library ライブラリーの一番下のカード - + from the bottom of %1's library %1のライブラリーの一番下から - + from the bottom of their library ライブラリーの一番下のカード - + from %1's library %1のライブラリーから - + from their library ライブラリーから - + from sideboard サイドボードから - + from the stack スタックから - + from custom zone '%1' - + %1 is now keeping the top card %2 revealed. %1 は%2一番上のカードを公開した状態でゲームをプレイしている。 - + %1 is not revealing the top card %2 any longer. %1 は%2一番上のカードの公開を終えた。 - + %1 can now look at top card %2 at any time. %1はいつでも%2一番上のカードを見ることができる。 - + %1 no longer can look at top card %2 at any time. %1はもう%2一番上のカードを見ることができない。 - + %1 attaches %2 to %3's %4. %1は%3の%4に%2をつけた。 - + %1 has conceded the game. %1 が投了した！！！ - + %1 has unconceded the game. %1が投了を撤回した。 - + %1 has restored connection to the game. %1 がゲームに再接続した。 - + %1 has lost connection to the game. %1 はゲームから切断された。 - + %1 points from their %2 to themselves. %1 は %2 から自分自身へ対象を指定した。 - + %1 points from their %2 to %3. %1 は %2 から %3 へ対象を指定した。 - + %1 points from %2's %3 to themselves. %1 は %2 の %3 から自分自身へ対象を指定した。 - + %1 points from %2's %3 to %4. %1 は %2 の %3 から %4 へ対象を指定した。 - + %1 points from their %2 to their %3. %1 は %2 から %3 へ対象を指定した。 - + %1 points from their %2 to %3's %4. %1 は %2 から %3 の %4 へ対象を指定した。 - + %1 points from %2's %3 to their own %4. %1 は %2 の %3 から %4 へ対象を指定した。 - + %1 points from %2's %3 to %4's %5. %1 は %2 の %3 から %4 の %5 へ対象を指定した。 - + %1 creates a face down token. - + %1 creates token: %2%3. %1 はトークン: %2 を%3作成した。 - + %1 has loaded a deck (%2). %1 はデッキをロードした。ハッシュ:%2 - + %1 has loaded a deck with %2 sideboard cards (%3). %1 はデッキをロードした。サイドボード数:%2, ハッシュ:%3 - + %1 destroys %2. %1 は %2 を取り除いた。 - + a card カード - + %1 gives %2 control over %3. %1 は %2 に %3 のコントロールを渡した。 - + %1 puts %2 into play%3 face down. %1 は %2 を%3裏向きでプレイした。 - + %1 puts %2 into play%3. %1 は %2 を%3プレイした。 - + %1 puts %2%3 into their graveyard face down. - + %1 puts %2%3 into their graveyard. %1 は %2 を%3墓地に置いた。 - + %1 exiles %2%3 face down. - + %1 exiles %2%3. %1 は %2 を%3追放した。 - + %1 moves %2%3 to their hand. %1は %2 を%3手札に加えた。 - + %1 puts %2%3 into their library. %1 は %2 を%3ライブラリーに加えた。 - + %1 puts %2%3 onto the bottom of their library. %1 は %2 を%3ライブラリーの一番下に置いた。 - + %1 puts %2%3 on top of their library. %1 は %2 を%3ライブラリーの一番上に置いた。 - + %1 puts %2%3 into their library %4 cards from the top. %1 は %2 を%3ライブラリーの一番上から%4枚目に置いた。 - + %1 moves %2%3 to sideboard. %1 は %2 を%3サイドボードに置いた。 - + %1 plays %2%3 face down. - + %1 plays %2%3. %1 は %2 を%3プレイした。 - + %1 moves %2%3 to custom zone '%4' face down. - + %1 moves %2%3 to custom zone '%4'. - + %1 tries to draw from an empty library %1 は……カードがないライブラリーからカードを引こうとした！ - + %1 draws %2 card(s). %1は%2枚カードを引いた。 - + %1 is looking at %2. %1 は%2を見ている。 - + %1 is looking at the %4 %3 card(s) %2. top card for singular, top %3 cards for plural %1 は%2%4%3枚のカードを見ている。 - + bottom 下から - + top 上から - + %1 turns %2 face-down. %1 は %2 を裏向きにした。 - + %1 turns %2 face-up. %1 は %2 を表向きにした。 - + The game has been closed. ゲームがクローズされました。 - + The game has started. ◇◇ゲーム開始！◇◇ - + You are flooding the game. Please wait a couple of seconds. - + %1 has joined the game. %1 がゲームに参加した。 - + %1 is now watching the game. %1 が観戦に参加した。 - + You have been kicked out of the game. ゲームからキックされました。 - + %1 has left the game (%2). %1 はゲームから離脱した（%2）。 - + %1 is not watching the game any more (%2). %1 が観戦から離脱した（%2）。 - + %1 is not ready to start the game any more. %1 は準備完了を解除した。 - + %1 shuffles their deck and draws a new hand of %2 card(s). ％1はライブラリーを切り直し、新たにカードを％2枚引いた。 - + %1 shuffles their deck and draws a new hand. ％1はライブラリーを切り直し、新たに手札を引いた。 - + You are watching a replay of game #%1. ゲーム#%1のリプレイを再生しています。 - + %1 is ready to start the game. %1 はゲーム開始の準備が完了した！！ - + cards an unknown amount of cards カード - + %1 card(s) a card for singular, %1 cards for plural %1枚のカード - + %1 lends %2 to %3. %1 は %3 に%2を貸した。 - + %1 reveals %2 to %3. %1 は %3 に%2を見せた。 - + %1 reveals %2. %1 は%2を公開した。 - + %1 randomly reveals %2%3 to %4. %1 は%3無作為に %2 を選び、%4に見せた。 - + %1 randomly reveals %2%3. %1 は%3無作為に %2 を選び、公開した。 - + %1 peeks at face down card #%2. %1 は裏向きのカード#%2の表面を確認した。 - + %1 peeks at face down card #%2: %3. %1 は裏向きのカード#%2の表面を確認した ( %3 ) 。 - + %1 reveals %2%3 to %4. %1 は%3 %2 を %4 に見せた。 - + %1 reveals %2%3. %1 は%3 %2 を公開した。 - + %1 reversed turn order, now it's %2. %1はターン順を逆にした（%2）。 - + reversed 逆転 - + normal 順転 - + Heads 表 - + Tails 裏 - + %1 flipped a coin. It landed as %2. %1 はコインを投げた。結果は……【%2】だ！ - + %1 rolls a %2 with a %3-sided die. %1 は%3面ダイスをふり、【%2】を出した。 - + %1 flips %2 coins. There are %3 heads and %4 tails. %1 は%2枚のコインを投げた。表が【%3】枚、裏が【%4】枚出た。 - + %1 rolls a %2-sided dice %3 times: %4. %1 は%2面体サイコロを%3個振り、それぞれ【%4】を出した。 - + %1's turn. ■ %1 のターン■ - + %1 sets annotation of %2 to %3. %1 は %2 に注釈をつけた (%3)。 - - %1 places %2 %3%4 counter(s) on %5 (now %6). + + %1 places %2 "%3" counter(s) on %4 (now %5). - - %1 removes %2 %3%4 counter(s) from %5 (now %6). + + %1 removes %2 "%3" counter(s) from %4 (now %5). - - %1 failed to undo their last draw. - - - - + %1 sets counter %2 to %3 (%4%5). %1 は%2カウンターを%3に設定した (%4%5)。 - + %1 sets %2 to not untap normally. %1 は %2 をアンタップ・ステップの間にアンタップしないようにした。 - + %1 sets %2 to untap normally. %1 は %2 を通常どおりアンタップするように設定した。 - + %1 removes the PT of %2. %1 は %2 のP/Tを取り除いた。 - + %1 changes the PT of %2 from nothing to %4. %1 は %2 のP/Tを%4にした。 - + %1 changes the PT of %2 from %3 to %4. %1 は %2 のP/Tを%3から%4にした。 - + %1 has locked their sideboard. %1 はサイドボードをロックした。 - + %1 has unlocked their sideboard. %1 はサイドボードを解禁した。 - + %1 taps their permanents. %1 は自分のコントロールするパーマネントをタップした。 - + %1 untaps their permanents. %1 は自分のコントロールするパーマネントをアンタップした。 - + %1 taps %2. %1 は %2 をタップした。 - + %1 untaps %2. %1 は %2 をアンタップした。 - + %1 shuffles %2. %1 は%2を切り直した。 - + %1 shuffles the bottom %3 cards of %2. %1 は%2の一番下の%3枚のカードをに無作為の順番で置いた。 - + %1 shuffles the top %3 cards of %2. %1 は%2の一番上の%3枚のカードをに無作為の順番で置いた。 - + %1 shuffles cards %3 - %4 of %2. %1 は%2の %3 - %4 枚を無作為の順番で置いた。 - + %1 unattaches %2. %1 は %2 をはずした。 - + %1 undoes their last draw. %1 は最後に引いたカードを戻した。 - + %1 undoes their last draw (%2). %1 は最後に引いたカード ( %2 ) を戻した 。 @@ -6394,115 +6301,110 @@ Cockatrice will now reload the card database. MessagesSettingsPage - + Word1 Word2 Word3 ここに入力してください - + Add New Message 定型文を追加 - + Edit Message 定型文を編集 - + Remove Message 定型文を削除 - + Add message 定型文を追加 - - + + Message: 定型文: - + Edit message 定型文を編集 - + Chat settings チャット設定 - + Custom alert words 反応するキーワード - + Enable chat mentions メンション機能を有効 - + Enable mention completer メンション補完を有効 - + In-game message macros 定型文 - + How to use in-game message macros ゲーム内メッセージマクロの使い方 - + Ignore chat room messages sent by unregistered users 未登録ユーザーのルームメッセージを無視 - + Ignore private messages sent by unregistered users 未登録ユーザーの個人チャットを無視 - - Ignore private messages sent by non-buddy users - - - - - + + Invert text color 反転テキストの色 - + Enable desktop notifications for private messages 個人チャットのデスクトップ通知を有効 - + Enable desktop notification for mentions メンションのデスクトップ通知を有効 - + Enable room message history on join 参加時にルームのメッセージ履歴を表示 - - + + (Color is hexadecimal) (色は16進数) - + Separate words with a space, alphanumeric characters only 英数字のみ使用可能。単語を半角スペースで区切って下さい。 @@ -6510,42 +6412,42 @@ Cockatrice will now reload the card database. MoveMenu - + Move to - + &Top of library in random order - + X cards from the top of library... - + &Bottom of library in random order - + T&able - + &Hand - + &Graveyard - + &Exile @@ -6558,47 +6460,47 @@ Cockatrice will now reload the card database. カード・タイプ - + Mana Value マナ総量 - + Color(s) 色 - + Loyalty 忠誠度 - + Main Card Type メインのカード・タイプ - + Mana Cost マナ・コスト - + P/T P/T - + Side 表裏 - + Layout レイアウト - + Color Identity 固有色 @@ -6621,152 +6523,6 @@ Cockatrice will now reload the card database. - - PaletteEditorDialog - - - - Reset - - - - - - Apply - - - - - - Save && Apply - - - - - ▼ Edit Palette - - - - - - ▶ Edit Palette - - - - - Palette Editor — %1 - - - - - <b>Palette Editor</b> &nbsp;·&nbsp; %1 - - - - - This theme ships no default palette files - - - - - Replace current colours with the theme author's defaults - - - - - Switch between the light and dark palette files - - - - - Editing: - - - - - Show or hide the per-role colour grid for manual tweaks - - - - - ↺ Revert to theme default - - - - - Discard unsaved edits and restore the last saved palette - - - - - Preview this palette without saving to disk - - - - - Write palette-%1.toml and reload the theme - - - - - Cannot save: this theme has no directory on disk - - - - - Save failed - - - - - Could not write %1 to: -%2 - - - - - No default found - - - - - No default palette file found for the "%1" scheme. - - - - - PaletteGridWidget - - - Active - - - - - Disabled - - - - - Inactive - - - - - Normal interactive state - - - - - Widget is disabled / not interactive - - - - - Window is in background / unfocused - - - Phase @@ -6833,57 +6589,57 @@ Cockatrice will now reload the card database. PhasesToolbar - + Untap step アンタップ・ステップ - + Upkeep step アップキープ・ステップ - + Draw step ドロー・ステップ - + First main phase 戦闘前メイン・フェイズ - + Beginning of combat step 戦闘開始ステップ - + Declare attackers step 攻撃クリーチャー指定ステップ - + Declare blockers step ブロック・クリーチャー指定ステップ - + Combat damage step 戦闘ダメージ・ステップ - + End of combat step 戦闘終了ステップ - + Second main phase 戦闘後メイン・フェイズ - + End of turn step 最終フェイズ @@ -6891,7 +6647,7 @@ Cockatrice will now reload the card database. PictureLoader - + en code for scryfall's language property, not available for all languages ja @@ -6900,142 +6656,151 @@ Cockatrice will now reload the card database. PlayerActions - - - - - grave - - - - - - - - exile - - - - - PlayerDialogs - - + View top cards of library - - - - - - - - - + + + + + + + + + Number of cards: (max. %1) - + View bottom cards of library - + Shuffle top cards of library - + Shuffle bottom cards of library - + Draw hand - + 0 and lower are in comparison to current hand size - + Draw cards - + + + + + grave + + + + + + + + exile + + + + Move top cards to %1 - + Move bottom cards to %1 - + Draw bottom cards - + + + C&reate another %1 token + + + + Create tokens - + + Number: - + Place card X cards from top of library - + Which position should this card be placed: - + (max. %1) - + Change power/toughness - + Change stats to: - + Set annotation - + Please enter the new annotation: + + + Set counters + + PlayerMenu - + Player "%1" - + &Counters @@ -7065,7 +6830,7 @@ This setting means you'll only see the default printing for each card, instead o - + Printing Selector @@ -7073,22 +6838,22 @@ This setting means you'll only see the default printing for each card, instead o PrintingSelectorCardOverlayWidget - + Preference 優先設定 - + Pin Printing ピン留めする - + Unpin Printing ピン留めを外す - + Show Related cards 関連カードを見る @@ -7159,57 +6924,57 @@ This setting means you'll only see the default printing for each card, instead o PtMenu - + Power / toughness - + &Increase power - + &Decrease power - + I&ncrease toughness - + D&ecrease toughness - + In&crease power and toughness - + Dec&rease power and toughness - + Increase power and decrease toughness - + Decrease power and increase toughness - + Set &power and toughness... - + Reset p&ower and toughness @@ -7217,37 +6982,37 @@ This setting means you'll only see the default printing for each card, instead o QMenuBar - + Services サービス - + Hide %1 %1を隠す - + Hide Others 他を隠す - + Show All すべて表示 - + Preferences... 設定... - + Quit %1 %1から出る - + About %1 %1について @@ -7255,17 +7020,17 @@ This setting means you'll only see the default printing for each card, instead o QObject - + Cockatrice card database (*.xml) Cockatriceカードデータベース(*.xml) - + All files (*.*) 全てのファイル (*.*) - + Cockatrice replays (*.cor) Cockatriceリプレイファイル (*.cor) @@ -7325,177 +7090,110 @@ Are you sure you would like to disable this feature? QPlatformTheme - + OK OK - + Save 保存 - + Save All 全て保存 - + Open 開く - + &Yes はい - + Yes to &All すべてはい - + &No いいえ - + N&o to All すべていいえ - + Abort 中止 - + Retry 再試行 - + Ignore 無視 - + Close 閉じる - + Cancel キャンセル - + Discard カードを捨てる - + Help ヘルプ - + Apply 適用 - + Reset リセット - + Restore Defaults デフォルトを復元 - - QuickSetupPanel - - - %1% - - - - - <b>Quick Setup</b> - - - - - Generate all palette roles automatically from a single accent colour - - - - - Accent: - - - - - Primary hue. Used directly for highlights and links. -At high intensity it also tints buttons and backgrounds. - - - - - Intensity: - - - - - Subtle - - - - - Full colour - - - - - 0–30 Subtle tint — only highlights and links change hue -30–70 Accented — buttons, tooltips, and borders join in -70–100 Full colour — backgrounds, everything - - - - - 70% - - - - - Generate ↓ - - - - - Derive all palette roles from the accent colour above. -Fine-tune individual colours in the grid afterwards. - - - RemoteDeckList_TreeModel - + Name デッキ名 - + ID ID - + Upload time アップロード日 @@ -7503,32 +7201,32 @@ Fine-tune individual colours in the grid afterwards. RemoteReplayList_TreeModel - + ID ID - + Name 説明 - + Players 参加プレイヤー - + Keep ロック - + Time started 開始日時 - + Duration (sec) 期間 (秒) @@ -7536,37 +7234,37 @@ Fine-tune individual colours in the grid afterwards. RfgMenu - + &Exile - + &View exile - + &Move exile to... - + &Top of library - + &Bottom of library - + &Hand - + &Graveyard @@ -7612,7 +7310,7 @@ Fine-tune individual colours in the grid afterwards. SayMenu - + S&ay @@ -7653,27 +7351,27 @@ Fine-tune individual colours in the grid afterwards. SetsModel - + Enabled 可能 - + Set type セットタイプ - + Set code セット略称 - + Long name 正式名称 - + Release date 公開日時 @@ -7681,53 +7379,53 @@ Fine-tune individual colours in the grid afterwards. ShortcutSettingsPage - - + + Restore all default shortcuts すべてのショートカットを元に戻す - + Do you really want to restore all default shortcuts? 本当にすべてのショートカットキーを元に戻しますか？ - + Clear all default shortcuts すべてのショートカットをクリア - + Do you really want to clear all shortcuts? 本当にすべてのショートカットキーをクリアしますか？ - + Section: セクション: - + Action: アクション: - + Shortcut: ショートカット: - + How to set custom shortcuts ショートカットキーの設定方法について（英語） - + Clear all shortcuts すべてのショートカットをクリア - + Search by shortcut name ショートカット名で検索 @@ -7783,12 +7481,12 @@ Please check your shortcut settings! SideboardMenu - + &Sideboard - + &View sideboard @@ -7796,27 +7494,27 @@ Please check your shortcut settings! SoundSettingsPage - + Enable &sounds サウンドを有効 - + Current sounds theme: 現在のサウンドテーマ: - + Test system sound engine サウンドテスト - + Sound settings サウンド設定 - + Master volume 音量 @@ -7888,146 +7586,16 @@ Please check your shortcut settings! リリース更新サーバーから無効な応答が受信されました。 - + No reply received from the tag update server. タグ更新サーバーからの応答がありませんでした。 - + Invalid reply received from the tag update server. タグ更新サーバーから無効な応答が受信されました。 - - StorageSettingsPage - - - - - Success - - - - - Cached card pictures have been reset. - - - - - Downloaded card pictures have been reset. - - - - - Error - - - - - One or more downloaded card pictures could not be cleared. - - - - - In-memory (currently loaded) card pictures have been reset. - - - - - Card Picture Loader Caching Method: - - - - - The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size. - - - - - Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while. - - - - - This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk. - - - - - Delete Cached Images - - - - - Delete Saved Images - - - - - Clear In-Memory Images - - - - - Card Picture Loader Cache Method - - - - - Network Cache - - - - - Filesystem - - - - - In-Memory Picture Cache - - - - - Network Cache Size: - - - - - On-disk cache for downloaded pictures - - - - - Redirect Cache TTL: - - - - - How long cached redirects for urls are valid for. - - - - - Picture Cache Size: - - - - - In-memory cache for pictures not currently on screen - - - - - Naming scheme: - - - - - Day(s) - - - TabAccount @@ -8163,117 +7731,117 @@ Please check your shortcut settings! TabArchidekt - - + + Desc. - - + + AND - - + + Require ALL selected colors - - + + Deck name... - - + + Owner... - - + + Packages - - + + Advanced Filters - + Bracket: - - + + Any - - + + Contains card... - - + + Commander... - - + + Tag... - - + + Deck Size - + Cards: - - + + Asc. - + Sort by: - + Filter by: - + Display Settings - - + + Search - - + + Formats @@ -8283,54 +7851,6 @@ Please check your shortcut settings! - - TabCardArtRules - - - Card: - - - - - ProviderId: - - - - - Mode: - - - - - Reason: - - - - - Type a card name... - - - - - Add rule - - - - - Remove rule - - - - - Refresh - - - - - Card Art Rules - - - TabDeckEditor @@ -8379,7 +7899,7 @@ Please check your shortcut settings! レイアウトをリセット - + Deck: %1 デッキ: %1 @@ -8387,49 +7907,55 @@ Please check your shortcut settings! TabDeckEditorVisual - + Visual Deck: %1 - + &Visual Deck Editor - - + + Card Info - - + + Deck - + + + Filters + + + + &View - + Printing - + Visible - + Floating - + Reset layout @@ -8437,22 +7963,22 @@ Please check your shortcut settings! TabDeckEditorVisualTabWidget - + Visual Deck View - + Visual Database Display - + Deck Analytics - + Sample Hand @@ -8460,134 +7986,134 @@ Please check your shortcut settings! TabDeckStorage - + Local file system ローカルのデッキ - + Server deck storage サーバーに保存されているデッキ - - + + Open in deck editor デッキエディターで開く - + Rename deck or folder - + Upload deck デッキをアップロード - + Download deck デッキをダウンロード + - - - + + New folder 新しいフォルダーを作成する + - Delete 削除 - + Open decks folder - + Rename local folder - + Rename local file - + New name: - - - - + + + + Error エラー - + Rename failed - - + + Invalid deck file 無効なデッキファイル - + Enter deck name デッキの名前を入力 - + This decklist does not have a name. Please enter a name: このデッキリストには名前がありません。 名前を入力してください: - + Unnamed deck 無名のデッキ - + Failed to upload deck to server - + Delete local file ローカルファイルの削除 - + Are you sure you want to delete the selected files? - + Delete remote decks - + Are you sure you want to delete the selected decks? 選択したデッキを削除してもよろしいですか? - - + + Name of new folder: 新しいフォルダの名前: @@ -8659,191 +8185,191 @@ Please enter a name: TabGame - - - + + + Replay リプレイ - - + + Game ゲーム - - + + Player List プレイヤーリスト - - + + Card Info カード情報 - - + + Messages メッセージ - - + + Replay Timeline リプレイタイムライン - + &Phases フェイズ - + &Game ゲーム - + Next &phase 次のフェイズ - + Next phase with &action ターン起因処理をしながら次のフェイズ - + Next &turn 次のターン - + Reverse turn order ゲームのターン順を逆転する - + &Remove all local arrows 全ての対象指定を消す - + Rotate View Cl&ockwise 席を時計回りに回転 - + Rotate View Co&unterclockwise 席を反時計回りに回転 - + Game &information ゲーム情報 - + Un&concede 投了を撤回 - - - + + + &Concede 投了する - + &Leave game ゲームから離脱する - + C&lose replay リプレイを閉じる - + &Focus Chat - + &Say: 発言欄: - + Selected cards - + &View レイアウト - + Visible 表示する - + Floating 別ウィンドウにする - + Reset layout レイアウトをリセット - + Concede 投了する - + Are you sure you want to concede this game? 本当にこのゲームを投了しますか？ - + Unconcede 投了を取り消す - + You have already conceded. Do you want to return to this game? あなたはすでに投了しています！　本当にゲームに復帰しますか？ - + Leave game ゲームから離脱する - + Are you sure you want to leave this game? 本当にこのゲームから離脱しますか？ - + A player has joined game #%1 プレイヤーがゲーム#%1に参加した。 - + %1 has joined the game %1 がゲームに参加した - + You have been kicked out of the game. ゲームからキックされました。 @@ -8902,115 +8428,115 @@ Please enter a name: 検索するには、有効な日数を選択する必要があります。 - + Username: ユーザー名: - + IP Address: IPアドレス: - + Game Name: ゲーム名: - + GameID: ゲームID: - + Message: メッセージ: - + Main Room メインルーム - + Game Room ゲームルーム - + Private Chat プライベートチャット - + Past X Days: X日経過: - + Today 今日 - + Last Hour 今 - + Maximum Results: - + At least one filter is required. The more information you put in, the more specific your results will be. 少なくとも一つのフィルタが必要です。 情報を入力すればするほど詳細な検索結果になります。 - + Get User Logs ユーザーログを取得 - + Clear Filters フィルタ解除 - + Filters フィルタ - + Log Locations ログの場所 - + Date Range 日付指定 - + Maximum Results - - + + Message History メッセージ履歴 - + Failed to collect message history information. メッセージ履歴情報の収集に失敗しました。 - + There are no messages for the selected filters. 選択したフィルタのためのメッセージはありません。 @@ -9028,27 +8554,27 @@ The more information you put in, the more specific your results will be.退出する - + %1 - Private chat %1 - 個人チャット - + This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. このユーザーはあなたを無視しています。メインチャットのメッセージは表示されず、ゲームに参加することもできません。 - + Private message from 個人チャット: - + %1 has left the server. %1はサーバーから退出しました。 - + %1 has joined the server. %1がサーバーに参加しました。 @@ -9056,180 +8582,180 @@ The more information you put in, the more specific your results will be. TabReplays - + Local file system ローカルのリプレイ - + Server replay storage サーバーに保存されたリプレイ - - + + Watch replay リプレイを再生 - + Rename 名前変更 - - + + New folder 新しいフォルダ - - + + Delete 削除 - + Open replays folder リプレイフォルダを開く - + Download replay リプレイをダウンロード - + Toggle expiration lock 有効期限ロックの切り替え - + Get replay share code - - + + Look up replay by share code - + Rename local folder ローカルフォルダの名前を変更 - + Rename local file ローカルファイルの名前を変更 - + New name: 新しい名前: - + Error エラー - + Rename failed 変更失敗 - + Name of new folder: 新しいフォルダの名前: - + Delete local file ローカルファイルの削除 - + Are you sure you want to delete the selected files? 選択したファイルを削除してもよろしいですか? - + Are you sure you want to delete the selected replays? 選択したリプレイを削除してもよろしいですか? - + Failed to get code - - + + Either this server does not support replay sharing, or does not permit replay sharing for you. - - - + + + Failed - + Could not get replay code - + Replay Share Code - + Others can use this code to add the replay to their list of remote replays: %1 - + Copy to clipboard - + Replay share code - + Replay code found - + Replay was added, or you already had access to it. - + Replay code not found - + Failed to submit code - + Unexpected error - + Delete remote replay サーバーファイルの削除 @@ -9242,62 +8768,47 @@ The more information you put in, the more specific your results will be. TabRoom - - Friends - - - - - Online - - - - - Ignored - - - - + &Say: 発言欄: - + Chat チャット - + &Room ルーム - + &Leave room ルームから出る - + &Clear chat チャットをクリア - + Chat Settings... チャット設定... - + mentioned you. あなたにメンションした。 - + Click to view クリックで見る - + You are flooding the chat. Please wait a couple of seconds. あなたはチャットルームから弾かれました。少々お待ちください。 @@ -9310,30 +8821,30 @@ The more information you put in, the more specific your results will be.サーバー - - - - + + + + Error エラー - + Failed to join the server room: it doesn't exist on the server. サーバールームに参加できませんでした: サーバーに存在しません。 - + The server thinks you are in the server room but your client is unable to display it. Try restarting your client. サーバーからサーバールームに入室中の応答がありましたが、クライアントが表示できませんでした。クライアントを再起動してみてください。 - + You do not have the required permission to join this server room. あなたはこのサーバールームに参加するための権限がありません。 - + Failed to join the server room due to an unknown error: %1. 原因不明のエラーによってサーバールームに参加できませんでした: %1。 @@ -9341,97 +8852,97 @@ The more information you put in, the more specific your results will be. TabSupervisor - + Deck Editor デッキエディター - + Visual Deck Editor - + EDHRec - + Archidekt - + Home - + &Visual Deck Storage ビジュアルデッキストレージ - + Visual Database Display - + Server サーバー - + Account アカウント - + Deck Storage デッキストレージ - + Game Replays リプレイ - + Administration 管理 - + Logs ログ - + Are you sure? よろしいですか？ - + There are still open games. Are you sure you want to quit? ゲームがまだ開いています。本当に退出しますか？ - + Click to view クリックで見る - + Your buddy %1 has signed on! %1がオンライン！ - + Unknown Event 不明なイベント - + The server has sent you a message that your client does not understand. This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. @@ -9442,39 +8953,39 @@ To update your client, go to Help -> Check for Updates. クライアントを更新するには、ヘルプ→更新のチェックをクリックしてください。 - + Idle Timeout 放置タイムアウト - + You are about to be logged out due to inactivity. 非アクティブのためログアウトしています。 - + Promotion 昇格 - + You have been promoted. Please log out and back in for changes to take effect. あなたは昇格されました。変更を有効にするためにログインしなおして下さい。 - + Warned 警告 - + You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. 以下の理由によって警告を受けました: %1。 これらのような行動はご遠慮頂ますようお願い致します。質問がある場合は、モデレーターにプライベートメッセージを送信してください。 - + You have received the following message from the server. (custom messages like these could be untranslated) サーバーから次のメッセージを受け取りました。 @@ -9484,12 +8995,12 @@ Please refrain from engaging in this activity or further actions may be taken ag TabVisualDatabaseDisplay - + Database Display - + Visual Database Display @@ -9528,42 +9039,42 @@ Please refrain from engaging in this activity or further actions may be taken ag TranslateCounterName - + Life ライフ - + White 白 - + Blue 青 - + Black 黒 - + Red 赤 - + Green 緑 - + Colorless 無色 - + Other その他 @@ -9571,69 +9082,11 @@ Please refrain from engaging in this activity or further actions may be taken ag UpdateDownloader - + Could not open the file for reading. ファイルが開けませんでした。 - - UserCardArtSettingsDialog - - - Card Art Settings - - - - - Type a card name... - - - - - Card name: - - - - - Card ProviderId: - - - - - Left margin (%): - - - - - Right margin (%): - - - - - Vertical offset: - - - - - Zoom: - - - - - Parameters - - - - - Preview - - - - - Remove Banner Card - - - UserContextMenu @@ -9751,7 +9204,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Ban History BAN履歴 @@ -9766,87 +9219,77 @@ Please refrain from engaging in this activity or further actions may be taken ag ユーザーはBANされていません。 - + Failed to collect ban information. BAN情報の収集に失敗しました。 - - - + + + Warning History 警告履歴 - + Warning Time;Moderator;User Name;Reason 警告回数;モデレーター;ユーザー名;理由 - + User has never been warned. ユーザーは警告されていません。 - + Failed to collect warning information. 警告情報の収集に失敗しました。 - + Failed to get admin notes. 管理者ノートの取得に失敗しました。 - - + + Success 成功 - + Successfully promoted user. ユーザーを昇格しました。 - + Successfully demoted user. ユーザーを降格しました。 - - Kick Player - - - - - Are you sure you want to kick this player from the game? - - - - - - + + + Failed 失敗 - + Failed to promote user. 昇格に失敗しました。 - + Failed to demote user. 降格に失敗しました。 - + Copy hash to clipboard クリップボードにハッシュをコピー - + Remove this user's messages このユーザーのメッセージを削除 @@ -9854,554 +9297,326 @@ Please refrain from engaging in this activity or further actions may be taken ag UserInfoBox - + Location: 現在地: - + Account Age: アカウント年齢: - + Edit 編集 - + Change password パスワード変更 - + Change avatar アバター変更 - + Administrator 管理者 - + Moderator モデレーター - + Registered user 登録ユーザー - - + + Unregistered user 未登録ユーザー - + Judge ジャッジ - + Unknown 不明 - + The entered password does not match your account. 入力されたパスワードはアカウントと一致しません。 - - - - + + + Information 情報 - + User information updated. ユーザー情報が更新されました。 - - - - - - - - - - - + + + + + + + + + + Error エラー - + User Information ユーザー情報 - + Real Name: 本名: - + User Level: ユーザー種別: - - - Edit Banner Card - - - + %n Year(s), amount of years (only shown if more than 0) %n年 - + %10%n Day(s) %20 amount of years (if more than 0), amount of days, date in local short format %10%n日%20 - + Enter Password パスワードを入力 - + Password verification is required in order to change your email address メールアドレスを変更するには、パスワード認証が必要です - - - + + + An error occurred while trying to update your user information. ユーザー情報の更新中にエラーが発生しました。 - - The selected card is blacklisted on this server or another error occurred. - - - - - Banner card removed. - - - - - Banner card updated. - - - - + This server does not permit you to update your user informations. このサーバーはユーザーの情報を更新することができません。 - + Password changed. パスワードが変更されました。 - + This server does not permit you to change your password. このサーバーはパスワードを変更することができません。 - + The new password is too short. 新しいパスワードが短すぎます。 - + The old password is incorrect. 前のパスワードが一致しませんでした。 - + Avatar updated. アバターを更新しました。 - + This server does not permit you to update your avatar. このサーバーはアバターを更新することができません。 - - - An error occured while trying to update your avatar. - - - This server does not permit you to update your user informations. - An error occured while trying to updater your avatar. - このサーバーはユーザーの情報を更新することができません。 - - - - UserInfoPopup - - - - Games - - - - - Chat - - - - - Open private chat - - - - - Profile - - - - - View user profile - - - - - Show this user's games - - - - - − Buddy - - - - - Remove from buddy list - - - - - + Buddy - - - - - Add to buddy list - - - - - − Ignore - - - - - Remove from ignore list - - - - - + Ignore - - - - - Add to ignore list - - - - - Ban - - - - - Ban from server - - - - - Warn - - - - - Warn user - - - - - Ban log - - - - - View ban history - - - - - Warn log - - - - - View warning history - - - - - Notes - - - - - View admin notes - - - - - − Mod - - - - - Demote from moderator - - - - - + Mod - - - - - Promote to moderator - - - - - − Judge - - - - - Demote from judge - - - - - + Judge - - - - - Promote to judge - - - - - Join game - - - - - Spectate - - - - - - Loading games… - - - - - Could not load games. - - - - - No active games. - + An error occured while trying to updater your avatar. + アバターの更新中にエラーが発生しました。 UserInterfaceSettingsPage - + General interface settings インターフェース全般設定 - + &Double-click cards to play them (instead of single-click) ダブルクリックでカードをプレイする (シングルクリックの代わり) - + &Clicking plays all selected cards (instead of just the clicked card) クリックしたカードだけでなく、選択したすべてのカードをプレイする。 - + &Play all nonlands onto the stack (not the battlefield) by default 土地でないカードをプレイする時、すぐに戦場に出さずにスタックに置く - + Do not delete &arrows inside of subphases - + Close card view window when last card is removed 最後のカードが削除されたときにカード表示ウィンドウを閉じる - + Auto focus search bar when card view window is opened - + Annotate card text on tokens トークンのカードテキストを注釈にもつける - - Show selection count during drag selection + + Show selection counter during drag selection - - Show total selection count + + Show total selection counter - - Show subtype breakdown in selection tally - - - - + Use tear-off menus, allowing right click menus to persist on screen ティアオフメニューを使用して、右クリックメニューを画面に表示したままにする - - Keep game chat focused when clicking in game (Note: disables card view search bar) - - - - + Notifications settings 通知設定 - + Enable notifications in taskbar タスクバーの通知を有効 - + Notify in the taskbar for game events while you are spectating タスクバーに観戦中のゲームイベントを通知する - + Notify in the taskbar when users in your buddy list connect フレンドリストのユーザーが接続したときにタスクバーで通知する - + Animation settings アニメーション設定 - + &Tap/untap animation タップ/アンタップアニメーション - + Deck editor/storage settings デッキエディタ/ストレージ設定 - + Open deck in new tab by default デフォルトでデッキを新しいタブで開く - + Use visual deck storage in game lobby ゲームロビーでビジュアルデッキストレージを使用 - + Use selection animation for Visual Deck Storage - + When adding a tag in the visual deck storage to a .txt deck: - + do nothing - + ask to convert to .cod - + always convert to .cod - + Default deck editor type - + Classic Deck Editor - + Visual Deck Editor - + Replay settings リプレイ設定 - + Buffer time for backwards skip via shortcut: @@ -10409,22 +9624,22 @@ Please refrain from engaging in this activity or further actions may be taken ag UserListWidget - + Users connected to server: %1 ユーザーがサーバーに接続: %1 - + Users in this room: %1 ルームのユーザー数: %1 - + Buddies online: %1 / %2 フレンドオンライン: %1 / %2 - + Ignored users online: %1 / %2 無視ユーザーオンライン: %1 / %2 @@ -10432,45 +9647,35 @@ Please refrain from engaging in this activity or further actions may be taken ag UtilityMenu - + Increment all card counters - + &Untap all permanents - + R&oll die... - - Flip coin - - - - + &Create token... - + C&reate another token - + Cr&eate predefined token - - - C&reate another %1 token - - VisualDatabaseDisplayColorFilterWidget @@ -10522,72 +9727,72 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFilterToolbarWidget - + Sort by - + Filter by - + Save and load filters - + Filter by exact card name - + Filter by card main-type - + Filter by card sub-type - + Filter by set - + Filter by format legality - + Save/Load - + Name - + Main Type - + Sub Type - + Sets - + Formats @@ -10595,22 +9800,22 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFormatLegalityFilterWidget - + Show formats with at least: - + cards - + Do not display formats with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) @@ -10628,32 +9833,32 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayMainTypeFilterWidget - + Show main types with at least: - + cards - + Do not display card main-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10661,27 +9866,27 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayNameFilterWidget - + Filter by name... (Exact match) - + Load from Deck - + Apply all card names in currently loaded deck as exact match name filters - + Load from Clipboard - + Apply all card names in clipboard as exact match name filters @@ -10689,7 +9894,7 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayRecentSetFilterSettingsWidget - + Filter to most recent sets @@ -10697,19 +9902,19 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySetFilterWidget - + Search sets... - - + + Mode: Exact Match - - + + Mode: Includes @@ -10717,37 +9922,37 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySubTypeFilterWidget - + Search subtypes... - + Show sub types with at least: - + cards - + Do not display card sub-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10755,23 +9960,23 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayWidget - + Search by card name (or search expressions) - + Visual - + Loading database ... - + Clear all filters @@ -10810,17 +10015,17 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Toggle Layout: Overlap - + Change how cards are displayed within zones (i.e. overlapped or fully visible.) - + Toggle Layout: Flat @@ -10849,17 +10054,17 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDeckEditorWidget - + Type a card name here for suggestions from the database... - + Quick search and add card - + Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter データベース内で最も近いものを検索し（自動提案付き）、Enter キーを押すと、優先印刷がデッキに追加されます。 @@ -10977,43 +10182,43 @@ Please refrain from engaging in this activity or further actions may be taken ag WarningDialog - + Which warning would you like to send? どの警告を送信しますか？ - + Redact all messages from this user in all rooms すべてのルームでこのユーザーからのすべてのメッセージを編集します - + &OK OK - + &Cancel キャンセル - + Warn user for misconduct 不正行為をユーザーに警告 - - + + Error エラー - + User name to send a warning to can not be blank, please specify a user to warn. ユーザー名は空欄に出来ません。有効なユーザー名を選択して下さい。 - + Warning to use can not be blank, please select a valid warning to send. 警告は空欄に出来ません。有効な警告を選択して下さい。 @@ -11021,133 +10226,133 @@ Please refrain from engaging in this activity or further actions may be taken ag WndSets - + Move selected set to the top 選択したセットを一番上へ - + Move selected set up 選択中のセットを上へ - + Move selected set down 選択中のセットを下へ - + Move selected set to the bottom 選択したセットを一番下へ - + Search by set name, code, or type セット名、略称、タイプで検索 - + Default order 初期順に戻す - + Restore original art priority order 元のアートの優先順位を復元する - + Enable all sets すべてのセットを有効 - + Disable all sets すべてのセットを無効 - + Enable selected set(s) 選択したセットを有効 - + Disable selected set(s) 選択したセットを無効 - + Deck Editor デッキエディター - + Use CTRL+A to select all sets in the view. Ctrl + A キーですべてのセットを選択します。 - + Only cards in enabled sets will appear in the card list of the deck editor. 有効にしたセットのカードのみがデッキエディタのカードリストに表示されます。 - + Image priority is decided in the following order: 画像の優先順位は、次の順序で決定されます: - + first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) %1 is a link to the wiki 最優先はCUSTOMフォルダ(%1)、以降はこのダイアログで有効化されたセットの並び順 - + Include cards rebalanced for Alchemy [requires restart] - + Card Art カードアート - + How to use custom card art カスタムカードアートの使い方 - + Hints ヒント - + Note 注意 - + Sorting by column allows you to find a set while not changing set priority. 列でソートすると、セットの優先度設定を変えずにセットを探すことができます。 - + To enable ordering again, click the column header until this message disappears. 優先度設定を行うには、このメッセージが消えるまで同じ列見出しをクリックしてください。 - + Use the current sorting as the set priority instead 現在のソートを優先度設定として使用する - + Sorts the set priority using the same column 同じ列を使用して優先度をソートする - + Manage sets セットを管理 @@ -11155,72 +10360,72 @@ Please refrain from engaging in this activity or further actions may be taken ag ZoneViewWidget - + Search by card name (or search expressions) - + Ungrouped グループなし - + Group by Type タイプ別グループ - + Group by Mana Value マナ・コスト別グループ - + Group by Color 色別グループ - + Unsorted 順不同 - + Sort by Name 名前順 - + Sort by Type タイプ順 - + Sort by Mana Cost マナ・コスト順 - + Sort by Colors 色順 - + Sort by P/T P/T順 - + Sort by Set セット順 - + shuffle when closing 閉じる時に切り直す - + pile view タイプ別に重ねて表示 @@ -11228,7 +10433,7 @@ Please refrain from engaging in this activity or further actions may be taken ag i18n - + English 日本語 (Japanese) @@ -11236,12 +10441,12 @@ Please refrain from engaging in this activity or further actions may be taken ag main - + Connect on startup 起動時に接続 - + Debug to file @@ -11255,7 +10460,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Deck Editor デッキエディター @@ -11336,7 +10541,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Replays リプレイ @@ -11451,129 +10656,129 @@ Please refrain from engaging in this activity or further actions may be taken ag デッキを開く... - - + + Load Deck from Clipboard... クリップボードからデッキを開く... - + Edit Deck in Clipboard, Annotated - + Edit Deck in Clipboard - + New Deck 新しいデッキ - + Open Custom Pictures Folder カスタム画像フォルダを開く - + Print Deck... デッキを印刷... - + Delete Card カードを削除 - - + + Reset Layout レイアウトをリセット - + Save Deck デッキを保存 - + Save Deck as... 名前を付けて保存... - + Save Deck to Clipboard, Annotated - + Save Deck to Clipboard, Annotated (No Set Info) - + Save Deck to Clipboard クリップボードにデッキをコピー - + Save Deck to Clipboard (No Set Info) クリップボードにデッキをコピー（セット情報なし） - + Load Local Deck... デッキ読み込み... - + Load Remote Deck... サーバーのデッキを開く... - + Set Ready to Start 準備完了する - + Toggle Sideboard Lock サイドボードロックの切り替え - + Add Green Counter 緑カウンターを置く - + Remove Green Counter 緑カウンターを取り除く - + Set Green Counters... 緑カウンターの数を決める... - + Add Red Counter 赤カウンターを置く - + Remove Red Counter 赤カウンターを取り除く - + Set Red Counters... 赤カウンターの数を決める... - + Add Life Counter ライフを得る @@ -11583,744 +10788,724 @@ Please refrain from engaging in this activity or further actions may be taken ag - - Load deck from online service... - - - - - Load from website... - - - - + Unload Deck - + Force Start - + Add Card Counter (F) - + Remove Card Counter (F) - + Set Card Counters (F)... - + Add Card Counter (E) - + Remove Card Counter (E) - + Set Card Counters (E)... - + Add Card Counter(D) - + Remove Card Counter (D) - + Set Card Counters (D)... - + Add Card Counter (C) - + Remove Card Counter (C) - + Set Card Counters (C)... - + Add Card Counter (B) - + Remove Card Counter (B) - + Set Card Counters (B)... - + Add Card Counter (A) - + Remove Card Counter (A) - + Set Card Counters (A)... - + Remove Life Counter ライフを失う - + Set Life Counters... ライフ総量を決める... - + Add White Counter 白カウンターを置く - + Remove White Counter 白カウンターを取り除く - + Set White Counters... - + Add Blue Counter - + Remove Blue Counter - + Set Blue Counters... - + Add Black Counter - + Remove Black Counter - + Set Black Counters... - + Add Colorless Counter - + Remove Colorless Counter - + Set Colorless Counters... - + Add Other Counter - + Remove Other Counter - + Set Other Counters... - + Increment all card counters - + Add Power (+1/+0) - + Remove Power (-1/-0) - + Move Toughness to Power (+1/-1) - + Add Toughness (+0/+1) - + Remove Toughness (-0/-1) - + Move Power to Toughness (-1/+1) - + Add Power and Toughness (+1/+1) - + Remove Power and Toughness (-1/-1) - + Set Power and Toughness... - + Reset Power and Toughness - + Untap アンタップ - + Upkeep アップキープ - + Draw ドロー - + First Main Phase 戦闘前メイン・フェイズ - + Start Combat - + Attack 攻撃 - + Block ブロック - + Damage ダメージ - + End Combat - + Second Main Phase 戦闘後メイン・フェイズ - + End エンド - + Next Phase 次のフェイズ - + Next Phase Action 処理しながら次のフェイズ - + Next Turn 次のターン - + Hide Card in Reveal Window - + Tap / Untap Card タップ / アンタップ - + Untap All - + Toggle Skip Untapping Toggle Untap - + Turn Card Over - + Peek Card - + Play Card カードをプレイ - + Play Card, Face Down - + Attach Card... - + Unattach Card - + Clone Card カードをコピー - + Create Token... トークンを生成する... - + Create All Related Tokens - + Create Another Token - + Set Annotation... - - Reduce Life by Power - - - - + Select All Cards in Zone - + Select All Cards in Row - + Select All Cards in Column - + Reveal Selected Cards to All Players - - + + Bottom of Library ライブラリーの一番下 - - - - + + + + Exile 追放領域 - - - - + + + + Graveyard 墓地 - - + + Hand 手札 - - + + Top of Library ライブラリーの一番上 - - + + Battlefield, Face Down - + Battlefield 戦場 - + Library 自分のライブラリー - + Sideboard サイドボード - + Top Cards of Library - + Bottom Cards of Library - + Close Recent View - - + + Stack スタック - - + + Graveyard (Multiple) - - + + Graveyard (Multiple), Face Down - - + + Exile (Multiple) - - + + Exile (Multiple), Face Down - + Stack Until Found - + Draw Bottom Card - + Draw Multiple Cards from Bottom... - + Draw Arrow... - + Remove Local Arrows - + Leave Game ゲームから退出 - + Concede 投了 - + Roll Dice... - - Flip Coin - - - - + Shuffle Library - + Shuffle Top Cards of Library - + Shuffle Bottom Cards of Library - + Mulligan マリガン - + Mulligan (Same hand size) - + Mulligan (Hand size - 1) - + Draw a Card - + Draw Multiple Cards... - + Undo Draw - + Always Reveal Top Card - + Always Look At Top Card - + Sort Hand by Name - + Sort Hand by Type - + Sort Hand by Mana Value - + Reveal Hand to All Players - + Reveal Random Card to All Players - + Rotate View Clockwise - + Rotate View Counterclockwise - + Unfocus Text Box - + Focus Chat - + Clear Chat - + Refresh 更新 - + Skip Forward - + Skip Backward - + Skip Forward by a lot - + Skip Backward by a lot - + Play/Pause - + Toggle Fast Forward - + Home - + Visual Deck Storage - + Deck Storage - + Server - + Account - + Administration - + Logs diff --git a/cockatrice/translations/cockatrice_ko.ts b/cockatrice/translations/cockatrice_ko.ts index 4b06f2a5e..5ec1dac77 100644 --- a/cockatrice/translations/cockatrice_ko.ts +++ b/cockatrice/translations/cockatrice_ko.ts @@ -2,7 +2,7 @@ AbstractCounter - + &Set counter... 카운터 설정... @@ -10,12 +10,12 @@ AbstractCounterDialog - + Set counter 카운터 설정 - + New value for counter '%1': 카운터 '%1'의 값을 지정해 주세요: @@ -36,60 +36,60 @@ AbstractTabDeckEditor - + Open in new tab - + Are you sure? - + The decklist has been modified. Do you want to save the changes? - - - - - - + + + + + + Error - + Could not open deck at %1 - + Could not save remote deck - - + + The deck could not be saved. Please check that the directory is writable and try again. - + Save deck - + The deck could not be saved. - + There are no cards in your deck to be exported @@ -105,12 +105,12 @@ Please check that the directory is writable and try again. AdminNotesDialog - + Update Notes - + Admin Notes for %1 @@ -127,227 +127,172 @@ Please check that the directory is writable and try again. Sideboard - - - Tokens - - AppearanceSettingsPage - + seconds - + Error 오류 - + Could not create themes directory at '%1'. - + Theme settings 테마 설정 - + Current theme: 현재 테마: - + Open themes folder - + Home tab background source: - + Home tab background shuffle frequency: - + Disabled - + + Display card name of background in bottom right: + + + + Menu settings - + Show keyboard shortcuts in right-click menus - + Show game filter toolbar above list in room tab - + Card rendering 카드 렌더링 - + Display card names on cards having a picture 이미지가 존재하는 카드에도 카드 이름 표시 - + Auto-Rotate cards with sideways layout - + Override all card art with personal set preference (Pre-ProviderID change behavior) - - Light - - - - - Dark - - - - - System - - - - - Active theme palette: - - - - - Edit theme palette - - - - - Home tab settings - - - - - Display card name of background in bottom right - - - - - Styling settings - - - - - Style user list - - - - - Card printings - - - - + Bump sets that the deck contains cards from to the top in the printing selector - + Scale cards on mouse over 마우스 오버 시 카드 확대 - + Use rounded card corners - - Card layout - - - - + Minimum overlap percentage of cards on the stack and in vertical hand - + Maximum initial height for card view window: - - + + rows - + Maximum expanded height for card view window: - + Card counters - + Counter %1 - + Hand layout 손 레이아웃 - + Display hand horizontally (wastes space) 손의 카드를 가로로 정렬 - + Enable left justification 손의 카드를 좌측으로 정렬 - + Table grid layout 테이블 격자 레이아웃 - + Invert vertical coordinate 전장의 상하배치를 전환 (대지를 앞에 배치) - + Minimum player count for multi-column layout: 다열 레이아웃를 위한 최소 플레이어 인원 (4명 이상 권장) - + Maximum font size for information displayed on cards: 카드 정보에 표시할 폰트의 최대 크기: @@ -355,12 +300,12 @@ Please check that the directory is writable and try again. ArchidektApiResponseDeckDisplayWidget - + Back to results - + Open Deck in Deck Editor @@ -386,112 +331,112 @@ Please check that the directory is writable and try again. BanDialog - + ban &user name 사용자 계정 추방 - + ban &IP address IP 주소 추방 - + ban client I&D 클라이언트 ID 추방 - + Ban type 추방 유형 - + &permanent ban 영구 추방 - + &temporary ban 기간제 추방 - + &Days: 일: - + &Hours: 시간: - + &Minutes: 분: - + Duration of the ban 추방 기간 - + Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. 추방 사유를 적어주세요. 해당 사유는 관리자들만 볼 수 있고 추방 당한 사용자는 볼 수 없습니다. - + Please enter the reason for the ban that will be visible to the banned person. 추방된 사용자가 보게 될 추방 사유를 적어주세요. - + Redact all messages from this user in all rooms - + &OK 확인 - + &Cancel 취소 - + Ban user from server 사용자를 서버에서 추방 - - - - + + + + Error 오류 - + You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. 추방의 유형을 선택해 주세요. - + You must have a value in the name ban when selecting the name ban checkbox. 사용자명 추방을 하기 위해선 사용자명을 입력하셔야 합니다. - + You must have a value in the ip ban when selecting the ip ban checkbox. 아이피 추방을 하기 위해선 아이피 주소를 입력하셔야 합니다. - + You must have a value in the clientid ban when selecting the clientid ban checkbox. 클라이언트 ID 추방을 하기 위해선 클라이언트 ID를 입력하셔야 합니다. @@ -499,123 +444,59 @@ This is only saved for moderators and cannot be seen by the banned person. BetaReleaseChannel - + Beta - + No reply received from the release update server. - + Invalid reply received from the release update server. - + No reply received from the file update server. - - CardArtPreviewWidget - - - No card selected - - - - - CardArtRulesModel - - - Card - - - - - ProviderId - - - - - Mode - - - - - Reason - - - CardDatabaseModel - + Name 카드 이름 - + Sets 확장판 - + Mana cost 마나 비용 - + Card type 카드 유형 - + P/T 공/방 - + Color(s) 색(들) - - CardDatabaseView - - - Add to Deck - - - - - Add to Sideboard - - - - - Select Printing - - - - - Show on EDHRec (Commander) - - - - - Show on EDHRec (Card) - - - - - Show Related cards - - - CardFilter @@ -744,22 +625,22 @@ This is only saved for moderators and cannot be seen by the banned person. CardInfoPictureWidget - + View related cards - + Add card to deck - + Mainboard - + Sideboard @@ -782,12 +663,12 @@ This is only saved for moderators and cannot be seen by the banned person. - + Related cards: - + Unknown card: @@ -795,146 +676,128 @@ This is only saved for moderators and cannot be seen by the banned person. CardMenu - + Re&veal to... - + &All players - + View related cards - + Token: - + All tokens - + &Select All - + S&elect Row - + S&elect Column - + &Play - + &Hide - + Play &Face Down - + &Tap / Untap Turn sideways or back again - + Skip &untapping - + T&urn Over Turn face up/face down - + &Peek at card face - + &Clone - + Attac&h to card... - + Unattac&h - + &Draw arrow... - + &Set annotation... - - Reduce life by power - - - - + Ca&rd counters - + &Add counter (%1) - + &Remove counter (%1) - + &Set counters (%1)... - - CardPictureLoaderCacheMethod - - - Network Cache - - - - - Filesystem - - - CardSizeWidget @@ -946,133 +809,133 @@ This is only saved for moderators and cannot be seen by the banned person. CardZoneLogic - + their hand nominative - + %1's hand nominative - + their library look at zone - + %1's library look at zone - + of their library top cards of zone, - + of %1's library top cards of zone - + their library reveal zone - + %1's library reveal zone - + their library shuffle - + %1's library shuffle - + their library nominative - + %1's library nominative - + their graveyard nominative - + %1's graveyard nominative - + their exile nominative - + %1's exile nominative - + their sideboard look at zone - + %1's sideboard look at zone - + their sideboard nominative - + %1's sideboard nominative - + their custom zone '%1' nominative - + %1's custom zone '%2' nominative @@ -1094,421 +957,16 @@ This is only saved for moderators and cannot be seen by the banned person. - - ColorButton - - - Click to pick a color - - - - - Pick colour - - - - - ConnectionController - - - - The server has reached its maximum user capacity, please check back later. - - - - - There are too many concurrent connections from your address. - - - - - Banned by moderator - - - - - Expected end time: %1 - - - - - This ban lasts indefinitely. - - - - - Scheduled server shutdown. - - - - - - Invalid username. - - - - - You have been logged out due to logging in at another location. - - - - - Connection closed - - - - - The server has terminated your connection. -Reason: %1 - - - - - The server is going to be restarted in %n minute(s). -All running games will be lost. -Reason for shutdown: %1 - - - - - Scheduled server shutdown - - - - - Failed Login - - - - - Your client seems to be missing features this server requires for connection. - - - - - To update your client, go to 'Help -> Check for Client Updates'. - - - - - - - - - - - - - - - - - - - - - - Error - - - - - Incorrect username or password. Please check your authentication information and try again. - - - - - There is already an active session using this user name. -Please close that session first and re-login. - - - - - - You are banned until %1. - - - - - - You are banned indefinitely. - - - - - This server requires user registration. Do you want to register now? - - - - - This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. -Please close and reopen your client to try again. - - - - - An internal error has occurred, please close and reopen Cockatrice before trying again. -If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - - - - Account activation - - - - - Your account has not been activated yet. -You need to provide the activation token received in the activation email. - - - - - Server Full - - - - - Unknown login error: %1 - - - - - - -This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - - - - - - - - - Registration denied - - - - - Registration is currently disabled on this server - - - - - There is already an existing account with the same user name. - - - - - It's mandatory to specify a valid email address when registering. - - - - - It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. - - - - - Password too short. - - - - - Registration failed for a technical problem on the server. - - - - - The connection to the server has been lost. - - - - - Unknown registration error: %1 - - - - - Account activation failed - - - - - Socket error: %1 - - - - - Server timeout - - - - - You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. -Local version is %1, remote version is %2. - - - - - Your Cockatrice client is obsolete. Please update your Cockatrice version. -Local version is %1, remote version is %2. - - - - - - Success - - - - - Registration accepted. -Will now login. - - - - - Account activation accepted. -Will now login. - - - - - Information - - - - - This server supports additional features that your client doesn't have. -This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. - -To update your client, go to Help -> Check for Updates. - - - - - - - Reset Password - - - - - Your password has been reset successfully, you can now log in using the new credentials. - - - - - Failed to reset user account password, please contact the server operator to reset your password. - - - - - Activation request received, please check your email for an activation token. - - - - - Connecting to %1... - - - - - Registering to %1 as %2... - - - - - Disconnected - - - - - Connected, logging in at %1 - - - - - Requesting forgotten password to %1 as %2... - - - - - Your username must respect these rules: - - - - - is %1 - %2 characters long - - - - - can %1 contain lowercase characters - - - - - - - - NOT - - - - - can %1 contain uppercase characters - - - - - can %1 contain numeric characters - - - - - can contain the following punctuation: %1 - - - - - first character can %1 be a punctuation mark - - - - - no unacceptable language as specified by these server rules: - note that the following lines will not be translated - - - - - can not contain any of the following words: %1 - - - - - can not match any of the following expressions: %1 - - - - - You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - - CustomZoneMenu - + C&ustom Zones - - + + View custom zone '%1' @@ -1516,35 +974,30 @@ To update your client, go to Help -> Check for Updates. DeckAnalyticsWidget - + Add Panel - + Remove Panel - + Save Layout - + Load Layout - - - Include Sideboard - - DeckEditorCardDatabaseDockWidget - + Card Database @@ -1560,17 +1013,47 @@ To update your client, go to Help -> Check for Updates. DeckEditorDatabaseDisplayWidget - + Search by card name (or search expressions) - + + Add to Deck + + + + + Add to Sideboard + + + + + Select Printing + + + + + Show on EDHRec (Commander) + + + + + Show on EDHRec (Card) + + + + + Show Related cards + + + + Add card to &maindeck - + Add card to &sideboard @@ -1603,72 +1086,72 @@ To update your client, go to Help -> Check for Updates. - + Select Printing - + Deck - + Deck &name: - + Banner Card/Tags Visibility Settings - + Show banner card selection menu - + Show tags selection menu - + &Comments: - + Group by: - + Format: - + Hash: - + &Increment number - + &Decrement number - + &Remove row - + Swap card to/from sideboard @@ -1676,17 +1159,17 @@ To update your client, go to Help -> Check for Updates. DeckEditorFilterDockWidget - + Filters - + &Clear all filters - + Delete selected @@ -1817,113 +1300,169 @@ To update your client, go to Help -> Check for Updates. DeckEditorSettingsPage - - + + Update Spoilers - + + Success 성공 - + Download URLs have been reset. - + + Downloaded card pictures have been reset. + + + + + Error + 오류 + + + + One or more downloaded card pictures could not be cleared. + + + + Add URL URL 추가 - - + + URL: URL: - - + + Edit URL URL 수정 - + + Network Cache Size: + + + + + Redirect Cache TTL: + + + + + How long cached redirects for urls are valid for. + + + + + Picture Cache Size: + + + + Add New URL 새 URL 추가 - + Remove URL URL 제거 - + + Day(s) + + + + Updating... - + Choose path - + URL Download Priority - + Spoilers - + Download Spoilers Automatically - + Spoiler Location: - + Last Change - + Spoilers download automatically on launch - + Press the button to manually update without relaunching - + Do not close settings until manual update is complete - + Download card pictures on the fly - + How to add a custom URL - + + Delete Downloaded Images + + + + Reset Download URLs + + + On-disk cache for downloaded pictures + + + + + In-memory cache for pictures not currently on screen + + DeckListHistoryManagerWidget @@ -1989,12 +1528,12 @@ To update your client, go to Help -> Check for Updates. DeckLoader - + Common deck formats (%1) - + All files (*.*) @@ -2216,27 +1755,27 @@ To update your client, go to Help -> Check for Updates. - + Moved to %1 1 × "%2" (%3) - + Removed "%1" (all copies) - + %1 1 × "%2" (%3) - + Added - + Removed @@ -2258,74 +1797,74 @@ To update your client, go to Help -> Check for Updates. DeckViewContainer - + Load deck... 덱 불러오기 - + Load remote deck... 원격 덱 불러오기 - + Load from clipboard... - + Load from website... - + Unload deck - + Ready to start 시작 준비 - + Force start - + Sideboard unlocked 사이드보드 카드 교체 가능 - + Sideboard locked 사이드보드 카드 교체 불가능 - - + + Error 오류 - + The selected file could not be loaded. 지정하신 파일을 불러올 수 없었습니다. - + Deck is greater than maximum file size. - + Are you sure you want to force start? This will kick all non-ready players from the game. - + Cockatrice @@ -2424,7 +1963,7 @@ This will kick all non-ready players from the game. - + Webpage @@ -2464,37 +2003,37 @@ This will kick all non-ready players from the game. - + Server URL - + Communication Port - + Unique Server Name - + Connection Warning - + You need to name your new connection profile. - + Connect Warning - + The player name can't be empty. 사용자명은 비어있을 수 없습니다. @@ -2607,17 +2146,17 @@ This will kick all non-ready players from the game. 게임 만들기 - + Game information 게임 정보 - + Error 오류 - + Server error. 서버 오류. @@ -2625,97 +2164,97 @@ This will kick all non-ready players from the game. DlgCreateToken - + &Name: 토큰 이름: - + Token 토큰 - + C&olor: 토큰 색: - + white 백색 - + blue 청색 - + black 흑색 - + red 적색 - + green 녹색 - + multicolor 다색 - + colorless 무색 - + &P/T: 공/방 - + &Annotation: 주석: - + &Destroy token when it leaves the table 토큰이 전장을 떠나면 게임에서 제거됨 - + Create face-down (Only hides name) - + Token data 토큰 정보 - + Show &all tokens 모든 토큰 보기 - + Show tokens from this &deck 이 덱에서 사용하는 토큰 보기 - + Choose token from list 목록에서 토큰 선택 - + Create token 토큰 생성 @@ -2749,7 +2288,7 @@ This will kick all non-ready players from the game. - + ✖ @@ -2764,12 +2303,12 @@ This will kick all non-ready players from the game. - + Duplicate Tag - + This tag already exists. @@ -2956,12 +2495,12 @@ To remove your current avatar, confirm without choosing a new image. 토큰의 이름을 입력해 주세요. - + Error 오류 - + The chosen name conflicts with an existing card or token. Make sure to enable the 'Token' set in the "Manage sets" dialog to display them correctly. @@ -2985,12 +2524,12 @@ Make sure to enable the 'Token' set in the "Manage sets" dia 미지정 - + Real name: 본명: - + Edit user profile 사용자 프로필 변경 @@ -3028,113 +2567,113 @@ Make sure to enable the 'Token' set in the "Manage sets" dia 2 시간 - + Hide 'buddies only' games - + Hide full games - + Hide games that have started - + Hide password protected games - + Hide 'ignored user' games - + Hide games not created by buddies Hide games not created by buddy - + Hide games with forced open decklists - + &Newer than: - + Game &description: 게임 이름: - + &Creator name: 방장 이름: - + General 일반 - + &Game types 게임 종류 - + at &least: 최소 참가 인원: - + at &most: 최대 참가 인원: - + Maximum player count 최대 플레이어 인원 - + Restrictions - + Show games only if &spectators can watch - + Show spectator password p&rotected games - + Show only if spectators can ch&at - + Show only if spectators can see &hands - + Spectators 관전자 - + Filter games 게임 필터 @@ -3437,37 +2976,37 @@ https://tappedout.net/mtg-decks/your-deck-name/ DlgMoveTopCardsUntil - + Card name (or search expressions): - + Number of hits: - + Auto play hits - + Put top cards on stack until... - + No cards matching the search expression exists in the card database. Proceed anyways? - + Cockatrice - + Invalid filter @@ -3526,40 +3065,40 @@ Your email will be used to verify your account. 미지정 - + Real name: 실명: - + Register to server 서버에 가입 - - - - + + + + Registration Warning 가입 실패 - + Your password is too short. - + Your passwords do not match, please try again. 입력된 비밀번호가 서로 다릅니다. 다시 시도하여 주십시오. - + Your email addresses do not match, please try again. 입력된 이메일이 서로 다릅니다. 다시 시도하여 주십시오. - + The player name can't be empty. 사용자명은 비어있을 수 없습니다. @@ -3567,17 +3106,17 @@ Your email will be used to verify your account. DlgRollDice - + Number of sides: - + Number of dice: - + Roll Dice @@ -3628,12 +3167,12 @@ Your email will be used to verify your account. DlgSettings - + Unknown Error loading card database 데이터베이스를 불러올 때 미상의 오류가 발생하였습니다. - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -3650,7 +3189,7 @@ Would you like to change your database location setting? 데이터베이스 경로를 다시 설정하시겠습니까? - + Your card database version is too old. This can cause problems loading card information or images @@ -3667,7 +3206,7 @@ Would you like to change your database location setting? 데이터베이스 경로를 다시 설정하시겠습니까? - + Your card database did not finish loading Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached @@ -3676,7 +3215,7 @@ Would you like to change your database location setting? - + File Error loading your card database. Would you like to change your database location setting? @@ -3685,7 +3224,7 @@ Would you like to change your database location setting? 데이터베이스 경로를 다시 설정하시겠습니까? - + Your card database was loaded but contains no cards. Would you like to change your database location setting? @@ -3694,7 +3233,7 @@ Would you like to change your database location setting? 데이터베이스 경로를 다시 설정하시겠습니까? - + Unknown card database load status Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues @@ -3703,66 +3242,61 @@ Would you like to change your database location setting? - - - + + + Error 오류 - + The path to your deck directory is invalid. Would you like to go back and set the correct path? 덱 파일을 보관하는 디렉토리의 경로가 잘못되었습니다. 경로를 다시 설정하시겠습니까? - + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? 카드 이미지 파일을 보관하는 디렉토리의 경로가 잘못되었습니다. 경로를 다시 설정하시겠습니까? - + Settings 환경설정 - + General 일반 - + Appearance 외형 - + User Interface 인터페이스 - - Storage - - - - + Card Sources - + Chat 대화 - + Sound 소리 - + Shortcuts 단축키 @@ -3854,9 +3388,9 @@ You can always change this behavior in the 'General' settings tab. - - - + + + Error 오류 @@ -3909,31 +3443,31 @@ Please visit the download page to update manually. - + Update Available - + A new version of Cockatrice is available! - + New version 새로운 버젼 - + Released - + Changelog 변경점 @@ -3943,50 +3477,50 @@ Please visit the download page to update manually. 업데이트 하시겠습니까? - + Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. - + Please check the <a href="%1">releases page</a> on our Github and download the build for your system. - - - + + + Update Error 업데이트 오류 - + An error occurred while checking for updates: - + An error occurred while downloading an update: - + Installing... 설치중... - + Cockatrice is unable to open the installer. - + Try to update manually by closing Cockatrice and running the installer. - + Download location 다운로드 위치 @@ -4076,67 +3610,67 @@ You may have to manually download the new version. DrawProbabilityWidget - + Draw Probability - + Probability of drawing - + Card Name - + Type - + Subtype - + Mana Value - + At least - + Exactly - + card(s) having drawn at least - + cards - + Category - + Qty - + Odds (%) @@ -4250,7 +3784,7 @@ You may have to manually download the new version. FilterBuilder - + Type your filter here @@ -4281,22 +3815,22 @@ You may have to manually download the new version. GameEventHandler - + kicked by game host or moderator - + player left the game - + player disconnected from server - + reason unknown @@ -4304,140 +3838,140 @@ You may have to manually download the new version. GameSelector - - - - - - - - - + + + + + + + + + Error 오류 - + Please join the appropriate room first. 해당 게임이 열려있는 채널에 먼저 들어가시기 바랍니다. - + Wrong password. 잘못된 비밀번호를 입력하셨습니다. - + Spectators are not allowed in this game. 관전이 허용되지 않은 게임입니다. - + The game is already full. 게임 인원이 전부 찼습니다. - + The game does not exist any more. 게임이 더 이상 존재하지 않습니다. - + This game is only open to registered users. 서버에 가입한 사용자만 참가 할 수 있습니다. - + This game is only open to its creator's buddies. 방장의 친구 목록에 등록된 사용자만 참가 할 수 있습니다. - + You are being ignored by the creator of this game. 방장이 당신을 차단하였습니다. - + Join Game - + Spectate Game - + Game Information - + Join Game as Judge - + Spectate Game as Judge - + Join game 게임 참가 - + Password: 비밀번호: - + Please join the respective room first. 해당 게임이 열려있는 채널에 먼저 들어가시기 바랍니다. - + &Filter games 게임 필터 - + C&lear filter 필터 해제 - + C&reate 게임 생성 - + &Join 게임 참가 - + Join as judge - + J&oin as spectator 관전자로 참가하기 - + Join as judge spectator - + Games shown: %1 / %2 - + Games 게임 목록 @@ -4445,32 +3979,32 @@ You may have to manually download the new version. GameSelectorQuickFilterToolBar - + All types - + Filter by game name... - + Filter by game type/format - + Hide games not created by buddies - + Hide full games - + Hide started games @@ -4478,105 +4012,105 @@ You may have to manually download the new version. GamesModel - + >1 day >1 일 - + %1%2 hr short age in hours - + new - + %1%2 min short age in minutes - + password 비밀번호 필요 - + buddies only 친구만 - + reg. users only 가입한 사용자 전용 - + open decklists + - can chat 관전자 대화 가능 - + see hands 손 공개 - + can see hands 관전자에게 손 공개 - + not allowed 허용 안됨 - + Room 게임 - + Age - + Description 게임 이름 - + Creator 방장 - + Type - + Restrictions 입장 제한 - + Players 플레이어 - + Spectators 관전자 @@ -4584,158 +4118,143 @@ You may have to manually download the new version. GeneralSettingsPage - + Reset all paths - + All paths have been reset - - - - - - - + + + + + + + Choose path 경로 선택 - - Language settings - + + Personal settings + 개인 설정 - + Language: 언어: - - Version settings - - - - - Card database - - - - - Startup settings - - - - + Paths (editing disabled in portable mode) - + Paths 디렉토리 경로 - + How to help with translations - + Decks directory: 덱 파일 경로: - + Filters directory: - + Replays directory: 리플레이 파일 경로: - + Pictures directory: 카드 이미지 경로: - + Card database: 카드 데이터베이스 경로: - + Custom database directory: - + Token database: 토큰 데이터베이스 경로: - + Update channel - + Check for client updates on startup - + Check for card database updates on startup - + Don't check - + Prompt for update - + Always update in the background - + Check for card database updates every - + days - + Notify if a feature supported by the server is missing in my client 서버에서 서포트하는 기능이 클라이언트에 존재하지 않을 경우 알림 - + Automatically run Oracle when running a new version of Cockatrice - + Show tips on startup - + Last update check on %1 (%2 days ago) @@ -4743,47 +4262,47 @@ You may have to manually download the new version. GraveyardMenu - + &Graveyard - + &View graveyard - + &Move graveyard to... - + &Top of library - + &Bottom of library - + &All players - + &Hand - + &Exile - + Reveal random card to... @@ -4791,88 +4310,88 @@ You may have to manually download the new version. HandMenu - + &Hand - + &View hand - + Sort hand by... - + Name - + Type - + Mana Value - + Take &mulligan (Choose hand size) - + Take mulligan (Same hand size) - + Take mulligan (Hand size - 1) - + &Move hand to... - + &Top of library - + &Bottom of library - + &Graveyard - + &Exile - + &Reveal hand to... - - + + All players - + Reveal r&andom card to... @@ -4880,52 +4399,52 @@ You may have to manually download the new version. HomeWidget - + Create New Deck - + Browse Decks - + Browse Card Database - + Browse EDHRec - + Browse Archidekt - + View Replays - + Quit - + Connecting... - + Connect - + Play @@ -4933,213 +4452,213 @@ You may have to manually download the new version. LibraryMenu - + &Library - + &View library - + View &top cards of library... - + View bottom cards of library... - + Reveal &library to... - + Lend library to... - + Reveal &top cards to... - + &Top of library... - + &Bottom of library... - + &Always reveal top card - + &Always look at top card - + &Open deck in deck editor - + &Draw card - + D&raw cards... - + &Undo last draw - + Shuffle - + &Play top card - + Play top card &face down - + Put top card on &bottom - + Move top card to grave&yard - + Move top card to e&xile - + Move top cards to &graveyard... - + Move top cards to graveyard face down... - + Move top cards to &exile... - + Move top cards to exile face down... - + Put top cards on stack &until... - + Shuffle top cards... - + &Draw bottom card - + D&raw bottom cards... - + &Play bottom card - + Play bottom card &face down - + Move bottom card to grave&yard - + Move bottom card to e&xile - + Move bottom cards to &graveyard... - + Move bottom cards to graveyard face down... - + Move bottom cards to &exile... - + Move bottom cards to exile face down... - + Put bottom card on &top - + Shuffle bottom cards... - - + + &All players - + Reveal top cards of library - + Number of cards: (max. %1) @@ -5147,453 +4666,845 @@ You may have to manually download the new version. MainWindow - - + + + The server has reached its maximum user capacity, please check back later. + 서버가 꽉 찼습니다. 나중에 다시 접속하여 주십시오. + + + + There are too many concurrent connections from your address. + 해당 IP주소에서 동시에 연결된 회선이 너무 많습니다. + + + + Banned by moderator + 관리자에 의해 서버에서 추방 당하였습니다. + + + + Expected end time: %1 + 예상 추방 종료 시간: %1 + + + + This ban lasts indefinitely. + 영구적 추방입니다. + + + + Scheduled server shutdown. + 정기 점검 중입니다. + + + + + Invalid username. + 잘못된 사용자명입니다. + + + + You have been logged out due to logging in at another location. + 다른 장소에서 로그인하여 접속이 해제되었습니다. + + + + Connection closed + 서버와의 연결이 끊어졌습니다. + + + + The server has terminated your connection. +Reason: %1 + 서버에서 연결을 끊었습니다. +사유: %1 + + + + The server is going to be restarted in %n minute(s). +All running games will be lost. +Reason for shutdown: %1 + 서버가 %n분 후 재시작 할 예정입니다. +진행 중인 게임은 저장되지 않습니다. +서버 재시작 사유: %1 + + + + Scheduled server shutdown + 정기 점검 + + + + + Success + 성공 + + + + Registration accepted. +Will now login. + 가입이 승인되었습니다. +로그인합니다. + + + + Account activation accepted. +Will now login. + 계정이 활성화 되었습니다. +로그인합니다. + + + + Player %1 플레이어 %1 - + Load replay 리플레이 불러오기 - + About Cockatrice 코카트리스에 관하여 - + Version - + Cockatrice Webpage 코카트리스 홈페이지 - + Project Manager: 현 프로젝트 매니저: - + Past Project Managers: 전 프로젝트 매니저: - + Developers: 개발진: - + Our Developers 기여자 목록 - + Help Develop! 개발을 도와주세요! - + Translators: 번역진: - + Our Translators 번역진: - + Help Translate! 번역을 도와주세요! - + Support: 기술 지원: - + Report an Issue 문제점 보고 - + Troubleshooting 문제 해결 - + F.A.Q. 자주 묻는 질문 - - + + + + + + + + + + + + + + + + + + + + Error 오류 - + + Server timeout + 서버 응답시간 초과 + + + + Failed Login + 로그인 실패 + + + + Your client seems to be missing features this server requires for connection. + + + + + To update your client, go to 'Help -> Check for Client Updates'. + + + + + Incorrect username or password. Please check your authentication information and try again. + 잘못된 사용자명이나 비밀번호입니다. +확인 후 다시 시도해 주세요. + + + + There is already an active session using this user name. +Please close that session first and re-login. + 해당 사용자명으로 연결된 다른 세션이 있습니다. +해당 세션을 종료 한 후에 다시 시도해 주세요. + + + + + You are banned until %1. + %1까지 추방 당하였습니다. + + + + + You are banned indefinitely. + 당신은 무기한 추방 당하였습니다. + + + + This server requires user registration. Do you want to register now? + 본 서버는 가입이 필요합니다. +지금 가입하시겠습니까? + + + + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. + + + + + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. + + + + + Account activation + 계정 활성화 + + + + Your account has not been activated yet. +You need to provide the activation token received in the activation email. + 계정이 아직 활성화 되지 않았습니다. +가입 시 기입한 메일 주소에서 계정 활성화 토큰을 확인하여 주십시오. + + + + Server Full + + + + + Unknown login error: %1 + 알 수 없는 로그인 오류: %1 + + + + + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. + +대부분 클라이언트가 오래되어서 서버와 클라이언트가 말이 제대로 통하지 않을때 발생하는 문제입니다. + + + + Your username must respect these rules: + 사용자명은 다음 조건을 만족해야 합니다: + + + + is %1 - %2 characters long + %1에서 %2자 사이 + + + + can %1 contain lowercase characters + 소문자 사용 %1가능 + + + + + + + NOT + 불 + + + + can %1 contain uppercase characters + 대문자 사용 %1가능 + + + + can %1 contain numeric characters + 숫자 사용 %1가능 + + + + can contain the following punctuation: %1 + 다음 문장 부호를 사용 가능 : + + + + first character can %1 be a punctuation mark + 첫 글자를 문장 부호로 입력 %1가능 + + + + no unacceptable language as specified by these server rules: + note that the following lines will not be translated + + + + + can not contain any of the following words: %1 + + + + + can not match any of the following expressions: %1 + + + + + You may only use A-Z, a-z, 0-9, _, ., and - in your username. + 사용자명에는 영어 대소문자, 숫자, _(밑줄), .(마침표)나 -(대쉬)만 사용하실 수 있습니다. + + + + + + + + + Registration denied + 가입 실패 + + + + Registration is currently disabled on this server + 본 서버는 현재 가입을 받지 않습니다. + + + + There is already an existing account with the same user name. + 이미 존재하는 사용자명 입니다. + + + + It's mandatory to specify a valid email address when registering. + 사용 가능한 이메일 주소를 작성하셔야 합니다. + + + + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + + + + + Password too short. + 비밀번호가 너무 짧습니다. + + + + Registration failed for a technical problem on the server. + 서버의 기술적 문제로 가입에 실패하였습니다. + + + + The connection to the server has been lost. + + + + + Unknown registration error: %1 + 가입 중 알 수 없는 오류 발생: %1 + + + + Account activation failed + 계정 활성화 실패 + + + + Socket error: %1 + 소켓 오류: %1 + + + + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + 서버 버전이 클라이언트보다 오래되었습니다. +클라이언트를 다운그레이드하거나 다른 서버에 연결해 주시기 바랍니다. +클라이언트 버전 %1, 서버 버전 %2. + + + + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + 코카트리스 클라이언트 버전이 오래되었습니다. +클라이언트 업데이트를 해 주세요. +클라이언트 버전 %1, 서버 버전 %2. + + + + Connecting to %1... + %1로 연결 시도 중... + + + + Registering to %1 as %2... + 서버 %1에 %2(으)로 가입 중... + + + + Disconnected + 연결 안됨 + + + + Connected, logging in at %1 + 연결됨, %1로 로그인 시도 중 + + + + + + Requesting forgotten password to %1 as %2... + + + + &Connect... 서버로 연결 - + &Disconnect 서버와의 연결 해제 - + Start &local game... 오프라인 게임 시작 - + &Watch replay... 리플레이 재생 - + &Full screen 전체 화면 - + &Register to server... 서버에 가입 - + &Restore password... - + &Settings... 환경설정 - + &Exit 끝내기 - + A&ctions 액션 - + &Cockatrice 코카트리스 - + C&ard Database - + &Manage sets... - + Edit custom &tokens... - + Open custom image folder 커스텀 이미지 폴더 열기 - + Open custom sets folder 커스텀 셋 폴더 열기 - + Add custom sets/cards 커스텀 셋/카드 추가 - + Reload card database - + Tabs - + &Help 도움말 - + &About Cockatrice 코카트리스에 관하여 - + &Tip of the Day - + Check for Client Updates 클라이언트 업데이트 확인 - + Check for Card Updates... - + Check for Card Updates (Automatic) - + Show Status Bar - + View &Debug Log - + Open Settings Folder - + Show/Hide - + New Version - + Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. - + Cockatrice installed - + Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. - + Card database 카드 데이터베이스 - + Cockatrice is unable to load the card database. Do you want to update your card database now? If unsure or first time user, choose "Yes" - - + + Yes 예 - - + + No 아니오 - + Open settings 설정 열기 - + New sets found - + %n new set(s) found in the card database Set code(s): %1 Do you want to enable it/them? - - Yes, always enable - - - - + View sets 셋 보기 - + Welcome 환영합니다 - + Hi! It seems like you're running this version of Cockatrice for the first time. All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. - + + Information 알림 - + A card database update is already running. 이미 카드 데이터베이스 업데이트가 진행 중입니다. - + Unable to run the card database updater: 카드 데이터베이스 업데이트를 진행할 수 없습니다: - + Card database update running. - + Failed to start. The file might be missing, or permissions might be incorrect. - + The process crashed some time after starting successfully. - + Timed out. The process took too long to respond. The last waitFor...() function timed out. - + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. - + An error occurred when attempting to read from the process. For example, the process may not be running. - + Unknown error occurred. - + The card database updater exited with an error: %1 - - - - - + + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + + + + + + + + Load sets/cards - + Selected file cannot be found. - + You can only import XML databases at this time. - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. - + Sets/cards failed to import. + + + + + Reset Password + + + + + Your password has been reset successfully, you can now log in using the new credentials. + + + + + Failed to reset user account password, please contact the server operator to reset your password. + + + + + Activation request received, please check your email for an activation token. + + ManaBaseConfigDialog - + Mana Base Configuration - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): - + OK - + Cancel @@ -5665,27 +5576,27 @@ Cockatrice will now reload the card database. ManaDevotionConfigDialog - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): @@ -5755,615 +5666,610 @@ Cockatrice will now reload the card database. MessageLogWidget - + from play 전장에 - + from their graveyard - + from exile 추방 영역에 - + from their hand 자신의 손에 - + the top card of %1's library %1의 서고 맨 위의 카드 - + the top card of their library - + from the top of %1's library %1의 서고 맨 위에 - + from the top of their library - + the bottom card of %1's library %1의 서고 맨 밑의 카드 - + the bottom card of their library - + from the bottom of %1's library %1의 서고 맨 밑에 - + from the bottom of their library - + from %1's library %1의 서고에 - + from their library - + from sideboard 사이드보드에 - + from the stack 스택에 - + from custom zone '%1' - + %1 is now keeping the top card %2 revealed. %1이(가) %2 맨 위 카드를 공개합니다. - + %1 is not revealing the top card %2 any longer. %1이(가) %2 맨 위 카드를 더 이상 공개하지 않습니다. - + %1 can now look at top card %2 at any time. - + %1 no longer can look at top card %2 at any time. - + %1 attaches %2 to %3's %4. - + %1 has conceded the game. - + %1 has unconceded the game. - + %1 has restored connection to the game. - + %1 has lost connection to the game. - + %1 points from their %2 to themselves. - + %1 points from their %2 to %3. - + %1 points from %2's %3 to themselves. - + %1 points from %2's %3 to %4. - + %1 points from their %2 to their %3. %1님이 자신의 %2에서 자신의 %3을(를) 가리켰습니다. - + %1 points from their %2 to %3's %4. %1님이 자신의 %2에서 %3님의 %4을(를) 가리켰습니다. - + %1 points from %2's %3 to their own %4. - + %1 points from %2's %3 to %4's %5. - + %1 creates a face down token. - + %1 creates token: %2%3. %1님이 토큰 생성: %2%3. - + %1 has loaded a deck (%2). %1이(가) 덱을 불러왔습니다. (해시값: %2) - + %1 has loaded a deck with %2 sideboard cards (%3). %1이(가) %2장의 사이드보드가 있는 덱을 불러왔습니다. (해시값: %3) - + %1 destroys %2. - + a card 카드 한 장 - + %1 gives %2 control over %3. %1이(가) %3의 조종권을 %2에게 넘깁니다. - + %1 puts %2 into play%3 face down. - + %1 puts %2 into play%3. %1이(가) %3서 %2을(를) 전장에 놓았습니다. - + %1 puts %2%3 into their graveyard face down. - + %1 puts %2%3 into their graveyard. - + %1 exiles %2%3 face down. - + %1 exiles %2%3. %1이(가) %3 있던 %2을(를) 추방합니다. - + %1 moves %2%3 to their hand. - + %1 puts %2%3 into their library. - + %1 puts %2%3 onto the bottom of their library. - + %1 puts %2%3 on top of their library. - + %1 puts %2%3 into their library %4 cards from the top. - + %1 moves %2%3 to sideboard. %1이(가) %3 있던 %2을(를) 서고 맨 밑에 넣었습니다. - + %1 plays %2%3 face down. - + %1 plays %2%3. %1이(가) %3서 %2을(를) 플레이 하였습니다. - + %1 moves %2%3 to custom zone '%4' face down. - + %1 moves %2%3 to custom zone '%4'. - + %1 tries to draw from an empty library - + %1 draws %2 card(s). - + %1 is looking at %2. - + %1 is looking at the %4 %3 card(s) %2. top card for singular, top %3 cards for plural - + bottom - + top - + %1 turns %2 face-down. - + %1 turns %2 face-up. - + The game has been closed. 게임이 종료되었습니다. - + The game has started. 게임이 시작되었습니다. - + You are flooding the game. Please wait a couple of seconds. - + %1 has joined the game. %1님이 게임에 입장했습니다. - + %1 is now watching the game. %1이(가) 관전을 시작하였습니다. - + You have been kicked out of the game. 게임에서 강제 퇴장 당하였습니다. - + %1 has left the game (%2). - + %1 is not watching the game any more (%2). - + %1 is not ready to start the game any more. - + %1 shuffles their deck and draws a new hand of %2 card(s). - + %1 shuffles their deck and draws a new hand. - + You are watching a replay of game #%1. - + %1 is ready to start the game. %1님이 게임 시작 준비를 끝냈습니다. - + cards an unknown amount of cards - + %1 card(s) a card for singular, %1 cards for plural - + %1 lends %2 to %3. - + %1 reveals %2 to %3. - + %1 reveals %2. %1님이 %2을(를) 공개. - + %1 randomly reveals %2%3 to %4. - + %1 randomly reveals %2%3. - + %1 peeks at face down card #%2. - + %1 peeks at face down card #%2: %3. - + %1 reveals %2%3 to %4. - + %1 reveals %2%3. - + %1 reversed turn order, now it's %2. - + reversed - + normal - + Heads 앞면 - + Tails 뒷면 - + %1 flipped a coin. It landed as %2. - + %1 rolls a %2 with a %3-sided die. - + %1 flips %2 coins. There are %3 heads and %4 tails. - + %1 rolls a %2-sided dice %3 times: %4. - + %1's turn. %1의 차례입니다. - + %1 sets annotation of %2 to %3. - - %1 places %2 %3%4 counter(s) on %5 (now %6). + + %1 places %2 "%3" counter(s) on %4 (now %5). - - %1 removes %2 %3%4 counter(s) from %5 (now %6). + + %1 removes %2 "%3" counter(s) from %4 (now %5). - - %1 failed to undo their last draw. - - - - + %1 sets counter %2 to %3 (%4%5). - + %1 sets %2 to not untap normally. - + %1 sets %2 to untap normally. - + %1 removes the PT of %2. - + %1 changes the PT of %2 from nothing to %4. - + %1 changes the PT of %2 from %3 to %4. - + %1 has locked their sideboard. - + %1 has unlocked their sideboard. - + %1 taps their permanents. %1님이 자신의 지속물을 탭. - + %1 untaps their permanents. %1님이 자신의 지속물을 언탭. - + %1 taps %2. %1님이 %2을(를) 탭. - + %1 untaps %2. %1님이 %2을(를) 언탭. - + %1 shuffles %2. %1님이 %2를 셔플했습니다. - + %1 shuffles the bottom %3 cards of %2. - + %1 shuffles the top %3 cards of %2. - + %1 shuffles cards %3 - %4 of %2. - + %1 unattaches %2. %1님이 %2을(를) 뗴어냈습니다. - + %1 undoes their last draw. - + %1 undoes their last draw (%2). @@ -6371,115 +6277,110 @@ Cockatrice will now reload the card database. MessagesSettingsPage - + Word1 Word2 Word3 - + Add New Message - + Edit Message - + Remove Message - + Add message 메세지 추가 - - + + Message: 메세지: - + Edit message - + Chat settings 대화 설정 - + Custom alert words 키워드 알림 - + Enable chat mentions 대화 중 본인의 사용자명 멘션 시 해당 문장을 강조 - + Enable mention completer 멘션 자동완성 기능 - + In-game message macros 게임 내 대화 매크로 - + How to use in-game message macros - + Ignore chat room messages sent by unregistered users 서버에 가입하지 않은 사용자의 채널 대화 차단 - + Ignore private messages sent by unregistered users 서버에 가입하지 않은 사용자가 보낸 1:1 대화 차단 - - Ignore private messages sent by non-buddy users - - - - - + + Invert text color 문장 색 반전 - + Enable desktop notifications for private messages 1:1 대화를 받을 시 데스크탑 알림 설정 - + Enable desktop notification for mentions 자신의 사용자명 멘션 시 데스크탑 알림 설정 - + Enable room message history on join 채널 입장 시 이전 대화 기록 표시 - - + + (Color is hexadecimal) (16진수 색상 코드) - + Separate words with a space, alphanumeric characters only 각 단어마다 스페이스바로 띄어써주세요. 문자 및 숫자만 가능합니다. @@ -6487,42 +6388,42 @@ Cockatrice will now reload the card database. MoveMenu - + Move to - + &Top of library in random order - + X cards from the top of library... - + &Bottom of library in random order - + T&able - + &Hand - + &Graveyard - + &Exile @@ -6535,47 +6436,47 @@ Cockatrice will now reload the card database. - + Mana Value - + Color(s) - + Loyalty - + Main Card Type - + Mana Cost - + P/T - + Side - + Layout - + Color Identity @@ -6598,152 +6499,6 @@ Cockatrice will now reload the card database. - - PaletteEditorDialog - - - - Reset - - - - - - Apply - - - - - - Save && Apply - - - - - ▼ Edit Palette - - - - - - ▶ Edit Palette - - - - - Palette Editor — %1 - - - - - <b>Palette Editor</b> &nbsp;·&nbsp; %1 - - - - - This theme ships no default palette files - - - - - Replace current colours with the theme author's defaults - - - - - Switch between the light and dark palette files - - - - - Editing: - - - - - Show or hide the per-role colour grid for manual tweaks - - - - - ↺ Revert to theme default - - - - - Discard unsaved edits and restore the last saved palette - - - - - Preview this palette without saving to disk - - - - - Write palette-%1.toml and reload the theme - - - - - Cannot save: this theme has no directory on disk - - - - - Save failed - - - - - Could not write %1 to: -%2 - - - - - No default found - - - - - No default palette file found for the "%1" scheme. - - - - - PaletteGridWidget - - - Active - - - - - Disabled - - - - - Inactive - - - - - Normal interactive state - - - - - Widget is disabled / not interactive - - - - - Window is in background / unfocused - - - Phase @@ -6810,57 +6565,57 @@ Cockatrice will now reload the card database. PhasesToolbar - + Untap step 언탭단 - + Upkeep step 유지단 - + Draw step 뽑기단 - + First main phase 첫번째 본단계 - + Beginning of combat step 전투 시작단 - + Declare attackers step 공격자 선언단 - + Declare blockers step 방어자 선언단 - + Combat damage step 전투 피해단 - + End of combat step 전투 종료단 - + Second main phase 두번째 본단계 - + End of turn step 종료단 @@ -6868,7 +6623,7 @@ Cockatrice will now reload the card database. PictureLoader - + en code for scryfall's language property, not available for all languages ko @@ -6877,142 +6632,151 @@ Cockatrice will now reload the card database. PlayerActions - - - - - grave - - - - - - - - exile - - - - - PlayerDialogs - - + View top cards of library - - - - - - - - - + + + + + + + + + Number of cards: (max. %1) - + View bottom cards of library - + Shuffle top cards of library - + Shuffle bottom cards of library - + Draw hand - + 0 and lower are in comparison to current hand size - + Draw cards - + + + + + grave + + + + + + + + exile + + + + Move top cards to %1 - + Move bottom cards to %1 - + Draw bottom cards - + + + C&reate another %1 token + + + + Create tokens - + + Number: - + Place card X cards from top of library - + Which position should this card be placed: - + (max. %1) - + Change power/toughness - + Change stats to: - + Set annotation - + Please enter the new annotation: + + + Set counters + + PlayerMenu - + Player "%1" - + &Counters @@ -7042,7 +6806,7 @@ This setting means you'll only see the default printing for each card, instead o - + Printing Selector @@ -7050,22 +6814,22 @@ This setting means you'll only see the default printing for each card, instead o PrintingSelectorCardOverlayWidget - + Preference - + Pin Printing - + Unpin Printing - + Show Related cards @@ -7136,57 +6900,57 @@ This setting means you'll only see the default printing for each card, instead o PtMenu - + Power / toughness - + &Increase power - + &Decrease power - + I&ncrease toughness - + D&ecrease toughness - + In&crease power and toughness - + Dec&rease power and toughness - + Increase power and decrease toughness - + Decrease power and increase toughness - + Set &power and toughness... - + Reset p&ower and toughness @@ -7194,37 +6958,37 @@ This setting means you'll only see the default printing for each card, instead o QMenuBar - + Services 서비스 - + Hide %1 %1 가리기 - + Hide Others 기타 가리기 - + Show All 모두 보기 - + Preferences... 환경설정... - + Quit %1 %1 종료 - + About %1 %1에 관하여 @@ -7232,17 +6996,17 @@ This setting means you'll only see the default printing for each card, instead o QObject - + Cockatrice card database (*.xml) 코카트리스 카드 데이터베이스 파일 (*.xml) - + All files (*.*) 모든 파일 (*.*) - + Cockatrice replays (*.cor) 코카트리스 리플레이 파일 (*.cor) @@ -7302,177 +7066,110 @@ Are you sure you would like to disable this feature? QPlatformTheme - + OK - + Save - + Save All - + Open - + &Yes - + Yes to &All - + &No - + N&o to All - + Abort - + Retry - + Ignore - + Close - + Cancel - + Discard - + Help - + Apply - + Reset - + Restore Defaults - - QuickSetupPanel - - - %1% - - - - - <b>Quick Setup</b> - - - - - Generate all palette roles automatically from a single accent colour - - - - - Accent: - - - - - Primary hue. Used directly for highlights and links. -At high intensity it also tints buttons and backgrounds. - - - - - Intensity: - - - - - Subtle - - - - - Full colour - - - - - 0–30 Subtle tint — only highlights and links change hue -30–70 Accented — buttons, tooltips, and borders join in -70–100 Full colour — backgrounds, everything - - - - - 70% - - - - - Generate ↓ - - - - - Derive all palette roles from the accent colour above. -Fine-tune individual colours in the grid afterwards. - - - RemoteDeckList_TreeModel - + Name 덱 이름 - + ID ID - + Upload time 업로드 시간 @@ -7480,32 +7177,32 @@ Fine-tune individual colours in the grid afterwards. RemoteReplayList_TreeModel - + ID ID - + Name 게임 이름 - + Players 플레이어 - + Keep 보존 - + Time started 게임 시작 시간 - + Duration (sec) 게임 길이 @@ -7513,37 +7210,37 @@ Fine-tune individual colours in the grid afterwards. RfgMenu - + &Exile - + &View exile - + &Move exile to... - + &Top of library - + &Bottom of library - + &Hand - + &Graveyard @@ -7589,7 +7286,7 @@ Fine-tune individual colours in the grid afterwards. SayMenu - + S&ay @@ -7630,27 +7327,27 @@ Fine-tune individual colours in the grid afterwards. SetsModel - + Enabled 활성화 - + Set type 확장판 종류 - + Set code 확장판 약자 - + Long name 확장판 이름 - + Release date 발매 일자 @@ -7658,53 +7355,53 @@ Fine-tune individual colours in the grid afterwards. ShortcutSettingsPage - - + + Restore all default shortcuts - + Do you really want to restore all default shortcuts? - + Clear all default shortcuts - + Do you really want to clear all shortcuts? - + Section: - + Action: - + Shortcut: - + How to set custom shortcuts - + Clear all shortcuts - + Search by shortcut name @@ -7758,12 +7455,12 @@ Please check your shortcut settings! SideboardMenu - + &Sideboard - + &View sideboard @@ -7771,27 +7468,27 @@ Please check your shortcut settings! SoundSettingsPage - + Enable &sounds 음향 효과 켜기 - + Current sounds theme: 현재 소리 테마: - + Test system sound engine 시스템 사운드 엔진 테스트 - + Sound settings 음향 설정 - + Master volume 주 음량 @@ -7863,146 +7560,16 @@ Please check your shortcut settings! - + No reply received from the tag update server. - + Invalid reply received from the tag update server. - - StorageSettingsPage - - - - - Success - - - - - Cached card pictures have been reset. - - - - - Downloaded card pictures have been reset. - - - - - Error - - - - - One or more downloaded card pictures could not be cleared. - - - - - In-memory (currently loaded) card pictures have been reset. - - - - - Card Picture Loader Caching Method: - - - - - The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size. - - - - - Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while. - - - - - This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk. - - - - - Delete Cached Images - - - - - Delete Saved Images - - - - - Clear In-Memory Images - - - - - Card Picture Loader Cache Method - - - - - Network Cache - - - - - Filesystem - - - - - In-Memory Picture Cache - - - - - Network Cache Size: - - - - - On-disk cache for downloaded pictures - - - - - Redirect Cache TTL: - - - - - How long cached redirects for urls are valid for. - - - - - Picture Cache Size: - - - - - In-memory cache for pictures not currently on screen - - - - - Naming scheme: - - - - - Day(s) - - - TabAccount @@ -8138,117 +7705,117 @@ Please check your shortcut settings! TabArchidekt - - + + Desc. - - + + AND - - + + Require ALL selected colors - - + + Deck name... - - + + Owner... - - + + Packages - - + + Advanced Filters - + Bracket: - - + + Any - - + + Contains card... - - + + Commander... - - + + Tag... - - + + Deck Size - + Cards: - - + + Asc. - + Sort by: - + Filter by: - + Display Settings - - + + Search - - + + Formats @@ -8258,54 +7825,6 @@ Please check your shortcut settings! - - TabCardArtRules - - - Card: - - - - - ProviderId: - - - - - Mode: - - - - - Reason: - - - - - Type a card name... - - - - - Add rule - - - - - Remove rule - - - - - Refresh - - - - - Card Art Rules - - - TabDeckEditor @@ -8354,7 +7873,7 @@ Please check your shortcut settings! 화면 레이아웃 초기화 - + Deck: %1 덱 편집기: %1 @@ -8362,49 +7881,55 @@ Please check your shortcut settings! TabDeckEditorVisual - + Visual Deck: %1 - + &Visual Deck Editor - - + + Card Info - - + + Deck - + + + Filters + + + + &View - + Printing - + Visible - + Floating - + Reset layout @@ -8412,22 +7937,22 @@ Please check your shortcut settings! TabDeckEditorVisualTabWidget - + Visual Deck View - + Visual Database Display - + Deck Analytics - + Sample Hand @@ -8435,134 +7960,134 @@ Please check your shortcut settings! TabDeckStorage - + Local file system 로컬 파일 시스템 - + Server deck storage 서버 덱 보관함 - - + + Open in deck editor 덱 편집기로 열기 - + Rename deck or folder - + Upload deck 덱 업로드 - + Download deck 덱 다운로드 + - - - + + New folder 새 폴더 + - Delete 삭제 - + Open decks folder - + Rename local folder - + Rename local file - + New name: - - - - + + + + Error - + Rename failed - - + + Invalid deck file - + Enter deck name 덱 이름 작성 - + This decklist does not have a name. Please enter a name: 이 덱리스트는 이름이 없습니다. 이름을 입력해 주세요: - + Unnamed deck 이름 없는 덱 - + Failed to upload deck to server - + Delete local file 로컬 파일 삭제 - + Are you sure you want to delete the selected files? - + Delete remote decks - + Are you sure you want to delete the selected decks? - - + + Name of new folder: 새 폴더의 이름: @@ -8634,191 +8159,191 @@ Please enter a name: TabGame - - - + + + Replay 리플레이 - - + + Game 게임 - - + + Player List 플레이어 목록 - - + + Card Info 카드 정보 - - + + Messages 메세지 - - + + Replay Timeline 리플레이 타임라인 - + &Phases 단계 - + &Game 게임 - + Next &phase 다음 단계로 진행 - + Next phase with &action - + Next &turn 턴 넘기기 - + Reverse turn order - + &Remove all local arrows 내가 그린 화살표 제거 - + Rotate View Cl&ockwise 플레이어 위치 시계방향으로 조정 - + Rotate View Co&unterclockwise 플레이어 위치 반시계방향으로 조정 - + Game &information 게임 정보 - + Un&concede - - - + + + &Concede 항복 - + &Leave game 게임 나가기 - + C&lose replay 리플레이 닫기 - + &Focus Chat - + &Say: 말하기: - + Selected cards - + &View &보기 - + Visible 표시 - + Floating 띄우기 - + Reset layout 레이아웃 초기화 - + Concede 항복 - + Are you sure you want to concede this game? 정말 게임에서 항복하시겠습니까? - + Unconcede - + You have already conceded. Do you want to return to this game? - + Leave game 게임 나가기 - + Are you sure you want to leave this game? 정말 게임에서 나가시겠습니까? - + A player has joined game #%1 - + %1 has joined the game - + You have been kicked out of the game. 게임에서 강제 퇴장 당하였습니다. @@ -8877,115 +8402,115 @@ Please enter a name: - + Username: 사용자명: - + IP Address: IP 주소: - + Game Name: 게임 이름: - + GameID: 게임 ID: - + Message: 메세지: - + Main Room 대화 채널 - + Game Room 게임 방 - + Private Chat 1:1 대화 - + Past X Days: ~일 전: - + Today 오늘 - + Last Hour 1시간 이내 - + Maximum Results: - + At least one filter is required. The more information you put in, the more specific your results will be. 최소한 한개 이상의 필터를 지정해주세요. 자세히 지정하시면 좀 더 세분화된 결과를 보실 수 있습니다. - + Get User Logs - + Clear Filters - + Filters 필터 - + Log Locations - + Date Range - + Maximum Results - - + + Message History - + Failed to collect message history information. - + There are no messages for the selected filters. @@ -9003,27 +8528,27 @@ The more information you put in, the more specific your results will be.나가기 - + %1 - Private chat %1 - 1:1 대화 - + This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. - + Private message from - + %1 has left the server. %1이(가) 서버와의 연결을 끊었습니다. - + %1 has joined the server. %1이(가) 서버에 연결하였습니다. @@ -9031,180 +8556,180 @@ The more information you put in, the more specific your results will be. TabReplays - + Local file system 로컬 파일 시스템 - + Server replay storage 서버 리플레이 보관함 - - + + Watch replay 리플레이 보기 - + Rename - - + + New folder - - + + Delete 삭제 - + Open replays folder - + Download replay 리플레이 다운로드 - + Toggle expiration lock 자동 삭제 여부 토글 - + Get replay share code - - + + Look up replay by share code - + Rename local folder - + Rename local file - + New name: - + Error - + Rename failed - + Name of new folder: - + Delete local file 로컬 파일 삭제 - + Are you sure you want to delete the selected files? - + Are you sure you want to delete the selected replays? - + Failed to get code - - + + Either this server does not support replay sharing, or does not permit replay sharing for you. - - - + + + Failed - + Could not get replay code - + Replay Share Code - + Others can use this code to add the replay to their list of remote replays: %1 - + Copy to clipboard - + Replay share code - + Replay code found - + Replay was added, or you already had access to it. - + Replay code not found - + Failed to submit code - + Unexpected error - + Delete remote replay 서버에 저장된 리플레이 삭제 @@ -9217,62 +8742,47 @@ The more information you put in, the more specific your results will be. TabRoom - - Friends - - - - - Online - - - - - Ignored - - - - + &Say: 말하기: - + Chat 대화 - + &Room 채널 - + &Leave room 채널에서 나가기 - + &Clear chat 대화 내용 삭제 - + Chat Settings... 대화 설정... - + mentioned you. 이(가) 당신에게 멘션을 보냈습니다. - + Click to view 여기를 눌러 확인 - + You are flooding the chat. Please wait a couple of seconds. 너무 빨리 말하고 있습니다. 조금만 기다려 주세요. @@ -9285,30 +8795,30 @@ The more information you put in, the more specific your results will be.서버 - - - - + + + + Error 오류 - + Failed to join the server room: it doesn't exist on the server. - + The server thinks you are in the server room but your client is unable to display it. Try restarting your client. - + You do not have the required permission to join this server room. - + Failed to join the server room due to an unknown error: %1. @@ -9316,98 +8826,98 @@ The more information you put in, the more specific your results will be. TabSupervisor - + Deck Editor - + Visual Deck Editor - + EDHRec - + Archidekt - + Home - + &Visual Deck Storage - + Visual Database Display - + Server - + Account - + Deck Storage - + Game Replays - + Administration - + Logs - + Are you sure? 확실하십니까? - + There are still open games. Are you sure you want to quit? 참가 중인 게임이 있습니다. 정말로 코카트리스를 종료하시겠습니까? - + Click to view - + Your buddy %1 has signed on! - + Unknown Event - + The server has sent you a message that your client does not understand. This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. @@ -9415,32 +8925,32 @@ To update your client, go to Help -> Check for Updates. - + Idle Timeout - + You are about to be logged out due to inactivity. - + Promotion 승급 - + You have been promoted. Please log out and back in for changes to take effect. - + Warned 경고 - + You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. 운영진으로부터 %1의 사유로 경고를 받았습니다. @@ -9448,7 +8958,7 @@ Please refrain from engaging in this activity or further actions may be taken ag 문의사항은 관리자에게 1:1대화로 물어보시기 바랍니다. - + You have received the following message from the server. (custom messages like these could be untranslated) @@ -9457,12 +8967,12 @@ Please refrain from engaging in this activity or further actions may be taken ag TabVisualDatabaseDisplay - + Database Display - + Visual Database Display @@ -9499,42 +9009,42 @@ Please refrain from engaging in this activity or further actions may be taken ag TranslateCounterName - + Life - + White - + Blue - + Black - + Red - + Green - + Colorless - + Other @@ -9542,69 +9052,11 @@ Please refrain from engaging in this activity or further actions may be taken ag UpdateDownloader - + Could not open the file for reading. - - UserCardArtSettingsDialog - - - Card Art Settings - - - - - Type a card name... - - - - - Card name: - - - - - Card ProviderId: - - - - - Left margin (%): - - - - - Right margin (%): - - - - - Vertical offset: - - - - - Zoom: - - - - - Parameters - - - - - Preview - - - - - Remove Banner Card - - - UserContextMenu @@ -9722,7 +9174,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Ban History @@ -9737,87 +9189,77 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Failed to collect ban information. - - - + + + Warning History - + Warning Time;Moderator;User Name;Reason - + User has never been warned. 경고를 받은 적이 없는 사용자입니다. - + Failed to collect warning information. - + Failed to get admin notes. - - + + Success 성공 - + Successfully promoted user. 해당 사용자 승급에 성공하였습니다. - + Successfully demoted user. 해당 사용자 강등에 성공하였습니다. - - Kick Player - - - - - Are you sure you want to kick this player from the game? - - - - - - + + + Failed 실패 - + Failed to promote user. 해당 사용자 승급에 실패하였습니다. - + Failed to demote user. 해당 사용자 강등에 실패하였습니다. - + Copy hash to clipboard - + Remove this user's messages @@ -9825,554 +9267,326 @@ Please refrain from engaging in this activity or further actions may be taken ag UserInfoBox - + Location: 거주지: - + Account Age: 계정 나이: - + Edit 프로필 수정 - + Change password 비밀번호 변경 - + Change avatar 아바타 변경 - + Administrator 운영자 - + Moderator 관리자 - + Registered user 서버에 가입한 사용자 - - + + Unregistered user 서버에 가입하지 않은 사용자 - + Judge - + Unknown 미상 - + The entered password does not match your account. - - - - + + + Information 사용자 정보 - + User information updated. 사용자 정보가 갱신되었습니다. - - - - - - - - - - - + + + + + + + + + + Error 오류 - + User Information - + Real Name: - + User Level: - - - Edit Banner Card - - - + %n Year(s), amount of years (only shown if more than 0) - + %10%n Day(s) %20 amount of years (if more than 0), amount of days, date in local short format - + Enter Password - + Password verification is required in order to change your email address - - - + + + An error occurred while trying to update your user information. - - The selected card is blacklisted on this server or another error occurred. - - - - - Banner card removed. - - - - - Banner card updated. - - - - + This server does not permit you to update your user informations. 본 서버는 당신의 사용자 정보를 수정 할 수 없게 설정되어 있습니다. - + Password changed. 비밀번호가 변경되었습니다. - + This server does not permit you to change your password. 본 서버는 당신의 비밀번호를 수정 할 수 없게 설정되어 있습니다. - + The new password is too short. 새로운 비밀번호가 너무 짧습니다. - + The old password is incorrect. 예전 비밀번호가 잘못되었습니다. - + Avatar updated. 아바타를 변경하였습니다. - + This server does not permit you to update your avatar. 본 서버는 당신의 아바타를 변경 할 수 없게 설정되어 있습니다. - - - An error occured while trying to update your avatar. - - - This server does not permit you to update your user informations. - An error occured while trying to updater your avatar. - 본 서버는 당신의 사용자 정보를 수정 할 수 없게 설정되어 있습니다. - - - - UserInfoPopup - - - - Games - - - - - Chat - - - - - Open private chat - - - - - Profile - - - - - View user profile - - - - - Show this user's games - - - - - − Buddy - - - - - Remove from buddy list - - - - - + Buddy - - - - - Add to buddy list - - - - - − Ignore - - - - - Remove from ignore list - - - - - + Ignore - - - - - Add to ignore list - - - - - Ban - - - - - Ban from server - - - - - Warn - - - - - Warn user - - - - - Ban log - - - - - View ban history - - - - - Warn log - - - - - View warning history - - - - - Notes - - - - - View admin notes - - - - - − Mod - - - - - Demote from moderator - - - - - + Mod - - - - - Promote to moderator - - - - - − Judge - - - - - Demote from judge - - - - - + Judge - - - - - Promote to judge - - - - - Join game - - - - - Spectate - - - - - - Loading games… - - - - - Could not load games. - - - - - No active games. - + An error occured while trying to updater your avatar. + 아바타 변경 중 오류가 발생하였습니다. UserInterfaceSettingsPage - + General interface settings 일반 인터페이스 설정 - + &Double-click cards to play them (instead of single-click) 카드를 더블 클릭해서 발동 (해제시 한번만 클릭하면 발동 됨) - + &Clicking plays all selected cards (instead of just the clicked card) - + &Play all nonlands onto the stack (not the battlefield) by default 모든 대지가 아닌 카드를 발동 시에 스택으로 이동 (해제시 전장으로 바로 이동) - + Do not delete &arrows inside of subphases - + Close card view window when last card is removed - + Auto focus search bar when card view window is opened - + Annotate card text on tokens 토큰에 카드 텍스트 주석 자동 추가 - - Show selection count during drag selection + + Show selection counter during drag selection - - Show total selection count + + Show total selection counter - - Show subtype breakdown in selection tally - - - - + Use tear-off menus, allowing right click menus to persist on screen - - Keep game chat focused when clicking in game (Note: disables card view search bar) - - - - + Notifications settings - + Enable notifications in taskbar 상태 표시줄 알림 설정 - + Notify in the taskbar for game events while you are spectating 관전중인 게임의 상태 표시줄 알림 설정 - + Notify in the taskbar when users in your buddy list connect - + Animation settings 애니메이션 설정 - + &Tap/untap animation 탭/언탭 애니메이션 - + Deck editor/storage settings - + Open deck in new tab by default - + Use visual deck storage in game lobby - + Use selection animation for Visual Deck Storage - + When adding a tag in the visual deck storage to a .txt deck: - + do nothing - + ask to convert to .cod - + always convert to .cod - + Default deck editor type - + Classic Deck Editor - + Visual Deck Editor - + Replay settings - + Buffer time for backwards skip via shortcut: @@ -10380,22 +9594,22 @@ Please refrain from engaging in this activity or further actions may be taken ag UserListWidget - + Users connected to server: %1 - + Users in this room: %1 - + Buddies online: %1 / %2 - + Ignored users online: %1 / %2 @@ -10403,45 +9617,35 @@ Please refrain from engaging in this activity or further actions may be taken ag UtilityMenu - + Increment all card counters - + &Untap all permanents - + R&oll die... - - Flip coin - - - - + &Create token... - + C&reate another token - + Cr&eate predefined token - - - C&reate another %1 token - - VisualDatabaseDisplayColorFilterWidget @@ -10493,72 +9697,72 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFilterToolbarWidget - + Sort by - + Filter by - + Save and load filters - + Filter by exact card name - + Filter by card main-type - + Filter by card sub-type - + Filter by set - + Filter by format legality - + Save/Load - + Name - + Main Type - + Sub Type - + Sets - + Formats @@ -10566,22 +9770,22 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFormatLegalityFilterWidget - + Show formats with at least: - + cards - + Do not display formats with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) @@ -10599,32 +9803,32 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayMainTypeFilterWidget - + Show main types with at least: - + cards - + Do not display card main-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10632,27 +9836,27 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayNameFilterWidget - + Filter by name... (Exact match) - + Load from Deck - + Apply all card names in currently loaded deck as exact match name filters - + Load from Clipboard - + Apply all card names in clipboard as exact match name filters @@ -10660,7 +9864,7 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayRecentSetFilterSettingsWidget - + Filter to most recent sets @@ -10668,19 +9872,19 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySetFilterWidget - + Search sets... - - + + Mode: Exact Match - - + + Mode: Includes @@ -10688,37 +9892,37 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySubTypeFilterWidget - + Search subtypes... - + Show sub types with at least: - + cards - + Do not display card sub-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10726,23 +9930,23 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayWidget - + Search by card name (or search expressions) - + Visual - + Loading database ... - + Clear all filters @@ -10781,17 +9985,17 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Toggle Layout: Overlap - + Change how cards are displayed within zones (i.e. overlapped or fully visible.) - + Toggle Layout: Flat @@ -10820,17 +10024,17 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDeckEditorWidget - + Type a card name here for suggestions from the database... - + Quick search and add card - + Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter @@ -10948,43 +10152,43 @@ Please refrain from engaging in this activity or further actions may be taken ag WarningDialog - + Which warning would you like to send? 어떤 종류의 경고를 보내시겠습니까? - + Redact all messages from this user in all rooms - + &OK 확인 - + &Cancel 취소 - + Warn user for misconduct 사용자의 부적절한 행동에 경고 - - + + Error 오류 - + User name to send a warning to can not be blank, please specify a user to warn. - + Warning to use can not be blank, please select a valid warning to send. @@ -10992,133 +10196,133 @@ Please refrain from engaging in this activity or further actions may be taken ag WndSets - + Move selected set to the top 선택한 확장판을 맨 위로 올리기 - + Move selected set up 선택한 확장판을 한 단계 올리기 - + Move selected set down 선택한 확장판을 한 단계 내리기 - + Move selected set to the bottom 선택한 확장판을 맨 아래로 내리기 - + Search by set name, code, or type - + Default order - + Restore original art priority order - + Enable all sets 모든 확장판 활성화 - + Disable all sets 모든 확장판 비활성화 - + Enable selected set(s) 선택한 세트 적용 - + Disable selected set(s) 선택한 세트 미적용 - + Deck Editor 덱 편집기 - + Use CTRL+A to select all sets in the view. - + Only cards in enabled sets will appear in the card list of the deck editor. - + Image priority is decided in the following order: - + first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) %1 is a link to the wiki - + Include cards rebalanced for Alchemy [requires restart] - + Card Art 카드 이미지 - + How to use custom card art - + Hints - + Note - + Sorting by column allows you to find a set while not changing set priority. - + To enable ordering again, click the column header until this message disappears. - + Use the current sorting as the set priority instead - + Sorts the set priority using the same column - + Manage sets @@ -11126,72 +10330,72 @@ Please refrain from engaging in this activity or further actions may be taken ag ZoneViewWidget - + Search by card name (or search expressions) - + Ungrouped - + Group by Type - + Group by Mana Value - + Group by Color - + Unsorted - + Sort by Name - + Sort by Type - + Sort by Mana Cost - + Sort by Colors - + Sort by P/T - + Sort by Set - + shuffle when closing 닫은 후 덱 섞기 - + pile view 카드 유형별 행 정렬 @@ -11199,7 +10403,7 @@ Please refrain from engaging in this activity or further actions may be taken ag i18n - + English 한국어 (Korean) @@ -11207,12 +10411,12 @@ Please refrain from engaging in this activity or further actions may be taken ag main - + Connect on startup - + Debug to file @@ -11226,7 +10430,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Deck Editor 덱 편집기 @@ -11307,7 +10511,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Replays @@ -11422,129 +10626,129 @@ Please refrain from engaging in this activity or further actions may be taken ag - - + + Load Deck from Clipboard... - + Edit Deck in Clipboard, Annotated - + Edit Deck in Clipboard - + New Deck - + Open Custom Pictures Folder - + Print Deck... - + Delete Card - - + + Reset Layout - + Save Deck - + Save Deck as... - + Save Deck to Clipboard, Annotated - + Save Deck to Clipboard, Annotated (No Set Info) - + Save Deck to Clipboard - + Save Deck to Clipboard (No Set Info) - + Load Local Deck... - + Load Remote Deck... - + Set Ready to Start - + Toggle Sideboard Lock - + Add Green Counter - + Remove Green Counter - + Set Green Counters... - + Add Red Counter - + Remove Red Counter - + Set Red Counters... - + Add Life Counter @@ -11554,744 +10758,724 @@ Please refrain from engaging in this activity or further actions may be taken ag - - Load deck from online service... - - - - - Load from website... - - - - + Unload Deck - + Force Start - + Add Card Counter (F) - + Remove Card Counter (F) - + Set Card Counters (F)... - + Add Card Counter (E) - + Remove Card Counter (E) - + Set Card Counters (E)... - + Add Card Counter(D) - + Remove Card Counter (D) - + Set Card Counters (D)... - + Add Card Counter (C) - + Remove Card Counter (C) - + Set Card Counters (C)... - + Add Card Counter (B) - + Remove Card Counter (B) - + Set Card Counters (B)... - + Add Card Counter (A) - + Remove Card Counter (A) - + Set Card Counters (A)... - + Remove Life Counter - + Set Life Counters... - + Add White Counter - + Remove White Counter - + Set White Counters... - + Add Blue Counter - + Remove Blue Counter - + Set Blue Counters... - + Add Black Counter - + Remove Black Counter - + Set Black Counters... - + Add Colorless Counter - + Remove Colorless Counter - + Set Colorless Counters... - + Add Other Counter - + Remove Other Counter - + Set Other Counters... - + Increment all card counters - + Add Power (+1/+0) - + Remove Power (-1/-0) - + Move Toughness to Power (+1/-1) - + Add Toughness (+0/+1) - + Remove Toughness (-0/-1) - + Move Power to Toughness (-1/+1) - + Add Power and Toughness (+1/+1) - + Remove Power and Toughness (-1/-1) - + Set Power and Toughness... - + Reset Power and Toughness - + Untap 언탭단 - + Upkeep 유지단 - + Draw 뽑기단 - + First Main Phase - + Start Combat - + Attack 공격자 선언단 - + Block 방어자 선언단 - + Damage 전투 피해단 - + End Combat - + Second Main Phase - + End 종료단 - + Next Phase - + Next Phase Action - + Next Turn - + Hide Card in Reveal Window - + Tap / Untap Card - + Untap All - + Toggle Skip Untapping Toggle Untap - + Turn Card Over - + Peek Card - + Play Card - + Play Card, Face Down - + Attach Card... - + Unattach Card - + Clone Card - + Create Token... - + Create All Related Tokens - + Create Another Token - + Set Annotation... - - Reduce Life by Power - - - - + Select All Cards in Zone - + Select All Cards in Row - + Select All Cards in Column - + Reveal Selected Cards to All Players - - + + Bottom of Library - - - - + + + + Exile 추방 영역 - - - - + + + + Graveyard 무덤 - - + + Hand 손 - - + + Top of Library - - + + Battlefield, Face Down - + Battlefield - + Library 서고 - + Sideboard 사이드보드 - + Top Cards of Library - + Bottom Cards of Library - + Close Recent View - - + + Stack - - + + Graveyard (Multiple) - - + + Graveyard (Multiple), Face Down - - + + Exile (Multiple) - - + + Exile (Multiple), Face Down - + Stack Until Found - + Draw Bottom Card - + Draw Multiple Cards from Bottom... - + Draw Arrow... - + Remove Local Arrows - + Leave Game - + Concede 항복 - + Roll Dice... - - Flip Coin - - - - + Shuffle Library - + Shuffle Top Cards of Library - + Shuffle Bottom Cards of Library - + Mulligan 멀리건 - + Mulligan (Same hand size) - + Mulligan (Hand size - 1) - + Draw a Card - + Draw Multiple Cards... - + Undo Draw - + Always Reveal Top Card - + Always Look At Top Card - + Sort Hand by Name - + Sort Hand by Type - + Sort Hand by Mana Value - + Reveal Hand to All Players - + Reveal Random Card to All Players - + Rotate View Clockwise - + Rotate View Counterclockwise - + Unfocus Text Box - + Focus Chat - + Clear Chat - + Refresh - + Skip Forward - + Skip Backward - + Skip Forward by a lot - + Skip Backward by a lot - + Play/Pause - + Toggle Fast Forward - + Home - + Visual Deck Storage - + Deck Storage - + Server - + Account - + Administration - + Logs diff --git a/cockatrice/translations/cockatrice_nl.ts b/cockatrice/translations/cockatrice_nl.ts index 882e50dae..773b042d2 100644 --- a/cockatrice/translations/cockatrice_nl.ts +++ b/cockatrice/translations/cockatrice_nl.ts @@ -2,7 +2,7 @@ AbstractCounter - + &Set counter... &Teller instellen... @@ -10,12 +10,12 @@ AbstractCounterDialog - + Set counter Teller instellen - + New value for counter '%1': Nieuwe waarde voor teller '%1': @@ -36,62 +36,62 @@ AbstractTabDeckEditor - + Open in new tab Open in nieuw tabblad - + Are you sure? Weet je het zeker? - + The decklist has been modified. Do you want to save the changes? De decklijst is gewijzigd. Wil je de wijzigingen opslaan? - - - - - - + + + + + + Error Foutmelding - + Could not open deck at %1 Kon het deckbestand niet openen: %1 - + Could not save remote deck Kon remote deck niet opslaan - - + + The deck could not be saved. Please check that the directory is writable and try again. Het deck kon niet opgeslagen worden. Kijk na of je schrijfrechten tot de folder hebt, en probeer opnieuw. - + Save deck Deck opslaan - + The deck could not be saved. Het deck kon niet opslagen worden. - + There are no cards in your deck to be exported Er zijn geen kaarten in je deck om te exporteren. @@ -107,12 +107,12 @@ Kijk na of je schrijfrechten tot de folder hebt, en probeer opnieuw. AdminNotesDialog - + Update Notes Update Notities - + Admin Notes for %1 Admin Notities voor %1 @@ -129,227 +129,172 @@ Kijk na of je schrijfrechten tot de folder hebt, en probeer opnieuw.Sideboard Sideboard - - - Tokens - - AppearanceSettingsPage - + seconds secondes - + Error Foutmelding - + Could not create themes directory at '%1'. Kon de themes map niet aanmaken op '%1'. - + Theme settings Thema opties - + Current theme: Huidige thema: - + Open themes folder Themasmap Openen - + Home tab background source: Starttabblad achtergrond bron: - + Home tab background shuffle frequency: Starttabblad achtergrond verversperiode. - + Disabled Uitgeschakeld - + + Display card name of background in bottom right: + Kaartnaam van achtergrond rechtsonder weergeven + + + Menu settings Menu instellingen - + Show keyboard shortcuts in right-click menus Laat snelkoppelingen in rechtermuisknop menus zien - + Show game filter toolbar above list in room tab Spelfilter werkbalk weergeven boven lijst in kamertab - + Card rendering Kaartweergave - + Display card names on cards having a picture Kaartnamen altijd weergeven op kaarten met een afbeelding - + Auto-Rotate cards with sideways layout Zijwaardse kaarten gedraaid weergeven - + Override all card art with personal set preference (Pre-ProviderID change behavior) Overschrijf alle kaart beelden met eigen set voorkeuren (Gedrag van voor implementatie van ProviderID) - - Light - - - - - Dark - - - - - System - - - - - Active theme palette: - - - - - Edit theme palette - - - - - Home tab settings - - - - - Display card name of background in bottom right - - - - - Styling settings - - - - - Style user list - - - - - Card printings - - - - + Bump sets that the deck contains cards from to the top in the printing selector Plaats sets van andere kaarten in het deck bovenin de drukselector - + Scale cards on mouse over Kaarten schalen met de muis - + Use rounded card corners Ronde kaarthoekjes - - Card layout - - - - + Minimum overlap percentage of cards on the stack and in vertical hand Minimum overlap percentage van kaarten op de stack en in verticale handweergave - + Maximum initial height for card view window: Grootste begingrootte voor kaartbekijkvenster - - + + rows rijen - + Maximum expanded height for card view window: Grootste uitgebreide grootte voor kaartbekijkvenster - + Card counters Kaart-counters - + Counter %1 Counter %1 - + Hand layout Handweergave - + Display hand horizontally (wastes space) Hand horizontaal weergeven (gebruikt extra ruimte) - + Enable left justification Linker justificatie inschakelen - + Table grid layout Tafelindeling - + Invert vertical coordinate Verticale coördinaat omkeren - + Minimum player count for multi-column layout: Minimaal aantal spelers voor kolommenindeling: - + Maximum font size for information displayed on cards: Maximale lettergrootte voor informatie die op kaarten wordt weergegeven: @@ -357,12 +302,12 @@ Kijk na of je schrijfrechten tot de folder hebt, en probeer opnieuw. ArchidektApiResponseDeckDisplayWidget - + Back to results Terug naar resultaten - + Open Deck in Deck Editor Open Deck in Deckbewerker @@ -388,112 +333,112 @@ Kijk na of je schrijfrechten tot de folder hebt, en probeer opnieuw. BanDialog - + ban &user name ban &gebruikersnaam - + ban &IP address ban &IP-adres - + ban client I&D ban gebruiker I&D - + Ban type Ban type - + &permanent ban &definitieve ban - + &temporary ban &tijdelijke ban - + &Days: &Dagen: - + &Hours: &Uur: - + &Minutes: &Minuten: - + Duration of the ban Duur van de ban - + Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. Voer een reden voor de ban in. Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de verbannen persoon. - + Please enter the reason for the ban that will be visible to the banned person. Voer een reden in die zichtbaar zal zijn voor de verbannen persoon. - + Redact all messages from this user in all rooms Verwijder alle berichten van deze gebruiker in alle kamers - + &OK &OK - + &Cancel &Annuleren - + Ban user from server Ban gebruiker van server - - - - + + + + Error Fout - + You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. U moet een ban gebaseerd op IP, naam, gebruikers ID of een combinatie van de drie. - + You must have a value in the name ban when selecting the name ban checkbox. U moet een naam meegeven als u een naam gebaseerde ban wilt uitvoeren. - + You must have a value in the ip ban when selecting the ip ban checkbox. U moet een IP meegeven als u een IP gebaseerde ban wilt uitvoeren. - + You must have a value in the clientid ban when selecting the clientid ban checkbox. U moet een gebruikers ID meegeven als u een gebruikers ID gebaseerde ban wilt uitvoeren. @@ -501,123 +446,59 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v BetaReleaseChannel - + Beta Beta - + No reply received from the release update server. Geen antwoord ontvangen van de release update server. - + Invalid reply received from the release update server. Ongeldig antwoord ontvangen van de release update server. - + No reply received from the file update server. Geen antwoord ontvangen van de bestandsupdateserver. - - CardArtPreviewWidget - - - No card selected - - - - - CardArtRulesModel - - - Card - - - - - ProviderId - - - - - Mode - - - - - Reason - - - CardDatabaseModel - + Name Naam - + Sets Sets - + Mana cost Manakosten - + Card type Kaarttype - + P/T P/T - + Color(s) Kleur(en) - - CardDatabaseView - - - Add to Deck - - - - - Add to Sideboard - - - - - Select Printing - - - - - Show on EDHRec (Commander) - - - - - Show on EDHRec (Card) - - - - - Show Related cards - - - CardFilter @@ -746,22 +627,22 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v CardInfoPictureWidget - + View related cards Bekijk gerelateerde kaarten - + Add card to deck Voeg kaart aan deck toe - + Mainboard Mainboard - + Sideboard Sideboard @@ -784,12 +665,12 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v Verzamelnummer: - + Related cards: Gerelateerde kaarten: - + Unknown card: Onbekende kaart: @@ -797,146 +678,128 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v CardMenu - + Re&veal to... &Onthul aan.... - + &All players &Alle spelers - + View related cards Bekijk gerelateerde kaarten - + Token: Token: - + All tokens Alle tokens - + &Select All &Selecteer Alle - + S&elect Row S&electeer Rij - + S&elect Column S&electeer Kolom - + &Play &Speel - + &Hide &Verberg - + Play &Face Down Speel kaart &verdekt - + &Tap / Untap Turn sideways or back again &Tap / Ontap - + Skip &untapping &Ontappen overslaan - + T&urn Over Turn face up/face down &Draai om - + &Peek at card face &Gluren naar de voorkant van kaart - + &Clone &Kloneer - + Attac&h to card... Aan de kaart &bevestigen.... - + Unattac&h &Losmaken - + &Draw arrow... &Teken pijl.... - + &Set annotation... Aantekeningen &zetten.... - - Reduce life by power - - - - + Ca&rd counters Kaart-&counters - + &Add counter (%1) Voeg counter &toe (%1) - + &Remove counter (%1) &Verwijder counter (%1) - + &Set counters (%1)... Counters &instellen (%1)... - - CardPictureLoaderCacheMethod - - - Network Cache - - - - - Filesystem - - - CardSizeWidget @@ -948,133 +811,133 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v CardZoneLogic - + their hand nominative hun hand - + %1's hand nominative %1s hand - + their library look at zone hun library - + %1's library look at zone %1s library - + of their library top cards of zone, van hun library - + of %1's library top cards of zone van %1s library - + their library reveal zone hun library - + %1's library reveal zone %1s library - + their library shuffle hun library - + %1's library shuffle %1s library - + their library nominative hun library - + %1's library nominative %1s library - + their graveyard nominative hun kerkhof - + %1's graveyard nominative %1s kerkhof - + their exile nominative hun verbannen - + %1's exile nominative %1s verbannen - + their sideboard look at zone hun sideboard - + %1's sideboard look at zone %1s sideboard - + their sideboard nominative hun sideboard - + %1's sideboard nominative %1s sideboard - + their custom zone '%1' nominative hun aangepaste zone '%1' - + %1's custom zone '%2' nominative %1s aangepaste zone '%2' @@ -1096,421 +959,16 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v Parseerfout op regel %1 kolom %2: - - ColorButton - - - Click to pick a color - - - - - Pick colour - - - - - ConnectionController - - - - The server has reached its maximum user capacity, please check back later. - - - - - There are too many concurrent connections from your address. - - - - - Banned by moderator - - - - - Expected end time: %1 - - - - - This ban lasts indefinitely. - - - - - Scheduled server shutdown. - - - - - - Invalid username. - - - - - You have been logged out due to logging in at another location. - - - - - Connection closed - - - - - The server has terminated your connection. -Reason: %1 - - - - - The server is going to be restarted in %n minute(s). -All running games will be lost. -Reason for shutdown: %1 - - - - - Scheduled server shutdown - - - - - Failed Login - - - - - Your client seems to be missing features this server requires for connection. - - - - - To update your client, go to 'Help -> Check for Client Updates'. - - - - - - - - - - - - - - - - - - - - - - Error - - - - - Incorrect username or password. Please check your authentication information and try again. - - - - - There is already an active session using this user name. -Please close that session first and re-login. - - - - - - You are banned until %1. - - - - - - You are banned indefinitely. - - - - - This server requires user registration. Do you want to register now? - - - - - This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. -Please close and reopen your client to try again. - - - - - An internal error has occurred, please close and reopen Cockatrice before trying again. -If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - - - - Account activation - - - - - Your account has not been activated yet. -You need to provide the activation token received in the activation email. - - - - - Server Full - - - - - Unknown login error: %1 - - - - - - -This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - - - - - - - - - Registration denied - - - - - Registration is currently disabled on this server - - - - - There is already an existing account with the same user name. - - - - - It's mandatory to specify a valid email address when registering. - - - - - It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. - - - - - Password too short. - - - - - Registration failed for a technical problem on the server. - - - - - The connection to the server has been lost. - - - - - Unknown registration error: %1 - - - - - Account activation failed - - - - - Socket error: %1 - - - - - Server timeout - - - - - You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. -Local version is %1, remote version is %2. - - - - - Your Cockatrice client is obsolete. Please update your Cockatrice version. -Local version is %1, remote version is %2. - - - - - - Success - - - - - Registration accepted. -Will now login. - - - - - Account activation accepted. -Will now login. - - - - - Information - - - - - This server supports additional features that your client doesn't have. -This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. - -To update your client, go to Help -> Check for Updates. - - - - - - - Reset Password - - - - - Your password has been reset successfully, you can now log in using the new credentials. - - - - - Failed to reset user account password, please contact the server operator to reset your password. - - - - - Activation request received, please check your email for an activation token. - - - - - Connecting to %1... - - - - - Registering to %1 as %2... - - - - - Disconnected - - - - - Connected, logging in at %1 - - - - - Requesting forgotten password to %1 as %2... - - - - - Your username must respect these rules: - - - - - is %1 - %2 characters long - - - - - can %1 contain lowercase characters - - - - - - - - NOT - - - - - can %1 contain uppercase characters - - - - - can %1 contain numeric characters - - - - - can contain the following punctuation: %1 - - - - - first character can %1 be a punctuation mark - - - - - no unacceptable language as specified by these server rules: - note that the following lines will not be translated - - - - - can not contain any of the following words: %1 - - - - - can not match any of the following expressions: %1 - - - - - You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - - CustomZoneMenu - + C&ustom Zones &Aangepaste Zone - - + + View custom zone '%1' Aangepaste zone '%1' bekijken @@ -1518,35 +976,30 @@ To update your client, go to Help -> Check for Updates. DeckAnalyticsWidget - + Add Panel Paneel Toevoegen - + Remove Panel Paneel Verwijderen - + Save Layout Indeling Opslaan - + Load Layout Indeling Laden - - - Include Sideboard - - DeckEditorCardDatabaseDockWidget - + Card Database Kaartdatabase @@ -1562,17 +1015,47 @@ To update your client, go to Help -> Check for Updates. DeckEditorDatabaseDisplayWidget - + Search by card name (or search expressions) Zoek op kaartnaam (of zoekexpressies) - + + Add to Deck + Toevoegen aan deck + + + + Add to Sideboard + Toevoegen aan sideboard + + + + Select Printing + Selecteer Druk + + + + Show on EDHRec (Commander) + Bekijk op EDHRec (Commander) + + + + Show on EDHRec (Card) + Bekijk op EDHRec (Kaart) + + + + Show Related cards + Gerelateerde kaarten tonen + + + Add card to &maindeck Kaart aan deck &toevoegen - + Add card to &sideboard Kaart aan &sideboard toevoegen @@ -1605,72 +1088,72 @@ To update your client, go to Help -> Check for Updates. Kleuren - + Select Printing Selecteer Druk - + Deck Deck - + Deck &name: Deck&naam: - + Banner Card/Tags Visibility Settings Vaandelkaart/Tags zichtbaarheidsinstellingen - + Show banner card selection menu Selectiemenu van vaandelkaarten weergeven - + Show tags selection menu Selectiemenu van tags weergeven - + &Comments: &Opmerkingen: - + Group by: Groepeer op: - + Format: Format: - + Hash: Hash: - + &Increment number Ver&hoog getal - + &Decrement number Ver&laag getal - + &Remove row Ver&wijder rij - + Swap card to/from sideboard Wissel kaart van/naar sideboard @@ -1678,17 +1161,17 @@ To update your client, go to Help -> Check for Updates. DeckEditorFilterDockWidget - + Filters Filters - + &Clear all filters &Wis alle filters - + Delete selected Selectie verwijderen @@ -1819,113 +1302,169 @@ To update your client, go to Help -> Check for Updates. DeckEditorSettingsPage - - + + Update Spoilers Update Spoilers - + + Success Succes - + Download URLs have been reset. Download URL's zijn gereset. - + + Downloaded card pictures have been reset. + Gedownloade kaartafbeeldingen's zijn gereset. + + + + Error + Fout + + + + One or more downloaded card pictures could not be cleared. + Een of meer gedownloade kaartafbeeldingen konden niet worden gewist. + + + Add URL URL toevoegen - - + + URL: URL: - - + + Edit URL URL bewerken - + + Network Cache Size: + Netwerk Cache Grootte: + + + + Redirect Cache TTL: + Redirect Cache TTL: + + + + How long cached redirects for urls are valid for. + Hoe lang cached redirects voor urls geldig zijn + + + + Picture Cache Size: + Afbeeldingen Cache Grootte: + + + Add New URL Nieuwe URL toevoegen - + Remove URL URL verwijderen - + + Day(s) + Dag(en) + + + Updating... Bijwerken... - + Choose path Kies locatie - + URL Download Priority URL Download Prioriteit - + Spoilers Spoilers - + Download Spoilers Automatically Spoilers Automatisch Downloaden - + Spoiler Location: Spoiler Locatie: - + Last Change Laatste Wijziging - + Spoilers download automatically on launch Spoilers downloaden automatisch bij opstarten - + Press the button to manually update without relaunching Druk op de knop om handmatig bij te werken zonder opnieuw te starten. - + Do not close settings until manual update is complete Sluit de instellingen niet af voordat de handmatige update is voltooid - + Download card pictures on the fly Kaartafbeeldingen on the fly downloaden - + How to add a custom URL Hoe een aangepaste URL toe te voegen - + + Delete Downloaded Images + Gedownloade Afbeeldingen Verwijderen + + + Reset Download URLs Reset Download URL's + + + On-disk cache for downloaded pictures + Cache op schijf voor gedownloade afbeeldingen + + + + In-memory cache for pictures not currently on screen + Cache in geheugen voor afbeeldingen die momenteel niet op het scherm staan + DeckListHistoryManagerWidget @@ -1991,12 +1530,12 @@ To update your client, go to Help -> Check for Updates. DeckLoader - + Common deck formats (%1) Algemene deckformaten (%1) - + All files (*.*) Alle bestanden (*.*) @@ -2218,27 +1757,27 @@ To update your client, go to Help -> Check for Updates. Toegevoegd (%1): %2 (%3) %4 - + Moved to %1 1 × "%2" (%3) Verplaatst naar %1 1 × "%2" (%3) - + Removed "%1" (all copies) Verwijderd "%1" (alle exemplaren) - + %1 1 × "%2" (%3) %1 1 × "%2" (%3) - + Added Toegevoegd - + Removed Verwijderd @@ -2260,75 +1799,75 @@ To update your client, go to Help -> Check for Updates. DeckViewContainer - + Load deck... Deck laden... - + Load remote deck... Laad extern deck... - + Load from clipboard... Van klembord laden.... - + Load from website... Van website laden... - + Unload deck Deck uitladen - + Ready to start Gereed voor begin - + Force start Geforceerd starten - + Sideboard unlocked Sideboard ontgrendeld - + Sideboard locked Sideboard vergrendeld - - + + Error Fout - + The selected file could not be loaded. Het geselecteerde bestand kon niet geladen worden. - + Deck is greater than maximum file size. Deck is groter dan maximum bestandsgrootte. - + Are you sure you want to force start? This will kick all non-ready players from the game. Weet je zeker dat je geforceerd beginnen wil? Dit zal alle spelers die niet gereed zijn van het spel verwijderen. - + Cockatrice Cockatrice @@ -2429,7 +1968,7 @@ Wil je het deck omzetten naar het .cod-formaat? - + Webpage Website @@ -2469,37 +2008,37 @@ Wil je het deck omzetten naar het .cod-formaat? Verbinding maken met server - + Server URL Server URL - + Communication Port Communicatiepoort - + Unique Server Name Unieke Servernaam - + Connection Warning Verbindingswaarschuwing - + You need to name your new connection profile. U moet het nieuwe verbindingsprofiel een naam geven. - + Connect Warning Verbindingswaarschuwing - + The player name can't be empty. De naam van de speler mag niet leeg zijn. @@ -2612,17 +2151,17 @@ Wil je het deck omzetten naar het .cod-formaat? Spel aanmaken - + Game information Spelgegevens - + Error Fout - + Server error. Server Fout @@ -2630,97 +2169,97 @@ Wil je het deck omzetten naar het .cod-formaat? DlgCreateToken - + &Name: &Naam: - + Token Token - + C&olor: Kle&ur: - + white wit - + blue blauw - + black zwart - + red rood - + green groen - + multicolor veelkleurig - + colorless kleurloos - + &P/T: &P/T: - + &Annotation: &Annotatie: - + &Destroy token when it leaves the table &Vernietig token als het de tafel verlaat - + Create face-down (Only hides name) Verdekt aanmaken (Verbergt alleen naam) - + Token data Token data - + Show &all tokens Laat &alle tokens zien - + Show tokens from this &deck Laat tokens van dit &dek zien - + Choose token from list Kies token uit lijst - + Create token Maak token @@ -2754,7 +2293,7 @@ Wil je het deck omzetten naar het .cod-formaat? - + ✖ ✖ @@ -2769,12 +2308,12 @@ Wil je het deck omzetten naar het .cod-formaat? Naam van tag mog niet leeg zijn! - + Duplicate Tag Tag Dupliceren - + This tag already exists. Deze tag bestaat al. @@ -2961,12 +2500,12 @@ Om je avatar te verwijderen, accepteer zonder een nieuwe afbeelding te kiezen.Gelieve de naam van de token in te voeren: - + Error Fout - + The chosen name conflicts with an existing card or token. Make sure to enable the 'Token' set in the "Manage sets" dialog to display them correctly. De gekozen naam is al in gebruik door een bestaande kaart of token. @@ -2991,12 +2530,12 @@ Zorg ervoor dat u de 'Token' set in het " Beheer sets" dialo Onbekend - + Real name: Echte naam: - + Edit user profile Gebruikers profiel aanpassen @@ -3034,113 +2573,113 @@ Zorg ervoor dat u de 'Token' set in het " Beheer sets" dialo 2 uur - + Hide 'buddies only' games Verberg 'alleen maatjes' spellen - + Hide full games Verberg volle spellen - + Hide games that have started Verberg spellen die al begonnen zijn - + Hide password protected games Verberg met wachtwoord vergrendelde spellen - + Hide 'ignored user' games Verberg spellen door 'genegeerde' gebruikers - + Hide games not created by buddies Hide games not created by buddy Verberg spellen niet aangemaakt door maatjes - + Hide games with forced open decklists Verberg spellen met gedwongen open decklijsten - + &Newer than: &Nieuwer dan: - + Game &description: Spel &omschrijving: - + &Creator name: Naam van &maker: - + General Algemeen - + &Game types &Spel types - + at &least: ten&minste: - + at &most: op zijn &hoogst: - + Maximum player count Maximale aantal spelers - + Restrictions Restricties - + Show games only if &spectators can watch Laat alleen spellen zien als &toeschouwers kunnen kijken - + Show spectator password p&rotected games Laat spellen zien met &wachtwoord voor toeschouwers - + Show only if spectators can ch&at Laat alleen spellen zien als toeschouwers kunnen &chatten - + Show only if spectators can see &hands Laat alleen spellen zien als toeschouwers &handen kunnen zien - + Spectators Toeschouwers - + Filter games Spellen filteren @@ -3451,37 +2990,37 @@ https://tappedout.net/mtg-decks/your-deck-name/ DlgMoveTopCardsUntil - + Card name (or search expressions): Kaart naam (of zoekexpressies) - + Number of hits: Hoeveelheid resultaten: - + Auto play hits Speel resultaten automatisch - + Put top cards on stack until... Plaats bovenste kaart op stack totdat... - + No cards matching the search expression exists in the card database. Proceed anyways? Er zijn geen kaarten die bij deze zoekopdracht passen in de kaartendatabase. Toch doorgaan? - + Cockatrice Cockatrice - + Invalid filter Ongeldige filter @@ -3541,40 +3080,40 @@ Je email zal gebruikt worden om je account te controleren. Onbekend - + Real name: Echte naam: - + Register to server Registreer op server - - - - + + + + Registration Warning Registratie Waarschuwing - + Your password is too short. Je wachtwoord is te kort. - + Your passwords do not match, please try again. Uw wachtwoorden komen niet overeen, probeer opnieuw. - + Your email addresses do not match, please try again. Uw email adressen komen niet overeen, probeer opnieuw. - + The player name can't be empty. Spelersnaam kan niet leeg zijn. @@ -3582,17 +3121,17 @@ Je email zal gebruikt worden om je account te controleren. DlgRollDice - + Number of sides: Aantal zijden: - + Number of dice: Aantal dobbelstenen: - + Roll Dice Werp Dobbelstenen @@ -3643,12 +3182,12 @@ Je email zal gebruikt worden om je account te controleren. DlgSettings - + Unknown Error loading card database Onbekende Fout in het lezen van de kaart database - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -3665,7 +3204,7 @@ U zou oracle moeten herstarten om uw database te updaten. Zou u de locatie van uw database willen veranderen? - + Your card database version is too old. This can cause problems loading card information or images @@ -3682,7 +3221,7 @@ Dit zou mogelijk opgelost worden door oracle opnieuw te starten en je kaart data Wil je de locatie van je database veranderen? - + Your card database did not finish loading Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached @@ -3695,7 +3234,7 @@ Plaats een klacht op https://github.com/Cockatrice/Cockatrice/issues met uw card Wilt u uw database lokatie aanpassen? - + File Error loading your card database. Would you like to change your database location setting? @@ -3704,7 +3243,7 @@ Would you like to change your database location setting? Wilt u uw database lokatie aanpassen? - + Your card database was loaded but contains no cards. Would you like to change your database location setting? @@ -3713,7 +3252,7 @@ Would you like to change your database location setting? Wilt u uw database lokatie aanpassen? - + Unknown card database load status Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues @@ -3726,64 +3265,59 @@ Plaats een klacht op https://github.com/Cockatrice/Cockatrice/issues asltublieft Wilt u uw database lokatie aanpassen? - - - + + + Error Fout - + The path to your deck directory is invalid. Would you like to go back and set the correct path? Het pad naar uw deck map is niet geldig. Wilt u terug gaan en de correcte pad invullen? - + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? Het pad naar uw kaart afbeelding map is niet geldig. Wil je terug gaan en het juiste pad invullen? - + Settings Instellingen - + General Algemeen - + Appearance Weergave - + User Interface Gebruikersomgeving - - Storage - - - - + Card Sources Kaart Bronnen - + Chat Chat - + Sound Geluid - + Shortcuts Sneltoetsen @@ -3877,9 +3411,9 @@ Je kan altijd dit gedrag aanpassen in de "Algemeen" instellingtab. - - - + + + Error Fout @@ -3932,31 +3466,31 @@ Ga naar de downloadpagina om handmatig bij te werken. - + Update Available Update Beschikbaar - + A new version of Cockatrice is available! Een nieuwe versie van Cockatrice is beschikbaar! - + New version Nieuwe versie - + Released Released - + Changelog Changelog @@ -3966,51 +3500,51 @@ Ga naar de downloadpagina om handmatig bij te werken. Wilt u nu updaten? - + Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. Helaas, de automatische bewerker is niet geslaagd in het vinden van een toepasselijke download. Je moet misschien handmatig de nieuwe versie downloaden. - + Please check the <a href="%1">releases page</a> on our Github and download the build for your system. Controleer alsjeblieft de <a href="%1">releases pagina</a>op onze Github en download de versie voor jouw systeem. - - - + + + Update Error Update Fout - + An error occurred while checking for updates: Er is een fout opgetreden bij het controleren op updates: - + An error occurred while downloading an update: Er is een fout opgetreden tijdens het downloaden van een update: - + Installing... Installeren... - + Cockatrice is unable to open the installer. Cockatrice kan het installatieprogramma niet openen. - + Try to update manually by closing Cockatrice and running the installer. Probeer handmatig bij te werken door Cockatrice te sluiten en het installatieprogramma uit te voeren. - + Download location Download locatie @@ -4100,67 +3634,67 @@ Je moet misschien handmatig de nieuwe versie downloaden. DrawProbabilityWidget - + Draw Probability Raapkans - + Probability of drawing Kans op rapen - + Card Name Kaartnaam - + Type Type - + Subtype Subtype - + Mana Value Manawaarde - + At least Minstens - + Exactly Precies - + card(s) having drawn at least kaart(en) na het rapen van - + cards kaarten - + Category Kategorie - + Qty Hoeveel - + Odds (%) Kans (%) @@ -4274,7 +3808,7 @@ Je moet misschien handmatig de nieuwe versie downloaden. FilterBuilder - + Type your filter here Typ hier uw filter in @@ -4305,22 +3839,22 @@ Je moet misschien handmatig de nieuwe versie downloaden. GameEventHandler - + kicked by game host or moderator er uit geschopt door spelmaker of moderator - + player left the game speler heeft het spel verlaten - + player disconnected from server speler verbrak verbinding van server - + reason unknown reden onbekend @@ -4328,140 +3862,140 @@ Je moet misschien handmatig de nieuwe versie downloaden. GameSelector - - - - - - - - - + + + + + + + + + Error Fout - + Please join the appropriate room first. Gelieve eerst naar de juiste kamer te gaan. - + Wrong password. Verkeerd wachtwoord. - + Spectators are not allowed in this game. Toeschouwers zijn niet toegelaten in dit spel. - + The game is already full. Dit spel is reeds vol. - + The game does not exist any more. Het spel bestaat niet meer. - + This game is only open to registered users. Dit spel is alleen toegankelijk voor geregistreerde gebruikers. - + This game is only open to its creator's buddies. Dit spel is alleen toegankelijk voor de maatjes van de maker van dit spel. - + You are being ignored by the creator of this game. Je wordt genegeerd door de maker van dit spel. - + Join Game Aansluiten bij spel - + Spectate Game Spel Toeschouwen - + Game Information Spelgegevens - + Join Game as Judge Bij Spel Aansluiten als Judge - + Spectate Game as Judge Spel Toeschouwen als Judge - + Join game Aansluiten bij spel - + Password: Wachtwoord: - + Please join the respective room first. Gelieve eerst bij de betreffende kamer aan te sluiten. - + &Filter games &Filter spellen - + C&lear filter W&is filter - + C&reate C&reëer - + &Join &Aansluiten - + Join as judge Aansluiten als judge - + J&oin as spectator &Aansluiten als toeschouwer - + Join as judge spectator Aansluiten als judge toeschouwer - + Games shown: %1 / %2 Spellen weergegeven: %1 / %2 - + Games Spellen @@ -4469,32 +4003,32 @@ Je moet misschien handmatig de nieuwe versie downloaden. GameSelectorQuickFilterToolBar - + All types Alle types - + Filter by game name... Filter op spelnaam... - + Filter by game type/format Filter op speltype/format - + Hide games not created by buddies Verberg spellen niet gemaakt door maatjes - + Hide full games Verberg volle spellen - + Hide started games Verberg begonnen spellen @@ -4502,105 +4036,105 @@ Je moet misschien handmatig de nieuwe versie downloaden. GamesModel - + >1 day >1 dag - + %1%2 hr short age in hours %1%2 uur%1%2 uur - + new nieuw - + %1%2 min short age in minutes %1%2 min%1%2 min - + password wachtwoord - + buddies only alleen maatjes - + reg. users only enkel geregistreerde gebruikers - + open decklists decklijsten gedeeld + - can chat kan praten - + see hands zie handen - + can see hands kan handen zien - + not allowed niet toegelaten - + Room Kamer - + Age Ouderdom - + Description Omschrijving - + Creator Maker - + Type Type - + Restrictions Restricties - + Players Spelers - + Spectators Toeschouwers @@ -4608,158 +4142,143 @@ Je moet misschien handmatig de nieuwe versie downloaden. GeneralSettingsPage - + Reset all paths Reset alle bestandspaden - + All paths have been reset Alle bestandspaden zijn gereset - - - - - - - + + + + + + + Choose path Kies pad - - Language settings - + + Personal settings + Persoonlijke instellingen - + Language: Taal: - - Version settings - - - - - Card database - - - - - Startup settings - - - - + Paths (editing disabled in portable mode) Locaties (bewerken uitgeschakeld in "portable mode") - + Paths Paden - + How to help with translations Hoe met vertalen te helpen - + Decks directory: Map voor decks: - + Filters directory: Filters map: - + Replays directory: Map voor replays: - + Pictures directory: Map voor afbeeldingen: - + Card database: Kaartdatabase: - + Custom database directory: Custom database map: - + Token database: Token-database - + Update channel Updatekanaal - + Check for client updates on startup Controleren op client-updates bij opstarten - + Check for card database updates on startup Controleren op kaartendatabasebewerkingen bij opstarten - + Don't check Niet controleren - + Prompt for update Vragen om bewerking - + Always update in the background Altijd in achtergrond bewerken - + Check for card database updates every Controleren op kaartendatabasebewerkingen iedere - + days dagen - + Notify if a feature supported by the server is missing in my client Waarschuw als een functie die is ondersteund door de server mist in mijn client - + Automatically run Oracle when running a new version of Cockatrice Oracle automatisch uitvoeren bij het opstarten van een nieuwe versie van Cockatrice - + Show tips on startup Toon tips bij het opstarten - + Last update check on %1 (%2 days ago) Laatste controle op %1 (%2 dagen geleden) @@ -4767,47 +4286,47 @@ Je moet misschien handmatig de nieuwe versie downloaden. GraveyardMenu - + &Graveyard &Graveyard - + &View graveyard &Bekijk graveyard - + &Move graveyard to... &Verplaats graveyard naar... - + &Top of library &Bovenkant van library - + &Bottom of library &Onderkant van library - + &All players &Alle spelers - + &Hand &Hand - + &Exile &Exile - + Reveal random card to... Onthul willekeurige kaart aan... @@ -4815,88 +4334,88 @@ Je moet misschien handmatig de nieuwe versie downloaden. HandMenu - + &Hand &Hand - + &View hand &Bekijk hand - + Sort hand by... Sorteer hand op... - + Name Naam - + Type Type - + Mana Value Manawaarde - + Take &mulligan (Choose hand size) Neem &mulligan (Kies handgrootte) - + Take mulligan (Same hand size) Neem mulligan (Dezelfde handgrootte) - + Take mulligan (Hand size - 1) Neem mulligan (Handgrootte - 1) - + &Move hand to... &Verplaats hand naar.... - + &Top of library &Bovenkant van library - + &Bottom of library &Onderkant van library - + &Graveyard &Graveyard - + &Exile &Exile - + &Reveal hand to... &Onthul hand aan.... - - + + All players Alle spelers - + Reveal r&andom card to... Onthul &willekeurige kaart aan.... @@ -4904,52 +4423,52 @@ Je moet misschien handmatig de nieuwe versie downloaden. HomeWidget - + Create New Deck Maak Nieuw Deck - + Browse Decks Decks Doorbladeren - + Browse Card Database Kaartendatabase Doorbladeren - + Browse EDHRec EDHRec Doorbladeren - + Browse Archidekt Archidekt Doorbladeren - + View Replays Replays Inzien - + Quit Sluiten - + Connecting... Verbinden... - + Connect Verbinden - + Play Spelen @@ -4957,213 +4476,213 @@ Je moet misschien handmatig de nieuwe versie downloaden. LibraryMenu - + &Library &Library - + &View library &Bekijk library - + View &top cards of library... Bekijk &bovenste kaarten van library.... - + View bottom cards of library... Bekijk onderste kaarten van library... - + Reveal &library to... Onthul &library aan... - + Lend library to... Leen library aan... - + Reveal &top cards to... &Onthul bovenste kaarten aan.... - + &Top of library... &Bovenkant van library... - + &Bottom of library... &Onderkant van library... - + &Always reveal top card Toon &altijd bovenste kaart - + &Always look at top card &Altijd bovenste kaart bekijken - + &Open deck in deck editor &Open deck in deckbewerker - + &Draw card &Raap kaart - + D&raw cards... R&aap kaarten... - + &Undo last draw &Ontdoe laatste raap - + Shuffle Schudden - + &Play top card &Speel bovenste kaart - + Play top card &face down Speel bovenste kaart &verdekt - + Put top card on &bottom Leg bovenste kaart aan de &onderkant - + Move top card to grave&yard Verplaats bovenste kaart naar grave&yard - + Move top card to e&xile Verplaats bovenste kaart naar exile - + Move top cards to &graveyard... Verplaats bovenste kaarten naar &graveyard.... - + Move top cards to graveyard face down... Verplaats bovenste kaarten naar &graveyard verdekt.... - + Move top cards to &exile... Verplaats bovenste kaarten naar &exile.... - + Move top cards to exile face down... Verplaats bovenste kaarten naar exile verdekt.... - + Put top cards on stack &until... Plaats bovenste kaart op stack &totdat... - + Shuffle top cards... Schud bovenste kaarten... - + &Draw bottom card &Raap onderste kaart - + D&raw bottom cards... R&aap onderste kaarten... - + &Play bottom card &Speel onderste kaart - + Play bottom card &face down Speel onderste kaart &verdekt - + Move bottom card to grave&yard Verplaats onderste kaart naar grave&yard - + Move bottom card to e&xile Verplaats onderste kaart naar e&xile - + Move bottom cards to &graveyard... Verplaats onderste kaarten naar &graveyard.... - + Move bottom cards to graveyard face down... Verplaats onderste kaarten naar graveyard verdekt.... - + Move bottom cards to &exile... Verplaats onderste kaarten naar &exile... - + Move bottom cards to exile face down... Verplaats onderste kaarten naar exile verdekt... - + Put bottom card on &top Leg onderste kaart &bovenop - + Shuffle bottom cards... Schud onderste kaarten... - - + + &All players &Alle spelers - + Reveal top cards of library Onthul bovenste kaarten van library - + Number of cards: (max. %1) Aantal kaarten: (max. %1) @@ -5171,302 +4690,668 @@ Je moet misschien handmatig de nieuwe versie downloaden. MainWindow - - + + + The server has reached its maximum user capacity, please check back later. + De server heeft zijn maximale gebruikerscapaciteit bereikt, controleer later nogmaals. + + + + There are too many concurrent connections from your address. + Er zijn te veel gelijktijdige verbindingen vanaf uw adres. + + + + Banned by moderator + Verbannen door moderator + + + + Expected end time: %1 + Verwachte eindtijd: %1 + + + + This ban lasts indefinitely. + Deze verbanning duurt voor onbepaalde tijd. + + + + Scheduled server shutdown. + Geplande stillegging van de server. + + + + + Invalid username. + Ongeldige spelersnaam. + + + + You have been logged out due to logging in at another location. + U bent uitgelogd omdat u op een andere locatie bent ingelogd. + + + + Connection closed + Connectie verbroken + + + + The server has terminated your connection. +Reason: %1 + De server heeft uw verbinding beëindigd. +Reden: %1 + + + + The server is going to be restarted in %n minute(s). +All running games will be lost. +Reason for shutdown: %1 + De server wordt binnen een minuut opnieuw opgestart. +Alle lopende spellen zullen verloren gaan. +Reden voor de sluiting: %1De server wordt binnen %n minuten opnieuw opgestart. +Alle lopende spellen zullen verloren gaan. +Reden voor de sluiting: %1 + + + + Scheduled server shutdown + Geplande stillegging server + + + + + Success + Succesvol + + + + Registration accepted. +Will now login. + Registratie geaccepteerd. +Logt nu in. + + + + Account activation accepted. +Will now login. + Account activering geaccepteerd. +Logt nu in. + + + + Player %1 Speler %1 - + Load replay Laad replay - + About Cockatrice Over Cockatrice - + Version Versie - + Cockatrice Webpage Cockatrice Webpagina - + Project Manager: Project Manager: - + Past Project Managers: Vroegere projectmanagers: - + Developers: Ontwikkelaars: - + Our Developers Onze ontwikkelaars - + Help Develop! Help ontwikkelen! - + Translators: Vertalers: - + Our Translators Onze Vertalers - + Help Translate! Help Vertalen! - + Support: Steun: - + Report an Issue Een probleem melden - + Troubleshooting Probleemoplossing - + F.A.Q. F.A.Q. - - + + + + + + + + + + + + + + + + + + + + Error Fout - + + Server timeout + Time-out van de server + + + + Failed Login + Gefaalde Login + + + + Your client seems to be missing features this server requires for connection. + Uw client lijkt functies te missen die deze server nodig heeft voor de verbinding. + + + + To update your client, go to 'Help -> Check for Client Updates'. + Om uw client bij te werken, gaat u naar 'Hulp -> Controleer op Client Updates'. + + + + Incorrect username or password. Please check your authentication information and try again. + Onjuiste gebruikersnaam of wachtwoord. Controleer uw verificatiegegevens en probeer het opnieuw. + + + + There is already an active session using this user name. +Please close that session first and re-login. + Er is al een actieve sessie bezig met deze gebruikersnaam. +Gelieve die sessie eerst af te sluiten en opnieuw in te loggen. + + + + + You are banned until %1. + Je bent banned tot %1. + + + + + You are banned indefinitely. + Je bent voor onbepaalde tijd banned. + + + + This server requires user registration. Do you want to register now? + Deze server vereist een gebruikersregistratie. Wilt u zich nu registreren? + + + + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. + Deze server vereist client ID's. Uw client slaagt er niet in een ID te genereren of u heeft een aangepaste client. +Gelieve uw client te sluiten en te heropenen om het opnieuw te proberen. + + + + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. + Er is een interne fout opgetreden, gelieve uw client te sluiten en te heropenen alvorens het opnieuw te proberen. +Als de fout zich blijft voordoen, controleer dan of u de laatste versie van de software gebruikt en neem indien nodig contact op met de softwareontwikkelaars. + + + + Account activation + Account activering + + + + Your account has not been activated yet. +You need to provide the activation token received in the activation email. + Uw account is nog niet geactiveerd. +U moet de activeringscode die u in de activeringsmail hebt ontvangen, invullen. + + + + Server Full + Server Vol + + + + Unknown login error: %1 + Onbekende aanmeldingsfout: %1 + + + + + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. + +Dit betekent meestal dat uw clientversie verouderd is en dat de server een antwoord heeft gestuurd dat uw client niet begrijpt. + + + + Your username must respect these rules: + Uw gebruikersnaam moet aan deze regels voldoen: + + + + is %1 - %2 characters long + is %1 - %2 karakters lang + + + + can %1 contain lowercase characters + kan %1 kleine letters bevatten. + + + + + + + NOT + NIET + + + + can %1 contain uppercase characters + kan %1 hoofdletters bevatten + + + + can %1 contain numeric characters + kan %1 numerieke tekens bevatten + + + + can contain the following punctuation: %1 + kan de volgende leestekens bevatten: %1 + + + + first character can %1 be a punctuation mark + eerste teken kan %1 een leesteken zijn. + + + + no unacceptable language as specified by these server rules: + note that the following lines will not be translated + geen onacceptabel taalgebruik als aangegeven door deze server regels: + + + + can not contain any of the following words: %1 + mag niet een van de volgende woorden bevatten: %1 + + + + can not match any of the following expressions: %1 + mag niet overeenkomen met een van de volgende expressies: %1 + + + + You may only use A-Z, a-z, 0-9, _, ., and - in your username. + U mag alleen A-Z, a-z, 0-9, _, ., en - in uw gebruikersnaam gebruiken. + + + + + + + + + Registration denied + Registratie geweigerd + + + + Registration is currently disabled on this server + Registratie is momenteel uitgeschakeld op deze server. + + + + There is already an existing account with the same user name. + Er bestaat al een bestaand account met dezelfde gebruikersnaam. + + + + It's mandatory to specify a valid email address when registering. + Het is verplicht om een geldig e-mailadres op te geven bij de registratie. + + + + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + Het lijkt erop dat u probeert een nieuw account te registreren op deze server, maar dat u al een account hebt geregistreerd met de verstrekte e-mail. Deze server beperkt het aantal accounts dat een gebruiker per adres kan registreren. Neem contact op met de serverbeheerder voor verdere hulp of om uw gegevens te verkrijgen. + + + + Password too short. + Wachtwoord te kort. + + + + Registration failed for a technical problem on the server. + De registratie is mislukt wegens een technisch probleem op de server. + + + + The connection to the server has been lost. + De verbinding met de server is verloren gegaan. + + + + Unknown registration error: %1 + Onbekende registratiefout: %1 + + + + Account activation failed + Account activering mislukt + + + + Socket error: %1 + Socket error: %1 + + + + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + U probeert verbinding te maken met een verouderde server. Gelieve uw Cockatrice versie te downgraden of verbinding te maken met een geschikte server. +Lokale versie is %1, externe versie is %2. + + + + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + Uw Cockatrice klant is verouderd. Gelieve uw Cockatrice versie bij te werken. +Lokale versie is %1, externe versie is %2. + + + + Connecting to %1... + Verbinding maken met %1.... + + + + Registering to %1 as %2... + Registreren bij %1 als %2.... + + + + Disconnected + Verbinding verbroken + + + + Connected, logging in at %1 + Verbonden, inloggen bij %1 + + + + + + Requesting forgotten password to %1 as %2... + Aanvragen van vergeten wachtwoord tot %1 als %2... + + + &Connect... &Verbinden.... - + &Disconnect V&erbinding verbreken - + Start &local game... Start &plaatselijk spel.... - + &Watch replay... &Bekijk replay... - + &Full screen &Volledig scherm - + &Register to server... &Registreer bij server... - + &Restore password... &Reset wachtwoord... - + &Settings... &Instellingen.... - + &Exit &Afsluiten - + A&ctions Act&ies - + &Cockatrice &Cockatrice - + C&ard Database &Kaartdatabase: - + &Manage sets... &Beheer sets... - + Edit custom &tokens... Aangepaste &tokens bewerken - + Open custom image folder Open map voor aangepaste afbeeldingen - + Open custom sets folder Open aangepaste sets map - + Add custom sets/cards Aangepaste sets/kaarten toevoegen - + Reload card database Kaartendatabase opniew laden - + Tabs Tabs - + &Help &Hulp - + &About Cockatrice &Over Cockatrice - + &Tip of the Day &Tip van de Dag - + Check for Client Updates Controleren op Client-updates - + Check for Card Updates... Kijk of er kaartupdates zijn... - + Check for Card Updates (Automatic) Controleren op kaartbewerkingen (Automatisch) - + Show Status Bar Statusbalk Weergeven - + View &Debug Log Bekijk &debug log - + Open Settings Folder Instellingsmap Openen - + Show/Hide Tonen/Verbergen - + New Version Niewe Versie - + Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. Gefeliciteerd met de update naar Cockatrice %1! Oracle zal nu starten om uw kaartendatabase bij te werken. - + Cockatrice installed Cockatrice geinstalleerd - + Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. Gefeliciteerd met het installeren van Cockatrice %1! Oracle zal nu starten om uw kaartendatabase bij te werken. - + Card database Kaartdatabase - + Cockatrice is unable to load the card database. Do you want to update your card database now? If unsure or first time user, choose "Yes" Cockatrice kan de kaartendatabase niet laden. - - + + Yes Ja - - + + No Nee - + Open settings Open instellingen - + New sets found Nieuwe sets gevonden - + %n new set(s) found in the card database Set code(s): %1 Do you want to enable it/them? @@ -5477,22 +5362,17 @@ Set codes: %1 Wilt u deze inschakelen? - - Yes, always enable - - - - + View sets Bekijk sets - + Welcome Welkom - + Hi! It seems like you're running this version of Cockatrice for the first time. All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. @@ -5501,133 +5381,167 @@ Alle sets in de kaartendatabase zijn ingeschakeld. Lees meer over het wijzigen van de setvolgorde of het uitschakelen van specifieke sets en de daaruit voortvloeiende effecten in het "Beheer sets" dialoogvenster. - + + Information Informatie - + A card database update is already running. Een update van de kaartendatabase is al aan de gang. - + Unable to run the card database updater: Kan het updateprogramma van de kaartendatabase niet uitvoeren: - + Card database update running. Kaartendatabasebewerking in uitvoering. - + Failed to start. The file might be missing, or permissions might be incorrect. Opstarten mislukt. Het bestand mist misschien, of toestemmingen zijn misschien incorrect. - + The process crashed some time after starting successfully. Het proces crashte nadat deze geslaagd is opgestart. - + Timed out. The process took too long to respond. The last waitFor...() function timed out. Tijd verlopen. Het proces nam te lang met antwoorden. De laatste waitfor...() functie verliep. - + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. Een fout heeft zich voorgedaan tijdens een poging om te schrijven naar het proces. Bijvoorbeeld, het proces is niet in uitvoering misschien, of het heeft misschien het invoerkanaal gesloten. - + An error occurred when attempting to read from the process. For example, the process may not be running. Een fout heeft zich voorgedaan tijdens een poging om te lezen van het proces. Bijvoorbeeld, het proces is niet in uitvoering misschien. - + Unknown error occurred. Een onbekende fout heeft zich voorgedaan. - + The card database updater exited with an error: %1 De kaartendatabasebewerker sloot af met foutmelding. %1 - - - - - + + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + Deze server ondersteunt extra functies die uw client niet heeft. +Dit is waarschijnlijk geen probleem, maar dit bericht kan betekenen dat er een nieuwe versie van Cockatrice beschikbaar is of dat deze server een aangepaste of pre-release versie draait. + +Om uw client bij te werken, ga naar Hulp -> Controleer op updates. + + + + + + + Load sets/cards Laad sets/kaarten - + Selected file cannot be found. Geselecteerd bestand kan niet worden gevonden. - + You can only import XML databases at this time. U kunt op dit moment alleen XML-databases importeren. - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. De nieuwe sets/kaarten zijn succesvol toegevoegd. Cockatrice zal nu de kaartendatabase herladen. - + Sets/cards failed to import. Sets/kaarten zijn niet geïmporteerd. + + + + + Reset Password + Reset Wachtwoord + + + + Your password has been reset successfully, you can now log in using the new credentials. + Uw wachtwoord is succesvol gereset, u kunt nu inloggen met de nieuwe gegevens. + + + + Failed to reset user account password, please contact the server operator to reset your password. + Het opnieuw instellen van het wachtwoord voor uw gebruikersaccount is mislukt, neem contact op met de serverbeheerder om uw wachtwoord opnieuw in te stellen. + + + + Activation request received, please check your email for an activation token. + Activeringsaanvraag ontvangen, kijk in uw e-mail voor een activeringscode. + ManaBaseConfigDialog - + Mana Base Configuration Manabasis Configuratie - + Display type: Soort weergave: - + pie taart - + bar balk - + combinedBar combinatieBalk - + Filter Colors (optional): Filter Kleuren (optioneel): - + OK OK - + Cancel Annuleren @@ -5699,27 +5613,27 @@ Cockatrice zal nu de kaartendatabase herladen. ManaDevotionConfigDialog - + Display type: Soort weergave: - + pie taart - + bar balk - + combinedBar combinatieBalk - + Filter Colors (optional): Filter Kleuren (optioneel): @@ -5789,615 +5703,610 @@ Cockatrice zal nu de kaartendatabase herladen. MessageLogWidget - + from play vanuit spel - + from their graveyard vanuit hun graveyard. - + from exile vanuit exile - + from their hand vanuit hun hand. - + the top card of %1's library de bovenste kaart %1's library - + the top card of their library de bovenste kaart van hun library - + from the top of %1's library van de top van %1's library - + from the top of their library van de bovenkant van hun library - + the bottom card of %1's library de onderste kaart van %1's library - + the bottom card of their library de onderste kaart van hun library - + from the bottom of %1's library van de onderkant van %1's library - + from the bottom of their library van de onderkant van hun library - + from %1's library van %1's library - + from their library van hun library - + from sideboard van sideboard - + from the stack van de stack - + from custom zone '%1' vanaf aangepaste zone '%1' - + %1 is now keeping the top card %2 revealed. %1 houdt nu de bovenste kaart %2 onthuld. - + %1 is not revealing the top card %2 any longer. %1 geeft de bovenste kaart %2 niet meer weer. - + %1 can now look at top card %2 at any time. %1 kan nu altijd de bovenste kaart %2 bekijken. - + %1 no longer can look at top card %2 at any time. %1 kan nu niet meer de bovenste kaart %2 bekijken. - + %1 attaches %2 to %3's %4. %1 bevestigt %2 aan %3s %4. - + %1 has conceded the game. %1 heeft het spel opgegeven. - + %1 has unconceded the game. %1 is terug in het spel. - + %1 has restored connection to the game. %1 heeft de verbinding met het spel hersteld. - + %1 has lost connection to the game. %1 heeft de verbinding met het spel verloren. - + %1 points from their %2 to themselves. %1 wijst van hun %2 naar zichzelf. - + %1 points from their %2 to %3. %1 wijst van hun %2 naar %3. - + %1 points from %2's %3 to themselves. %1 wijst van %2s %3 naar zichzelf. - + %1 points from %2's %3 to %4. %1 wijst van %2s %3 naar %4. - + %1 points from their %2 to their %3. %1 wijst van hun %2 naar hun %3. - + %1 points from their %2 to %3's %4. %1 wijst van hun %2 naar %3s %4. - + %1 points from %2's %3 to their own %4. %1 wijst van %2s %3 naar hun eigen %4. - + %1 points from %2's %3 to %4's %5. %1 wijst van %2s %3 naar %4s %5. - + %1 creates a face down token. %1 creëert een token verdekt. - + %1 creates token: %2%3. %1 creëert een token: %2%3. - + %1 has loaded a deck (%2). %1 heeft een deck geladen (%2). - + %1 has loaded a deck with %2 sideboard cards (%3). %1 heeft een deck met %2 sideboard kaarten geladen (%3). - + %1 destroys %2. %1 vernietigt %2. - + a card een kaart - + %1 gives %2 control over %3. %1 geeft %2 controle over %3. - + %1 puts %2 into play%3 face down. %1 zet %2 gesloten in het spel%3. - + %1 puts %2 into play%3. %1 zet %2 in het spel%3. - + %1 puts %2%3 into their graveyard face down. %1 legt %2%3 in hun graveyard verdekt. - + %1 puts %2%3 into their graveyard. %1 legt %2%3 in hun graveyard. - + %1 exiles %2%3 face down. %1 legt %2%3 in exile verdekt. - + %1 exiles %2%3. %1 legt %2%3 in exile. - + %1 moves %2%3 to their hand. %1 verplaatst %2%3 naar hun hand. - + %1 puts %2%3 into their library. %1 legt %2%3 in hun library. - + %1 puts %2%3 onto the bottom of their library. %1 legt %2%3 aan de onderkant van hun library. - + %1 puts %2%3 on top of their library. %1 legt %2%3 op de bovenkant van hun library. - + %1 puts %2%3 into their library %4 cards from the top. %1 plaatst %2%3 in hun library %4 kaarten vanaf de bovenkant. - + %1 moves %2%3 to sideboard. %1 verplaatst %2%3 naar het sideboard. - + %1 plays %2%3 face down. %1 speelt %2%3 verdekt. - + %1 plays %2%3. %1 speelt %2%3. - + %1 moves %2%3 to custom zone '%4' face down. %1 verplaatst %2%3 naar aangepaste zone '%4' verdekt. - + %1 moves %2%3 to custom zone '%4'. %1 verplaatst %2%3 naar aangepaste zone '%4'. - + %1 tries to draw from an empty library %1 probeert een kaart te nemen van een lege library - + %1 draws %2 card(s). %1 trekt een kaart%1 trekt %2 kaarten - + %1 is looking at %2. %1 is aan het kijken naar %2. - + %1 is looking at the %4 %3 card(s) %2. top card for singular, top %3 cards for plural %1 kijkt naar de %4 %3 kaart %2.%1 kijkt naar de %4 %3 kaarten %2. - + bottom onderkant - + top bovenkant - + %1 turns %2 face-down. %1 draait %2 om met de voorkant naar beneden. - + %1 turns %2 face-up. %1 draait %2 om met de voorkant naar boven. - + The game has been closed. Het spel is afgesloten. - + The game has started. Het spel is begonnen. - + You are flooding the game. Please wait a couple of seconds. Je bent het spel aan het overstelpen. Wacht een paar seconden. - + %1 has joined the game. %1 heeft zich bij het spel aangesloten. - + %1 is now watching the game. %1 kijkt nu naar het spel. - + You have been kicked out of the game. Je bent uit het spel geschopt. - + %1 has left the game (%2). %1 heeft het spel verlaten (%2). - + %1 is not watching the game any more (%2). %1 kijkt niet meer naar het spel (%2). - + %1 is not ready to start the game any more. %1 is niet meer klaar om het spel te starten. - + %1 shuffles their deck and draws a new hand of %2 card(s). %1 schudt zijn of haar deck en raapt een nieuwe hand van %2 kaart.%1 schudt zijn of haar deck en raapt een nieuwe hand van %2 kaarten. - + %1 shuffles their deck and draws a new hand. %1 schudt zijn of haar deck en trekt een nieuwe hand. - + You are watching a replay of game #%1. Je kijkt naar een replay van spel #%1. - + %1 is ready to start the game. %1 is klaar om het spel te starten. - + cards an unknown amount of cards kaarten - + %1 card(s) a card for singular, %1 cards for plural één kaart%1 kaarten - + %1 lends %2 to %3. %1 leent %2 aan %3. - + %1 reveals %2 to %3. %1 onthult %2 naar %3. - + %1 reveals %2. %1 onthult %2. - + %1 randomly reveals %2%3 to %4. %1 onthult %2%3 aan %4 gebaseerd op willekeur. - + %1 randomly reveals %2%3. %1 onthult %2%3 gebaseerd op willekeur. - + %1 peeks at face down card #%2. %1 bekijkt verdekte kaart #%2. - + %1 peeks at face down card #%2: %3. %1 bekijkt verdekte kaart #%2: %3. - + %1 reveals %2%3 to %4. %1 onthult %2%3 aan %4. - + %1 reveals %2%3. %1 onthult %2%3. - + %1 reversed turn order, now it's %2. %1 keert de beurtvolgorde om, deze is nu %2. - + reversed omgekeerd - + normal normaal - + Heads Kop - + Tails Munt - + %1 flipped a coin. It landed as %2. %1 gooit een muntje om. Het landde %2. - + %1 rolls a %2 with a %3-sided die. %1 rolt een %2 met een %3-zijdige dobbelsteen. - + %1 flips %2 coins. There are %3 heads and %4 tails. %1 werpt %2 munten. Er zijn %3 koppen en %4 munten. - + %1 rolls a %2-sided dice %3 times: %4. %1 werpt een %2-zijdige dobbelsteen %3 keer: %4. - + %1's turn. %1s beurt. - + %1 sets annotation of %2 to %3. %1 verandert de annotatie van %2 naar %3. - - %1 places %2 %3%4 counter(s) on %5 (now %6). - + + %1 places %2 "%3" counter(s) on %4 (now %5). + %1 plaatst %2 "%3" counter op %4 (nu %5).%1 plaatst %2 "%3" counters op %4 (nu %5). - - %1 removes %2 %3%4 counter(s) from %5 (now %6). - + + %1 removes %2 "%3" counter(s) from %4 (now %5). + %1 verwijderd %2 "%3" counter van %4 (nu %5).%1 verwijderd %2 "%3" counters van %4 (nu %5). - - %1 failed to undo their last draw. - - - - + %1 sets counter %2 to %3 (%4%5). %1 verandert teller %2 naar %3 (%4%5). - + %1 sets %2 to not untap normally. %1 zet %2 op niet tegelijk ontappen. - + %1 sets %2 to untap normally. %1 zet %2 op tegelijk ontappen. - + %1 removes the PT of %2. %1 verwijdert de stats van %2. - + %1 changes the PT of %2 from nothing to %4. %1 verandert de stats van %2 van niks naar %4. - + %1 changes the PT of %2 from %3 to %4. %1 verandert de stats van %2 van %3 naar %4. - + %1 has locked their sideboard. %1 heeft hun sideboard vergrendeld. - + %1 has unlocked their sideboard. %1 heeft hun sideboard ontgrendeld. - + %1 taps their permanents. %1 tapt alles. - + %1 untaps their permanents. %1 ontapt alles. - + %1 taps %2. %1 tapt %2. - + %1 untaps %2. %1 ontapt %2. - + %1 shuffles %2. %1 schudt %2. - + %1 shuffles the bottom %3 cards of %2. %1 schudt de onderste %3 kaarten van %2. - + %1 shuffles the top %3 cards of %2. %1 schudt de bovenste %3 kaarten van %2. - + %1 shuffles cards %3 - %4 of %2. %1 schudt kaarten %3 - %4 van %2. - + %1 unattaches %2. %1 maakt %2 los. - + %1 undoes their last draw. %1 legt hun laatst getrekte kaart terug. - + %1 undoes their last draw (%2). %1 legt hun laats getrekte kaart terug (%2). @@ -6405,115 +6314,110 @@ Cockatrice zal nu de kaartendatabase herladen. MessagesSettingsPage - + Word1 Word2 Word3 Woord1 Woord2 Woord3 - + Add New Message Bericht toevoegen - + Edit Message Bericht bewerken - + Remove Message Bericht Verwijderen - + Add message Bericht toevoegen - - + + Message: Bericht: - + Edit message Bericht bewerken - + Chat settings Chat instellingen - + Custom alert words Aanpasbare alerteringswoorden - + Enable chat mentions Schakel chat vermeldingen in - + Enable mention completer Vermeldings aanvuller inschakelen - + In-game message macros In-game bericht macro's - + How to use in-game message macros Uitleg gebruik van in-game bericht macro's - + Ignore chat room messages sent by unregistered users Chatroomberichten van niet-geregistreerde gebruikers negeren - + Ignore private messages sent by unregistered users Privéberichten van niet-geregistreerde gebruikers negeren - - Ignore private messages sent by non-buddy users - - - - - + + Invert text color Text kleur inverteren - + Enable desktop notifications for private messages Desktopmeldingen voor privéberichten inschakelen - + Enable desktop notification for mentions Desktopmelding voor vermeldingen inschakelen - + Enable room message history on join Kamerboodschapsgeschiedenis op aansluiting inschakelen - - + + (Color is hexadecimal) (Kleur is hexadecimaal) - + Separate words with a space, alphanumeric characters only Woorden scheiden met een spatie, alleen alfanumerieke tekens @@ -6521,42 +6425,42 @@ Cockatrice zal nu de kaartendatabase herladen. MoveMenu - + Move to Verplaats naar - + &Top of library in random order %bovenkant library in willekeurige volgorde - + X cards from the top of library... X kaarten van bovenkant library... - + &Bottom of library in random order &Onderkant library in willekeurige volgorde - + T&able &Tafel - + &Hand &Hand - + &Graveyard &Graveyard - + &Exile &Exile @@ -6569,47 +6473,47 @@ Cockatrice zal nu de kaartendatabase herladen. Kaart type - + Mana Value Mana Waarde - + Color(s) Kleur(en) - + Loyalty Loyaliteit - + Main Card Type Hoofd Kaarttype - + Mana Cost Mana Kosten - + P/T P/T - + Side Kant - + Layout Indeling - + Color Identity Color Identity @@ -6632,152 +6536,6 @@ Cockatrice zal nu de kaartendatabase herladen. Overlap richting: - - PaletteEditorDialog - - - - Reset - - - - - - Apply - - - - - - Save && Apply - - - - - ▼ Edit Palette - - - - - - ▶ Edit Palette - - - - - Palette Editor — %1 - - - - - <b>Palette Editor</b> &nbsp;·&nbsp; %1 - - - - - This theme ships no default palette files - - - - - Replace current colours with the theme author's defaults - - - - - Switch between the light and dark palette files - - - - - Editing: - - - - - Show or hide the per-role colour grid for manual tweaks - - - - - ↺ Revert to theme default - - - - - Discard unsaved edits and restore the last saved palette - - - - - Preview this palette without saving to disk - - - - - Write palette-%1.toml and reload the theme - - - - - Cannot save: this theme has no directory on disk - - - - - Save failed - - - - - Could not write %1 to: -%2 - - - - - No default found - - - - - No default palette file found for the "%1" scheme. - - - - - PaletteGridWidget - - - Active - - - - - Disabled - - - - - Inactive - - - - - Normal interactive state - - - - - Widget is disabled / not interactive - - - - - Window is in background / unfocused - - - Phase @@ -6844,57 +6602,57 @@ Cockatrice zal nu de kaartendatabase herladen. PhasesToolbar - + Untap step Untap fase - + Upkeep step Upkeep fase - + Draw step Draw fase - + First main phase Eerste hoofdfase - + Beginning of combat step Begin vechtfase - + Declare attackers step Aanvallers aangeven fase - + Declare blockers step Verdedigers aangeven fase - + Combat damage step Gevechtsschade fase - + End of combat step Einde vechtfase - + Second main phase Tweede hoofdfase - + End of turn step Einde van de beurt fase @@ -6902,7 +6660,7 @@ Cockatrice zal nu de kaartendatabase herladen. PictureLoader - + en code for scryfall's language property, not available for all languages en @@ -6911,142 +6669,151 @@ Cockatrice zal nu de kaartendatabase herladen. PlayerActions - - - - + + View top cards of library + Bekijk bovenste kaarten van library + + + + + + + + + + + + Number of cards: (max. %1) + Aantal kaarten: (max. %1) + + + + View bottom cards of library + Bekijk onderste kaarten library + + + + Shuffle top cards of library + Schud bovenste kaarten library + + + + Shuffle bottom cards of library + Schud onderste kaarten library + + + + Draw hand + Raap hand + + + + 0 and lower are in comparison to current hand size + 0 en minder zijn in verhouding tot huidige handgrootte + + + + Draw cards + Raap kaarten + + + + + + grave graveyard - - - - + + + + exile exile - - - PlayerDialogs - - View top cards of library - - - - - - - - - - - - - Number of cards: (max. %1) - - - - - View bottom cards of library - - - - - Shuffle top cards of library - - - - - Shuffle bottom cards of library - - - - - Draw hand - - - - - 0 and lower are in comparison to current hand size - - - - - Draw cards - - - - + Move top cards to %1 - + Verplaats bovenste kaarten naar %1 - + Move bottom cards to %1 - + Verplaats onderste kaarten naar %1 - + Draw bottom cards - + Raap onderste kaarten - + + + C&reate another %1 token + &Maak nog een %1 token + + + Create tokens - + Token maken - + + Number: - + Aantal: - + Place card X cards from top of library - + Plaats kaart X kaarten vanaf bovenkant van library - + Which position should this card be placed: - + Hoeveelste van boven moet de kaart geplaatst worden: - + (max. %1) - + (max. %1) - + Change power/toughness - + Verander kracht/hardheid - + Change stats to: - + Verander stats naar: - + Set annotation - + Aantekening instellen - + Please enter the new annotation: - + Voer de nieuwe aantekening in: + + + + Set counters + Counters instellen PlayerMenu - + Player "%1" Speler "%1" - + &Counters &Counters @@ -7080,7 +6847,7 @@ Deze instelling betekend dat je alleen de geprioritiseerde druk van iedere kaart Navigatieknoppen weergeven - + Printing Selector Drukkiezer @@ -7088,22 +6855,22 @@ Deze instelling betekend dat je alleen de geprioritiseerde druk van iedere kaart PrintingSelectorCardOverlayWidget - + Preference Voorkeur - + Pin Printing Druk Vastpinnen - + Unpin Printing Druk Lospinnen - + Show Related cards Gerelateerde kaarten weergeven @@ -7174,57 +6941,57 @@ Deze instelling betekend dat je alleen de geprioritiseerde druk van iedere kaart PtMenu - + Power / toughness Kracht / hardheid - + &Increase power Ver&hoog kracht - + &Decrease power Ver&laag kracht - + I&ncrease toughness Verh&oog hardheid - + D&ecrease toughness Verl&aag hardheid - + In&crease power and toughness Verhoo&g kracht en hardheid - + Dec&rease power and toughness Verlaa&g kracht en hardheid - + Increase power and decrease toughness Verhoog kracht en verlaag hardheid - + Decrease power and increase toughness Verlaag kracht en verhoog hardheid - + Set &power and toughness... Kracht en hardheid &instellen... - + Reset p&ower and toughness &Herstel kracht en hardheid @@ -7232,37 +6999,37 @@ Deze instelling betekend dat je alleen de geprioritiseerde druk van iedere kaart QMenuBar - + Services Diensten - + Hide %1 Verberg %1 - + Hide Others Verberg Anderen - + Show All Toon Alle - + Preferences... Voorkeuren... - + Quit %1 Stop %1 - + About %1 Over %1 @@ -7270,17 +7037,17 @@ Deze instelling betekend dat je alleen de geprioritiseerde druk van iedere kaart QObject - + Cockatrice card database (*.xml) Cockatrice kaartendatabase (*.xml) - + All files (*.*) Alle bestanden (*.*) - + Cockatrice replays (*.cor) Cockatrice replays (*.cor) @@ -7352,177 +7119,110 @@ Weet je zeker dat je deze functie wil uitschakelen? QPlatformTheme - + OK OK - + Save Opslaan - + Save All Alles Opslaan - + Open Open - + &Yes &Ja - + Yes to &All Ja op A&lle - + &No &Nee - + N&o to All Nee op &Alle - + Abort Afbreken - + Retry Opnieuw proberen - + Ignore Negeren - + Close Sluiten - + Cancel Annuleren - + Discard Afleggen - + Help Hulp - + Apply Toepassen - + Reset Resetten - + Restore Defaults Standaardinstellingen herstellen - - QuickSetupPanel - - - %1% - - - - - <b>Quick Setup</b> - - - - - Generate all palette roles automatically from a single accent colour - - - - - Accent: - - - - - Primary hue. Used directly for highlights and links. -At high intensity it also tints buttons and backgrounds. - - - - - Intensity: - - - - - Subtle - - - - - Full colour - - - - - 0–30 Subtle tint — only highlights and links change hue -30–70 Accented — buttons, tooltips, and borders join in -70–100 Full colour — backgrounds, everything - - - - - 70% - - - - - Generate ↓ - - - - - Derive all palette roles from the accent colour above. -Fine-tune individual colours in the grid afterwards. - - - RemoteDeckList_TreeModel - + Name Naam - + ID ID - + Upload time Upload tijd @@ -7530,32 +7230,32 @@ Fine-tune individual colours in the grid afterwards. RemoteReplayList_TreeModel - + ID ID - + Name Naam - + Players Spelers - + Keep Bewaar - + Time started Tijd begonnen - + Duration (sec) Duur (sec) @@ -7563,37 +7263,37 @@ Fine-tune individual colours in the grid afterwards. RfgMenu - + &Exile &Exile - + &View exile &Bekijk exile - + &Move exile to... &Verplaats exile naar... - + &Top of library &Bovenkant library - + &Bottom of library &Onderkant library - + &Hand &Hand - + &Graveyard &Graveyard @@ -7639,7 +7339,7 @@ Fine-tune individual colours in the grid afterwards. SayMenu - + S&ay &Zeg @@ -7680,27 +7380,27 @@ Fine-tune individual colours in the grid afterwards. SetsModel - + Enabled Ingeschakeld - + Set type Set type - + Set code Set code - + Long name Lange naam - + Release date releasedatum @@ -7708,53 +7408,53 @@ Fine-tune individual colours in the grid afterwards. ShortcutSettingsPage - - + + Restore all default shortcuts Alle standaard snelkoppelingen herstellen - + Do you really want to restore all default shortcuts? Wilt u echt alle standaard snelkoppelingen herstellen? - + Clear all default shortcuts Alle standaard snelkoppelingen wissen - + Do you really want to clear all shortcuts? Wil je echt alle snelkoppelingen vrijmaken? - + Section: Sectie: - + Action: Functie: - + Shortcut: Sneltoets: - + How to set custom shortcuts Hoe aangepaste snelkoppelingen in te stellen - + Clear all shortcuts Alle sneltoetsen wissen - + Search by shortcut name Zoek op sneltoetsnaam @@ -7810,12 +7510,12 @@ Controleer uw snelkoppelingsinstellingen! SideboardMenu - + &Sideboard &Sideboard - + &View sideboard &Bekijk sideboard @@ -7823,27 +7523,27 @@ Controleer uw snelkoppelingsinstellingen! SoundSettingsPage - + Enable &sounds &Geluiden inschakelen - + Current sounds theme: Huidige geluiden thema: - + Test system sound engine Test geluid engine van systeem - + Sound settings Geluidsinstellingen - + Master volume Hoofdvolume @@ -7915,146 +7615,16 @@ Controleer uw snelkoppelingsinstellingen! Ongeldig antwoord ontvangen van de release update server. - + No reply received from the tag update server. Geen antwoord ontvangen van de tag update server. - + Invalid reply received from the tag update server. Ongeldig antwoord ontvangen van de tag update server. - - StorageSettingsPage - - - - - Success - - - - - Cached card pictures have been reset. - - - - - Downloaded card pictures have been reset. - - - - - Error - - - - - One or more downloaded card pictures could not be cleared. - - - - - In-memory (currently loaded) card pictures have been reset. - - - - - Card Picture Loader Caching Method: - - - - - The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size. - - - - - Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while. - - - - - This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk. - - - - - Delete Cached Images - - - - - Delete Saved Images - - - - - Clear In-Memory Images - - - - - Card Picture Loader Cache Method - - - - - Network Cache - - - - - Filesystem - - - - - In-Memory Picture Cache - - - - - Network Cache Size: - - - - - On-disk cache for downloaded pictures - - - - - Redirect Cache TTL: - - - - - How long cached redirects for urls are valid for. - - - - - Picture Cache Size: - - - - - In-memory cache for pictures not currently on screen - - - - - Naming scheme: - - - - - Day(s) - - - TabAccount @@ -8190,117 +7760,117 @@ Controleer uw snelkoppelingsinstellingen! TabArchidekt - - + + Desc. Afl. - - + + AND EN - - + + Require ALL selected colors Vereis ALLE gekozen kleuren - - + + Deck name... Decknaam... - - + + Owner... Eigenaar... - - + + Packages Pakketten - - + + Advanced Filters Geavanceerde Filters - + Bracket: Bracket: - - + + Any Geen Voorkeur - - + + Contains card... Bevat kaart... - - + + Commander... Commander... - - + + Tag... Tag... - - + + Deck Size Deckgrootte - + Cards: Kaarten: - - + + Asc. Opl. - + Sort by: Sorteer op: - + Filter by: Filter op: - + Display Settings Weergavensinstellingen - - + + Search Zoeken - - + + Formats Formats @@ -8310,54 +7880,6 @@ Controleer uw snelkoppelingsinstellingen! Archidekt: - - TabCardArtRules - - - Card: - - - - - ProviderId: - - - - - Mode: - - - - - Reason: - - - - - Type a card name... - - - - - Add rule - - - - - Remove rule - - - - - Refresh - - - - - Card Art Rules - - - TabDeckEditor @@ -8406,7 +7928,7 @@ Controleer uw snelkoppelingsinstellingen! Indeling resetten - + Deck: %1 Dek: %1 @@ -8414,49 +7936,55 @@ Controleer uw snelkoppelingsinstellingen! TabDeckEditorVisual - + Visual Deck: %1 Visueel Deck: %1 - + &Visual Deck Editor &Visuele Deckbewerker - - + + Card Info Kaarteninfo - - + + Deck Deck - + + + Filters + Filters + + + &View &Bekijk - + Printing Druk - + Visible Zichtbaar - + Floating Zwevend - + Reset layout Herstel indeling @@ -8464,22 +7992,22 @@ Controleer uw snelkoppelingsinstellingen! TabDeckEditorVisualTabWidget - + Visual Deck View Visuele Deckweergave - + Visual Database Display Visuele Databaseweergave - + Deck Analytics Deckanalyses - + Sample Hand Proefhand @@ -8487,133 +8015,133 @@ Controleer uw snelkoppelingsinstellingen! TabDeckStorage - + Local file system Plaatselijk bestandssysteem - + Server deck storage Dekopslag op de server - - + + Open in deck editor Open deck in bewerker - + Rename deck or folder Hernoem deck of map - + Upload deck Upload dek - + Download deck Download dek + - - - + + New folder Nieuwe map + - Delete Verwijder - + Open decks folder Deckmap openen - + Rename local folder Hernoem plaatselijke map - + Rename local file Hernoem plaatselijk bestand - + New name: Nieuwe naam: - - - - + + + + Error Foutmelding - + Rename failed Hernoemen mislukt - - + + Invalid deck file Ongeldig deck bestand - + Enter deck name Geeft dek naam in - + This decklist does not have a name. Please enter a name: De deklijst heeft geen naam. Geef een naam in aub. - + Unnamed deck Onbenoemd dek - + Failed to upload deck to server Uploaded van deck naar server mislukt - + Delete local file Verwijder plaatselijk bestand - + Are you sure you want to delete the selected files? Weet je zeker dat je de opgeslagen bestanden wil verwijderen? - + Delete remote decks Verwijder deck van server - + Are you sure you want to delete the selected decks? Weet je zeker dat je de geselekteerde decks wil verwijderen? - - + + Name of new folder: Naam van de map: @@ -8685,191 +8213,191 @@ Please enter a name: TabGame - - - + + + Replay Replay - - + + Game Spel - - + + Player List Spelerslijst - - + + Card Info Kaartinfo - - + + Messages Berichten - - + + Replay Timeline Replay Tijdslijn - + &Phases Fases - + &Game Spel - + Next &phase Volgende fase - + Next phase with &action Volgende fase met &handeling - + Next &turn Volgende beurt - + Reverse turn order Keer beurtvolgorde om - + &Remove all local arrows Verwijder alle plaatselijke pijlen - + Rotate View Cl&ockwise Draai de weergave met de klok &mee - + Rotate View Co&unterclockwise Draai de weergave &tegen de klok in - + Game &information Spelgegevens - + Un&concede Opgeven &terugdraaien - - - + + + &Concede &Geef op - + &Leave game Verlaat spel - + C&lose replay Sluit opgeslagen spel - + &Focus Chat &Focus Chat - + &Say: Zeg: - + Selected cards Geselecteerde kaarten - + &View &Bekijk - + Visible Zichtbaar - + Floating Zwevend - + Reset layout Reset indeling - + Concede Opgeven - + Are you sure you want to concede this game? Ben je zeker dat je wilt opgeven voor dit spel? - + Unconcede Opgeven ongedaan maken - + You have already conceded. Do you want to return to this game? Je hebt al opgegeven. Wil je nar dit spel terugkeren? - + Leave game Verlaat spel - + Are you sure you want to leave this game? Ben je zeker dat je dit spel wilt verlaten? - + A player has joined game #%1 Een speler sluitte aan bij spel #%1 - + %1 has joined the game %1 sluitte bij het spel aan - + You have been kicked out of the game. Je bent uit het spel gegooid. @@ -8928,115 +8456,115 @@ Please enter a name: U moet een geldig aantal dagen selecteren om te zoeken. - + Username: Gebruikersnaam: - + IP Address: IP-adres: - + Game Name: Spelnaam: - + GameID: GameID: - + Message: Boodschap: - + Main Room Hoofdkamer - + Game Room Spelkamer - + Private Chat Privéchat - + Past X Days: Afgelopen X dagen: - + Today Vandaag - + Last Hour Afgelopen uur - + Maximum Results: Maximale resultaten: - + At least one filter is required. The more information you put in, the more specific your results will be. Er is minstens één filter nodig. Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn. - + Get User Logs Gebruikerslogboeken ontvangen - + Clear Filters Wis filters - + Filters Filters - + Log Locations Loglokaties - + Date Range Datumbereik - + Maximum Results Maximale resultaten - - + + Message History Bericht Geschiedenis - + Failed to collect message history information. Het is mislukt om informatie over de berichtgeschiedenis te verzamelen. - + There are no messages for the selected filters. Er zijn geen berichten voor de geselecteerde filters. @@ -9054,27 +8582,27 @@ Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn.Verlaat - + %1 - Private chat %1 - Privaat gesprek - + This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. Deze gebruiker negeert u, ze kunnen uw berichten niet zien in de hoofdchat en u kunt niet deelnemen aan hun spelletjes. - + Private message from Privé bericht van - + %1 has left the server. %1 heeft zich afgemeld van de server. - + %1 has joined the server. %1 heeft zich aangemeld op de server @@ -9082,181 +8610,181 @@ Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn. TabReplays - + Local file system Plaatselijk bestandssysteem - + Server replay storage Opslag gespeelde spellen op server - - + + Watch replay Bekijk opgeslagen spel - + Rename Hernoemen - - + + New folder Nieuwe map - - + + Delete Verwijder - + Open replays folder Open replays map - + Download replay Download opgeslagen spel. - + Toggle expiration lock Schakel expiratieslot om - + Get replay share code Ontvang replay-deelcode - - + + Look up replay by share code Replay opzoeken met replay-deelcode - + Rename local folder Hernoem plaatselijke map - + Rename local file Hernoem plaatselijk bestand - + New name: Nieuwe naam: - + Error Foutmelding - + Rename failed Hernoemen mislukt - + Name of new folder: Naam van nieuwe map: - + Delete local file Verwijder plaatselijk bestand - + Are you sure you want to delete the selected files? Weet je zeker dat je de geselecteerde bestanden wil verwijderen? - + Are you sure you want to delete the selected replays? Weet je zeker dat je de geselecteerde replays wil verwijderen? - + Failed to get code Ontvangen code mislukt - - + + Either this server does not support replay sharing, or does not permit replay sharing for you. Deze server ondersteund het delen van replays niet of deze staat het niet toe aan jou. - - - + + + Failed Mislukt - + Could not get replay code Ontvangen replay-code niet gelukt - + Replay Share Code Replay-deelcode - + Others can use this code to add the replay to their list of remote replays: %1 Anderen kunnen deze code gebruiken om de replay aan hun lijst van serverreplays toe te voegen: %1 - + Copy to clipboard Kopieer naar klembord - + Replay share code Replay-deelcode - + Replay code found Replay-code gevonden - + Replay was added, or you already had access to it. Replay toegevoegd, of je had misschien al toegang tot deze. - + Replay code not found Replay-code niet gevonden - + Failed to submit code Versturen code mislukt - + Unexpected error Onverwachte foutmelding - + Delete remote replay Verwijder op server opgeslagen spel @@ -9269,62 +8797,47 @@ Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn. TabRoom - - Friends - - - - - Online - - - - - Ignored - - - - + &Say: Zeg: - + Chat Gesprek - + &Room Kamer - + &Leave room Verlaat kamer - + &Clear chat Maak gespreksgeschiedenis leeg - + Chat Settings... Gespreksinstellingen... - + mentioned you. heeft je genoemd. - + Click to view Klik om weer te geven - + You are flooding the chat. Please wait a couple of seconds. Je bent de chat aan het overstelpen. Wacht enkele seconden a.u.b. @@ -9337,30 +8850,30 @@ Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn.Server - - - - + + + + Error Fout - + Failed to join the server room: it doesn't exist on the server. Aansluiten bij kamer mislukt: deze bestaat niet op de server. - + The server thinks you are in the server room but your client is unable to display it. Try restarting your client. De server denkt dat je in de kamer bent, maar de client is niet in staat om deze te tonen. Probeer de client opnieuw te starten. - + You do not have the required permission to join this server room. U heeft niet de vereiste toestemming om bij deze kamer aan te sluiten. - + Failed to join the server room due to an unknown error: %1. Mislukt om bij de kamer aan te sluiten door een onbekende fout: %1. @@ -9368,97 +8881,97 @@ Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn. TabSupervisor - + Deck Editor Deckbewerker - + Visual Deck Editor Visuele Deckbewerker - + EDHRec EDHRec - + Archidekt Archidekt - + Home Thuis - + &Visual Deck Storage &Visuele Deckopslag - + Visual Database Display Visuele Databaseweergave - + Server Server - + Account Account - + Deck Storage Deckopslag - + Game Replays Spel-replays - + Administration Beheer - + Logs Logs - + Are you sure? Weet je het zeker? - + There are still open games. Are you sure you want to quit? Er staan nog spellen open. Ben je zeker dat je wilt afsluiten? - + Click to view Klik om weer te geven - + Your buddy %1 has signed on! Je maatje %1 heeft in gelogd! - + Unknown Event Onbekend Event - + The server has sent you a message that your client does not understand. This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. @@ -9469,39 +8982,39 @@ Dit bericht kan betekenen dat er een nieuwe versie van Cockatrice beschikbaar is Om uw client bij te werken, ga naar Hulp -> Controleer op updates. - + Idle Timeout Inactiviteit Time-out - + You are about to be logged out due to inactivity. U staat op het punt uitgelogd te worden wegens inactiviteit. - + Promotion Promotie - + You have been promoted. Please log out and back in for changes to take effect. Je bent bevorderd. Gelieve uit te loggen en weer in te loggen om de wijzigingen in werking te laten treden. - + Warned Gewaarschuwd - + You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. U heeft een waarschuwing ontvangen wegens %1. Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties tegen u worden ondernomen. Als u vragen heeft, kunt u een privé-bericht sturen naar een moderator. - + You have received the following message from the server. (custom messages like these could be untranslated) U heeft het volgende bericht van de server ontvangen. @@ -9511,12 +9024,12 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties TabVisualDatabaseDisplay - + Database Display Databaseweergave - + Visual Database Display Visuele Databaseweergave @@ -9555,42 +9068,42 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties TranslateCounterName - + Life Leven - + White Wit - + Blue Blauw - + Black Zwart - + Red Rood - + Green Groen - + Colorless Kleurloos - + Other Overig @@ -9598,69 +9111,11 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties UpdateDownloader - + Could not open the file for reading. Kon het bestand niet openen om te lezen. - - UserCardArtSettingsDialog - - - Card Art Settings - - - - - Type a card name... - - - - - Card name: - - - - - Card ProviderId: - - - - - Left margin (%): - - - - - Right margin (%): - - - - - Vertical offset: - - - - - Zoom: - - - - - Parameters - - - - - Preview - - - - - Remove Banner Card - - - UserContextMenu @@ -9778,7 +9233,7 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties - + Ban History Ban Geschiedenis @@ -9793,87 +9248,77 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties De gebruiker is nog nooit gebant. - + Failed to collect ban information. Mislukt in het verzamelen van gegevens over ban. - - - + + + Warning History Waarschuwingsgeschiedenis - + Warning Time;Moderator;User Name;Reason Waarschuwingstijd;Moderator;Gebruikersnaam;Reden - + User has never been warned. De gebruiker is nog nooit gewaarschuwd. - + Failed to collect warning information. Mislukt in het verzamelen van gegevens over waarschuwing. - + Failed to get admin notes. Ontvangen adminnotities mislukt. - - + + Success Succesvol - + Successfully promoted user. Succesvolle promotie van gebruiker. - + Successfully demoted user. Succesvolle demotie van gebruiker. - - Kick Player - - - - - Are you sure you want to kick this player from the game? - - - - - - + + + Failed Mislukt - + Failed to promote user. Mislukt in het bevorderen van gebruiker. - + Failed to demote user. De gebruiker is niet gedemoteerd. - + Copy hash to clipboard Kopieer hash naar klembord - + Remove this user's messages Verwijder de berichten van deze gebruiker @@ -9881,554 +9326,326 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties UserInfoBox - + Location: Locatie: - + Account Age: Leeftijd lidmaatschap - + Edit Bewerken - + Change password Verander wachtwoord - + Change avatar Verander Icoon - + Administrator Administrator - + Moderator Moderator - + Registered user Geregistreerde gebruiker - - + + Unregistered user Ongeregistreerde gebruiker - + Judge Judge - + Unknown Onbekend - + The entered password does not match your account. Het opgegeven wachtwoord komt niet overeen met jouw account. - - - - + + + Information Gegevens - + User information updated. Gebruikersgegevens bijgewerkt. - - - - - - - - - - - + + + + + + + + + + Error Fout - + User Information Gebruikersgegevens - + Real Name: Echte Naam: - + User Level: Gebruikersniveau: - - - Edit Banner Card - - - + %n Year(s), amount of years (only shown if more than 0) %n jaar, %n jaar, - + %10%n Day(s) %20 amount of years (if more than 0), amount of days, date in local short format %10%n dag %20%10%n Dagen %20 - + Enter Password Wachtwoord Invoeren - + Password verification is required in order to change your email address Wachtwoord controle is vereist om je e-mailadres te veranderen - - - + + + An error occurred while trying to update your user information. Er is een fout opgetreden bij het bijwerken van uw gebruikersgegevens. - - The selected card is blacklisted on this server or another error occurred. - - - - - Banner card removed. - - - - - Banner card updated. - - - - + This server does not permit you to update your user informations. Deze server staat jou niet toe om je gebruikersgegevens bij te werken. - + Password changed. Wachtwoord gewijzigd. - + This server does not permit you to change your password. Deze server staat u niet toe uw wachtwoord te wijzigen. - + The new password is too short. Het nieuwe wachtwoord is te kort. - + The old password is incorrect. Het oude wachtwoord is onjuist. - + Avatar updated. Avatar bijgewerkt. - + This server does not permit you to update your avatar. Deze server laat je niet toe om je avatar bij te werken. - - - An error occured while trying to update your avatar. - - - This server does not permit you to update your user informations. - An error occured while trying to updater your avatar. - Deze server staat jou niet toe om je gebruikersgegevens bij te werken. - - - - UserInfoPopup - - - - Games - - - - - Chat - - - - - Open private chat - - - - - Profile - - - - - View user profile - - - - - Show this user's games - - - - - − Buddy - - - - - Remove from buddy list - - - - - + Buddy - - - - - Add to buddy list - - - - - − Ignore - - - - - Remove from ignore list - - - - - + Ignore - - - - - Add to ignore list - - - - - Ban - - - - - Ban from server - - - - - Warn - - - - - Warn user - - - - - Ban log - - - - - View ban history - - - - - Warn log - - - - - View warning history - - - - - Notes - - - - - View admin notes - - - - - − Mod - - - - - Demote from moderator - - - - - + Mod - - - - - Promote to moderator - - - - - − Judge - - - - - Demote from judge - - - - - + Judge - - - - - Promote to judge - - - - - Join game - - - - - Spectate - - - - - - Loading games… - - - - - Could not load games. - - - - - No active games. - + An error occured while trying to updater your avatar. + Er is een fout opgetreden bij het updaten van uw avatar. UserInterfaceSettingsPage - + General interface settings Algemene weergave-instellingen - + &Double-click cards to play them (instead of single-click) Dubbelklik op kaarten om ze te spelen (in plaats van enkele klik) - + &Clicking plays all selected cards (instead of just the clicked card) &Klikken speelt alle geselecteerde kaarten (in plaats van allen de geklikte kaart) - + &Play all nonlands onto the stack (not the battlefield) by default Speel standaard alle niet-landen op de stapel (niet op het slagveld) - + Do not delete &arrows inside of subphases Verwijder &pijlen niet binnen subphases - + Close card view window when last card is removed Sluit kaartenweergavevenster wanner laatste kaart verwijderd is - + Auto focus search bar when card view window is opened Focus zoekbalk onmiddelijk wanneer kaartenweergavevenster is geopent - + Annotate card text on tokens Maak aantekeningen bij de kaarttekst op tokens - - Show selection count during drag selection - + + Show selection counter during drag selection + Geef selectieteller weer tijdens sleepselectie - - Show total selection count - + + Show total selection counter + Geef totale selectieteller weer - - Show subtype breakdown in selection tally - - - - + Use tear-off menus, allowing right click menus to persist on screen Gebruik tear-off menus, laat rechtermuisknopmenu's op het scherm staan - - Keep game chat focused when clicking in game (Note: disables card view search bar) - - - - + Notifications settings Notificatie instellingen - + Enable notifications in taskbar Activeer meldingen in de taakbalk - + Notify in the taskbar for game events while you are spectating Meld spelgebeurtenissen in de taakbalk terwijl je toekijkt - + Notify in the taskbar when users in your buddy list connect Notificatie in de taakbalk wanneer gebruikers in je buddy lijst verbinding maken - + Animation settings Animatie-instellingen - + &Tap/untap animation &Tap/Untap animatie - + Deck editor/storage settings Deckbewerker/opslag instellingen - + Open deck in new tab by default Deck standaard in niewe tab openen - + Use visual deck storage in game lobby Visuele deckopslag gebruiken in spelontvangstscherm - + Use selection animation for Visual Deck Storage Gebruik selectieanimatie voor Visuele Deckopslag - + When adding a tag in the visual deck storage to a .txt deck: Wanner een tag aan een .txt deck wordt toegevoegd in de visuele deckopslag: - + do nothing niks doen - + ask to convert to .cod vragen om naar .cod om te zetten - + always convert to .cod altijd omzetten naar .cod - + Default deck editor type Standaard deckbewerker soort - + Classic Deck Editor Klassieke Deckbewerker - + Visual Deck Editor Visuele Deckbewerker - + Replay settings Replayinstellingen - + Buffer time for backwards skip via shortcut: @@ -10436,22 +9653,22 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties UserListWidget - + Users connected to server: %1 - + Users in this room: %1 - + Buddies online: %1 / %2 - + Ignored users online: %1 / %2 @@ -10459,45 +9676,35 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties UtilityMenu - + Increment all card counters - + &Untap all permanents - + R&oll die... - - Flip coin - - - - + &Create token... - + C&reate another token - + Cr&eate predefined token - - - C&reate another %1 token - - VisualDatabaseDisplayColorFilterWidget @@ -10549,72 +9756,72 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties VisualDatabaseDisplayFilterToolbarWidget - + Sort by - + Filter by - + Save and load filters - + Filter by exact card name - + Filter by card main-type - + Filter by card sub-type - + Filter by set - + Filter by format legality - + Save/Load - + Name - + Main Type - + Sub Type - + Sets - + Formats @@ -10622,22 +9829,22 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties VisualDatabaseDisplayFormatLegalityFilterWidget - + Show formats with at least: - + cards - + Do not display formats with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) @@ -10655,32 +9862,32 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties VisualDatabaseDisplayMainTypeFilterWidget - + Show main types with at least: - + cards - + Do not display card main-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10688,27 +9895,27 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties VisualDatabaseDisplayNameFilterWidget - + Filter by name... (Exact match) - + Load from Deck - + Apply all card names in currently loaded deck as exact match name filters - + Load from Clipboard - + Apply all card names in clipboard as exact match name filters @@ -10716,7 +9923,7 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties VisualDatabaseDisplayRecentSetFilterSettingsWidget - + Filter to most recent sets @@ -10724,19 +9931,19 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties VisualDatabaseDisplaySetFilterWidget - + Search sets... - - + + Mode: Exact Match - - + + Mode: Includes @@ -10744,37 +9951,37 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties VisualDatabaseDisplaySubTypeFilterWidget - + Search subtypes... - + Show sub types with at least: - + cards - + Do not display card sub-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10782,23 +9989,23 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties VisualDatabaseDisplayWidget - + Search by card name (or search expressions) - + Visual - + Loading database ... - + Clear all filters @@ -10837,17 +10044,17 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties - + Toggle Layout: Overlap - + Change how cards are displayed within zones (i.e. overlapped or fully visible.) - + Toggle Layout: Flat @@ -10876,17 +10083,17 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties VisualDeckEditorWidget - + Type a card name here for suggestions from the database... - + Quick search and add card - + Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter @@ -11004,43 +10211,43 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties WarningDialog - + Which warning would you like to send? Welke waarschuwing wilt u sturen? - + Redact all messages from this user in all rooms Verwijder alle berichten van deze gebruiker in alle kamers - + &OK &OK - + &Cancel &Cancel - + Warn user for misconduct Waarschuw gebruiker voor wangedrag - - + + Error Fout - + User name to send a warning to can not be blank, please specify a user to warn. Gebruikersnaam om een waarschuwing naar te sturen kan niet leeg zijn, geef een gebruiker op om te waarschuwen. - + Warning to use can not be blank, please select a valid warning to send. Te gebruiken waarschuwing kan niet leeg zijn, selecteer een geldige waarschuwing om te verzenden. @@ -11048,133 +10255,133 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties WndSets - + Move selected set to the top Verplaats de geselecteerde set naar boven - + Move selected set up Verplaats de geselecteerde set naar boven - + Move selected set down Verplaats de geselecteerde set naar beneden - + Move selected set to the bottom Verplaats de geselecteerde set naar beneden - + Search by set name, code, or type Zoeken op setnaam, -code of -type - + Default order Standaard volgorde - + Restore original art priority order Herstel oorspronkelijke volgorde prioriteit afbeeldingen - + Enable all sets Alle sets inschakelen - + Disable all sets Alle sets uitschakelen - + Enable selected set(s) Geselecteerde set(s) inschakelen - + Disable selected set(s) Geselecteerde set(s) uitschakelen - + Deck Editor Deckbewerker - + Use CTRL+A to select all sets in the view. Gebruik CTRL+A om alle sets in de lijst te selecteren. - + Only cards in enabled sets will appear in the card list of the deck editor. Alleen kaarten in de ingeschakelde sets zullen verschijnen in de kaartlijst van de deckbewerker. - + Image priority is decided in the following order: De prioriteit voor afbeeldingen wordt in de volgende volgorde vastgesteld: - + first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) %1 is a link to the wiki eerst de CUSTOM Map (%1), daarna de Ingeschakelde Sets in deze dialoog (Boven naar Beneden) - + Include cards rebalanced for Alchemy [requires restart] - + Card Art Afbeelding - + How to use custom card art Hoe aangepaste kaart afbeeldingen te gebruiken - + Hints Tips - + Note Opmerking - + Sorting by column allows you to find a set while not changing set priority. Sorteren op kolom stelt u in staat om een set te vinden zonder de ingestelde prioriteit te wijzigen. - + To enable ordering again, click the column header until this message disappears. Om rangschikken weer mogelijk te maken, klik op de kop van de kolom totdat dit bericht verdwijnt. - + Use the current sorting as the set priority instead Gebruik de huidige sortering als de ingestelde prioriteit - + Sorts the set priority using the same column Sorteert de prioriteit van sets met behulp van dezelfde kolom - + Manage sets Beheer sets @@ -11182,72 +10389,72 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties ZoneViewWidget - + Search by card name (or search expressions) - + Ungrouped - + Group by Type - + Group by Mana Value - + Group by Color - + Unsorted - + Sort by Name - + Sort by Type - + Sort by Mana Cost - + Sort by Colors - + Sort by P/T - + Sort by Set - + shuffle when closing Schudden bij afsluiten - + pile view Stapelweergave @@ -11255,7 +10462,7 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties i18n - + English Nederlands (Dutch) @@ -11263,12 +10470,12 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties main - + Connect on startup Verbinding maken bij het opstarten - + Debug to file Debug naar bestand @@ -11282,7 +10489,7 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties - + Deck Editor Deckbewerker @@ -11363,7 +10570,7 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties - + Replays Replays @@ -11478,129 +10685,129 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties Deck Inladen... - - + + Load Deck from Clipboard... Deck Inladen van Klembord... - + Edit Deck in Clipboard, Annotated - + Edit Deck in Clipboard - + New Deck Nieuw Deck - + Open Custom Pictures Folder Open Custom Afbeeldingen Map - + Print Deck... Print Deck... - + Delete Card Verwijder Kaart - - + + Reset Layout Reset Indeling - + Save Deck Bewaar Deck - + Save Deck as... Bewaar Deck Als... - + Save Deck to Clipboard, Annotated Bewaar Deck op Klembord, Geannoteerd - + Save Deck to Clipboard, Annotated (No Set Info) - + Save Deck to Clipboard Bewaar Deck op Klembord - + Save Deck to Clipboard (No Set Info) - + Load Local Deck... Plaatselijk Deck Inladen... - + Load Remote Deck... Remote Deck Inladen... - + Set Ready to Start Gereed om te Beginnen - + Toggle Sideboard Lock Sideboard Vergrendeling Omschakelen - + Add Green Counter Groene Counters Omhoog - + Remove Green Counter Groene Counters Omlaag - + Set Green Counters... Groene Tellers Instellen... - + Add Red Counter Rode Counters Omhoog - + Remove Red Counter Rode Counters Omlaag - + Set Red Counters... Rode Counters Instellen... - + Add Life Counter Levensteller Omhoog @@ -11610,744 +10817,724 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties - - Load deck from online service... - - - - - Load from website... - - - - + Unload Deck - + Force Start - + Add Card Counter (F) - + Remove Card Counter (F) - + Set Card Counters (F)... - + Add Card Counter (E) - + Remove Card Counter (E) - + Set Card Counters (E)... - + Add Card Counter(D) - + Remove Card Counter (D) - + Set Card Counters (D)... - + Add Card Counter (C) - + Remove Card Counter (C) - + Set Card Counters (C)... - + Add Card Counter (B) - + Remove Card Counter (B) - + Set Card Counters (B)... - + Add Card Counter (A) - + Remove Card Counter (A) - + Set Card Counters (A)... - + Remove Life Counter Levensteller Omlaag - + Set Life Counters... Levensteller Instellen... - + Add White Counter Witte Teller Omhoog - + Remove White Counter Witte Teller Omlaag - + Set White Counters... Witte Teller Instellen... - + Add Blue Counter Blauwe Teller Omhoog - + Remove Blue Counter Blauwe Teller Omlaag - + Set Blue Counters... Blauwe Teller Instellen... - + Add Black Counter Zwarte Teller Omhoog - + Remove Black Counter Zwarte Teller Omlaag - + Set Black Counters... Zwarte Teller Instellen... - + Add Colorless Counter Kleurloze Teller Omhoog - + Remove Colorless Counter Kleurloze Teller Omlaag - + Set Colorless Counters... Kleurloze Teller Instellen... - + Add Other Counter Overige Teller Omhoog - + Remove Other Counter Overige Teller Omlaag - + Set Other Counters... Overige Teller Instellen... - + Increment all card counters - + Add Power (+1/+0) Kracht Verhogen (+1/+0) - + Remove Power (-1/-0) Kracht Verlagen (-1/-0) - + Move Toughness to Power (+1/-1) Verplaats Hardheid Naar Kracht (+1/-1) - + Add Toughness (+0/+1) Hardheid Verhogen (+0/+1) - + Remove Toughness (-0/-1) Hardheid Verlagen (-0/-1) - + Move Power to Toughness (-1/+1) Verplaats Kracht Naar Hardheid (-1/+1) - + Add Power and Toughness (+1/+1) Kracht en Hardheid Verhogen (+1/+1) - + Remove Power and Toughness (-1/-1) Kracht en Hardheid Verlagen (-1/-1) - + Set Power and Toughness... Kracht en Hardheid Instellen... - + Reset Power and Toughness Kracht en Hardheid Resetten - + Untap Ontap - + Upkeep Upkeep - + Draw Trek - + First Main Phase Eerste Hoofdfase - + Start Combat Start Gevechtfase - + Attack Aanval - + Block Blokkeren - + Damage Schade - + End Combat Einde Gevechtfase - + Second Main Phase Tweede Hoofdfase - + End Einde - + Next Phase Volgende Fase - + Next Phase Action Volgende Fase Handeling - + Next Turn Volgende Beurt - + Hide Card in Reveal Window - + Tap / Untap Card Tap / Ontap Kaart - + Untap All Untap Alles - + Toggle Skip Untapping Toggle Untap - + Turn Card Over Draai Kaart Om - + Peek Card Bekijk Kaart - + Play Card Speel Kaart - + Play Card, Face Down - + Attach Card... Kaart Bevestigen Aan... - + Unattach Card Kaart Losmaken - + Clone Card Copieer Kaart - + Create Token... Maak Token... - + Create All Related Tokens Maak Alle Gerelateerde Tokens - + Create Another Token Maak Nog een Token - + Set Annotation... Zet Annotatie... - - Reduce Life by Power - - - - + Select All Cards in Zone - + Select All Cards in Row - + Select All Cards in Column - + Reveal Selected Cards to All Players - - + + Bottom of Library Onderkant van Library - - - - + + + + Exile Exile - - - - + + + + Graveyard Graveyard - - + + Hand Hand - - + + Top of Library Bovenkant van Library - - + + Battlefield, Face Down Speelveld, Gesloten - + Battlefield Speelveld - + Library Library - + Sideboard Sideboard - + Top Cards of Library Bovenste Kaarten van Library - + Bottom Cards of Library - + Close Recent View Recent Overzicht Sluiten - - + + Stack Stack - - + + Graveyard (Multiple) Graveyard (Meerdere) - - + + Graveyard (Multiple), Face Down - - + + Exile (Multiple) Exile (Meerdere) - - + + Exile (Multiple), Face Down - + Stack Until Found Stack Totdat Gevonden - + Draw Bottom Card Trek Onderste Kaart - + Draw Multiple Cards from Bottom... Trek Meerdere Kaarten van Onderkant... - + Draw Arrow... Trek Pijl... - + Remove Local Arrows Verwijder Plaatselijke Pijlen - + Leave Game Verlaat Spel - + Concede Opgeven - + Roll Dice... Werp Dobbelstenen... - - Flip Coin - - - - + Shuffle Library Library Schudden - + Shuffle Top Cards of Library - + Shuffle Bottom Cards of Library - + Mulligan Mulligan - + Mulligan (Same hand size) - + Mulligan (Hand size - 1) - + Draw a Card Trek een Kaart - + Draw Multiple Cards... Trek Meerdere Kaarten... - + Undo Draw Kaart Trekken Ongedaan Maken - + Always Reveal Top Card Altijd Bovenste Kaart Onthullen - + Always Look At Top Card Altijd Bovenste Kaart Bekijken - + Sort Hand by Name - + Sort Hand by Type - + Sort Hand by Mana Value - + Reveal Hand to All Players - + Reveal Random Card to All Players - + Rotate View Clockwise Draai Weergave Met de Klok Mee - + Rotate View Counterclockwise Draai Weergave Tegen de Klok In - + Unfocus Text Box Textvak Verlaten - + Focus Chat Focus Naar Chat - + Clear Chat Wis Chat - + Refresh Verversen - + Skip Forward - + Skip Backward - + Skip Forward by a lot - + Skip Backward by a lot - + Play/Pause Start/Stop - + Toggle Fast Forward Versnelling Schakelen - + Home - + Visual Deck Storage - + Deck Storage - + Server Server - + Account Account - + Administration - + Logs diff --git a/cockatrice/translations/cockatrice_pl.ts b/cockatrice/translations/cockatrice_pl.ts index 29b7b3896..236eff991 100644 --- a/cockatrice/translations/cockatrice_pl.ts +++ b/cockatrice/translations/cockatrice_pl.ts @@ -2,7 +2,7 @@ AbstractCounter - + &Set counter... &Ustaw znacznik… @@ -10,12 +10,12 @@ AbstractCounterDialog - + Set counter Ustaw znacznik - + New value for counter '%1': Nowa wartość dla znacznika '%1' @@ -36,60 +36,60 @@ AbstractTabDeckEditor - + Open in new tab - + Are you sure? - + The decklist has been modified. Do you want to save the changes? - - - - - - + + + + + + Error - + Could not open deck at %1 - + Could not save remote deck - - + + The deck could not be saved. Please check that the directory is writable and try again. - + Save deck - + The deck could not be saved. - + There are no cards in your deck to be exported @@ -105,12 +105,12 @@ Please check that the directory is writable and try again. AdminNotesDialog - + Update Notes Aktualności - + Admin Notes for %1 Notatki Administracyjne dla %1 @@ -127,227 +127,172 @@ Please check that the directory is writable and try again. Sideboard Sideboard - - - Tokens - - AppearanceSettingsPage - + seconds - + Error Błąd - + Could not create themes directory at '%1'. Nie można stworzyć folderu motywów w '%1'. - + Theme settings Ustawienia motywu - + Current theme: Obecny motyw: - + Open themes folder Otwórz folder motywów - + Home tab background source: - + Home tab background shuffle frequency: - + Disabled - + + Display card name of background in bottom right: + + + + Menu settings Ustawienia menu - + Show keyboard shortcuts in right-click menus Pokazuj skróty klawiszowe w menu kontekstowym - + Show game filter toolbar above list in room tab - + Card rendering Rendering kart - + Display card names on cards having a picture Wyświetl nazwy kart na kartach z obrazkami - + Auto-Rotate cards with sideways layout Automatycznie obracaj karty horyzontalne - + Override all card art with personal set preference (Pre-ProviderID change behavior) - - Light - - - - - Dark - - - - - System - - - - - Active theme palette: - - - - - Edit theme palette - - - - - Home tab settings - - - - - Display card name of background in bottom right - - - - - Styling settings - - - - - Style user list - - - - - Card printings - - - - + Bump sets that the deck contains cards from to the top in the printing selector Podbijaj dodatki z których karty są w talii. - + Scale cards on mouse over Skaluj karty po najechaniu kursorem myszy - + Use rounded card corners - - Card layout - - - - + Minimum overlap percentage of cards on the stack and in vertical hand Minimalny procent zachodzenia kart na siebie na stosie oraz w ręce pionowej - + Maximum initial height for card view window: Maksymalna podstawowa wysokość okna podglądu karty - - + + rows rzędy - + Maximum expanded height for card view window: - + Card counters - + Counter %1 - + Hand layout Układ ręki - + Display hand horizontally (wastes space) Wyświetl karty na ręce poziomo (marnuje miejsce) - + Enable left justification Wyrównuj karty do lewej strony pola - + Table grid layout Układ stołu - + Invert vertical coordinate Odwróć współrzędne pionowe - + Minimum player count for multi-column layout: Minimalna liczba graczy dla widoku wielokolumnowego - + Maximum font size for information displayed on cards: Maksymalny rozmiar czcionki dla informacji wyświetlanych na kartach @@ -355,12 +300,12 @@ Please check that the directory is writable and try again. ArchidektApiResponseDeckDisplayWidget - + Back to results - + Open Deck in Deck Editor @@ -386,112 +331,112 @@ Please check that the directory is writable and try again. BanDialog - + ban &user name zbanuj nazwę &użytkownika - + ban &IP address zbanuj adres &IP - + ban client I&D ID zablokowanego konta - + Ban type Rodzaj bana - + &permanent ban ban &permanentny - + &temporary ban ban &tymczasowy - + &Days: &Dni: - + &Hours: &Godziny: - + &Minutes: &Minuty: - + Duration of the ban Czas trwania bana - + Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. Podaj przyczynę bana. Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowanej osoby. - + Please enter the reason for the ban that will be visible to the banned person. Podaj przyczynę bana do wglądu dla banowanej osoby. - + Redact all messages from this user in all rooms Redaguj wiadomości od tego użytkownika we wszystkich pokojach - + &OK &OK - + &Cancel &Anuluj - + Ban user from server Zbanuj użytkownika z serwera - - - - + + + + Error Błąd - + You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. Aby ustawić bana, musisz wybrać nazwę, IP, ID klienta lub dowolną kombinację tej trójki. - + You must have a value in the name ban when selecting the name ban checkbox. Pole imienia musi być wypełnione dla opcji ban imienia. - + You must have a value in the ip ban when selecting the ip ban checkbox. Pole ip musi być wypełnione dla opcji ban ip. - + You must have a value in the clientid ban when selecting the clientid ban checkbox. Pole id klienta musi być wypełnione dla opcji ban id klienta. @@ -499,123 +444,59 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan BetaReleaseChannel - + Beta - + No reply received from the release update server. Brak odpowiedzi z serwera uaktualnień wersji. - + Invalid reply received from the release update server. Nieprawidłowa odpowiedź serwera uaktualnień wersji. - + No reply received from the file update server. Brak odpowiedzi z serwera uaktualnień plików. - - CardArtPreviewWidget - - - No card selected - - - - - CardArtRulesModel - - - Card - - - - - ProviderId - - - - - Mode - - - - - Reason - - - CardDatabaseModel - + Name Nazwa - + Sets Dodatki - + Mana cost Koszt many - + Card type Typ karty - + P/T S/W - + Color(s) Kolor(y) - - CardDatabaseView - - - Add to Deck - - - - - Add to Sideboard - - - - - Select Printing - - - - - Show on EDHRec (Commander) - - - - - Show on EDHRec (Card) - - - - - Show Related cards - - - CardFilter @@ -744,22 +625,22 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan CardInfoPictureWidget - + View related cards - + Add card to deck - + Mainboard - + Sideboard @@ -782,12 +663,12 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan - + Related cards: Powiązane karty: - + Unknown card: Nieznana karta: @@ -795,146 +676,128 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan CardMenu - + Re&veal to... - + &All players - + View related cards - + Token: - + All tokens - + &Select All - + S&elect Row - + S&elect Column - + &Play - + &Hide - + Play &Face Down - + &Tap / Untap Turn sideways or back again - + Skip &untapping - + T&urn Over Turn face up/face down - + &Peek at card face - + &Clone - + Attac&h to card... - + Unattac&h - + &Draw arrow... - + &Set annotation... - - Reduce life by power - - - - + Ca&rd counters - + &Add counter (%1) - + &Remove counter (%1) - + &Set counters (%1)... - - CardPictureLoaderCacheMethod - - - Network Cache - - - - - Filesystem - - - CardSizeWidget @@ -946,133 +809,133 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan CardZoneLogic - + their hand nominative - + %1's hand nominative - + their library look at zone - + %1's library look at zone - + of their library top cards of zone, - + of %1's library top cards of zone - + their library reveal zone - + %1's library reveal zone - + their library shuffle - + %1's library shuffle - + their library nominative - + %1's library nominative - + their graveyard nominative - + %1's graveyard nominative - + their exile nominative - + %1's exile nominative - + their sideboard look at zone - + %1's sideboard look at zone - + their sideboard nominative - + %1's sideboard nominative - + their custom zone '%1' nominative - + %1's custom zone '%2' nominative @@ -1094,421 +957,16 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan - - ColorButton - - - Click to pick a color - - - - - Pick colour - - - - - ConnectionController - - - - The server has reached its maximum user capacity, please check back later. - - - - - There are too many concurrent connections from your address. - - - - - Banned by moderator - - - - - Expected end time: %1 - - - - - This ban lasts indefinitely. - - - - - Scheduled server shutdown. - - - - - - Invalid username. - - - - - You have been logged out due to logging in at another location. - - - - - Connection closed - - - - - The server has terminated your connection. -Reason: %1 - - - - - The server is going to be restarted in %n minute(s). -All running games will be lost. -Reason for shutdown: %1 - - - - - Scheduled server shutdown - - - - - Failed Login - - - - - Your client seems to be missing features this server requires for connection. - - - - - To update your client, go to 'Help -> Check for Client Updates'. - - - - - - - - - - - - - - - - - - - - - - Error - - - - - Incorrect username or password. Please check your authentication information and try again. - - - - - There is already an active session using this user name. -Please close that session first and re-login. - - - - - - You are banned until %1. - - - - - - You are banned indefinitely. - - - - - This server requires user registration. Do you want to register now? - - - - - This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. -Please close and reopen your client to try again. - - - - - An internal error has occurred, please close and reopen Cockatrice before trying again. -If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - - - - Account activation - - - - - Your account has not been activated yet. -You need to provide the activation token received in the activation email. - - - - - Server Full - - - - - Unknown login error: %1 - - - - - - -This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - - - - - - - - - Registration denied - - - - - Registration is currently disabled on this server - - - - - There is already an existing account with the same user name. - - - - - It's mandatory to specify a valid email address when registering. - - - - - It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. - - - - - Password too short. - - - - - Registration failed for a technical problem on the server. - - - - - The connection to the server has been lost. - - - - - Unknown registration error: %1 - - - - - Account activation failed - - - - - Socket error: %1 - - - - - Server timeout - - - - - You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. -Local version is %1, remote version is %2. - - - - - Your Cockatrice client is obsolete. Please update your Cockatrice version. -Local version is %1, remote version is %2. - - - - - - Success - - - - - Registration accepted. -Will now login. - - - - - Account activation accepted. -Will now login. - - - - - Information - - - - - This server supports additional features that your client doesn't have. -This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. - -To update your client, go to Help -> Check for Updates. - - - - - - - Reset Password - - - - - Your password has been reset successfully, you can now log in using the new credentials. - - - - - Failed to reset user account password, please contact the server operator to reset your password. - - - - - Activation request received, please check your email for an activation token. - - - - - Connecting to %1... - - - - - Registering to %1 as %2... - - - - - Disconnected - - - - - Connected, logging in at %1 - - - - - Requesting forgotten password to %1 as %2... - - - - - Your username must respect these rules: - - - - - is %1 - %2 characters long - - - - - can %1 contain lowercase characters - - - - - - - - NOT - - - - - can %1 contain uppercase characters - - - - - can %1 contain numeric characters - - - - - can contain the following punctuation: %1 - - - - - first character can %1 be a punctuation mark - - - - - no unacceptable language as specified by these server rules: - note that the following lines will not be translated - - - - - can not contain any of the following words: %1 - - - - - can not match any of the following expressions: %1 - - - - - You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - - CustomZoneMenu - + C&ustom Zones - - + + View custom zone '%1' @@ -1516,35 +974,30 @@ To update your client, go to Help -> Check for Updates. DeckAnalyticsWidget - + Add Panel - + Remove Panel - + Save Layout - + Load Layout - - - Include Sideboard - - DeckEditorCardDatabaseDockWidget - + Card Database @@ -1560,17 +1013,47 @@ To update your client, go to Help -> Check for Updates. DeckEditorDatabaseDisplayWidget - + Search by card name (or search expressions) - + + Add to Deck + + + + + Add to Sideboard + + + + + Select Printing + + + + + Show on EDHRec (Commander) + + + + + Show on EDHRec (Card) + + + + + Show Related cards + + + + Add card to &maindeck - + Add card to &sideboard @@ -1603,72 +1086,72 @@ To update your client, go to Help -> Check for Updates. - + Select Printing - + Deck - + Deck &name: - + Banner Card/Tags Visibility Settings - + Show banner card selection menu - + Show tags selection menu - + &Comments: - + Group by: - + Format: - + Hash: - + &Increment number - + &Decrement number - + &Remove row - + Swap card to/from sideboard @@ -1676,17 +1159,17 @@ To update your client, go to Help -> Check for Updates. DeckEditorFilterDockWidget - + Filters - + &Clear all filters - + Delete selected @@ -1817,113 +1300,169 @@ To update your client, go to Help -> Check for Updates. DeckEditorSettingsPage - - + + Update Spoilers Uaktualnij Spoilery - + + Success Sukces - + Download URLs have been reset. Pobrane URL zostały zresetowane. - + + Downloaded card pictures have been reset. + Pobrane obrazy kart zostały zresetowane + + + + Error + Błąd + + + + One or more downloaded card pictures could not be cleared. + Jedno lub więcej pobranych ilustracji kart nie mogło zostać wyczyszczonych. + + + Add URL Dodaj URL - - + + URL: URL: - - + + Edit URL Edytuj URL - + + Network Cache Size: + Rozmiar sieciowej pamięci podręcznej: + + + + Redirect Cache TTL: + TTL przekierowania w pamięci podręcznej: + + + + How long cached redirects for urls are valid for. + Jak długo zapisane przekierowania są ważne. + + + + Picture Cache Size: + Rozmiar Pamięci Podręcznej dla Obrazków: + + + Add New URL Dodaj Nowy URL - + Remove URL Usuń URL - + + Day(s) + Dni + + + Updating... Trwa aktualizacja... - + Choose path Wybierz ścieżkę - + URL Download Priority Priorytet Pobierania URL - + Spoilers Spoilery - + Download Spoilers Automatically Pobierz spoilery automatycznie - + Spoiler Location: Lokalizacja spoilera - + Last Change Ostatnia zmiana - + Spoilers download automatically on launch Spoilery są pobierane automatycznie w czasie premiery. - + Press the button to manually update without relaunching Wciśnij przycisk żeby ręcznie uaktualnić bez restartu. - + Do not close settings until manual update is complete Nie zamykaj ustawień dopóki aktualizacja manualna się nie skończy - + Download card pictures on the fly Pobierz ilustracje kart w locie - + How to add a custom URL Jak dodać niestandardowe URL - + + Delete Downloaded Images + Usuń Pobrane Ilustracje + + + Reset Download URLs Resetuj Pobieranie URLi + + + On-disk cache for downloaded pictures + Pamięć podręczna na dysku dla pobranych obrazków + + + + In-memory cache for pictures not currently on screen + Pamięć podręczna w pamięci fizycznej dla obrazków które nie są na ekranie + DeckListHistoryManagerWidget @@ -1989,12 +1528,12 @@ To update your client, go to Help -> Check for Updates. DeckLoader - + Common deck formats (%1) - + All files (*.*) @@ -2216,27 +1755,27 @@ To update your client, go to Help -> Check for Updates. - + Moved to %1 1 × "%2" (%3) - + Removed "%1" (all copies) - + %1 1 × "%2" (%3) - + Added - + Removed @@ -2258,74 +1797,74 @@ To update your client, go to Help -> Check for Updates. DeckViewContainer - + Load deck... Wczytaj talię... - + Load remote deck... Wczytaj zdalną talię... - + Load from clipboard... - + Load from website... - + Unload deck - + Ready to start Gotowe do rozpoczęcia - + Force start Wymuś rozpoczęcie - + Sideboard unlocked Biblioteka poboczna odblokowana - + Sideboard locked Biblioteka poboczna zablokowana - - + + Error Błąd - + The selected file could not be loaded. Wybrany plik nie mógł zostać wczytany. - + Deck is greater than maximum file size. - + Are you sure you want to force start? This will kick all non-ready players from the game. - + Cockatrice @@ -2424,7 +1963,7 @@ This will kick all non-ready players from the game. - + Webpage Strona internetowa @@ -2464,37 +2003,37 @@ This will kick all non-ready players from the game. Połącz z Serwerem - + Server URL Serwer URL - + Communication Port Port Komunikacyjny - + Unique Server Name Unikalna Nazwa Serwera - + Connection Warning Ostrzeżenie o połączeniu - + You need to name your new connection profile. Musisz nazwać swój nowy profil połączenia - + Connect Warning Ostrzeżenie połączenia - + The player name can't be empty. Nazwa użytkownika nie może być pusta @@ -2607,17 +2146,17 @@ This will kick all non-ready players from the game. Stwórz grę - + Game information Informacje o grze - + Error Błąd - + Server error. Błąd serwera. @@ -2625,97 +2164,97 @@ This will kick all non-ready players from the game. DlgCreateToken - + &Name: &Nazwa: - + Token Token - + C&olor: &Kolor: - + white biały - + blue niebieski - + black czarny - + red czerwony - + green zielony - + multicolor wielokolorowy - + colorless bezkolorowy - + &P/T: &S/W: - + &Annotation: &Adnotacja: - + &Destroy token when it leaves the table &Zniszcz tokena kiedy opuści stół - + Create face-down (Only hides name) - + Token data Dane tokena - + Show &all tokens Pok&azuj wszystkie tokeny - + Show tokens from this &deck Pokazuj tokeny z tej &talii - + Choose token from list Wybierz token z listy: - + Create token Tworzenie tokena @@ -2749,7 +2288,7 @@ This will kick all non-ready players from the game. - + ✖ @@ -2764,12 +2303,12 @@ This will kick all non-ready players from the game. - + Duplicate Tag - + This tag already exists. @@ -2956,12 +2495,12 @@ By usunąć twojego bieżącego awatara potwierdź bez wybierania nowego obrazka Wprowadź nazwę tokena: - + Error Błąd - + The chosen name conflicts with an existing card or token. Make sure to enable the 'Token' set in the "Manage sets" dialog to display them correctly. Wybrana nazwa koliduje z istniejącą kartą lub tokenem. @@ -2986,12 +2525,12 @@ Upewnij się że aktywowano 'Token' w oknie "Zarządzaj dodatkami Niezdefiniowane - + Real name: Prawdziwe imię: - + Edit user profile Edycja profilu użytkownika @@ -3029,113 +2568,113 @@ Upewnij się że aktywowano 'Token' w oknie "Zarządzaj dodatkami 2 godziny - + Hide 'buddies only' games - + Hide full games - + Hide games that have started - + Hide password protected games - + Hide 'ignored user' games - + Hide games not created by buddies Hide games not created by buddy - + Hide games with forced open decklists - + &Newer than: &Nowsze niż: - + Game &description: &Opis gry - + &Creator name: Założy&ciel gry - + General Generalne - + &Game types Typy roz&grywki - + at &least: co &najmniej - + at &most: co naj&wyżej - + Maximum player count Maksymalna liczba graczy - + Restrictions Ograniczenia - + Show games only if &spectators can watch Pokazuj gry tylko jeśli &widzowie mogą oglądać - + Show spectator password p&rotected games Pokazuj gry wymagające hasła dla widzów - + Show only if spectators can ch&at Pokazuj gry tylko jeśli widzowie mogą rozm&awiać - + Show only if spectators can see &hands Pokazuj gry tylko jeśli widzowie mogą oglądać &ręce - + Spectators Widzowie - + Filter games Filtruj gry @@ -3438,37 +2977,37 @@ https://tappedout.net/mtg-decks/your-deck-name/ DlgMoveTopCardsUntil - + Card name (or search expressions): Nazwa karty (lub wyrażenie wyszukiwania): - + Number of hits: Ilość trafień: - + Auto play hits Automatycznie graj trafienia - + Put top cards on stack until... Kładź karty z wierzchu na stosie dopóki... - + No cards matching the search expression exists in the card database. Proceed anyways? W bazie kart nie znaleziono kart które spełniają twoje wyrażenie. Kontynuować mimo to? - + Cockatrice Cockatrice - + Invalid filter Nieprawidłowy filtr @@ -3528,40 +3067,40 @@ Twój email zostanie użyty aby zweryfikować twoje konto. Nie wiadomo - + Real name: Prawdziwe imię: - + Register to server Zarejestruj się - - - - + + + + Registration Warning Ostrzeżenie rejestracji - + Your password is too short. Twoje hasło jest za krótkie. - + Your passwords do not match, please try again. Wpisane hasła nie są zgodne. Spróbuj ponownie. - + Your email addresses do not match, please try again. Wpisane adresy mailowe nie są zgodne. Spróbuj ponownie. - + The player name can't be empty. Nazwa użytkownika nie może być pusta @@ -3569,17 +3108,17 @@ Twój email zostanie użyty aby zweryfikować twoje konto. DlgRollDice - + Number of sides: Liczba ścian: - + Number of dice: Liczba kości: - + Roll Dice Rzuć kośćmi @@ -3630,12 +3169,12 @@ Twój email zostanie użyty aby zweryfikować twoje konto. DlgSettings - + Unknown Error loading card database W trakcie wczytywania bazy kart wystąpił nieznany błąd - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -3652,7 +3191,7 @@ Może istnieć potrzeba uruchomienia Oracle w celu uaktualnienia bazy kart. Czy chcesz zmienić ustawienia położenia bazy kart? - + Your card database version is too old. This can cause problems loading card information or images @@ -3669,7 +3208,7 @@ Zwykle można temu zaradzić poprzez uruchomienie narzędzia Oracle i uaktualnie Czy chcesz zmienić ustawienia położenia bazy kart? - + Your card database did not finish loading Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached @@ -3682,7 +3221,7 @@ Proszę wypełnić zgłoszenie błędu pod adresem https://github.com/Cockatrice Czy chcesz zmienić ustawienia położenia bazy kart? - + File Error loading your card database. Would you like to change your database location setting? @@ -3691,7 +3230,7 @@ Would you like to change your database location setting? Czy chcesz ustawić nową lokalizację bazy kart? - + Your card database was loaded but contains no cards. Would you like to change your database location setting? @@ -3700,7 +3239,7 @@ Would you like to change your database location setting? Czy chcesz ustawić nową lokalizację bazy kart? - + Unknown card database load status Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues @@ -3713,64 +3252,59 @@ Proszę wypełnić zgłoszenie błędu pod adresem https://github.com/Cockatrice Czy chcesz zmienić ustawienia położenia bazy kart? - - - + + + Error Błąd - + The path to your deck directory is invalid. Would you like to go back and set the correct path? Ścieżka dostępu do twojego katalogu z taliami jest nieprawidłowa. Czy chcesz wrócić i ustawić poprawną ścieżkę? - + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? Ścieżka dostępu do twojego katalogu z obrazkami jest nieprawidłowa. Czy chcesz wrócić i ustawić poprawną ścieżkę? - + Settings Ustawienia - + General Ogólne - + Appearance Wygląd - + User Interface Interfejs - - Storage - - - - + Card Sources Źródło Karty - + Chat Czat - + Sound Dźwięk - + Shortcuts Skróty @@ -3862,9 +3396,9 @@ You can always change this behavior in the 'General' settings tab. - - - + + + Error Błąd @@ -3917,31 +3451,31 @@ Odwiedź stronę pobierania żeby uaktualnić ręcznie. - + Update Available Dostępna aktualizacja - + A new version of Cockatrice is available! Nowa wersja Cockatrice jest dostępna! - + New version Nowa wersja - + Released Wydania - + Changelog Zmiany @@ -3951,50 +3485,50 @@ Odwiedź stronę pobierania żeby uaktualnić ręcznie. Chcesz teraz zaktualizować? - + Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. - + Please check the <a href="%1">releases page</a> on our Github and download the build for your system. - - - + + + Update Error Błąd aktualizacji - + An error occurred while checking for updates: Wystąpił błąd podczas sprawdzania aktualizacji: - + An error occurred while downloading an update: Wystąpił błąd podczas pobierania aktualizacji: - + Installing... Instaluję... - + Cockatrice is unable to open the installer. Cockatrice nie może otworzyć instalatora. - + Try to update manually by closing Cockatrice and running the installer. Spróbuj zaktualizować ręcznie poprzez zamknięcie Cockatrice i włączenie instalatora. - + Download location Lokalizacja pobierania @@ -4084,67 +3618,67 @@ You may have to manually download the new version. DrawProbabilityWidget - + Draw Probability - + Probability of drawing - + Card Name - + Type - + Subtype - + Mana Value - + At least - + Exactly - + card(s) having drawn at least - + cards - + Category - + Qty - + Odds (%) @@ -4258,7 +3792,7 @@ You may have to manually download the new version. FilterBuilder - + Type your filter here Podaj swój filtr @@ -4289,22 +3823,22 @@ You may have to manually download the new version. GameEventHandler - + kicked by game host or moderator - + player left the game - + player disconnected from server - + reason unknown @@ -4312,140 +3846,140 @@ You may have to manually download the new version. GameSelector - - - - - - - - - + + + + + + + + + Error Błąd - + Please join the appropriate room first. Proszę najpierw dołączyć do właściwego pokoju. - + Wrong password. Nieprawidłowe hasło. - + Spectators are not allowed in this game. Ta rozgrywka nie dopuszcza widzów. - + The game is already full. Ta rozgrywka jest już pełna. - + The game does not exist any more. Ta rozgrywka już nie istnieje. - + This game is only open to registered users. Ta rozgrywka jest dostępna tylko dla zarejestrowanych użytkowników. - + This game is only open to its creator's buddies. Ta rozgrywka jest dostępna tylko dla znajomych jej twórcy. - + You are being ignored by the creator of this game. Twórca tej rozgrywki cię ignoruje. - + Join Game - + Spectate Game - + Game Information - + Join Game as Judge - + Spectate Game as Judge - + Join game Dołącz do gry - + Password: Hasło: - + Please join the respective room first. Proszę najpierw dołączyć do odpowiedniego pokoju. - + &Filter games &Filtr rozgrywek - + C&lear filter Usuń fi&ltr - + C&reate Utwó&rz - + &Join &Dołącz - + Join as judge - + J&oin as spectator D&ołącz jako widz - + Join as judge spectator - + Games shown: %1 / %2 Gra pokazana: %1 / %2 - + Games Gry @@ -4453,32 +3987,32 @@ You may have to manually download the new version. GameSelectorQuickFilterToolBar - + All types - + Filter by game name... - + Filter by game type/format - + Hide games not created by buddies - + Hide full games - + Hide started games @@ -4486,105 +4020,105 @@ You may have to manually download the new version. GamesModel - + >1 day >1 dzień - + %1%2 hr short age in hours %1%2 godz%1%2 godz%1%2 godz%1%2 godz - + new Nowa - + %1%2 min short age in minutes %1%2 min%1%2 min%1%2 min%1%2 min - + password hasło - + buddies only tylko znajomi - + reg. users only tylko zarejestrowani użytkownicy - + open decklists + - can chat mogą rozmawiać - + see hands widzą ręce - + can see hands widzą ręce - + not allowed niedozwoleni - + Room Pokój - + Age Wiek - + Description Opis - + Creator Twórca - + Type Typ - + Restrictions Ograniczenia - + Players Gracze - + Spectators Widzowie @@ -4592,158 +4126,143 @@ You may have to manually download the new version. GeneralSettingsPage - + Reset all paths Resetuj wszystkie ścieżki - + All paths have been reset Wszystkie ścieżki zostały zresetowane - - - - - - - + + + + + + + Choose path Wybierz ścieżkę - - Language settings - + + Personal settings + Ustawienia osobiste - + Language: Język: - - Version settings - - - - - Card database - - - - - Startup settings - - - - + Paths (editing disabled in portable mode) Scieżki (edytowanie wyłączone w trybie przenośnym) - + Paths Ścieżki - + How to help with translations - + Decks directory: Katalog z taliami: - + Filters directory: - + Replays directory: Katalog z powtórkami: - + Pictures directory: Katalog z obrazkami: - + Card database: Baza kart: - + Custom database directory: Niestandardowy folder z bazą: - + Token database: Baza tokenów: - + Update channel Aktualizuj kanał - + Check for client updates on startup Sprawdzaj aktualizacje klienta przy uruchomieniu - + Check for card database updates on startup - + Don't check - + Prompt for update - + Always update in the background - + Check for card database updates every - + days - + Notify if a feature supported by the server is missing in my client Powiadom jeśli właściwości wspierane przez serwer, brakują w kliencie - + Automatically run Oracle when running a new version of Cockatrice Automatycznie uruchom Oracle kiedy uruchomiona jest nowa wersja Cockatrice - + Show tips on startup Pokazuj wskazówki po uruchomieniu - + Last update check on %1 (%2 days ago) @@ -4751,47 +4270,47 @@ You may have to manually download the new version. GraveyardMenu - + &Graveyard - + &View graveyard - + &Move graveyard to... - + &Top of library - + &Bottom of library - + &All players - + &Hand - + &Exile - + Reveal random card to... @@ -4799,88 +4318,88 @@ You may have to manually download the new version. HandMenu - + &Hand - + &View hand - + Sort hand by... - + Name - + Type - + Mana Value - + Take &mulligan (Choose hand size) - + Take mulligan (Same hand size) - + Take mulligan (Hand size - 1) - + &Move hand to... - + &Top of library - + &Bottom of library - + &Graveyard - + &Exile - + &Reveal hand to... - - + + All players - + Reveal r&andom card to... @@ -4888,52 +4407,52 @@ You may have to manually download the new version. HomeWidget - + Create New Deck - + Browse Decks - + Browse Card Database - + Browse EDHRec - + Browse Archidekt - + View Replays - + Quit - + Connecting... - + Connect - + Play @@ -4941,213 +4460,213 @@ You may have to manually download the new version. LibraryMenu - + &Library - + &View library - + View &top cards of library... - + View bottom cards of library... - + Reveal &library to... - + Lend library to... - + Reveal &top cards to... - + &Top of library... - + &Bottom of library... - + &Always reveal top card - + &Always look at top card - + &Open deck in deck editor - + &Draw card - + D&raw cards... - + &Undo last draw - + Shuffle - + &Play top card - + Play top card &face down - + Put top card on &bottom - + Move top card to grave&yard - + Move top card to e&xile - + Move top cards to &graveyard... - + Move top cards to graveyard face down... - + Move top cards to &exile... - + Move top cards to exile face down... - + Put top cards on stack &until... - + Shuffle top cards... - + &Draw bottom card - + D&raw bottom cards... - + &Play bottom card - + Play bottom card &face down - + Move bottom card to grave&yard - + Move bottom card to e&xile - + Move bottom cards to &graveyard... - + Move bottom cards to graveyard face down... - + Move bottom cards to &exile... - + Move bottom cards to exile face down... - + Put bottom card on &top - + Shuffle bottom cards... - - + + &All players - + Reveal top cards of library - + Number of cards: (max. %1) @@ -5155,273 +4674,642 @@ You may have to manually download the new version. MainWindow - - + + + The server has reached its maximum user capacity, please check back later. + Ten serwer osiągnął maksymalną liczbę użytkowników, proszę sprawdzić później. + + + + There are too many concurrent connections from your address. + Trwa zbyt wiele równoległych połączeń z twojego adresu. + + + + Banned by moderator + Zbanowany przez moderatora. + + + + Expected end time: %1 + Oczekiwany czas zakończenia: %1 + + + + This ban lasts indefinitely. + Ten ban jest bezterminowy. + + + + Scheduled server shutdown. + Planowe wyłączenie serwera. + + + + + Invalid username. + Nieprawidłowa nazwa użytkownika. + + + + You have been logged out due to logging in at another location. + Zostałeś wylogowany ze względu inny proces logowania. + + + + Connection closed + Połączenie zakończone + + + + The server has terminated your connection. +Reason: %1 + Serwer zakończył twoje połączenie. +Przyczyna: %1 + + + + The server is going to be restarted in %n minute(s). +All running games will be lost. +Reason for shutdown: %1 + Serwer zostanie wyłączony za jedną minutę. +Wszystkie trwające gry zostaną utracone. +Przyczyna zamknięcia: %1Serwer zostanie wyłączony za %n minut. +Wszystkie trwające gry zostaną utracone. +Przyczyna zamknięcia: %1Serwer zostanie wyłączony za minut: %n. +Wszystkie trwające gry zostaną utracone. +Przyczyna zamknięcia: %1Serwer zostanie wyłączony za minut: %n. +Wszystkie trwające gry zostaną utracone. +Przyczyna zamknięcia: %1 + + + + Scheduled server shutdown + Planowe wyłączenie serwera + + + + + Success + Operacja zakończona pomyślnie + + + + Registration accepted. +Will now login. + Rejestracja zaakceptowana. +Rozpocznij logowanie. + + + + Account activation accepted. +Will now login. + Aktywacja konta zakończona pomyślnie. +Rozpocznij logowanie. + + + + Player %1 Gracz %1 - + Load replay Wczytaj powtórkę - + About Cockatrice O Cockatrice - + Version Wersja - + Cockatrice Webpage Oficjalna strona Cocatrice - + Project Manager: Menadżer projektu: - + Past Project Managers: Poprzedni menadżerowie projektu: - + Developers: Twórcy: - + Our Developers Lista współpracowników - + Help Develop! Dołącz do grona twórców! - + Translators: Tłumacze: - + Our Translators Nasi Tłumacze: - + Help Translate! Pomóż w tłumaczeniu! - + Support: Wsparcie: - + Report an Issue Zgłoś problem - + Troubleshooting Rozwiązywanie problemów - + F.A.Q. Najczęściej zadawane pytania - - + + + + + + + + + + + + + + + + + + + + Error Błąd - + + Server timeout + Upłynął limit czasu odpowiedzi serwera + + + + Failed Login + Nie udało się zalogować + + + + Your client seems to be missing features this server requires for connection. + Twój klient prawdopodobnie nie spełnia wymagań połączenia z tym serwerem. + + + + To update your client, go to 'Help -> Check for Client Updates'. + Aby zaktualizować twojego klienta, pójdź do 'Pomoc -> Sprawdź ustawienia klienta'. + + + + Incorrect username or password. Please check your authentication information and try again. + Nieprawidłowa nazwa użytkownika lub hasło. Sprawdź swoje dane weryfikacyjne i spróbuj ponownie. + + + + There is already an active session using this user name. +Please close that session first and re-login. + Istnieje już aktywna sesja dla tej nazwy użytkownika. +Zakończ tamtą sesję i zaloguj się ponownie. + + + + + You are banned until %1. + Twój ban trwa do: %1. + + + + + You are banned indefinitely. + Zostałeś zbanowany bezterminowo. + + + + This server requires user registration. Do you want to register now? + Ten serwer wymaga rejestracji użytkownika. Chcesz się teraz zarejestrować? + + + + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. + Ten serwer potrzebuje ID klienta. Twój klient nie może wygenerować ID lub używasz zmodyfikowanego klienta. +Proszę zamknij i otwórz ponownie swojego klienta aby spróbować ponownie. + + + + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. + Doszło do wewnętrznego błędu, proszę zamknąć i ponownie otworzyć Cockatrice przed ponowną próbą. +Jeśli błąd będzie się utrzymywać, upewnij się, że używasz najnowszej wersji programu oraz jeśli potrzebne skontaktuj się z deweloperami programu. + + + + Account activation + Aktywacja konta + + + + Your account has not been activated yet. +You need to provide the activation token received in the activation email. + Twoje konto nie zostało jeszcze aktywowane. +Musisz podać token aktywujący, otrzymany w wiadomości email. + + + + Server Full + Serwer pełny + + + + Unknown login error: %1 + Nieznany błąd logowania: %1 + + + + + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. + To zwykle oznacza że wersja klienta jest nieaktualna i serwer wysłał odpowiedź, której twój klient nie rozpoznaje. + + + + Your username must respect these rules: + Twoja nazwa użytkownika musi być zgodna z poniższymi regułami: + + + + is %1 - %2 characters long + %1 jest o %2 znaków za długi + + + + can %1 contain lowercase characters + może zawierać 1% małych liter + + + + + + + NOT + NIE + + + + can %1 contain uppercase characters + może zawierać %1 dużych liter + + + + can %1 contain numeric characters + może zawierać %1 cyfr + + + + can contain the following punctuation: %1 + Może zawierać następujące interpunkcje: %1 + + + + first character can %1 be a punctuation mark + Pierwszy znak może zawierać %1 + + + + no unacceptable language as specified by these server rules: + note that the following lines will not be translated + zasady serwera nie pozwalają na takie słownictwo: + + + + can not contain any of the following words: %1 + Nie można używać żadnego z podanych wyrazów: %1 + + + + can not match any of the following expressions: %1 + Nie pasuje to żadnego z podanych wyrażeń: %1 + + + + You may only use A-Z, a-z, 0-9, _, ., and - in your username. + Możesz użyć tylko tych znaków: A-Z, a-z, 0-9, _, ., i - w nazwie użytkownika. + + + + + + + + + Registration denied + Rejestracja nieudana + + + + Registration is currently disabled on this server + Rejestracja jest obecnie wyłączona na tym serwerze. + + + + There is already an existing account with the same user name. + Istnieje już konto o tej nazwie. + + + + It's mandatory to specify a valid email address when registering. + Podanie poprawnego adresu email jest wymagane przy rejestracji. + + + + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + Zdaje się że próbujesz zarejestrować nowe konto na tym serwerze, posiadając już zarejestrowane konto dla tego adresu. Ten serwer ogranicza liczbę kont, które można zarejestrować dla pojedynczego adresu. Skontaktuj się z operatorem serwera w celu uzyskania pomocy lub otrzymania twoich poufnych danych. + + + + Password too short. + Hasło jest zbyt krótkie. + + + + Registration failed for a technical problem on the server. + Rejestracja nie powiodła się z powodów technicznych na serwerze. + + + + The connection to the server has been lost. + + + + + Unknown registration error: %1 + Nieznany błąd rejestracji: %1 + + + + Account activation failed + Aktywacja konta zakończona niepowodzeniem + + + + Socket error: %1 + Błąd gniazda: %1 + + + + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + Próbujesz połączyć się z nieaktualnym serwerem. Zainstaluj starszą wersję Cockatrice lub wybierz odpowiedni serwer. +Lokalna wersja to %1, wersja zdalna to %2. + + + + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + Twój klient Cockatrice jest nieaktualny. Uaktualnij Cockatrice do nowszej wersji. +Lokalna wersja to %1, wersja zdalna to %2. + + + + Connecting to %1... + %1 — łączenie… + + + + Registering to %1 as %2... + Rejestrowanie do %1 jako %2... + + + + Disconnected + Rozłączony + + + + Connected, logging in at %1 + Połączenie ustanowione; logowanie jako %1 + + + + + + Requesting forgotten password to %1 as %2... + Proszenie o zapomniane hasło do %1 jako %2... + + + &Connect... &Połącz… - + &Disconnect &Rozłącz - + Start &local game... Rozpocznij &lokalną grę… - + &Watch replay... &Obejrzyj powtórkę… - + &Full screen Pełny ekra&n - + &Register to server... &Zarejestruj się... - + &Restore password... &Przywróć hasło... - + &Settings... &Ustawienia… - + &Exit &Wyjdź - + A&ctions Ak&cje - + &Cockatrice &Cockatrice - + C&ard Database B&aza kart - + &Manage sets... &Zarządzaj dodatkami... - + Edit custom &tokens... Edytuj niestandardowe %tokens... - + Open custom image folder Otwórz folder ze spersonalizowanymi obrazkami - + Open custom sets folder Otwórz folder ze spersonalizowanymi setami - + Add custom sets/cards Dodaj spersonalizowane sety/karty - + Reload card database Przeładuj bazę kart - + Tabs - + &Help Po&moc - + &About Cockatrice &O Cockatrice - + &Tip of the Day &Wskazówka na Dziś - + Check for Client Updates Sprawdź uaktualnienia klienta - + Check for Card Updates... Uaktualnij bazę kart... - + Check for Card Updates (Automatic) - + Show Status Bar - + View &Debug Log Pokaż log &debugowania - + Open Settings Folder - + Show/Hide Pokaż/Ukryj - + New Version Nowa Wersja - + Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. Gratulacje z powodu aktualizacji do Cockatrice %1! Oracle uruchomi się teraz aby zaktualizować bazę danych kart. - + Cockatrice installed Cockatrice zainstalowany - + Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. Gratulacje z powodu instalacji Cockatrice %1! Oracle uruchomi się teraz aby zainstalować początkowe bazy danych kart. - + Card database Baza kart - + Cockatrice is unable to load the card database. Do you want to update your card database now? If unsure or first time user, choose "Yes" @@ -5430,29 +5318,29 @@ Czy chcesz teraz uaktualnić bazę kart? Jeżeli nie masz pewności lub jesteś nowym użytkownikiem, wybierz "Tak" - - + + Yes Tak - - + + No Nie - + Open settings Otwórz ustawienia - + New sets found Znaleziono nowe dodatki - + %n new set(s) found in the card database Set code(s): %1 Do you want to enable it/them? @@ -5467,22 +5355,17 @@ Kody dodatków: %1 Czy chcesz je teraz uaktywnić? - - Yes, always enable - - - - + View sets Pokaż dodatki - + Welcome Witaj - + Hi! It seems like you're running this version of Cockatrice for the first time. All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. @@ -5491,132 +5374,166 @@ Wszystkie dodatki w bazie kart zostały aktywowane. Przeczytaj więcej na temat zmiany kolejności czy wyłączania poszczególnych dodatków i tym podobnych w oknie "Zarządzaj Dodatkami". - + + Information Informacja - + A card database update is already running. Aktualizacja bazy kart jest w trakcie - + Unable to run the card database updater: Nie można uruchomić aktualizacji bazy kart: - + Card database update running. - + Failed to start. The file might be missing, or permissions might be incorrect. - + The process crashed some time after starting successfully. - + Timed out. The process took too long to respond. The last waitFor...() function timed out. - + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. - + An error occurred when attempting to read from the process. For example, the process may not be running. - + Unknown error occurred. - + The card database updater exited with an error: %1 - - - - - + + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + Ten serwer wspiera dodatkowe funkcje, których nie posiada twój klient. +Prawdopodobnie nie jest to problem, ale ta wiadomośc może oznaczać że jest dostępna nowa wersja Cockatrice, lub że na tym serwerze działa zmodyfikowana albo nieopublikowana wersja. + +Aby aktualizować klienta, otwórz okno Pomoc -> Sprawdź Aktualizacje + + + + + + + Load sets/cards Wczytaj dodatki/karty - + Selected file cannot be found. Wybrany plik nie został znaleziony. - + You can only import XML databases at this time. Możesz zaimportować jedynie bazy danych XML w tym momencie. - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. Nowe dodatki/karty dodane pomyślnie. Cockatrice ponownie załaduje teraz bazę danych. - + Sets/cards failed to import. Dodatki/karty nie mogły być zaimportowane. + + + + + Reset Password + Zresetuj hasło + + + + Your password has been reset successfully, you can now log in using the new credentials. + Twoje hasło zostały pomyślnie zresetowane, możesz teraz zalogować się używając nowego uwierzytelniania. + + + + Failed to reset user account password, please contact the server operator to reset your password. + Nie udało się zresetować hasła użytkownika, skontaktuj się z operatorem serwera w celu wykonania resetu. + + + + Activation request received, please check your email for an activation token. + Otrzymano żądanie aktywacji, odbierz token aktywujący w swojej skrzynce email. + ManaBaseConfigDialog - + Mana Base Configuration - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): - + OK - + Cancel @@ -5688,27 +5605,27 @@ Cockatrice ponownie załaduje teraz bazę danych. ManaDevotionConfigDialog - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): @@ -5778,615 +5695,610 @@ Cockatrice ponownie załaduje teraz bazę danych. MessageLogWidget - + from play z gry - + from their graveyard z jego grobu - + from exile ze strefy wygnania - + from their hand z jego ręki - + the top card of %1's library karta z wierzchu biblioteki gracza %1 - + the top card of their library pierwsza karta jego biblioteki - + from the top of %1's library z wierzchu biblioteki gracza %1 - + from the top of their library z wierzchu jego biblioteki - + the bottom card of %1's library karta z wierzchu biblioteki gracza %1 - + the bottom card of their library ostatnia karta jego biblioteki - + from the bottom of %1's library z dna biblioteki gracza %1 - + from the bottom of their library z dna jego biblioteki - + from %1's library z biblioteki gracza %1 - + from their library z jego biblioteki - + from sideboard z talii pobocznej - + from the stack ze stosu - + from custom zone '%1' - + %1 is now keeping the top card %2 revealed. %1 od teraz gra z odwróconą kartą z wierzchu %2. - + %1 is not revealing the top card %2 any longer. %1 już nie gra z odwróconą kartą z wierzchu %2. - + %1 can now look at top card %2 at any time. %1 może teraz patrzeć na kartę z wierzchu %2 w każdej chwili. - + %1 no longer can look at top card %2 at any time. %1 nie może już patrzeć na kartę z wierzchu %2 w każdej chwili. - + %1 attaches %2 to %3's %4. %1 przyłącza %2 do %4 %3 - + %1 has conceded the game. %1 poddał grę. - + %1 has unconceded the game. %1 nie poddał gry. - + %1 has restored connection to the game. %1 odzyskał połączenie z grą. - + %1 has lost connection to the game. %1 utracił połączenie z grą. - + %1 points from their %2 to themselves. %1 wskazuje z jego karty %2 na samego siebie. - + %1 points from their %2 to %3. %1 wskazuje z jego karty %2 na kartę %3. - + %1 points from %2's %3 to themselves. %1 wskazuje z karty gracza %2 %3 na samą siebie. - + %1 points from %2's %3 to %4. %1 wskazuje z karty gracza %2 %3 na kartę %4. - + %1 points from their %2 to their %3. %1 wskazuje z jego karty %2 na jego kartę %3. - + %1 points from their %2 to %3's %4. %1 wskazuje z jego karty %2 na karty %3's %4. - + %1 points from %2's %3 to their own %4. %1 wskazuje z kart %2's %3 na swoją kartę %4. - + %1 points from %2's %3 to %4's %5. %1 wskazuje z karty gracza %2 %3 na kartę gracza %4 (%5). - + %1 creates a face down token. - + %1 creates token: %2%3. %1 stworzył token: %2%3. - + %1 has loaded a deck (%2). Gracz %1 wczytał talię (%2). - + %1 has loaded a deck with %2 sideboard cards (%3). Gracz %1 wczytał talię oraz %2 kart talii pobocznej (hash: %3). - + %1 destroys %2. %1 niszczy %2. - + a card kartę - + %1 gives %2 control over %3. %1 oddaje %3 pod kontrolę gracza %2. - + %1 puts %2 into play%3 face down. %1 zagrywa kartę %2 na pole bitwy%3 koszulką do góry. - + %1 puts %2 into play%3. %1 zagrywa kartę %2 na pole bitwy %3. - + %1 puts %2%3 into their graveyard face down. - + %1 puts %2%3 into their graveyard. %1 kładzie %2 %3 na cmentarz. - + %1 exiles %2%3 face down. - + %1 exiles %2%3. %1 przenosi kartę %2 do strefy wygnania %3. - + %1 moves %2%3 to their hand. %1 bierze %2 %3 do ręki. - + %1 puts %2%3 into their library. %1 wkłada %2 %3 do biblioteki. - + %1 puts %2%3 onto the bottom of their library. %1 przenosi %2 %3 na dno swojej biblioteki. - + %1 puts %2%3 on top of their library. %1 przenosi %2 %3 na wierzch swojej bibliotek - + %1 puts %2%3 into their library %4 cards from the top. %1 kładzie %2 %3 na jego biblioteke %4 kart z góry. - + %1 moves %2%3 to sideboard. %1 przenosi kartę %2 %3 do talii pobocznej. - + %1 plays %2%3 face down. - + %1 plays %2%3. %1 zagrywa kartę %2 %3. - + %1 moves %2%3 to custom zone '%4' face down. - + %1 moves %2%3 to custom zone '%4'. - + %1 tries to draw from an empty library %1 próbuje dobrać z pustej biblioteki - + %1 draws %2 card(s). %1 dobiera %2 kartę.%1 dobiera %2 kart.%1 dobiera %2 kart.%1 dobiera %2 kart. - + %1 is looking at %2. %1 przegląda %2. - + %1 is looking at the %4 %3 card(s) %2. top card for singular, top %3 cards for plural - + bottom - + top - + %1 turns %2 face-down. %1 kładzie %2 grzbietem do góry. - + %1 turns %2 face-up. %1 kładzie %2 grzbietem do dołu. - + The game has been closed. Gra została zakończona. - + The game has started. Gra została rozpoczęta. - + You are flooding the game. Please wait a couple of seconds. - + %1 has joined the game. %1 dołączył do gry. - + %1 is now watching the game. %1 obserwuje grę. - + You have been kicked out of the game. Wyrzucono cię z gry. - + %1 has left the game (%2). %1 opuścił grę (%2). - + %1 is not watching the game any more (%2). %1 przestał oglądać grę (%2). - + %1 is not ready to start the game any more. %1 nie jest już gotowy do rozpoczęcia gry. - + %1 shuffles their deck and draws a new hand of %2 card(s). %1 tasuje swoją talie i dobiera nową rękę z %2 kartą.%1 tasuje swoją talie i dobiera nową rękę z %2 kartami.%1 tasuje swoją talie i dobiera nową rękę z %2 kartami.%1 tasuje swoją talie i dobiera nową rękę z %2 kartami. - + %1 shuffles their deck and draws a new hand. %1 tasuje swoją talie i dobiera nową rękę. - + You are watching a replay of game #%1. Oglądasz powtórkę gry #%1. - + %1 is ready to start the game. %1 jest gotowy do rozpoczęcia gry. - + cards an unknown amount of cards karty - + %1 card(s) a card for singular, %1 cards for plural jedną kartę%1 kart%1 kart%1 kart - + %1 lends %2 to %3. %1 pożycza %2 graczowi %3. - + %1 reveals %2 to %3. %1 pokazuję kartę %2 graczowi %3. - + %1 reveals %2. %1 pokazuję kartę %2. - + %1 randomly reveals %2%3 to %4. %1 pokazuje losowo kartę %2 %3 graczowi %4. - + %1 randomly reveals %2%3. %1 pokazuje losowo kartę %2 %3. - + %1 peeks at face down card #%2. %1 spogląda na kartę odwróconą koszulką do góry #%2. - + %1 peeks at face down card #%2: %3. %1 spogląda na kartę odwróconą koszulką do góry #%2: %3. - + %1 reveals %2%3 to %4. %1 pokazuje kartę %2 %3 graczowi %4. - + %1 reveals %2%3. %1 pokazuje kartę %2 %3. - + %1 reversed turn order, now it's %2. %1 odwrócona kolejność tur, teraz %2 - + reversed odwrócone - + normal normalne - + Heads Orzeł - + Tails Reszka - + %1 flipped a coin. It landed as %2. %1 podrzucił monetą. Wylądowała na %2. - + %1 rolls a %2 with a %3-sided die. %1 rzuca %2 kostką %3-ścienną. - + %1 flips %2 coins. There are %3 heads and %4 tails. %1 rzuca %2 monetami. Wypadło %3 orłów i %4 reszek. - + %1 rolls a %2-sided dice %3 times: %4. %1 rzuca %2-ścienną kostką %3 razy: %4. - + %1's turn. Tura gracza %1 - + %1 sets annotation of %2 to %3. %1 ustala adnotację karty %2 na %3. - - %1 places %2 %3%4 counter(s) on %5 (now %6). + + %1 places %2 "%3" counter(s) on %4 (now %5). - - %1 removes %2 %3%4 counter(s) from %5 (now %6). + + %1 removes %2 "%3" counter(s) from %4 (now %5). - - %1 failed to undo their last draw. - - - - + %1 sets counter %2 to %3 (%4%5). %1 ustawia licznik %2 na %3 (%4%5). - + %1 sets %2 to not untap normally. %1 blokuje karcie %2 normalne odtapowywanie. - + %1 sets %2 to untap normally. %1 umożliwia karcie %2 normalne odtapowywanie. - + %1 removes the PT of %2. %1 usuwa PT %2. - + %1 changes the PT of %2 from nothing to %4. %1 zmienia PT %2 z niczego na %4 - + %1 changes the PT of %2 from %3 to %4. %1 zmienia PT %2 z %3 na %4. - + %1 has locked their sideboard. %1 zablokował jego bibliotekę poboczną - + %1 has unlocked their sideboard. %1 odblokował jego bibliotekę poboczną - + %1 taps their permanents. %1 tapuje swoje permanenty. - + %1 untaps their permanents. %1 odtapowuje swoje permanenty. - + %1 taps %2. %1 tapuje kartę %2. - + %1 untaps %2. %1 odtapowuje kartę %2. - + %1 shuffles %2. %1 tasuje %2. - + %1 shuffles the bottom %3 cards of %2. %1 tasuje %3 dolne karty z %2. - + %1 shuffles the top %3 cards of %2. %1 tasuje %3 górne karty z %2. - + %1 shuffles cards %3 - %4 of %2. %1 tasuje %3 - %4 z %2 kart. - + %1 unattaches %2. %1 odczepia kartę %2. - + %1 undoes their last draw. %1 cofa ostatnią dobraną kartę - + %1 undoes their last draw (%2). %1 cofa ostatnią dobraną kartę (%2) @@ -6394,115 +6306,110 @@ Cockatrice ponownie załaduje teraz bazę danych. MessagesSettingsPage - + Word1 Word2 Word3 Wyraz1 Wyraz2 Wyraz3 - + Add New Message Dodaj Nową Wiadomość - + Edit Message Edytuj Wiadomość - + Remove Message Usuń Wiadomość - + Add message Dodaj wiadomość - - + + Message: Wiadomość: - + Edit message Edytuj wiadomość - + Chat settings Ustawienia czatu - + Custom alert words Niestandardowy tekst alertu. - + Enable chat mentions Włącz wywołania na czacie - + Enable mention completer Włącz autouzupełnianie wywołania - + In-game message macros Makra wiadomości w trakcie gry - + How to use in-game message macros Jak korzystać z makr wiadomości w trakcie gry - + Ignore chat room messages sent by unregistered users Ignoruj wiadomości na czacie od niezarejestrowanych użytkowników - + Ignore private messages sent by unregistered users Ignoruj prywatne wiadomości od niezarejestrowanych użytkowników - - Ignore private messages sent by non-buddy users - - - - - + + Invert text color Odwróć kolor tekstu - + Enable desktop notifications for private messages Włącz desktopowe notyfikacje dla prywatnych wiadomości - + Enable desktop notification for mentions Włącz desktopowe notyfikacje dla wywołań - + Enable room message history on join Włącz historię wiadomości w pokoju po dołączeniu - - + + (Color is hexadecimal) (Kolor w kodzie heksadecymalnym) - + Separate words with a space, alphanumeric characters only Rozdziel słowa spacją, tylko alfanumeryczne znaki @@ -6510,42 +6417,42 @@ Cockatrice ponownie załaduje teraz bazę danych. MoveMenu - + Move to - + &Top of library in random order - + X cards from the top of library... - + &Bottom of library in random order - + T&able - + &Hand - + &Graveyard - + &Exile @@ -6558,47 +6465,47 @@ Cockatrice ponownie załaduje teraz bazę danych. Typ Karty - + Mana Value Wartość Many - + Color(s) Kolor(y) - + Loyalty Lojalność - + Main Card Type Główny Typ Karty - + Mana Cost Koszt Many - + P/T S/W - + Side Strona - + Layout Ułożenie - + Color Identity Tożsamość Koloru @@ -6621,152 +6528,6 @@ Cockatrice ponownie załaduje teraz bazę danych. Kierunek przykrycia: - - PaletteEditorDialog - - - - Reset - - - - - - Apply - - - - - - Save && Apply - - - - - ▼ Edit Palette - - - - - - ▶ Edit Palette - - - - - Palette Editor — %1 - - - - - <b>Palette Editor</b> &nbsp;·&nbsp; %1 - - - - - This theme ships no default palette files - - - - - Replace current colours with the theme author's defaults - - - - - Switch between the light and dark palette files - - - - - Editing: - - - - - Show or hide the per-role colour grid for manual tweaks - - - - - ↺ Revert to theme default - - - - - Discard unsaved edits and restore the last saved palette - - - - - Preview this palette without saving to disk - - - - - Write palette-%1.toml and reload the theme - - - - - Cannot save: this theme has no directory on disk - - - - - Save failed - - - - - Could not write %1 to: -%2 - - - - - No default found - - - - - No default palette file found for the "%1" scheme. - - - - - PaletteGridWidget - - - Active - - - - - Disabled - - - - - Inactive - - - - - Normal interactive state - - - - - Widget is disabled / not interactive - - - - - Window is in background / unfocused - - - Phase @@ -6833,57 +6594,57 @@ Cockatrice ponownie załaduje teraz bazę danych. PhasesToolbar - + Untap step Krok odtapowania - + Upkeep step Krok utrzymania - + Draw step Krok dobierania - + First main phase Pierwsza faza główna - + Beginning of combat step Krok początku walki - + Declare attackers step Krok deklaracji atakujących - + Declare blockers step Krok deklaracji broniących - + Combat damage step Krok obrażeń bitewnych - + End of combat step Krok zakończenia walki - + Second main phase Druga faza główna - + End of turn step Krok końca tury @@ -6891,7 +6652,7 @@ Cockatrice ponownie załaduje teraz bazę danych. PictureLoader - + en code for scryfall's language property, not available for all languages @@ -6900,142 +6661,151 @@ Cockatrice ponownie załaduje teraz bazę danych. PlayerActions - - - - - grave - - - - - - - - exile - - - - - PlayerDialogs - - + View top cards of library - - - - - - - - - + + + + + + + + + Number of cards: (max. %1) - + View bottom cards of library - + Shuffle top cards of library - + Shuffle bottom cards of library - + Draw hand - + 0 and lower are in comparison to current hand size - + Draw cards - + + + + + grave + + + + + + + + exile + + + + Move top cards to %1 - + Move bottom cards to %1 - + Draw bottom cards - + + + C&reate another %1 token + + + + Create tokens - + + Number: - + Place card X cards from top of library - + Which position should this card be placed: - + (max. %1) - + Change power/toughness - + Change stats to: - + Set annotation - + Please enter the new annotation: + + + Set counters + + PlayerMenu - + Player "%1" - + &Counters @@ -7065,7 +6835,7 @@ This setting means you'll only see the default printing for each card, instead o - + Printing Selector @@ -7073,22 +6843,22 @@ This setting means you'll only see the default printing for each card, instead o PrintingSelectorCardOverlayWidget - + Preference - + Pin Printing Przypnij wersję - + Unpin Printing Odepnij wersję - + Show Related cards Pokaż powiązane karty @@ -7159,57 +6929,57 @@ This setting means you'll only see the default printing for each card, instead o PtMenu - + Power / toughness - + &Increase power - + &Decrease power - + I&ncrease toughness - + D&ecrease toughness - + In&crease power and toughness - + Dec&rease power and toughness - + Increase power and decrease toughness - + Decrease power and increase toughness - + Set &power and toughness... - + Reset p&ower and toughness @@ -7217,37 +6987,37 @@ This setting means you'll only see the default printing for each card, instead o QMenuBar - + Services Usługi - + Hide %1 Ukryj %1 - + Hide Others Ukryj pozostałe - + Show All Pokaż wszystkie - + Preferences... Preferencje… - + Quit %1 Zakończ %1 - + About %1 O programie %1 @@ -7255,17 +7025,17 @@ This setting means you'll only see the default printing for each card, instead o QObject - + Cockatrice card database (*.xml) Baza kart Cockatrice (*.xml) - + All files (*.*) Wszystkie pliki (*.*) - + Cockatrice replays (*.cor) Powtórki Cockatrice (*.cor) @@ -7325,177 +7095,110 @@ Are you sure you would like to disable this feature? QPlatformTheme - + OK OK - + Save Zapisz - + Save All Zapisz Wszystko - + Open Otwórz - + &Yes Tak - + Yes to &All Tak - wszystko - + &No Nie - + N&o to All Nie - wszystko - + Abort Przerwij - + Retry Powtórz - + Ignore Ignoruj - + Close Zamknij - + Cancel Anuluj - + Discard Odrzuć - + Help Pomoc - + Apply Aplikuj - + Reset Reset - + Restore Defaults Przywróć domyślne - - QuickSetupPanel - - - %1% - - - - - <b>Quick Setup</b> - - - - - Generate all palette roles automatically from a single accent colour - - - - - Accent: - - - - - Primary hue. Used directly for highlights and links. -At high intensity it also tints buttons and backgrounds. - - - - - Intensity: - - - - - Subtle - - - - - Full colour - - - - - 0–30 Subtle tint — only highlights and links change hue -30–70 Accented — buttons, tooltips, and borders join in -70–100 Full colour — backgrounds, everything - - - - - 70% - - - - - Generate ↓ - - - - - Derive all palette roles from the accent colour above. -Fine-tune individual colours in the grid afterwards. - - - RemoteDeckList_TreeModel - + Name Nazwa - + ID ID - + Upload time Data dodania @@ -7503,32 +7206,32 @@ Fine-tune individual colours in the grid afterwards. RemoteReplayList_TreeModel - + ID ID - + Name Nazwa - + Players Gracze - + Keep Zachowaj - + Time started Czas rozpoczęcia - + Duration (sec) Czas trwania (sek) @@ -7536,37 +7239,37 @@ Fine-tune individual colours in the grid afterwards. RfgMenu - + &Exile - + &View exile - + &Move exile to... - + &Top of library - + &Bottom of library - + &Hand - + &Graveyard @@ -7612,7 +7315,7 @@ Fine-tune individual colours in the grid afterwards. SayMenu - + S&ay @@ -7653,27 +7356,27 @@ Fine-tune individual colours in the grid afterwards. SetsModel - + Enabled Włączone - + Set type Rodzaj dodatku - + Set code Kod dodatku - + Long name Pełna nazwa - + Release date Data wydania @@ -7681,53 +7384,53 @@ Fine-tune individual colours in the grid afterwards. ShortcutSettingsPage - - + + Restore all default shortcuts Przywróć domyślne skróty - + Do you really want to restore all default shortcuts? Czy na pewno chcesz przywrócić wszystkie domyślne skróty? - + Clear all default shortcuts Wyczyść wszystkie domyślne skróty - + Do you really want to clear all shortcuts? Czy na pewno chcesz wyczyścić wszystkie skróty? - + Section: Sekcja: - + Action: Akcja: - + Shortcut: Skrót: - + How to set custom shortcuts Jak ustawić niestandardowe skróty klawiszowe - + Clear all shortcuts Wyczyść wszystkie skróty - + Search by shortcut name Szukaj po nazwie skrótu @@ -7783,12 +7486,12 @@ Sprawdź ustawienia skrótów! SideboardMenu - + &Sideboard - + &View sideboard @@ -7796,27 +7499,27 @@ Sprawdź ustawienia skrótów! SoundSettingsPage - + Enable &sounds Włącz &efekty dźwiękowe - + Current sounds theme: Aktualny zestaw dźwięków: - + Test system sound engine Testuj silnik dźwiękowy systemu - + Sound settings Ustawienia dźwięku - + Master volume Główne ustawienia głośności @@ -7888,146 +7591,16 @@ Sprawdź ustawienia skrótów! Nieprawidłowa odpowiedź serwera uaktualnień wersji. - + No reply received from the tag update server. Brak odpowiedzi z serwera uaktualnień tagów. - + Invalid reply received from the tag update server. Nieprawidłowa odpowiedź serwera uaktualnień tagów. - - StorageSettingsPage - - - - - Success - - - - - Cached card pictures have been reset. - - - - - Downloaded card pictures have been reset. - - - - - Error - - - - - One or more downloaded card pictures could not be cleared. - - - - - In-memory (currently loaded) card pictures have been reset. - - - - - Card Picture Loader Caching Method: - - - - - The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size. - - - - - Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while. - - - - - This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk. - - - - - Delete Cached Images - - - - - Delete Saved Images - - - - - Clear In-Memory Images - - - - - Card Picture Loader Cache Method - - - - - Network Cache - - - - - Filesystem - - - - - In-Memory Picture Cache - - - - - Network Cache Size: - - - - - On-disk cache for downloaded pictures - - - - - Redirect Cache TTL: - - - - - How long cached redirects for urls are valid for. - - - - - Picture Cache Size: - - - - - In-memory cache for pictures not currently on screen - - - - - Naming scheme: - - - - - Day(s) - - - TabAccount @@ -8163,117 +7736,117 @@ Sprawdź ustawienia skrótów! TabArchidekt - - + + Desc. - - + + AND - - + + Require ALL selected colors - - + + Deck name... - - + + Owner... - - + + Packages - - + + Advanced Filters - + Bracket: - - + + Any - - + + Contains card... - - + + Commander... - - + + Tag... - - + + Deck Size - + Cards: - - + + Asc. - + Sort by: - + Filter by: - + Display Settings - - + + Search - - + + Formats @@ -8283,54 +7856,6 @@ Sprawdź ustawienia skrótów! - - TabCardArtRules - - - Card: - - - - - ProviderId: - - - - - Mode: - - - - - Reason: - - - - - Type a card name... - - - - - Add rule - - - - - Remove rule - - - - - Refresh - - - - - Card Art Rules - - - TabDeckEditor @@ -8379,7 +7904,7 @@ Sprawdź ustawienia skrótów! Resetuj układ - + Deck: %1 Talia: %1 @@ -8387,49 +7912,55 @@ Sprawdź ustawienia skrótów! TabDeckEditorVisual - + Visual Deck: %1 - + &Visual Deck Editor - - + + Card Info - - + + Deck - + + + Filters + + + + &View - + Printing - + Visible - + Floating - + Reset layout @@ -8437,22 +7968,22 @@ Sprawdź ustawienia skrótów! TabDeckEditorVisualTabWidget - + Visual Deck View - + Visual Database Display - + Deck Analytics - + Sample Hand @@ -8460,134 +7991,134 @@ Sprawdź ustawienia skrótów! TabDeckStorage - + Local file system Pliki lokalne - + Server deck storage Przechowalnia talii na serwerze - - + + Open in deck editor Otwórz w edytorze talii - + Rename deck or folder - + Upload deck Wyślij talię - + Download deck Pobierz talię + - - - + + New folder Nowy folder + - Delete Usuń - + Open decks folder Otwórz folder talii - + Rename local folder - + Rename local file - + New name: - - - - + + + + Error Błąd - + Rename failed - - + + Invalid deck file Nieprawidłowy plik talii - + Enter deck name Podaj nazwę talii - + This decklist does not have a name. Please enter a name: Talia nie posiada nazwy. Wprowadź nazwę: - + Unnamed deck Nienazwana talia - + Failed to upload deck to server Nie udało się wysłać talii na serwer - + Delete local file Usuń plik lokalny - + Are you sure you want to delete the selected files? Czy na pewno chcesz usunąć wybrane pliki? - + Delete remote decks Usuń zdalną talię - + Are you sure you want to delete the selected decks? Czy na pewno chcesz usunąć wybrane talie? - - + + Name of new folder: Nazwa nowego folderu: @@ -8659,191 +8190,191 @@ Wprowadź nazwę: TabGame - - - + + + Replay Powtórka - - + + Game Gra - - + + Player List Lista Graczy - - + + Card Info Informacje o karcie - - + + Messages Wiadomości - - + + Replay Timeline Oś czasu powtórki - + &Phases &Fazy - + &Game &Gra - + Next &phase Następna &faza - + Next phase with &action Następna faza z akcją - + Next &turn Następna &tura - + Reverse turn order Odwróć kolejność tur - + &Remove all local arrows Usuń wszystkie &wskaźniki - + Rotate View Cl&ockwise Obróć widok &zgodnie z ruchem wskazówek zegara - + Rotate View Co&unterclockwise Obróć widok &przeciwnie do ruchu wskazówek zegara - + Game &information &Informacje o grze - + Un&concede Powróć do gry - - - + + + &Concede &Poddaj grę - + &Leave game &Opuść grę - + C&lose replay &Zamknij powtórkę - + &Focus Chat Skup czat - + &Say: &Powiedz: - + Selected cards - + &View &Widok - + Visible Widoczne - + Floating Pływające - + Reset layout Resetuj układ - + Concede Poddaj grę - + Are you sure you want to concede this game? Czy na pewno chcesz poddać tę grę? - + Unconcede Powróć do gry - + You have already conceded. Do you want to return to this game? Poddałeś już się. Czy chcesz powrócić do tej gry? - + Leave game Opuść grę - + Are you sure you want to leave this game? Czy na pewno chcesz zakończyć tę rozgrywkę? - + A player has joined game #%1 Gracz dołączył do gry #%1 - + %1 has joined the game %1 dołączył(a) do gry. - + You have been kicked out of the game. Wyrzucono cię z gry. @@ -8902,115 +8433,115 @@ Wprowadź nazwę: Musisz wybrać poprawną liczbę dni żeby zlokalizować. - + Username: Nazwa użytkownika: - + IP Address: Adres IP: - + Game Name: Nazwa rozgrywki: - + GameID: ID Gry: - + Message: Wiadomość: - + Main Room Pokój Główny - + Game Room Pokój - + Private Chat Rozmowa Prywatna - + Past X Days: Ostatnie X Dni: - + Today Dziś - + Last Hour Ostatnia godzina - + Maximum Results: Maksymalny Wynik: - + At least one filter is required. The more information you put in, the more specific your results will be. Wymagany jest co najmniej jeden filtr. Im więcej podanych informacji, tym bardziej sprecyzowany wynik. - + Get User Logs Pobierz Logi Użytkownika - + Clear Filters Wyczyść Filtry - + Filters Filtry - + Log Locations Loguj Połóżenia - + Date Range Okres - + Maximum Results Maksymalny Wynik - - + + Message History Historia wiadomości - + Failed to collect message history information. Nie udało się zebrać informacji o historii wiadomości. - + There are no messages for the selected filters. Brak wiadomości dla wybranych filtrów. @@ -9028,27 +8559,27 @@ Im więcej podanych informacji, tym bardziej sprecyzowany wynik. &Opuść - + %1 - Private chat %1 - Prywatny chat - + This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. Ten użytkownik Cię ignoruje, nie może zobaczyć twoich wiadomości w głównym czacie oraz nie możesz dołączyć do jego gier. - + Private message from Prywatna wiadomość od - + %1 has left the server. Gracz %1 opuścił serwer. - + %1 has joined the server. Gracz %1 pojawił się na serwerze. @@ -9056,180 +8587,180 @@ Im więcej podanych informacji, tym bardziej sprecyzowany wynik. TabReplays - + Local file system Lokalny system plików - + Server replay storage Powtórki na serwerze - - + + Watch replay Obejrzyj powtórkę - + Rename Zmień nazwę - - + + New folder Nowy folder - - + + Delete Usuń - + Open replays folder Otwórz folder powtórek - + Download replay Pobierz powtórkę - + Toggle expiration lock Wł./Wył. ochronę przed automatycznym usunięciem - + Get replay share code - - + + Look up replay by share code - + Rename local folder Zmień nazwę lokalnego folderu - + Rename local file Zmień nazwę lokalnego pliku - + New name: Nowa nazwa: - + Error Błąd - + Rename failed Zmiana nazwy nie powiodła się - + Name of new folder: Nazwa nowego folderu: - + Delete local file Usuń plik lokalny - + Are you sure you want to delete the selected files? Czy na pewno chcesz usunąć wybrane pliki? - + Are you sure you want to delete the selected replays? Czy na pewno chcesz usunąć wybrane powtórki? - + Failed to get code - - + + Either this server does not support replay sharing, or does not permit replay sharing for you. - - - + + + Failed - + Could not get replay code - + Replay Share Code - + Others can use this code to add the replay to their list of remote replays: %1 - + Copy to clipboard - + Replay share code - + Replay code found - + Replay was added, or you already had access to it. - + Replay code not found - + Failed to submit code - + Unexpected error - + Delete remote replay Usuń przechowywaną powtórkę @@ -9242,62 +8773,47 @@ Im więcej podanych informacji, tym bardziej sprecyzowany wynik. TabRoom - - Friends - - - - - Online - - - - - Ignored - - - - + &Say: &Powiedz: - + Chat Czat - + &Room P&okój - + &Leave room Op&uść pokój - + &Clear chat Wyczyść &czat - + Chat Settings... Ustawienia czatu… - + mentioned you. wspomniał o tobie. - + Click to view Kliknij aby podglądnąć - + You are flooding the chat. Please wait a couple of seconds. Spamujesz. Poczekaj chwilę. @@ -9310,30 +8826,30 @@ Im więcej podanych informacji, tym bardziej sprecyzowany wynik. Serwer - - - - + + + + Error Błąd - + Failed to join the server room: it doesn't exist on the server. Błąd podczas próby dołączenia do pokoju: nie istnieje na serwerze. - + The server thinks you are in the server room but your client is unable to display it. Try restarting your client. Serwer myśli że jesteś w pokoju ale twój klient nie może tego wyświetlić. Spróbuj zrestartować twojego klienta. - + You do not have the required permission to join this server room. Nie masz uprawnień do dołączenia do tego pokoju. - + Failed to join the server room due to an unknown error: %1. Błąd podczas próby dołączenia do pokoju z powodu nieznanego błędu: %1 @@ -9341,97 +8857,97 @@ Im więcej podanych informacji, tym bardziej sprecyzowany wynik. TabSupervisor - + Deck Editor - + Visual Deck Editor - + EDHRec - + Archidekt - + Home - + &Visual Deck Storage - + Visual Database Display - + Server - + Account - + Deck Storage - + Game Replays - + Administration - + Logs - + Are you sure? Czy na pewno? - + There are still open games. Are you sure you want to quit? Ciągle masz otwarte gry. Czy na pewno chcesz wyjść? - + Click to view Kliknij aby podglądnąć - + Your buddy %1 has signed on! Twój znajomy %1 zalogował się! - + Unknown Event Nieznane zdarzenie - + The server has sent you a message that your client does not understand. This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. @@ -9442,39 +8958,39 @@ Ta wiadomośc może oznaczać że jest dostępna nowa wersja Cockatrice, lub że Aby aktualizować klienta, otwórz okno Pomoc -> Sprawdź Aktualizacje - + Idle Timeout Przekroczono czas bezczynności - + You are about to be logged out due to inactivity. Zostaniesz wylogowany ze względu na nieaktywność. - + Promotion Awans - + You have been promoted. Please log out and back in for changes to take effect. Zostałeś awansowany. Proszę wyloguj się i zaloguj ponownie aby zmiany zostały wprowadzone. - + Warned Ostrzeżony - + You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. Otrzymałeś ostrzeżenie z powodu %1. Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. Jeżeli masz pytania, wyślij prywatną wiadomość do moderatora. - + You have received the following message from the server. (custom messages like these could be untranslated) Otrzymałeś następującą wiadomość od serwera. @@ -9484,12 +9000,12 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. TabVisualDatabaseDisplay - + Database Display - + Visual Database Display @@ -9526,42 +9042,42 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. TranslateCounterName - + Life Życie - + White Biały - + Blue Niebieski - + Black Czarny - + Red Czerwony - + Green Zielony - + Colorless Bezkolorowy - + Other Inne @@ -9569,69 +9085,11 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. UpdateDownloader - + Could not open the file for reading. Nie można było otworzyć pliku do odczytu. - - UserCardArtSettingsDialog - - - Card Art Settings - - - - - Type a card name... - - - - - Card name: - - - - - Card ProviderId: - - - - - Left margin (%): - - - - - Right margin (%): - - - - - Vertical offset: - - - - - Zoom: - - - - - Parameters - - - - - Preview - - - - - Remove Banner Card - - - UserContextMenu @@ -9749,7 +9207,7 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. - + Ban History Historia blokad @@ -9764,87 +9222,77 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. Użytkownik nigdy nie został zablokowany - + Failed to collect ban information. Błąd podczas zbierania informacji o blokadach. - - - + + + Warning History Historia ostrzeżeń - + Warning Time;Moderator;User Name;Reason Ostrzeżenie Czas;Moderator;Nazwa Użytkownika;Powód - + User has never been warned. Użytkownik nigdy nie dostał ostrzeżenia. - + Failed to collect warning information. Błąd podczas zbierania informacji o ostrzeżeniach. - + Failed to get admin notes. Błąd podczas zbierania notatek administratorskich. - - + + Success Operacja zakończona pomyślnie - + Successfully promoted user. Pomyślny awans gracza. - + Successfully demoted user. Pomyślna degradacja gracza. - - Kick Player - - - - - Are you sure you want to kick this player from the game? - - - - - - + + + Failed Wystąpił błąd - + Failed to promote user. Błąd podczas awansu gracza. - + Failed to demote user. Błąd podczas degradacji gracza. - + Copy hash to clipboard Zapisz hash do schowka - + Remove this user's messages Usuń wiadomości tego użytkownika @@ -9852,554 +9300,326 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. UserInfoBox - + Location: Lokacja: - + Account Age: Wiek konta: - + Edit Edytuj - + Change password Zmień hasło - + Change avatar Zmień awatar - + Administrator Administrator - + Moderator Moderator - + Registered user Zarejestrowany użytkownik - - + + Unregistered user Niezarejestrowany użytkownik - + Judge Sędzia - + Unknown Nieznany - + The entered password does not match your account. Wpisane hasło nie pasuje do twojego konta. - - - - + + + Information Informacje - + User information updated. Informacje o użytkowniku zaktualizowane. - - - - - - - - - - - + + + + + + + + + + Error Błąd - + User Information Informacje o użytkowniku - + Real Name: Prawdziwe imię: - + User Level: Rodzaj użytkownika: - - - Edit Banner Card - - - + %n Year(s), amount of years (only shown if more than 0) %n Rok%n Lat%n Lat%n Lat - + %10%n Day(s) %20 amount of years (if more than 0), amount of days, date in local short format %10%n Dzień %20%10%n Dni %20%10%n Dni %20%10%n Dni %20 - + Enter Password Wpisz hasło - + Password verification is required in order to change your email address Weryfikacja hasłem jest wymagana aby zmienić twój adres email. - - - + + + An error occurred while trying to update your user information. Wystąpił błąd podczas aktualizacji informacji o użytkowniku. - - The selected card is blacklisted on this server or another error occurred. - - - - - Banner card removed. - - - - - Banner card updated. - - - - + This server does not permit you to update your user informations. Ten serwer nie pozwala na aktualizację twoich informacji o użytkowniku. - + Password changed. Hasło zmienione. - + This server does not permit you to change your password. Ten serwer nie pozwala na zmianę twojego hasła. - + The new password is too short. Nowe hasło jest za krótkie. - + The old password is incorrect. Stare hasło jest niepoprawne. - + Avatar updated. Awatar zaktualizowany - + This server does not permit you to update your avatar. Ten serwer nie pozwala na aktualizację twojego awatara. - - - An error occured while trying to update your avatar. - - - This server does not permit you to update your user informations. - An error occured while trying to updater your avatar. - Ten serwer nie pozwala na aktualizację twoich informacji o użytkowniku. - - - - UserInfoPopup - - - - Games - - - - - Chat - - - - - Open private chat - - - - - Profile - - - - - View user profile - - - - - Show this user's games - - - - - − Buddy - - - - - Remove from buddy list - - - - - + Buddy - - - - - Add to buddy list - - - - - − Ignore - - - - - Remove from ignore list - - - - - + Ignore - - - - - Add to ignore list - - - - - Ban - - - - - Ban from server - - - - - Warn - - - - - Warn user - - - - - Ban log - - - - - View ban history - - - - - Warn log - - - - - View warning history - - - - - Notes - - - - - View admin notes - - - - - − Mod - - - - - Demote from moderator - - - - - + Mod - - - - - Promote to moderator - - - - - − Judge - - - - - Demote from judge - - - - - + Judge - - - - - Promote to judge - - - - - Join game - - - - - Spectate - - - - - - Loading games… - - - - - Could not load games. - - - - - No active games. - + An error occured while trying to updater your avatar. + Wystąpił błąd podczas aktualizowania twojego awatara. UserInterfaceSettingsPage - + General interface settings Ogólne ustawienia interfejsu - + &Double-click cards to play them (instead of single-click) Zagrywaj karty po&dwójnym kliknięciem (zamiast pojedynczym) - + &Clicking plays all selected cards (instead of just the clicked card) Kliknięcie zagrywa wszystkie wybrane karty (zamiast tylko klikniętej karty) - + &Play all nonlands onto the stack (not the battlefield) by default Karty nie będące lądami zagrywaj domyślnie na stos (zamiast na &pole bitwy) - + Do not delete &arrows inside of subphases - + Close card view window when last card is removed - + Auto focus search bar when card view window is opened - + Annotate card text on tokens Dodaj tekst karty na tokenach - - Show selection count during drag selection + + Show selection counter during drag selection - - Show total selection count + + Show total selection counter - - Show subtype breakdown in selection tally - - - - + Use tear-off menus, allowing right click menus to persist on screen Użycie odczepianych menu, pozwalające na zatrzymanie menu kontekstowego na ekranie - - Keep game chat focused when clicking in game (Note: disables card view search bar) - - - - + Notifications settings Ustawienia powiadomień - + Enable notifications in taskbar Włącz &powiadomienia na pasku zadań - + Notify in the taskbar for game events while you are spectating Powiadomienia na pasku zadań dla gier, które &obserwujesz - + Notify in the taskbar when users in your buddy list connect Powiadamiaj na pasku zadań kiedy użytkownik z twojej listy znajomych zaloguje się. - + Animation settings Ustawienia animacji - + &Tap/untap animation Animacja &tapowania/odtapowania - + Deck editor/storage settings - + Open deck in new tab by default Domyślnie otwórz talię w nowej karcie - + Use visual deck storage in game lobby - + Use selection animation for Visual Deck Storage - + When adding a tag in the visual deck storage to a .txt deck: - + do nothing - + ask to convert to .cod - + always convert to .cod - + Default deck editor type - + Classic Deck Editor - + Visual Deck Editor - + Replay settings Ustawienia powtórek - + Buffer time for backwards skip via shortcut: Buforuj czas do przeskoku w tył wywołane przez skrót: @@ -10407,22 +9627,22 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. UserListWidget - + Users connected to server: %1 - + Users in this room: %1 - + Buddies online: %1 / %2 - + Ignored users online: %1 / %2 @@ -10430,45 +9650,35 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. UtilityMenu - + Increment all card counters - + &Untap all permanents - + R&oll die... - - Flip coin - - - - + &Create token... - + C&reate another token - + Cr&eate predefined token - - - C&reate another %1 token - - VisualDatabaseDisplayColorFilterWidget @@ -10520,72 +9730,72 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. VisualDatabaseDisplayFilterToolbarWidget - + Sort by - + Filter by - + Save and load filters - + Filter by exact card name - + Filter by card main-type - + Filter by card sub-type - + Filter by set - + Filter by format legality - + Save/Load - + Name - + Main Type - + Sub Type - + Sets - + Formats @@ -10593,22 +9803,22 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. VisualDatabaseDisplayFormatLegalityFilterWidget - + Show formats with at least: - + cards - + Do not display formats with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) @@ -10626,32 +9836,32 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. VisualDatabaseDisplayMainTypeFilterWidget - + Show main types with at least: - + cards - + Do not display card main-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10659,27 +9869,27 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. VisualDatabaseDisplayNameFilterWidget - + Filter by name... (Exact match) - + Load from Deck - + Apply all card names in currently loaded deck as exact match name filters - + Load from Clipboard - + Apply all card names in clipboard as exact match name filters @@ -10687,7 +9897,7 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. VisualDatabaseDisplayRecentSetFilterSettingsWidget - + Filter to most recent sets @@ -10695,19 +9905,19 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. VisualDatabaseDisplaySetFilterWidget - + Search sets... - - + + Mode: Exact Match - - + + Mode: Includes @@ -10715,37 +9925,37 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. VisualDatabaseDisplaySubTypeFilterWidget - + Search subtypes... - + Show sub types with at least: - + cards - + Do not display card sub-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10753,23 +9963,23 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. VisualDatabaseDisplayWidget - + Search by card name (or search expressions) - + Visual - + Loading database ... - + Clear all filters @@ -10808,17 +10018,17 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. - + Toggle Layout: Overlap - + Change how cards are displayed within zones (i.e. overlapped or fully visible.) - + Toggle Layout: Flat @@ -10847,17 +10057,17 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. VisualDeckEditorWidget - + Type a card name here for suggestions from the database... - + Quick search and add card - + Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter @@ -10975,43 +10185,43 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. WarningDialog - + Which warning would you like to send? Jakie ostrzeżenie chciałbyś wysłać? - + Redact all messages from this user in all rooms Redaguj wiadomości od tego użytkownika we wszystkich pokojach - + &OK &OK - + &Cancel &Anuluj - + Warn user for misconduct Ostrzeż gracza za złe zachowanie - - + + Error Błąd - + User name to send a warning to can not be blank, please specify a user to warn. Nazwa gracza do wysłania ostrzeżenia nie może być pusta, prosze podać gracza. - + Warning to use can not be blank, please select a valid warning to send. Ostrzeżenie nie może być puste, zaznacz poprawne ostrzeżenie do wysłania. @@ -11019,133 +10229,133 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. WndSets - + Move selected set to the top Przesuń zaznaczony set do góry - + Move selected set up Przesuć wybrany dodatek w górę - + Move selected set down Przesuń wybrany dodatek w dół - + Move selected set to the bottom Przesuń zaznaczony set na dół - + Search by set name, code, or type Szukaj po nazwie dodatku, kodzie lub typie - + Default order Domyślna kolejność - + Restore original art priority order Przywróć oryginalny priorytet obrazów kart - + Enable all sets Włącz wszystkie dodatki - + Disable all sets Wyłącz wszystkie dodatki - + Enable selected set(s) Włącz zaznaczony/e set(y) - + Disable selected set(s) Wyłącz zaznaczony/e set(y) - + Deck Editor Edycja Talii - + Use CTRL+A to select all sets in the view. Użyj CTRL+A aby wybrać wszystkie dodatki w widoku. - + Only cards in enabled sets will appear in the card list of the deck editor. Tylko karty z odblokowanych dodatków pojawią się w edytorze talii kart - + Image priority is decided in the following order: Priorytet obrazów jest ustalany w następujący sposób: - + first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) %1 is a link to the wiki najpierw folder NIESTANDARDOWYCH (%1), potem Włączone Dodatki w tym oknie dialogowym (Z góry na dół) - + Include cards rebalanced for Alchemy [requires restart] - + Card Art Obraz karty - + How to use custom card art Jak ustawić niestandardowe obrazy do kart - + Hints Wskazówki - + Note Notatka - + Sorting by column allows you to find a set while not changing set priority. Sortowane kolumnami pozwala ci znaleźć dodatek nie zmieniając ich priorytetów. - + To enable ordering again, click the column header until this message disappears. Aby wyłączyć sortowanie klikaj ponownie na ten sam nagłówek kolumny aż zniknie ten komunikat. - + Use the current sorting as the set priority instead Użyj tymczasowego sortowania jako priorytet dodatków - + Sorts the set priority using the same column Sortuje priorytet dodatków korzystając z tej samej kolumny - + Manage sets Zarządzaj dodatkami @@ -11153,72 +10363,72 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. ZoneViewWidget - + Search by card name (or search expressions) - + Ungrouped Niepogrupowane - + Group by Type Grupuj po typie - + Group by Mana Value Grupuj po wartości many - + Group by Color Grupuj po kolorze - + Unsorted Nieposortowane - + Sort by Name Sortuj według nazwy - + Sort by Type Sortuj według typu - + Sort by Mana Cost Sortuj według wartości many - + Sort by Colors Sortuj według koloru - + Sort by P/T Sortuj według P/T - + Sort by Set Sortuj według dodatku - + shuffle when closing przetasuj przy zamykaniu - + pile view widok sterty @@ -11226,7 +10436,7 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. i18n - + English Polski (Polish) @@ -11234,12 +10444,12 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. main - + Connect on startup Zaloguj po uruchowmieniu - + Debug to file Debuguj do pliku @@ -11253,7 +10463,7 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. - + Deck Editor Edycja Talii @@ -11334,7 +10544,7 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. - + Replays Powtórki @@ -11449,129 +10659,129 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. Wczytaj talię... - - + + Load Deck from Clipboard... Wczytaj talię ze schowka… - + Edit Deck in Clipboard, Annotated - + Edit Deck in Clipboard - + New Deck Nowa talia - + Open Custom Pictures Folder Otwórz folder z niestandardowymi obrazkami - + Print Deck... Drukuj talię - + Delete Card Usuń kartę - - + + Reset Layout Zresetuj wygląd - + Save Deck Zapisz talię - + Save Deck as... Zapisz talię jako… - + Save Deck to Clipboard, Annotated Zapisz talię, anotowaną, do schowka - + Save Deck to Clipboard, Annotated (No Set Info) - + Save Deck to Clipboard Zapisz talię do schowka - + Save Deck to Clipboard (No Set Info) - + Load Local Deck... Wczytaj talię lokalną... - + Load Remote Deck... Wczytaj zdalną talię... - + Set Ready to Start Ustaw gotowość do rozpoczęcia - + Toggle Sideboard Lock Przełącz blokadę sideboard - + Add Green Counter Dodaj Zielony Znacznik - + Remove Green Counter Odejmij Zielony Znacznik - + Set Green Counters... Ustaw Zielony Znacznik... - + Add Red Counter Dodaj Czerwony Znacznik - + Remove Red Counter Odejmij Czerwony Znacznik - + Set Red Counters... Ustaw Czerwony Znacznik - + Add Life Counter Dodaj do Znacznika Życia @@ -11581,744 +10791,724 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. - - Load deck from online service... - - - - - Load from website... - - - - + Unload Deck - + Force Start - + Add Card Counter (F) - + Remove Card Counter (F) - + Set Card Counters (F)... - + Add Card Counter (E) - + Remove Card Counter (E) - + Set Card Counters (E)... - + Add Card Counter(D) - + Remove Card Counter (D) - + Set Card Counters (D)... - + Add Card Counter (C) - + Remove Card Counter (C) - + Set Card Counters (C)... - + Add Card Counter (B) - + Remove Card Counter (B) - + Set Card Counters (B)... - + Add Card Counter (A) - + Remove Card Counter (A) - + Set Card Counters (A)... - + Remove Life Counter Odejmij od Znacznika Życia - + Set Life Counters... Ustaw Znacznik Życia... - + Add White Counter Dodaj Biały Znacznik - + Remove White Counter Odejmij Biały Znacznik - + Set White Counters... Ustaw Biały Znacznik... - + Add Blue Counter Dodaj Niebieski Znacznik - + Remove Blue Counter Odejmij Niebieski Znacznik - + Set Blue Counters... Ustaw Niebieski Znacznik... - + Add Black Counter Dodaj Czarny Znacznik - + Remove Black Counter Odejmij Czarny Znacznik - + Set Black Counters... Ustaw Czarny Znacznik... - + Add Colorless Counter Dodaj Bezkolorowy Znacznik - + Remove Colorless Counter Odejmij Bezkolorowy Znacznik - + Set Colorless Counters... Ustaw Bezkolorowy Znacznik... - + Add Other Counter Dodaj Inny Znacznik - + Remove Other Counter Odejmij Inny Znacznik - + Set Other Counters... Ustaw Inny Znacznik... - + Increment all card counters - + Add Power (+1/+0) Dodaj Power (+1/+0) - + Remove Power (-1/-0) Odejmij Power (-1/-0) - + Move Toughness to Power (+1/-1) Przesuń Toughness do Power (+1/-1) - + Add Toughness (+0/+1) Dodaj Toughness (+0/+1) - + Remove Toughness (-0/-1) Odejmij Toughness (-0/-1) - + Move Power to Toughness (-1/+1) Przesuń Power do Toughness (-1/+1) - + Add Power and Toughness (+1/+1) Dodaj Power i Toughness (+1/+1) - + Remove Power and Toughness (-1/-1) Odejmij Power i Toughness (-1/-1) - + Set Power and Toughness... Ustaw Power i Toughness... - + Reset Power and Toughness Resetuj Power i Toughness - + Untap Odtapuj - + Upkeep Utrzymanie - + Draw Dobranie - + First Main Phase Pierwsza Faza Główna - + Start Combat Początek Walki - + Attack Atak - + Block Blok - + Damage Obrażenia - + End Combat Koniec Walki - + Second Main Phase Druga Faza Główna - + End Koniec - + Next Phase Następna Faza - + Next Phase Action Następna Akcja Fazowa - + Next Turn Następna Tura - + Hide Card in Reveal Window - + Tap / Untap Card Zatapuj / Odtapuj kartę - + Untap All Odtapuj Wszystkie - + Toggle Skip Untapping Toggle Untap - + Turn Card Over Obróć Kartę - + Peek Card Podglądnij Kartę - + Play Card Zagraj Kartę - + Play Card, Face Down - + Attach Card... Dołącz Kartę.. - + Unattach Card Odłącz Kartę - + Clone Card Sklonuj Kartę - + Create Token... Utwórz token… - + Create All Related Tokens Stwórz Wszystkie Pokrewne Tokeny - + Create Another Token Stwórz Kolejny Token - + Set Annotation... Ustaw Adnotację… - - Reduce Life by Power - - - - + Select All Cards in Zone Zaznacz Wszystkie Karty w Strefie - + Select All Cards in Row Zaznacz Wszystkie Karty w Rzędzie - + Select All Cards in Column Zaznacz Wszystkie Karty w Kolumnie - + Reveal Selected Cards to All Players - - + + Bottom of Library Dno biblioteki - - - - + + + + Exile Wygnanie - - - - + + + + Graveyard Grób - - + + Hand Ręka - - + + Top of Library Wierzch biblioteki - - + + Battlefield, Face Down Pole Bitwy, Koszulką do Góry - + Battlefield Pole Bitwy - + Library Biblioteka - + Sideboard Biblioteka poboczna - + Top Cards of Library Karty z Wierzchu Biblioteki - + Bottom Cards of Library - + Close Recent View Zamknij Ostatni Widok - - + + Stack Stos - - + + Graveyard (Multiple) Cmentarz (Wiele) - - + + Graveyard (Multiple), Face Down - - + + Exile (Multiple) Wygnanie (Wiele) - - + + Exile (Multiple), Face Down - + Stack Until Found Stos aż do Znalezienia - + Draw Bottom Card Dobierz Kartę z Dna - + Draw Multiple Cards from Bottom... Dobierz Wiele Kart z Dna... - + Draw Arrow... Narysuj wskaźnik... - + Remove Local Arrows Usuń Lokalne Wskaźniki - + Leave Game Opuść Grę - + Concede Poddanie - + Roll Dice... Rzuć Kośćmi... - - Flip Coin - - - - + Shuffle Library Potasuj Bibliotekę - + Shuffle Top Cards of Library - + Shuffle Bottom Cards of Library - + Mulligan Mulligan - + Mulligan (Same hand size) - + Mulligan (Hand size - 1) - + Draw a Card Dobierz Kartę - + Draw Multiple Cards... Dobierz Wiele Kart... - + Undo Draw Cofnij Dobranie - + Always Reveal Top Card Zawsze Odkrywaj Górną Kartę - + Always Look At Top Card Zawsze Patrz na Górną Kartę - + Sort Hand by Name - + Sort Hand by Type - + Sort Hand by Mana Value - + Reveal Hand to All Players - + Reveal Random Card to All Players - + Rotate View Clockwise Obróć widok zgodnie z ruchem wskazówek zegara - + Rotate View Counterclockwise Obróć widok przeciwnie do ruchu wskazówek zegara - + Unfocus Text Box Nie skupiaj Tekstu - + Focus Chat Skup Czat - + Clear Chat Wyczyść czat - + Refresh Odśwież - + Skip Forward Przeskocz do Przodu - + Skip Backward Przeskocz do Tyłu - + Skip Forward by a lot Bardzo Przeskocz do Przodu - + Skip Backward by a lot Bardzo Przeskocz do Tyłu - + Play/Pause Odtwórz/Pauza - + Toggle Fast Forward Przełącz przyspieszenie - + Home - + Visual Deck Storage - + Deck Storage - + Server - + Account - + Administration - + Logs diff --git a/cockatrice/translations/cockatrice_pt.ts b/cockatrice/translations/cockatrice_pt.ts index 912ee09d0..f67c8d138 100644 --- a/cockatrice/translations/cockatrice_pt.ts +++ b/cockatrice/translations/cockatrice_pt.ts @@ -2,7 +2,7 @@ AbstractCounter - + &Set counter... Definir marcador @@ -10,12 +10,12 @@ AbstractCounterDialog - + Set counter - + New value for counter '%1': @@ -36,60 +36,60 @@ AbstractTabDeckEditor - + Open in new tab - + Are you sure? - + The decklist has been modified. Do you want to save the changes? - - - - - - + + + + + + Error - + Could not open deck at %1 - + Could not save remote deck - - + + The deck could not be saved. Please check that the directory is writable and try again. - + Save deck - + The deck could not be saved. - + There are no cards in your deck to be exported @@ -105,12 +105,12 @@ Please check that the directory is writable and try again. AdminNotesDialog - + Update Notes - + Admin Notes for %1 @@ -127,227 +127,172 @@ Please check that the directory is writable and try again. Sideboard - - - Tokens - - AppearanceSettingsPage - + seconds - + Error - + Could not create themes directory at '%1'. - + Theme settings Definições do Tema - + Current theme: Tema actual: - + Open themes folder - + Home tab background source: - + Home tab background shuffle frequency: - + Disabled - + + Display card name of background in bottom right: + + + + Menu settings - + Show keyboard shortcuts in right-click menus - + Show game filter toolbar above list in room tab - + Card rendering Rendering da carta - + Display card names on cards having a picture Mostrar o nome em cartas com imagem - + Auto-Rotate cards with sideways layout - + Override all card art with personal set preference (Pre-ProviderID change behavior) - - Light - - - - - Dark - - - - - System - - - - - Active theme palette: - - - - - Edit theme palette - - - - - Home tab settings - - - - - Display card name of background in bottom right - - - - - Styling settings - - - - - Style user list - - - - - Card printings - - - - + Bump sets that the deck contains cards from to the top in the printing selector - + Scale cards on mouse over Aumentar as cartas ao passar o rato - + Use rounded card corners - - Card layout - - - - + Minimum overlap percentage of cards on the stack and in vertical hand - + Maximum initial height for card view window: - - + + rows - + Maximum expanded height for card view window: - + Card counters - + Counter %1 - + Hand layout Disposição da Mão - + Display hand horizontally (wastes space) Mostrar mão horizontalmente (desperdiça espaço) - + Enable left justification Permitir justificação de texto à esquerda - + Table grid layout Esquema da mesa - + Invert vertical coordinate Inverter coordenada vertical - + Minimum player count for multi-column layout: Número mínimo de kogadores para layout com múltiplas colunas: - + Maximum font size for information displayed on cards: @@ -355,12 +300,12 @@ Please check that the directory is writable and try again. ArchidektApiResponseDeckDisplayWidget - + Back to results - + Open Deck in Deck Editor @@ -386,112 +331,112 @@ Please check that the directory is writable and try again. BanDialog - + ban &user name Banir nome de &utilizador - + ban &IP address Banir endereço de &IP - + ban client I&D banir I&D do cliente - + Ban type Tipo de Ban - + &permanent ban Ban &permanente - + &temporary ban Ban &temporário - + &Days: &Dias: - + &Hours: &Horas: - + &Minutes: &Minutos: - + Duration of the ban Duração do ban - + Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. Por favor introduza o motivo do ban. Isto apenas é guardado para os moderadores e não é visível para a pessoa banida. - + Please enter the reason for the ban that will be visible to the banned person. Por favor introduza o motivo do ban que será visível à pessoa banida. - + Redact all messages from this user in all rooms - + &OK &OK - + &Cancel &Cancelar - + Ban user from server Banir utilizador do servidor - - - - + + + + Error Erro - + You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. Tem de seleccionar um banimento baseado no nome, no IP ou ambos. - + You must have a value in the name ban when selecting the name ban checkbox. Deve preencher o campo de nome a banir quando selecciona a caixa de verificação para banir um nome. - + You must have a value in the ip ban when selecting the ip ban checkbox. Deve preencher o campo de IP a banir quando selecciona a caixa de verificação para banir um IP. - + You must have a value in the clientid ban when selecting the clientid ban checkbox. Deve preencher o campo de identificação de cliente quando selecciona a caixa de verificação para banir uma identificação de cliente. @@ -499,123 +444,59 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban BetaReleaseChannel - + Beta - + No reply received from the release update server. - + Invalid reply received from the release update server. - + No reply received from the file update server. - - CardArtPreviewWidget - - - No card selected - - - - - CardArtRulesModel - - - Card - - - - - ProviderId - - - - - Mode - - - - - Reason - - - CardDatabaseModel - + Name Nome - + Sets Expansões - + Mana cost Custo de mana - + Card type Tipo de carta - + P/T P/R - + Color(s) Cor(es) - - CardDatabaseView - - - Add to Deck - - - - - Add to Sideboard - - - - - Select Printing - - - - - Show on EDHRec (Commander) - - - - - Show on EDHRec (Card) - - - - - Show Related cards - - - CardFilter @@ -744,22 +625,22 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban CardInfoPictureWidget - + View related cards - + Add card to deck - + Mainboard - + Sideboard @@ -782,12 +663,12 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban - + Related cards: - + Unknown card: @@ -795,146 +676,128 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban CardMenu - + Re&veal to... - + &All players - + View related cards - + Token: - + All tokens - + &Select All - + S&elect Row - + S&elect Column - + &Play - + &Hide - + Play &Face Down - + &Tap / Untap Turn sideways or back again - + Skip &untapping - + T&urn Over Turn face up/face down - + &Peek at card face - + &Clone - + Attac&h to card... - + Unattac&h - + &Draw arrow... - + &Set annotation... - - Reduce life by power - - - - + Ca&rd counters - + &Add counter (%1) - + &Remove counter (%1) - + &Set counters (%1)... - - CardPictureLoaderCacheMethod - - - Network Cache - - - - - Filesystem - - - CardSizeWidget @@ -946,133 +809,133 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban CardZoneLogic - + their hand nominative - + %1's hand nominative - + their library look at zone - + %1's library look at zone - + of their library top cards of zone, - + of %1's library top cards of zone - + their library reveal zone - + %1's library reveal zone - + their library shuffle - + %1's library shuffle - + their library nominative - + %1's library nominative - + their graveyard nominative - + %1's graveyard nominative - + their exile nominative - + %1's exile nominative - + their sideboard look at zone - + %1's sideboard look at zone - + their sideboard nominative - + %1's sideboard nominative - + their custom zone '%1' nominative - + %1's custom zone '%2' nominative @@ -1094,421 +957,16 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban - - ColorButton - - - Click to pick a color - - - - - Pick colour - - - - - ConnectionController - - - - The server has reached its maximum user capacity, please check back later. - - - - - There are too many concurrent connections from your address. - - - - - Banned by moderator - - - - - Expected end time: %1 - - - - - This ban lasts indefinitely. - - - - - Scheduled server shutdown. - - - - - - Invalid username. - - - - - You have been logged out due to logging in at another location. - - - - - Connection closed - - - - - The server has terminated your connection. -Reason: %1 - - - - - The server is going to be restarted in %n minute(s). -All running games will be lost. -Reason for shutdown: %1 - - - - - Scheduled server shutdown - - - - - Failed Login - - - - - Your client seems to be missing features this server requires for connection. - - - - - To update your client, go to 'Help -> Check for Client Updates'. - - - - - - - - - - - - - - - - - - - - - - Error - - - - - Incorrect username or password. Please check your authentication information and try again. - - - - - There is already an active session using this user name. -Please close that session first and re-login. - - - - - - You are banned until %1. - - - - - - You are banned indefinitely. - - - - - This server requires user registration. Do you want to register now? - - - - - This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. -Please close and reopen your client to try again. - - - - - An internal error has occurred, please close and reopen Cockatrice before trying again. -If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - - - - Account activation - - - - - Your account has not been activated yet. -You need to provide the activation token received in the activation email. - - - - - Server Full - - - - - Unknown login error: %1 - - - - - - -This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - - - - - - - - - Registration denied - - - - - Registration is currently disabled on this server - - - - - There is already an existing account with the same user name. - - - - - It's mandatory to specify a valid email address when registering. - - - - - It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. - - - - - Password too short. - - - - - Registration failed for a technical problem on the server. - - - - - The connection to the server has been lost. - - - - - Unknown registration error: %1 - - - - - Account activation failed - - - - - Socket error: %1 - - - - - Server timeout - - - - - You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. -Local version is %1, remote version is %2. - - - - - Your Cockatrice client is obsolete. Please update your Cockatrice version. -Local version is %1, remote version is %2. - - - - - - Success - - - - - Registration accepted. -Will now login. - - - - - Account activation accepted. -Will now login. - - - - - Information - - - - - This server supports additional features that your client doesn't have. -This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. - -To update your client, go to Help -> Check for Updates. - - - - - - - Reset Password - - - - - Your password has been reset successfully, you can now log in using the new credentials. - - - - - Failed to reset user account password, please contact the server operator to reset your password. - - - - - Activation request received, please check your email for an activation token. - - - - - Connecting to %1... - - - - - Registering to %1 as %2... - - - - - Disconnected - - - - - Connected, logging in at %1 - - - - - Requesting forgotten password to %1 as %2... - - - - - Your username must respect these rules: - - - - - is %1 - %2 characters long - - - - - can %1 contain lowercase characters - - - - - - - - NOT - - - - - can %1 contain uppercase characters - - - - - can %1 contain numeric characters - - - - - can contain the following punctuation: %1 - - - - - first character can %1 be a punctuation mark - - - - - no unacceptable language as specified by these server rules: - note that the following lines will not be translated - - - - - can not contain any of the following words: %1 - - - - - can not match any of the following expressions: %1 - - - - - You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - - CustomZoneMenu - + C&ustom Zones - - + + View custom zone '%1' @@ -1516,35 +974,30 @@ To update your client, go to Help -> Check for Updates. DeckAnalyticsWidget - + Add Panel - + Remove Panel - + Save Layout - + Load Layout - - - Include Sideboard - - DeckEditorCardDatabaseDockWidget - + Card Database @@ -1560,17 +1013,47 @@ To update your client, go to Help -> Check for Updates. DeckEditorDatabaseDisplayWidget - + Search by card name (or search expressions) - + + Add to Deck + + + + + Add to Sideboard + + + + + Select Printing + + + + + Show on EDHRec (Commander) + + + + + Show on EDHRec (Card) + + + + + Show Related cards + + + + Add card to &maindeck - + Add card to &sideboard @@ -1603,72 +1086,72 @@ To update your client, go to Help -> Check for Updates. - + Select Printing - + Deck - + Deck &name: - + Banner Card/Tags Visibility Settings - + Show banner card selection menu - + Show tags selection menu - + &Comments: - + Group by: - + Format: - + Hash: - + &Increment number - + &Decrement number - + &Remove row - + Swap card to/from sideboard @@ -1676,17 +1159,17 @@ To update your client, go to Help -> Check for Updates. DeckEditorFilterDockWidget - + Filters - + &Clear all filters - + Delete selected @@ -1817,113 +1300,169 @@ To update your client, go to Help -> Check for Updates. DeckEditorSettingsPage - - + + Update Spoilers - + + Success - + Download URLs have been reset. - + + Downloaded card pictures have been reset. + + + + + Error + + + + + One or more downloaded card pictures could not be cleared. + + + + Add URL - - + + URL: - - + + Edit URL - + + Network Cache Size: + + + + + Redirect Cache TTL: + + + + + How long cached redirects for urls are valid for. + + + + + Picture Cache Size: + + + + Add New URL - + Remove URL - + + Day(s) + + + + Updating... - + Choose path - + URL Download Priority - + Spoilers - + Download Spoilers Automatically - + Spoiler Location: - + Last Change - + Spoilers download automatically on launch - + Press the button to manually update without relaunching - + Do not close settings until manual update is complete - + Download card pictures on the fly - + How to add a custom URL - + + Delete Downloaded Images + + + + Reset Download URLs + + + On-disk cache for downloaded pictures + + + + + In-memory cache for pictures not currently on screen + + DeckListHistoryManagerWidget @@ -1989,12 +1528,12 @@ To update your client, go to Help -> Check for Updates. DeckLoader - + Common deck formats (%1) - + All files (*.*) @@ -2216,27 +1755,27 @@ To update your client, go to Help -> Check for Updates. - + Moved to %1 1 × "%2" (%3) - + Removed "%1" (all copies) - + %1 1 × "%2" (%3) - + Added - + Removed @@ -2258,74 +1797,74 @@ To update your client, go to Help -> Check for Updates. DeckViewContainer - + Load deck... &Carregar deck... - + Load remote deck... Carregar deck remoto... - + Load from clipboard... - + Load from website... - + Unload deck - + Ready to start - + Force start - + Sideboard unlocked - + Sideboard locked - - + + Error Erro - + The selected file could not be loaded. O ficheiro seleccionado não pôde ser carregado. - + Deck is greater than maximum file size. - + Are you sure you want to force start? This will kick all non-ready players from the game. - + Cockatrice @@ -2424,7 +1963,7 @@ This will kick all non-ready players from the game. - + Webpage @@ -2464,37 +2003,37 @@ This will kick all non-ready players from the game. - + Server URL - + Communication Port - + Unique Server Name - + Connection Warning - + You need to name your new connection profile. - + Connect Warning Aviso de conexão - + The player name can't be empty. O nome de utilizador tem de ser inserido. @@ -2607,17 +2146,17 @@ This will kick all non-ready players from the game. Criar jogo - + Game information Informação do jogo - + Error Erro - + Server error. Erro do servidor. @@ -2625,97 +2164,97 @@ This will kick all non-ready players from the game. DlgCreateToken - + &Name: &Nome: - + Token Ficha - + C&olor: C&or: - + white branco - + blue azul - + black preto - + red vermelho - + green verde - + multicolor multicolor - + colorless incolor - + &P/T: &P/R: - + &Annotation: &Nota: - + &Destroy token when it leaves the table &Destruir ficha quando ela deixar a mesa - + Create face-down (Only hides name) - + Token data Informação de ficha - + Show &all tokens Mostrar &todas as fichas - + Show tokens from this &deck Mostrar &fichas deste deck - + Choose token from list Escolha ficha da lista - + Create token Criar ficha @@ -2749,7 +2288,7 @@ This will kick all non-ready players from the game. - + ✖ @@ -2764,12 +2303,12 @@ This will kick all non-ready players from the game. - + Duplicate Tag - + This tag already exists. @@ -2956,12 +2495,12 @@ Para remover o seu avatar actual, confirme SEM escolher uma nova imagem.Por favor introduza o nome da ficha: - + Error Erro - + The chosen name conflicts with an existing card or token. Make sure to enable the 'Token' set in the "Manage sets" dialog to display them correctly. @@ -2985,12 +2524,12 @@ Make sure to enable the 'Token' set in the "Manage sets" dia Indefinido - + Real name: Nome real: - + Edit user profile Fazer alterações no seu perfil: @@ -3028,113 +2567,113 @@ Make sure to enable the 'Token' set in the "Manage sets" dia - + Hide 'buddies only' games - + Hide full games - + Hide games that have started - + Hide password protected games - + Hide 'ignored user' games - + Hide games not created by buddies Hide games not created by buddy - + Hide games with forced open decklists - + &Newer than: - + Game &description: &Descrição de jogo: - + &Creator name: &Nome do criador: - + General - + &Game types &Tipo de jogo - + at &least: no &mínimo: - + at &most: no m&áximo: - + Maximum player count Limite máximo de jogadores - + Restrictions Restrições - + Show games only if &spectators can watch - + Show spectator password p&rotected games - + Show only if spectators can ch&at - + Show only if spectators can see &hands - + Spectators - + Filter games Filtrar jogos @@ -3437,37 +2976,37 @@ https://tappedout.net/mtg-decks/your-deck-name/ DlgMoveTopCardsUntil - + Card name (or search expressions): - + Number of hits: - + Auto play hits - + Put top cards on stack until... - + No cards matching the search expression exists in the card database. Proceed anyways? - + Cockatrice - + Invalid filter @@ -3526,40 +3065,40 @@ Your email will be used to verify your account. Indefinido - + Real name: Nome real: - + Register to server Registe-se no server - - - - + + + + Registration Warning Registo recusado - + Your password is too short. - + Your passwords do not match, please try again. As passwords que digitou não coincidem. - + Your email addresses do not match, please try again. Os emails que digitou não coincidem. - + The player name can't be empty. Tem de escolher um nome de utilizador. @@ -3567,17 +3106,17 @@ Your email will be used to verify your account. DlgRollDice - + Number of sides: - + Number of dice: - + Roll Dice @@ -3628,12 +3167,12 @@ Your email will be used to verify your account. DlgSettings - + Unknown Error loading card database Erro desconhecido ao carregar a base de dados das cartas - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -3650,7 +3189,7 @@ Poderá necessitar de correr o Oracle para actualizar a base de dados. Gostaria de alterar a localização da base de dados? - + Your card database version is too old. This can cause problems loading card information or images @@ -3667,7 +3206,7 @@ Pode ser reparado correndo o Oracle de novo para actualizar a base de dados das Gostaria de alterar a localização da base de dados? - + Your card database did not finish loading Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached @@ -3676,7 +3215,7 @@ Would you like to change your database location setting? - + File Error loading your card database. Would you like to change your database location setting? @@ -3685,7 +3224,7 @@ Would you like to change your database location setting? Gostaria de alterar a localização da base de dados? - + Your card database was loaded but contains no cards. Would you like to change your database location setting? @@ -3694,7 +3233,7 @@ Would you like to change your database location setting? Gostaria de alterar a localização da base de dados? - + Unknown card database load status Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues @@ -3703,64 +3242,59 @@ Would you like to change your database location setting? - - - + + + Error Erro - + The path to your deck directory is invalid. Would you like to go back and set the correct path? O directório do seu deck é inválido. Gostaria de voltar atrás e corrigir o directório? - + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? O directório das imagens das cartas é inválido. Gostaria de voltar atrás e corrigir o directório? - + Settings Definições - + General Geral - + Appearance Aparência - + User Interface Interface do utilizador - - Storage - - - - + Card Sources - + Chat Chat - + Sound Som - + Shortcuts Atalhos @@ -3852,9 +3386,9 @@ You can always change this behavior in the 'General' settings tab. - - - + + + Error Erro @@ -3906,31 +3440,31 @@ Please visit the download page to update manually. - + Update Available - + A new version of Cockatrice is available! - + New version - + Released - + Changelog @@ -3940,50 +3474,50 @@ Please visit the download page to update manually. - + Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. - + Please check the <a href="%1">releases page</a> on our Github and download the build for your system. - - - + + + Update Error Erro na actualização - + An error occurred while checking for updates: - + An error occurred while downloading an update: - + Installing... A instalar... - + Cockatrice is unable to open the installer. - + Try to update manually by closing Cockatrice and running the installer. - + Download location @@ -4073,67 +3607,67 @@ You may have to manually download the new version. DrawProbabilityWidget - + Draw Probability - + Probability of drawing - + Card Name - + Type - + Subtype - + Mana Value - + At least - + Exactly - + card(s) having drawn at least - + cards - + Category - + Qty - + Odds (%) @@ -4247,7 +3781,7 @@ You may have to manually download the new version. FilterBuilder - + Type your filter here @@ -4278,22 +3812,22 @@ You may have to manually download the new version. GameEventHandler - + kicked by game host or moderator - + player left the game - + player disconnected from server - + reason unknown @@ -4301,140 +3835,140 @@ You may have to manually download the new version. GameSelector - - - - - - - - - + + + + + + + + + Error Erro - + Please join the appropriate room first. Por favor entre na sala apropriada primeiro. - + Wrong password. Password incorrecta. - + Spectators are not allowed in this game. Não são permitidos espectadores neste jogo. - + The game is already full. O jogo já se encontra cheio. - + The game does not exist any more. O jogo já não existe. - + This game is only open to registered users. Este jogo só está aberto a utilizadores registados. - + This game is only open to its creator's buddies. Este jogo só está aberto aos amigos do seu criador. - + You are being ignored by the creator of this game. Você está a ser ignorado pelo criador deste jogo. - + Join Game - + Spectate Game - + Game Information - + Join Game as Judge - + Spectate Game as Judge - + Join game Entrar no jogo - + Password: Password: - + Please join the respective room first. Por favor entre na sala respectiva primeiro. - + &Filter games &Filtrar jogos - + C&lear filter &Limpar filtros - + C&reate C&riar - + &Join &Entrar - + Join as judge - + J&oin as spectator Entrar como &espectador - + Join as judge spectator - + Games shown: %1 / %2 - + Games Jogos @@ -4442,32 +3976,32 @@ You may have to manually download the new version. GameSelectorQuickFilterToolBar - + All types - + Filter by game name... - + Filter by game type/format - + Hide games not created by buddies - + Hide full games - + Hide started games @@ -4475,105 +4009,105 @@ You may have to manually download the new version. GamesModel - + >1 day - + %1%2 hr short age in hours - + new - + %1%2 min short age in minutes - + password senha - + buddies only amigos apenas - + reg. users only utilizadores registados apenas - + open decklists + - can chat pode falar - + see hands ver mãos - + can see hands pode ver as mãos - + not allowed não permitidos - + Room Sala - + Age Idade - + Description Descrição - + Creator Criador - + Type Tipo - + Restrictions Restrições - + Players Jogadores - + Spectators Espectadores @@ -4581,158 +4115,143 @@ You may have to manually download the new version. GeneralSettingsPage - + Reset all paths - + All paths have been reset - - - - - - - + + + + + + + Choose path Escolher directório - - Language settings - + + Personal settings + Defenições pessoais - + Language: Língua: - - Version settings - - - - - Card database - - - - - Startup settings - - - - + Paths (editing disabled in portable mode) Diretórios (edição desativada em modo portátil) - + Paths Directórios - + How to help with translations - + Decks directory: Directório dos decks: - + Filters directory: - + Replays directory: Directório de replays: - + Pictures directory: Directório das imagens: - + Card database: Base de dados das cartas: - + Custom database directory: - + Token database: Base de dados das fichas: - + Update channel - + Check for client updates on startup - + Check for card database updates on startup - + Don't check - + Prompt for update - + Always update in the background - + Check for card database updates every - + days - + Notify if a feature supported by the server is missing in my client - + Automatically run Oracle when running a new version of Cockatrice - + Show tips on startup - + Last update check on %1 (%2 days ago) @@ -4740,47 +4259,47 @@ You may have to manually download the new version. GraveyardMenu - + &Graveyard - + &View graveyard - + &Move graveyard to... - + &Top of library - + &Bottom of library - + &All players - + &Hand - + &Exile - + Reveal random card to... @@ -4788,88 +4307,88 @@ You may have to manually download the new version. HandMenu - + &Hand - + &View hand - + Sort hand by... - + Name - + Type - + Mana Value - + Take &mulligan (Choose hand size) - + Take mulligan (Same hand size) - + Take mulligan (Hand size - 1) - + &Move hand to... - + &Top of library - + &Bottom of library - + &Graveyard - + &Exile - + &Reveal hand to... - - + + All players - + Reveal r&andom card to... @@ -4877,52 +4396,52 @@ You may have to manually download the new version. HomeWidget - + Create New Deck - + Browse Decks - + Browse Card Database - + Browse EDHRec - + Browse Archidekt - + View Replays - + Quit - + Connecting... - + Connect - + Play @@ -4930,213 +4449,213 @@ You may have to manually download the new version. LibraryMenu - + &Library - + &View library - + View &top cards of library... - + View bottom cards of library... - + Reveal &library to... - + Lend library to... - + Reveal &top cards to... - + &Top of library... - + &Bottom of library... - + &Always reveal top card - + &Always look at top card - + &Open deck in deck editor - + &Draw card - + D&raw cards... - + &Undo last draw - + Shuffle - + &Play top card - + Play top card &face down - + Put top card on &bottom - + Move top card to grave&yard - + Move top card to e&xile - + Move top cards to &graveyard... - + Move top cards to graveyard face down... - + Move top cards to &exile... - + Move top cards to exile face down... - + Put top cards on stack &until... - + Shuffle top cards... - + &Draw bottom card - + D&raw bottom cards... - + &Play bottom card - + Play bottom card &face down - + Move bottom card to grave&yard - + Move bottom card to e&xile - + Move bottom cards to &graveyard... - + Move bottom cards to graveyard face down... - + Move bottom cards to &exile... - + Move bottom cards to exile face down... - + Put bottom card on &top - + Shuffle bottom cards... - - + + &All players - + Reveal top cards of library - + Number of cards: (max. %1) @@ -5144,271 +4663,636 @@ You may have to manually download the new version. MainWindow - - + + + The server has reached its maximum user capacity, please check back later. + O servidor atingiu a máxima capacidade de utilizadores, por favor verifique de novo mais tarde. + + + + There are too many concurrent connections from your address. + Há demasiadas ligações concorrentes do seu endereço. + + + + Banned by moderator + Banido por moderador + + + + Expected end time: %1 + Tempo previsto para o final:%1 + + + + This ban lasts indefinitely. + Este banimento dura indefinidamente. + + + + Scheduled server shutdown. + Encerramento do servidor agendado. + + + + + Invalid username. + Nome de utilizador invalido. + + + + You have been logged out due to logging in at another location. + Você deslogado por ter entrado numa outra localização. + + + + Connection closed + Ligação terminada + + + + The server has terminated your connection. +Reason: %1 + O servidor terminou a sua ligação. +Motivo: %1 + + + + The server is going to be restarted in %n minute(s). +All running games will be lost. +Reason for shutdown: %1 + O servidor vai ser reiniciado em %n minuto(s). +Todos os jogos a decorrer serão perdidos. +Motivo para o encerramento: %1O servidor vai ser reiniciado em %n minuto(s). +Todos os jogos a decorrer serão perdidos. +Motivo para o encerramento: %1O servidor vai ser reiniciado em %n minuto(s). +Todos os jogos a decorrer serão perdidos. +Motivo para o encerramento: %1 + + + + Scheduled server shutdown + Encerramento do servidor agendado + + + + + Success + Sucesso + + + + Registration accepted. +Will now login. + Registo aceite.%s +Entrará agora. + + + + Account activation accepted. +Will now login. + Activação da conta aceite. %s +Entrará agora. + + + + Player %1 Jogador %1 - + Load replay Carregar replay - + About Cockatrice Sobre o Cockatrice - + Version - + Cockatrice Webpage Website Cockatrice - + Project Manager: Gestor do projecto: - + Past Project Managers: Anteriores gestores do projecto: - + Developers: Desenvolvedores: - + Our Developers Os nossos desenvolvedores - + Help Develop! Ajuda Desenvolvimento! - + Translators: Tradutores: - + Our Translators - + Help Translate! Ajude a traduzir! - + Support: Ajuda técnica: - + Report an Issue Reportar um Problema - + Troubleshooting Solução de problemas - + F.A.Q. Perguntas frequentes - - + + + + + + + + + + + + + + + + + + + + Error Erro - + + Server timeout + Tempo do servidor esgotado + + + + Failed Login + Tentativa falhada de entrada + + + + Your client seems to be missing features this server requires for connection. + + + + + To update your client, go to 'Help -> Check for Client Updates'. + + + + + Incorrect username or password. Please check your authentication information and try again. + Nome de utilizador ou palavra-passe incorrecta. Por favor verifique as suas informações e tente de novo. + + + + There is already an active session using this user name. +Please close that session first and re-login. + Já existe uma sessão activa com este nome de utilizador. +Por favor termine essa sessão e volte a ligar-se. + + + + + You are banned until %1. + Está banido até %1. + + + + + You are banned indefinitely. + Está banido indefinidamente. + + + + This server requires user registration. Do you want to register now? + Este servidor requer registo de utilizador. Gostaria de se registar agora? + + + + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. + + + + + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. + + + + + Account activation + Activação de conta + + + + Your account has not been activated yet. +You need to provide the activation token received in the activation email. + + + + + Server Full + + + + + Unknown login error: %1 + Erro de login desconhecido:%1 + + + + + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. + +Normalmente isto significa que a sua versão de cliente está desactualizada e que o servidor enviou uma resposta que o seu cliente não percebe. + + + + Your username must respect these rules: + O seu nome de utilizador deve respeitar as seguintes regras: + + + + is %1 - %2 characters long + tem %1 - %2 caracteres + + + + can %1 contain lowercase characters + %1 pode conter caracteres em minúsculas + + + + + + + NOT + NÃO + + + + can %1 contain uppercase characters + %1 pode conter caracteres em maiúsculas + + + + can %1 contain numeric characters + %1 pode conter caracteres numéricos + + + + can contain the following punctuation: %1 + pode conter a seguinte pontuação: %1 + + + + first character can %1 be a punctuation mark + o primeiro caracter %1 pode ser pontuação + + + + no unacceptable language as specified by these server rules: + note that the following lines will not be translated + + + + + can not contain any of the following words: %1 + + + + + can not match any of the following expressions: %1 + + + + + You may only use A-Z, a-z, 0-9, _, ., and - in your username. + Apenas A-Z, a-z, 0-9, _, ., e - são permitidos. + + + + + + + + + Registration denied + Registo recusado + + + + Registration is currently disabled on this server + Os registos encontram-se indisponívels para este servidor de momento. + + + + There is already an existing account with the same user name. + Já existe uma conta com o mesmo nome de utilizador. + + + + It's mandatory to specify a valid email address when registering. + É obrigatório especificar um endereço de e-mail válido quando se regista. + + + + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + + + + + Password too short. + A password que inseriu é demasiado curta. + + + + Registration failed for a technical problem on the server. + Falha no registo devido a um problema técnico com o servidor + + + + The connection to the server has been lost. + + + + + Unknown registration error: %1 + Erro de registo desconhecido: %1 + + + + Account activation failed + Falha na activação de conta + + + + Socket error: %1 + Erro de ligação:%1 + + + + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + Está a tentar ligar-se a um servidor obsoleto. Por favor faça downgrade à sua versão do Cockatrice ou ligue-se a servidor adequado. +Versão local é %1, versão remota é %2. + + + + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + A sua versão do Cockatrice é obsoleta. Por favor actualize-a. +Versão local é %1, versão remota é %2. + + + + Connecting to %1... + Ligando a %1... + + + + Registering to %1 as %2... + Registando em %1 como %2... + + + + Disconnected + Desligado + + + + Connected, logging in at %1 + Conectado, logando em %1 + + + + + + Requesting forgotten password to %1 as %2... + + + + &Connect... &Ligar... - + &Disconnect &Desligar - + Start &local game... Começar &jogo local... - + &Watch replay... &Ver replay... - + &Full screen Ecrã &inteiro - + &Register to server... &A registar no servidor... - + &Restore password... - + &Settings... &Configurações... - + &Exit &Sair - + A&ctions A&cções - + &Cockatrice &Cockatrice - + C&ard Database B&ase de dados de cartas - + &Manage sets... - + Edit custom &tokens... - + Open custom image folder Abrir a pasta de imagens personalizadas - + Open custom sets folder Abrir a pasta de expansões personalizadas - + Add custom sets/cards Adicione cartas/expansões personalizadas - + Reload card database - + Tabs - + &Help &Ajuda - + &About Cockatrice S&obre o Cockatrice - + &Tip of the Day - + Check for Client Updates - + Check for Card Updates... - + Check for Card Updates (Automatic) - + Show Status Bar - + View &Debug Log - + Open Settings Folder - + Show/Hide - + New Version - + Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. - + Cockatrice installed - + Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. - + Card database Base de dados de cartas - + Cockatrice is unable to load the card database. Do you want to update your card database now? If unsure or first time user, choose "Yes" @@ -5417,183 +5301,209 @@ Deseja actualizar a sua base de dados agora?%s Se não tem a certeza ou é a primeira vez que está a utilizar o Cockatrice, escolha "Sim" - - + + Yes Sim - - + + No Não - + Open settings Abrir definições - + New sets found Novas expansões foram encontradas - + %n new set(s) found in the card database Set code(s): %1 Do you want to enable it/them? - - Yes, always enable - - - - + View sets Ver expansões - + Welcome Bem-vindo/a - + Hi! It seems like you're running this version of Cockatrice for the first time. All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. - + + Information Informação - + A card database update is already running. A actualização da base de dados das cartas já está a correr. - + Unable to run the card database updater: Incapaz de correr o actualizador da base de dados das cartas: - + Card database update running. - + Failed to start. The file might be missing, or permissions might be incorrect. - + The process crashed some time after starting successfully. - + Timed out. The process took too long to respond. The last waitFor...() function timed out. - + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. - + An error occurred when attempting to read from the process. For example, the process may not be running. - + Unknown error occurred. - + The card database updater exited with an error: %1 - - - - - + + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + + + + + + + + Load sets/cards Carregar expansões/cartas - + Selected file cannot be found. O ficheiro escolhido não foi encontrado. - + You can only import XML databases at this time. - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. Actualização completa com sucesso. %s O Cockatrice irá agora recarregar a base de dados das cartas. - + Sets/cards failed to import. Falha na importação de expansões/cartas. + + + + + Reset Password + + + + + Your password has been reset successfully, you can now log in using the new credentials. + + + + + Failed to reset user account password, please contact the server operator to reset your password. + + + + + Activation request received, please check your email for an activation token. + + ManaBaseConfigDialog - + Mana Base Configuration - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): - + OK - + Cancel @@ -5665,27 +5575,27 @@ O Cockatrice irá agora recarregar a base de dados das cartas. ManaDevotionConfigDialog - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): @@ -5755,615 +5665,610 @@ O Cockatrice irá agora recarregar a base de dados das cartas. MessageLogWidget - + from play do jogo - + from their graveyard do seu cemitério - + from exile vindo do exílio - + from their hand da sua mão - + the top card of %1's library a carta do topo do grimório de %1 - + the top card of their library a carta do topo dos seus grimórios - + from the top of %1's library do topo do grimório de %1 - + from the top of their library do topo dos seus grimórios - + the bottom card of %1's library a carta do fundo do grimório de %1 - + the bottom card of their library a carta do fundo dos seus grimórios - + from the bottom of %1's library do fundo do grimório de %1 - + from the bottom of their library do fundo dos seus grimórios - + from %1's library do grimório de %1 - + from their library dos seus grimórios - + from sideboard do sideboard - + from the stack da pilha - + from custom zone '%1' - + %1 is now keeping the top card %2 revealed. %1 está agora a manter a carta do topo %2 revelada. - + %1 is not revealing the top card %2 any longer. %1 já não está a manter a carta do topo %2 revelada. - + %1 can now look at top card %2 at any time. - + %1 no longer can look at top card %2 at any time. - + %1 attaches %2 to %3's %4. %1 anexa %2 a %4 de %3. - + %1 has conceded the game. %1 concedeu o jogo. - + %1 has unconceded the game. - + %1 has restored connection to the game. %1 restabeleceu a ligação ao jogo. - + %1 has lost connection to the game. %1 perdeu a ligação ao jogo. - + %1 points from their %2 to themselves. %1 aponta do seu %2 para si próprio. - + %1 points from their %2 to %3. %1 aponta do seu %2 para %3. - + %1 points from %2's %3 to themselves. %1 aponta do %3 de %2 para si própria. - + %1 points from %2's %3 to %4. %1 aponta de %3 de %2 para %4. - + %1 points from their %2 to their %3. %1 aponta do seu %2 para %3. - + %1 points from their %2 to %3's %4. %1 aponta do seu %2 para o %4 de %3. - + %1 points from %2's %3 to their own %4. %1 aponta de %3 de %2 para o seu %4. - + %1 points from %2's %3 to %4's %5. %1 aponta de %3 de %2 para %5 de %4. - + %1 creates a face down token. - + %1 creates token: %2%3. %1 cria ficha: %2%3. - + %1 has loaded a deck (%2). %1 carregou um deck (%2). - + %1 has loaded a deck with %2 sideboard cards (%3). %1 carregou um deck com %2 cartas na sideboard (%3). - + %1 destroys %2. %1 destrói %2. - + a card uma carta - + %1 gives %2 control over %3. %1 dá controlo sobre %3 a %2. - + %1 puts %2 into play%3 face down. - + %1 puts %2 into play%3. %1 coloca %2 em jogo %3. - + %1 puts %2%3 into their graveyard face down. - + %1 puts %2%3 into their graveyard. %1 coloca %2%3 no seu grimório. - + %1 exiles %2%3 face down. - + %1 exiles %2%3. %1 exila %2%3. - + %1 moves %2%3 to their hand. %1 move %2%3 para a sua mão. - + %1 puts %2%3 into their library. %1 coloca %2%3 no seu grimório. - + %1 puts %2%3 onto the bottom of their library. - + %1 puts %2%3 on top of their library. %1 coloca %2%3 no topo do seu grimório. - + %1 puts %2%3 into their library %4 cards from the top. %1 põe %2%3 no seu grimório, %4 cartas a contar do topo. - + %1 moves %2%3 to sideboard. %1 move %2%3 para o sideboard. - + %1 plays %2%3 face down. - + %1 plays %2%3. %1 joga %2%3. - + %1 moves %2%3 to custom zone '%4' face down. - + %1 moves %2%3 to custom zone '%4'. - + %1 tries to draw from an empty library - + %1 draws %2 card(s). - + %1 is looking at %2. %1 está a olhar para %2. - + %1 is looking at the %4 %3 card(s) %2. top card for singular, top %3 cards for plural - + bottom - + top - + %1 turns %2 face-down. - + %1 turns %2 face-up. - + The game has been closed. Este jogo foi encerrado. - + The game has started. O jogo começou. - + You are flooding the game. Please wait a couple of seconds. - + %1 has joined the game. %1 entrou no jogo. - + %1 is now watching the game. %1 está agora a ver o jogo. - + You have been kicked out of the game. Você foi expulso do jogo. - + %1 has left the game (%2). %1 abandonou o jogo (%2). - + %1 is not watching the game any more (%2). %1 não está mais a observar o jogo (%2). - + %1 is not ready to start the game any more. %1 já não está pronto a começar o jogo. - + %1 shuffles their deck and draws a new hand of %2 card(s). - + %1 shuffles their deck and draws a new hand. - + You are watching a replay of game #%1. Está a ver um replay do jogo #%1. - + %1 is ready to start the game. %1 está pronto a começar o jogo. - + cards an unknown amount of cards - + %1 card(s) a card for singular, %1 cards for plural - + %1 lends %2 to %3. - + %1 reveals %2 to %3. %1 revela %2 a %3. - + %1 reveals %2. %1 revela %2. - + %1 randomly reveals %2%3 to %4. %1 revela aleatoreamente %2%3. a %4. - + %1 randomly reveals %2%3. %1 revela aleatoreamente %2%3. - + %1 peeks at face down card #%2. %1 espreita a carta virada para baixo #%2. - + %1 peeks at face down card #%2: %3. %1 espreita a carta virada para baixo #%2: %3. - + %1 reveals %2%3 to %4. %1 revela %2%3 a %4. - + %1 reveals %2%3. %1 revela %2%3. - + %1 reversed turn order, now it's %2. - + reversed - + normal - + Heads Cara - + Tails Coroa - + %1 flipped a coin. It landed as %2. %1 atirou uma moeda ao ar. Calhou %2. - + %1 rolls a %2 with a %3-sided die. %1 obteve %2 com um dado de %3 faces. - + %1 flips %2 coins. There are %3 heads and %4 tails. - + %1 rolls a %2-sided dice %3 times: %4. - + %1's turn. Turno de %1. - + %1 sets annotation of %2 to %3. %1 coloca uma nota de %2 em%3. - - %1 places %2 %3%4 counter(s) on %5 (now %6). + + %1 places %2 "%3" counter(s) on %4 (now %5). - - %1 removes %2 %3%4 counter(s) from %5 (now %6). + + %1 removes %2 "%3" counter(s) from %4 (now %5). - - %1 failed to undo their last draw. - - - - + %1 sets counter %2 to %3 (%4%5). %1 altera o número de marcadores %2 para %3(%4%5). - + %1 sets %2 to not untap normally. %1 define %2 para não desvirar normalmente. - + %1 sets %2 to untap normally. %1 define %2 para desvirar normalmente. - + %1 removes the PT of %2. - + %1 changes the PT of %2 from nothing to %4. - + %1 changes the PT of %2 from %3 to %4. - + %1 has locked their sideboard. %1 bloqueou o seu sideboard. - + %1 has unlocked their sideboard. %1 desbloqueou o seu sideboard. - + %1 taps their permanents. %1 vira as suas permanentes. - + %1 untaps their permanents. %1 desvira as suas permanentes. - + %1 taps %2. %1 vira %2. - + %1 untaps %2. %1 desvira %2. - + %1 shuffles %2. %1 baralha %2. - + %1 shuffles the bottom %3 cards of %2. - + %1 shuffles the top %3 cards of %2. - + %1 shuffles cards %3 - %4 of %2. - + %1 unattaches %2. %1 desanexa %2. - + %1 undoes their last draw. %1 desfaz a sua última compra. - + %1 undoes their last draw (%2). %1 desfaz a sua última compra (%2). @@ -6371,115 +6276,110 @@ O Cockatrice irá agora recarregar a base de dados das cartas. MessagesSettingsPage - + Word1 Word2 Word3 - + Add New Message - + Edit Message - + Remove Message - + Add message Adicionar mensagem - - + + Message: Mensagem: - + Edit message - + Chat settings Definições do Chat - + Custom alert words Palavras alerta personalizáveis - + Enable chat mentions Permitir menções no chat - + Enable mention completer Permitir complementação de menções - + In-game message macros Macros de mensagem no decorrer do jogo - + How to use in-game message macros - + Ignore chat room messages sent by unregistered users Ignorar mensagens de chat enviadas por utilizadores não registados - + Ignore private messages sent by unregistered users Ignorar mensagens privadas enviadas por utilizadores não registados - - Ignore private messages sent by non-buddy users - - - - - + + Invert text color Inverter cor do texto - + Enable desktop notifications for private messages Permitir notificações de mensagens privadas no Ambiente de Trabalho - + Enable desktop notification for mentions Permitir notificações de menções no ambiente de trabalho - + Enable room message history on join Permitir o histórico de mensagens de uma sala ao entrar - - + + (Color is hexadecimal) (A cor é hexadecimal) - + Separate words with a space, alphanumeric characters only Palavras separadas com espaço, apenas caracteres alfanuméricos @@ -6487,42 +6387,42 @@ O Cockatrice irá agora recarregar a base de dados das cartas. MoveMenu - + Move to - + &Top of library in random order - + X cards from the top of library... - + &Bottom of library in random order - + T&able - + &Hand - + &Graveyard - + &Exile @@ -6535,47 +6435,47 @@ O Cockatrice irá agora recarregar a base de dados das cartas. - + Mana Value - + Color(s) - + Loyalty - + Main Card Type - + Mana Cost - + P/T - + Side - + Layout - + Color Identity @@ -6598,152 +6498,6 @@ O Cockatrice irá agora recarregar a base de dados das cartas. - - PaletteEditorDialog - - - - Reset - - - - - - Apply - - - - - - Save && Apply - - - - - ▼ Edit Palette - - - - - - ▶ Edit Palette - - - - - Palette Editor — %1 - - - - - <b>Palette Editor</b> &nbsp;·&nbsp; %1 - - - - - This theme ships no default palette files - - - - - Replace current colours with the theme author's defaults - - - - - Switch between the light and dark palette files - - - - - Editing: - - - - - Show or hide the per-role colour grid for manual tweaks - - - - - ↺ Revert to theme default - - - - - Discard unsaved edits and restore the last saved palette - - - - - Preview this palette without saving to disk - - - - - Write palette-%1.toml and reload the theme - - - - - Cannot save: this theme has no directory on disk - - - - - Save failed - - - - - Could not write %1 to: -%2 - - - - - No default found - - - - - No default palette file found for the "%1" scheme. - - - - - PaletteGridWidget - - - Active - - - - - Disabled - - - - - Inactive - - - - - Normal interactive state - - - - - Widget is disabled / not interactive - - - - - Window is in background / unfocused - - - Phase @@ -6810,57 +6564,57 @@ O Cockatrice irá agora recarregar a base de dados das cartas. PhasesToolbar - + Untap step Etapa de Desvirar - + Upkeep step Etapa de manutenção - + Draw step Etapa de compra - + First main phase 1ª Fase Principal (pré-combate) - + Beginning of combat step Etapa de Início de Combate - + Declare attackers step Etapa de Declaração de Atacantes - + Declare blockers step Etapa de Declaração de Bloqueadores - + Combat damage step Etapa de Dano de Combate - + End of combat step Etapa de Fim de Combate - + Second main phase 2ª Fase Principal (pós-combate) - + End of turn step Fase Final @@ -6868,7 +6622,7 @@ O Cockatrice irá agora recarregar a base de dados das cartas. PictureLoader - + en code for scryfall's language property, not available for all languages pt @@ -6877,142 +6631,151 @@ O Cockatrice irá agora recarregar a base de dados das cartas. PlayerActions - - - - - grave - - - - - - - - exile - - - - - PlayerDialogs - - + View top cards of library - - - - - - - - - + + + + + + + + + Number of cards: (max. %1) - + View bottom cards of library - + Shuffle top cards of library - + Shuffle bottom cards of library - + Draw hand - + 0 and lower are in comparison to current hand size - + Draw cards - + + + + + grave + + + + + + + + exile + + + + Move top cards to %1 - + Move bottom cards to %1 - + Draw bottom cards - + + + C&reate another %1 token + + + + Create tokens - + + Number: - + Place card X cards from top of library - + Which position should this card be placed: - + (max. %1) - + Change power/toughness - + Change stats to: - + Set annotation - + Please enter the new annotation: + + + Set counters + + PlayerMenu - + Player "%1" - + &Counters @@ -7042,7 +6805,7 @@ This setting means you'll only see the default printing for each card, instead o - + Printing Selector @@ -7050,22 +6813,22 @@ This setting means you'll only see the default printing for each card, instead o PrintingSelectorCardOverlayWidget - + Preference - + Pin Printing - + Unpin Printing - + Show Related cards @@ -7136,57 +6899,57 @@ This setting means you'll only see the default printing for each card, instead o PtMenu - + Power / toughness - + &Increase power - + &Decrease power - + I&ncrease toughness - + D&ecrease toughness - + In&crease power and toughness - + Dec&rease power and toughness - + Increase power and decrease toughness - + Decrease power and increase toughness - + Set &power and toughness... - + Reset p&ower and toughness @@ -7194,37 +6957,37 @@ This setting means you'll only see the default printing for each card, instead o QMenuBar - + Services Serviços - + Hide %1 Ocultar %1 - + Hide Others Ocultar outros - + Show All Mostrar tudo - + Preferences... Preferências... - + Quit %1 Sair %1 - + About %1 Cerca %1 @@ -7232,17 +6995,17 @@ This setting means you'll only see the default printing for each card, instead o QObject - + Cockatrice card database (*.xml) Base de dados de cartas Cockatrice (*.xml) - + All files (*.*) Todos os ficheiros (*.*) - + Cockatrice replays (*.cor) Replays do Cockatrice (*.cor) @@ -7302,177 +7065,110 @@ Are you sure you would like to disable this feature? QPlatformTheme - + OK - + Save - + Save All - + Open - + &Yes - + Yes to &All - + &No - + N&o to All - + Abort - + Retry - + Ignore - + Close - + Cancel - + Discard - + Help - + Apply - + Reset - + Restore Defaults - - QuickSetupPanel - - - %1% - - - - - <b>Quick Setup</b> - - - - - Generate all palette roles automatically from a single accent colour - - - - - Accent: - - - - - Primary hue. Used directly for highlights and links. -At high intensity it also tints buttons and backgrounds. - - - - - Intensity: - - - - - Subtle - - - - - Full colour - - - - - 0–30 Subtle tint — only highlights and links change hue -30–70 Accented — buttons, tooltips, and borders join in -70–100 Full colour — backgrounds, everything - - - - - 70% - - - - - Generate ↓ - - - - - Derive all palette roles from the accent colour above. -Fine-tune individual colours in the grid afterwards. - - - RemoteDeckList_TreeModel - + Name Nome - + ID ID - + Upload time Hora de upload @@ -7480,32 +7176,32 @@ Fine-tune individual colours in the grid afterwards. RemoteReplayList_TreeModel - + ID ID - + Name Nome - + Players Jogadores - + Keep Keep - + Time started Tempo de começo - + Duration (sec) Duração (seg) @@ -7513,37 +7209,37 @@ Fine-tune individual colours in the grid afterwards. RfgMenu - + &Exile - + &View exile - + &Move exile to... - + &Top of library - + &Bottom of library - + &Hand - + &Graveyard @@ -7589,7 +7285,7 @@ Fine-tune individual colours in the grid afterwards. SayMenu - + S&ay @@ -7630,27 +7326,27 @@ Fine-tune individual colours in the grid afterwards. SetsModel - + Enabled Activado - + Set type Tipo de expansão - + Set code Código da expansão - + Long name Nome longo - + Release date Data de lançamento @@ -7658,53 +7354,53 @@ Fine-tune individual colours in the grid afterwards. ShortcutSettingsPage - - + + Restore all default shortcuts - + Do you really want to restore all default shortcuts? - + Clear all default shortcuts - + Do you really want to clear all shortcuts? - + Section: - + Action: - + Shortcut: - + How to set custom shortcuts - + Clear all shortcuts - + Search by shortcut name @@ -7758,12 +7454,12 @@ Please check your shortcut settings! SideboardMenu - + &Sideboard - + &View sideboard @@ -7771,27 +7467,27 @@ Please check your shortcut settings! SoundSettingsPage - + Enable &sounds Permitir &sons - + Current sounds theme: Tema sonoro actual: - + Test system sound engine Teste motor de sistema de som - + Sound settings Definições de Som - + Master volume Volume mestre @@ -7863,146 +7559,16 @@ Please check your shortcut settings! - + No reply received from the tag update server. - + Invalid reply received from the tag update server. - - StorageSettingsPage - - - - - Success - - - - - Cached card pictures have been reset. - - - - - Downloaded card pictures have been reset. - - - - - Error - - - - - One or more downloaded card pictures could not be cleared. - - - - - In-memory (currently loaded) card pictures have been reset. - - - - - Card Picture Loader Caching Method: - - - - - The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size. - - - - - Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while. - - - - - This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk. - - - - - Delete Cached Images - - - - - Delete Saved Images - - - - - Clear In-Memory Images - - - - - Card Picture Loader Cache Method - - - - - Network Cache - - - - - Filesystem - - - - - In-Memory Picture Cache - - - - - Network Cache Size: - - - - - On-disk cache for downloaded pictures - - - - - Redirect Cache TTL: - - - - - How long cached redirects for urls are valid for. - - - - - Picture Cache Size: - - - - - In-memory cache for pictures not currently on screen - - - - - Naming scheme: - - - - - Day(s) - - - TabAccount @@ -8138,117 +7704,117 @@ Please check your shortcut settings! TabArchidekt - - + + Desc. - - + + AND - - + + Require ALL selected colors - - + + Deck name... - - + + Owner... - - + + Packages - - + + Advanced Filters - + Bracket: - - + + Any - - + + Contains card... - - + + Commander... - - + + Tag... - - + + Deck Size - + Cards: - - + + Asc. - + Sort by: - + Filter by: - + Display Settings - - + + Search - - + + Formats @@ -8258,54 +7824,6 @@ Please check your shortcut settings! - - TabCardArtRules - - - Card: - - - - - ProviderId: - - - - - Mode: - - - - - Reason: - - - - - Type a card name... - - - - - Add rule - - - - - Remove rule - - - - - Refresh - - - - - Card Art Rules - - - TabDeckEditor @@ -8354,7 +7872,7 @@ Please check your shortcut settings! Repor disposição - + Deck: %1 Deck:%1 @@ -8362,49 +7880,55 @@ Please check your shortcut settings! TabDeckEditorVisual - + Visual Deck: %1 - + &Visual Deck Editor - - + + Card Info - - + + Deck - + + + Filters + + + + &View - + Printing - + Visible - + Floating - + Reset layout @@ -8412,22 +7936,22 @@ Please check your shortcut settings! TabDeckEditorVisualTabWidget - + Visual Deck View - + Visual Database Display - + Deck Analytics - + Sample Hand @@ -8435,134 +7959,134 @@ Please check your shortcut settings! TabDeckStorage - + Local file system Ficheiros locais - + Server deck storage Decks armazenados no servidor - - + + Open in deck editor Abrir no editor de decks - + Rename deck or folder - + Upload deck Upload do deck - + Download deck Download do deck + - - - + + New folder Nova pasta + - Delete Apagar - + Open decks folder - + Rename local folder - + Rename local file - + New name: - - - - + + + + Error - + Rename failed - - + + Invalid deck file - + Enter deck name Introduza o nome do deck - + This decklist does not have a name. Please enter a name: Este deck nao tem um nome Por favor introduza um nome: - + Unnamed deck Deck sem nome - + Failed to upload deck to server - + Delete local file Apagar ficheiro local - + Are you sure you want to delete the selected files? - + Delete remote decks - + Are you sure you want to delete the selected decks? - - + + Name of new folder: Nome da nova pasta: @@ -8634,191 +8158,191 @@ Por favor introduza um nome: TabGame - - - + + + Replay Repetição - - + + Game Jogo - - + + Player List Jogadores - - + + Card Info Informação da carta - - + + Messages Mensagens - - + + Replay Timeline Repetir Cronologia - + &Phases Fa&ses - + &Game &Jogo - + Next &phase Próxima &fase - + Next phase with &action - + Next &turn Próximo &turno - + Reverse turn order - + &Remove all local arrows &Remover todas as setas locais - + Rotate View Cl&ockwise Rodar a vista no se&ntido dos ponteiros - + Rotate View Co&unterclockwise rodar a vista no se&ntido contrário aos ponteiros - + Game &information &Informação do jogo - + Un&concede - - - + + + &Concede &Conceder - + &Leave game Sair do &jogo - + C&lose replay &Fechar replay - + &Focus Chat - + &Say: &Dizer: - + Selected cards - + &View &Vista - + Visible Visível - + Floating Flutuando - + Reset layout Repor disposição - + Concede Conceder - + Are you sure you want to concede this game? Tem a certeza que deseja conceder este jogo? - + Unconcede - + You have already conceded. Do you want to return to this game? - + Leave game Sair do jogo - + Are you sure you want to leave this game? Tem a certeza que deseja sair deste jogo? - + A player has joined game #%1 - + %1 has joined the game - + You have been kicked out of the game. Foi expulso do jogo. @@ -8877,115 +8401,115 @@ Por favor introduza um nome: Deve seleccionar um número válido de dias para localizar. - + Username: Nome de utilizador: - + IP Address: Morada IP: - + Game Name: Nome do Jogo: - + GameID: ID do Jogo - + Message: Mensagem: - + Main Room Sala principal - + Game Room Sala de Jogo - + Private Chat Chat Privado - + Past X Days: Últimos X Dias: - + Today Hoje - + Last Hour Última Hora - + Maximum Results: Resultados Máximos: - + At least one filter is required. The more information you put in, the more specific your results will be. É requerido pelo menos um filtro. %s Quanta mais informação der, mais específicos serão os resultados. - + Get User Logs Obter registos dos utilizadores - + Clear Filters Limpar Filtros - + Filters Filtros: - + Log Locations Localização dos Registos - + Date Range Alcance de dados - + Maximum Results Resultados máximos - - + + Message History Histórico de mensagens - + Failed to collect message history information. Falha na obtenção do histórico de mensagens - + There are no messages for the selected filters. Não há mensagens para os filtros seleccionados @@ -9003,27 +8527,27 @@ Quanta mais informação der, mais específicos serão os resultados.&Abandonar - + %1 - Private chat %1 - Chat privado - + This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. - + Private message from - + %1 has left the server. %1 abandonou o servidor. - + %1 has joined the server. %1 entrou no servidor. @@ -9031,180 +8555,180 @@ Quanta mais informação der, mais específicos serão os resultados. TabReplays - + Local file system Ficheiros locais - + Server replay storage Armazenamento de replays no servidor - - + + Watch replay Ver replay - + Rename - - + + New folder - - + + Delete Apagar - + Open replays folder - + Download replay Download replay - + Toggle expiration lock Alternar bloqueio de expiração - + Get replay share code - - + + Look up replay by share code - + Rename local folder - + Rename local file - + New name: - + Error - + Rename failed - + Name of new folder: - + Delete local file Apagar ficheiro local - + Are you sure you want to delete the selected files? - + Are you sure you want to delete the selected replays? - + Failed to get code - - + + Either this server does not support replay sharing, or does not permit replay sharing for you. - - - + + + Failed - + Could not get replay code - + Replay Share Code - + Others can use this code to add the replay to their list of remote replays: %1 - + Copy to clipboard - + Replay share code - + Replay code found - + Replay was added, or you already had access to it. - + Replay code not found - + Failed to submit code - + Unexpected error - + Delete remote replay Apagar replay remoto @@ -9217,62 +8741,47 @@ Quanta mais informação der, mais específicos serão os resultados. TabRoom - - Friends - - - - - Online - - - - - Ignored - - - - + &Say: &Dizer: - + Chat Chat - + &Room &Sala - + &Leave room &Abandonar a sala - + &Clear chat &Limpar chat - + Chat Settings... Definições do chat... - + mentioned you. mencionou-o. - + Click to view Clicar para ver - + You are flooding the chat. Please wait a couple of seconds. Estás a inundar o chat .Por favor aguarde alguns segundos. @@ -9285,30 +8794,30 @@ Quanta mais informação der, mais específicos serão os resultados.Servidor - - - - + + + + Error Erro - + Failed to join the server room: it doesn't exist on the server. - + The server thinks you are in the server room but your client is unable to display it. Try restarting your client. - + You do not have the required permission to join this server room. - + Failed to join the server room due to an unknown error: %1. @@ -9316,97 +8825,97 @@ Quanta mais informação der, mais específicos serão os resultados. TabSupervisor - + Deck Editor - + Visual Deck Editor - + EDHRec - + Archidekt - + Home - + &Visual Deck Storage - + Visual Database Display - + Server - + Account - + Deck Storage - + Game Replays - + Administration - + Logs - + Are you sure? Tem a certeza? - + There are still open games. Are you sure you want to quit? Ainda estão a decorrer alguns jogos. Tem a certeza que quer sair? - + Click to view - + Your buddy %1 has signed on! - + Unknown Event - + The server has sent you a message that your client does not understand. This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. @@ -9414,39 +8923,39 @@ To update your client, go to Help -> Check for Updates. - + Idle Timeout - + You are about to be logged out due to inactivity. - + Promotion Promoção - + You have been promoted. Please log out and back in for changes to take effect. - + Warned Avisado - + You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. Recebeu um aviso devido a %1. %s Por favor evite continuar essa actividade ou acções serão tomadas contra si futuramente. Se tem alguma questão, por favor envie uma mensagem privada a um moderador. - + You have received the following message from the server. (custom messages like these could be untranslated) @@ -9455,12 +8964,12 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f TabVisualDatabaseDisplay - + Database Display - + Visual Database Display @@ -9497,42 +9006,42 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f TranslateCounterName - + Life - + White - + Blue - + Black - + Red - + Green - + Colorless - + Other @@ -9540,69 +9049,11 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f UpdateDownloader - + Could not open the file for reading. Incapaz de abrir o ficheiro para leitura. - - UserCardArtSettingsDialog - - - Card Art Settings - - - - - Type a card name... - - - - - Card name: - - - - - Card ProviderId: - - - - - Left margin (%): - - - - - Right margin (%): - - - - - Vertical offset: - - - - - Zoom: - - - - - Parameters - - - - - Preview - - - - - Remove Banner Card - - - UserContextMenu @@ -9720,7 +9171,7 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f - + Ban History Histórico de banições @@ -9735,87 +9186,77 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f O utilizador nunca foi banido. - + Failed to collect ban information. - - - + + + Warning History Histórico de avisos - + Warning Time;Moderator;User Name;Reason Hora do aviso; Moderador; Nome do Utilizador; Razão - + User has never been warned. O utilizador nunca foi avisado. - + Failed to collect warning information. - + Failed to get admin notes. - - + + Success Sucesso - + Successfully promoted user. Utilizador promovido com sucesso. - + Successfully demoted user. Utilizador despromovido com sucesso. - - Kick Player - - - - - Are you sure you want to kick this player from the game? - - - - - - + + + Failed Falhou - + Failed to promote user. Falha na promoção do utilizador. - + Failed to demote user. Falha na despromoção do utilizador. - + Copy hash to clipboard - + Remove this user's messages @@ -9823,554 +9264,326 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f UserInfoBox - + Location: Localização: - + Account Age: Idade da Conta - + Edit Editar - + Change password Alterar password - + Change avatar Alterar avatar - + Administrator Administrador - + Moderator Moderador - + Registered user Utilizador registado - - + + Unregistered user Utilizador não registado - + Judge - + Unknown Desconhecido - + The entered password does not match your account. - - - - + + + Information Informação - + User information updated. Informação do utilizador actualizada. - - - - - - - - - - - + + + + + + + + + + Error Erro - + User Information - + Real Name: - + User Level: - - - Edit Banner Card - - - + %n Year(s), amount of years (only shown if more than 0) - + %10%n Day(s) %20 amount of years (if more than 0), amount of days, date in local short format - + Enter Password - + Password verification is required in order to change your email address - - - + + + An error occurred while trying to update your user information. - - The selected card is blacklisted on this server or another error occurred. - - - - - Banner card removed. - - - - - Banner card updated. - - - - + This server does not permit you to update your user informations. Este servidor não permite a actualização da sua informação pessoal. - + Password changed. Password alterada. - + This server does not permit you to change your password. Este servidor não permite a actualização da sua password. - + The new password is too short. A password nova é demasiado curta. - + The old password is incorrect. A password antiga está incorrecta. - + Avatar updated. Avatar actualizado. - + This server does not permit you to update your avatar. Este servidor não permite a actualização do seu avatar. - - - An error occured while trying to update your avatar. - - - This server does not permit you to update your user informations. - An error occured while trying to updater your avatar. - Este servidor não permite a actualização da sua informação pessoal. - - - - UserInfoPopup - - - - Games - - - - - Chat - - - - - Open private chat - - - - - Profile - - - - - View user profile - - - - - Show this user's games - - - - - − Buddy - - - - - Remove from buddy list - - - - - + Buddy - - - - - Add to buddy list - - - - - − Ignore - - - - - Remove from ignore list - - - - - + Ignore - - - - - Add to ignore list - - - - - Ban - - - - - Ban from server - - - - - Warn - - - - - Warn user - - - - - Ban log - - - - - View ban history - - - - - Warn log - - - - - View warning history - - - - - Notes - - - - - View admin notes - - - - - − Mod - - - - - Demote from moderator - - - - - + Mod - - - - - Promote to moderator - - - - - − Judge - - - - - Demote from judge - - - - - + Judge - - - - - Promote to judge - - - - - Join game - - - - - Spectate - - - - - - Loading games… - - - - - Could not load games. - - - - - No active games. - + An error occured while trying to updater your avatar. + Um erro ocorreu ao tentar actualizar o seu avatar. UserInterfaceSettingsPage - + General interface settings Configurações gerais da interface - + &Double-click cards to play them (instead of single-click) Clicar &duas vezes nas cartas para as jogar (ao invés de clicar apenas uma vez) - + &Clicking plays all selected cards (instead of just the clicked card) - + &Play all nonlands onto the stack (not the battlefield) by default &Jogar todos os não-terrenos para a pilha (em vez de para o campo de batalha) por definição - + Do not delete &arrows inside of subphases - + Close card view window when last card is removed - + Auto focus search bar when card view window is opened - + Annotate card text on tokens Permitir anotações em tokens - - Show selection count during drag selection + + Show selection counter during drag selection - - Show total selection count + + Show total selection counter - - Show subtype breakdown in selection tally - - - - + Use tear-off menus, allowing right click menus to persist on screen - - Keep game chat focused when clicking in game (Note: disables card view search bar) - - - - + Notifications settings - + Enable notifications in taskbar Permitir notificações na barra de tarefas - + Notify in the taskbar for game events while you are spectating Notificar eventos de jogos na barra de tarefas - + Notify in the taskbar when users in your buddy list connect - + Animation settings Configurações de Animações - + &Tap/untap animation Animação de &virar/desvirar - + Deck editor/storage settings - + Open deck in new tab by default - + Use visual deck storage in game lobby - + Use selection animation for Visual Deck Storage - + When adding a tag in the visual deck storage to a .txt deck: - + do nothing - + ask to convert to .cod - + always convert to .cod - + Default deck editor type - + Classic Deck Editor - + Visual Deck Editor - + Replay settings - + Buffer time for backwards skip via shortcut: @@ -10378,22 +9591,22 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f UserListWidget - + Users connected to server: %1 - + Users in this room: %1 - + Buddies online: %1 / %2 - + Ignored users online: %1 / %2 @@ -10401,45 +9614,35 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f UtilityMenu - + Increment all card counters - + &Untap all permanents - + R&oll die... - - Flip coin - - - - + &Create token... - + C&reate another token - + Cr&eate predefined token - - - C&reate another %1 token - - VisualDatabaseDisplayColorFilterWidget @@ -10491,72 +9694,72 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f VisualDatabaseDisplayFilterToolbarWidget - + Sort by - + Filter by - + Save and load filters - + Filter by exact card name - + Filter by card main-type - + Filter by card sub-type - + Filter by set - + Filter by format legality - + Save/Load - + Name - + Main Type - + Sub Type - + Sets - + Formats @@ -10564,22 +9767,22 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f VisualDatabaseDisplayFormatLegalityFilterWidget - + Show formats with at least: - + cards - + Do not display formats with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) @@ -10597,32 +9800,32 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f VisualDatabaseDisplayMainTypeFilterWidget - + Show main types with at least: - + cards - + Do not display card main-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10630,27 +9833,27 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f VisualDatabaseDisplayNameFilterWidget - + Filter by name... (Exact match) - + Load from Deck - + Apply all card names in currently loaded deck as exact match name filters - + Load from Clipboard - + Apply all card names in clipboard as exact match name filters @@ -10658,7 +9861,7 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f VisualDatabaseDisplayRecentSetFilterSettingsWidget - + Filter to most recent sets @@ -10666,19 +9869,19 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f VisualDatabaseDisplaySetFilterWidget - + Search sets... - - + + Mode: Exact Match - - + + Mode: Includes @@ -10686,37 +9889,37 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f VisualDatabaseDisplaySubTypeFilterWidget - + Search subtypes... - + Show sub types with at least: - + cards - + Do not display card sub-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10724,23 +9927,23 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f VisualDatabaseDisplayWidget - + Search by card name (or search expressions) - + Visual - + Loading database ... - + Clear all filters @@ -10779,17 +9982,17 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f - + Toggle Layout: Overlap - + Change how cards are displayed within zones (i.e. overlapped or fully visible.) - + Toggle Layout: Flat @@ -10818,17 +10021,17 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f VisualDeckEditorWidget - + Type a card name here for suggestions from the database... - + Quick search and add card - + Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter @@ -10946,43 +10149,43 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f WarningDialog - + Which warning would you like to send? Que aviso gostaria de enviar? - + Redact all messages from this user in all rooms - + &OK &OK - + &Cancel &Cancelar - + Warn user for misconduct Aviso por má conduta - - + + Error Erro - + User name to send a warning to can not be blank, please specify a user to warn. O nome de utilizador não se pode encontrar vazio, por favor especifique o utilizador que deseja avisar. - + Warning to use can not be blank, please select a valid warning to send. O aviso a enviar não se pode encontrar vazio, por favor seleccione um aviso válido para enviar. @@ -10990,133 +10193,133 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f WndSets - + Move selected set to the top Mover expansão seleccionada para o topo - + Move selected set up Mover expansão seleccionada para cima - + Move selected set down Mover expansão seleccionada para baixo - + Move selected set to the bottom Mover expansão seleccionada para o fundo - + Search by set name, code, or type - + Default order - + Restore original art priority order - + Enable all sets Permitir todas as expansões - + Disable all sets Inactivar todas as expansões - + Enable selected set(s) - + Disable selected set(s) - + Deck Editor - + Use CTRL+A to select all sets in the view. - + Only cards in enabled sets will appear in the card list of the deck editor. - + Image priority is decided in the following order: - + first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) %1 is a link to the wiki - + Include cards rebalanced for Alchemy [requires restart] - + Card Art - + How to use custom card art - + Hints - + Note - + Sorting by column allows you to find a set while not changing set priority. - + To enable ordering again, click the column header until this message disappears. - + Use the current sorting as the set priority instead - + Sorts the set priority using the same column - + Manage sets @@ -11124,72 +10327,72 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f ZoneViewWidget - + Search by card name (or search expressions) - + Ungrouped - + Group by Type - + Group by Mana Value - + Group by Color - + Unsorted - + Sort by Name - + Sort by Type - + Sort by Mana Cost - + Sort by Colors - + Sort by P/T - + Sort by Set - + shuffle when closing baralhar quando terminar - + pile view vista em pilha @@ -11197,7 +10400,7 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f i18n - + English Português (Portuguese) @@ -11205,12 +10408,12 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f main - + Connect on startup - + Debug to file @@ -11224,7 +10427,7 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f - + Deck Editor Editor de Baralhos @@ -11305,7 +10508,7 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f - + Replays @@ -11420,129 +10623,129 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f - - + + Load Deck from Clipboard... - + Edit Deck in Clipboard, Annotated - + Edit Deck in Clipboard - + New Deck - + Open Custom Pictures Folder - + Print Deck... - + Delete Card - - + + Reset Layout - + Save Deck - + Save Deck as... - + Save Deck to Clipboard, Annotated - + Save Deck to Clipboard, Annotated (No Set Info) - + Save Deck to Clipboard - + Save Deck to Clipboard (No Set Info) - + Load Local Deck... - + Load Remote Deck... - + Set Ready to Start - + Toggle Sideboard Lock - + Add Green Counter - + Remove Green Counter - + Set Green Counters... - + Add Red Counter - + Remove Red Counter - + Set Red Counters... - + Add Life Counter @@ -11552,744 +10755,724 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f - - Load deck from online service... - - - - - Load from website... - - - - + Unload Deck - + Force Start - + Add Card Counter (F) - + Remove Card Counter (F) - + Set Card Counters (F)... - + Add Card Counter (E) - + Remove Card Counter (E) - + Set Card Counters (E)... - + Add Card Counter(D) - + Remove Card Counter (D) - + Set Card Counters (D)... - + Add Card Counter (C) - + Remove Card Counter (C) - + Set Card Counters (C)... - + Add Card Counter (B) - + Remove Card Counter (B) - + Set Card Counters (B)... - + Add Card Counter (A) - + Remove Card Counter (A) - + Set Card Counters (A)... - + Remove Life Counter - + Set Life Counters... - + Add White Counter - + Remove White Counter - + Set White Counters... - + Add Blue Counter - + Remove Blue Counter - + Set Blue Counters... - + Add Black Counter - + Remove Black Counter - + Set Black Counters... - + Add Colorless Counter - + Remove Colorless Counter - + Set Colorless Counters... - + Add Other Counter - + Remove Other Counter - + Set Other Counters... - + Increment all card counters - + Add Power (+1/+0) - + Remove Power (-1/-0) - + Move Toughness to Power (+1/-1) - + Add Toughness (+0/+1) - + Remove Toughness (-0/-1) - + Move Power to Toughness (-1/+1) - + Add Power and Toughness (+1/+1) - + Remove Power and Toughness (-1/-1) - + Set Power and Toughness... - + Reset Power and Toughness - + Untap Desvirar - + Upkeep Etapa de Upkeep - + Draw Etapa de compra de cartas - + First Main Phase - + Start Combat - + Attack Etapa de Ataque - + Block Etapa de Bloqueio - + Damage Etapa de atribuição de dano - + End Combat - + Second Main Phase - + End Fim de turno - + Next Phase - + Next Phase Action - + Next Turn - + Hide Card in Reveal Window - + Tap / Untap Card - + Untap All - + Toggle Skip Untapping Toggle Untap - + Turn Card Over - + Peek Card - + Play Card - + Play Card, Face Down - + Attach Card... - + Unattach Card - + Clone Card - + Create Token... - + Create All Related Tokens - + Create Another Token - + Set Annotation... - - Reduce Life by Power - - - - + Select All Cards in Zone - + Select All Cards in Row - + Select All Cards in Column - + Reveal Selected Cards to All Players - - + + Bottom of Library - - - - + + + + Exile Exílio - - - - + + + + Graveyard Cemitério - - + + Hand Mão - - + + Top of Library - - + + Battlefield, Face Down - + Battlefield - + Library Baralho - + Sideboard Sideboard - + Top Cards of Library - + Bottom Cards of Library - + Close Recent View - - + + Stack - - + + Graveyard (Multiple) - - + + Graveyard (Multiple), Face Down - - + + Exile (Multiple) - - + + Exile (Multiple), Face Down - + Stack Until Found - + Draw Bottom Card - + Draw Multiple Cards from Bottom... - + Draw Arrow... - + Remove Local Arrows - + Leave Game - + Concede Desistir - + Roll Dice... - - Flip Coin - - - - + Shuffle Library - + Shuffle Top Cards of Library - + Shuffle Bottom Cards of Library - + Mulligan Mulligan - + Mulligan (Same hand size) - + Mulligan (Hand size - 1) - + Draw a Card - + Draw Multiple Cards... - + Undo Draw - + Always Reveal Top Card - + Always Look At Top Card - + Sort Hand by Name - + Sort Hand by Type - + Sort Hand by Mana Value - + Reveal Hand to All Players - + Reveal Random Card to All Players - + Rotate View Clockwise - + Rotate View Counterclockwise - + Unfocus Text Box - + Focus Chat - + Clear Chat - + Refresh - + Skip Forward - + Skip Backward - + Skip Forward by a lot - + Skip Backward by a lot - + Play/Pause - + Toggle Fast Forward - + Home - + Visual Deck Storage - + Deck Storage - + Server - + Account - + Administration - + Logs diff --git a/cockatrice/translations/cockatrice_pt_BR.ts b/cockatrice/translations/cockatrice_pt_BR.ts index 422ed5a4b..2c331260f 100644 --- a/cockatrice/translations/cockatrice_pt_BR.ts +++ b/cockatrice/translations/cockatrice_pt_BR.ts @@ -2,7 +2,7 @@ AbstractCounter - + &Set counter... &Definir marcador... @@ -10,12 +10,12 @@ AbstractCounterDialog - + Set counter Definir marcador - + New value for counter '%1': Novo valor para marcador '%1': @@ -36,62 +36,62 @@ AbstractTabDeckEditor - + Open in new tab Abrir em uma nova aba - + Are you sure? Você tem certeza? - + The decklist has been modified. Do you want to save the changes? A lista foi modificada. Gostaria de salvar as alterações? - - - - - - + + + + + + Error Erro - + Could not open deck at %1 Não foi possível abrir o deck em %1 - + Could not save remote deck O deck não pode ser salvo remotamente. - - + + The deck could not be saved. Please check that the directory is writable and try again. O deck não pôde ser salvo. Por favor, verifique se a pasta não é somente leitura e tente novamente. - + Save deck Salvar deck - + The deck could not be saved. O deck não pôde ser salvo. - + There are no cards in your deck to be exported Não há cartas em seu deck a serem exportadas @@ -101,18 +101,18 @@ Por favor, verifique se a pasta não é somente leitura e tente novamente. Add Analytics Panel - Adicionar ao Painel de Métricas + AdminNotesDialog - + Update Notes Notas de Atualização - + Admin Notes for %1 Notas do Administrador para %1 @@ -127,229 +127,174 @@ Por favor, verifique se a pasta não é somente leitura e tente novamente. Sideboard - Reserva - - - - Tokens - + Side AppearanceSettingsPage - + seconds segundos - + Error Erro - + Could not create themes directory at '%1'. Não foi possível criar o diretório de temas em '%1'. - + Theme settings Configurações de Tema - + Current theme: Tema atual: - + Open themes folder Abra a pasta de temas - + Home tab background source: Fonte do background da tab Home: - + Home tab background shuffle frequency: Frequência de escolha aleatória de background da tab Home: - + Disabled Desabilitado - + + Display card name of background in bottom right: + + + + Menu settings Configurações do Menu - + Show keyboard shortcuts in right-click menus Mostrar atalhos de teclado nos menus de clique com o botão direito - + Show game filter toolbar above list in room tab Mostrar o filtro de jogos acima da lista da tab de sala - + Card rendering Renderização das cartas - + Display card names on cards having a picture Mostrar nome nas cartas que possuem imagem - + Auto-Rotate cards with sideways layout Rotacionar automaticamente cartas com layout horizontal - + Override all card art with personal set preference (Pre-ProviderID change behavior) - - Light - - - - - Dark - - - - - System - - - - - Active theme palette: - - - - - Edit theme palette - - - - - Home tab settings - - - - - Display card name of background in bottom right - - - - - Styling settings - - - - - Style user list - - - - - Card printings - - - - + Bump sets that the deck contains cards from to the top in the printing selector Priorizar conjuntos que o deck contém no topo do seletor de impressão - + Scale cards on mouse over Redimensionar cartas ao passar o mouse - + Use rounded card corners Usar cantos de cartas arredondados - - Card layout - - - - + Minimum overlap percentage of cards on the stack and in vertical hand Porcentagem mínima de sobreposição de cartas na pilha e na mão vertical - + Maximum initial height for card view window: Altura inicial máxima para a janela de visualização de cartas: - - + + rows linhas - + Maximum expanded height for card view window: Altura expandida máxima para a janela de visualização de cartas: - + Card counters Marcadores de carta - + Counter %1 Marcador %1 - + Hand layout Organização da mão - + Display hand horizontally (wastes space) Mostrar a mão na horizontal (desperdiça espaço) - + Enable left justification Habilitada justificação à esquerda - + Table grid layout Organização do campo de batalha - + Invert vertical coordinate Inverter a coordenada vertical - + Minimum player count for multi-column layout: Número mínimo de jogadores para o layout de multi-colunas - + Maximum font size for information displayed on cards: Tamanho máximo da fonte para informações nas cartas: @@ -357,12 +302,12 @@ Por favor, verifique se a pasta não é somente leitura e tente novamente. ArchidektApiResponseDeckDisplayWidget - + Back to results - + Open Deck in Deck Editor Abrir no Editor de Decks @@ -388,112 +333,112 @@ Por favor, verifique se a pasta não é somente leitura e tente novamente. BanDialog - + ban &user name banir &usuário pelo nome - + ban &IP address banir endereço &IP - + ban client I&D banir cliente por I&D: - + Ban type Tipo de banimento - + &permanent ban &banir permanentemente - + &temporary ban &banir temporariamente - + &Days: &Dias: - + &Hours: &Horas: - + &Minutes: &Minutos: - + Duration of the ban Duração do banimento - + Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. Por favor, entre com o motivo do banimento. Isto será visto somente por moderadores e não pode ser visto pela pessoa banida. - + Please enter the reason for the ban that will be visible to the banned person. Por favor, entre com o motivo para o banimento que será visível pela pessoa banida. - + Redact all messages from this user in all rooms Remover todas mensagens deste usuário em todas as salas - + &OK &OK - + &Cancel &Cancelar - + Ban user from server Banir usuário do servidor - - - - + + + + Error Erro - + You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. Você deve selecionar um nome, IP, cliente ou alguma combinação desses três itens para banir. - + You must have a value in the name ban when selecting the name ban checkbox. Você têm que colocar um nome válido quando seleciona a caixa de banimento por nome. - + You must have a value in the ip ban when selecting the ip ban checkbox. Você têm que colocar um IP válido quando seleciona a caixa de banimento por IP. - + You must have a value in the clientid ban when selecting the clientid ban checkbox. Você têm que colocar um ID de cliente válido quando seleciona a caixa de banimento por ID de cliente. @@ -501,123 +446,59 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid BetaReleaseChannel - + Beta Beta - + No reply received from the release update server. Nenhuma resposta recebida do servidor de atualização. - + Invalid reply received from the release update server. Resposta inválida recebida do servidor de atualização. - + No reply received from the file update server. Nenhuma resposta recebida do servidor de atualização. - - CardArtPreviewWidget - - - No card selected - - - - - CardArtRulesModel - - - Card - - - - - ProviderId - - - - - Mode - - - - - Reason - - - CardDatabaseModel - + Name Nome - + Sets Expansões - + Mana cost Custo de mana - + Card type Tipo de carta - + P/T P/R - + Color(s) Cor(es) - - CardDatabaseView - - - Add to Deck - - - - - Add to Sideboard - - - - - Select Printing - - - - - Show on EDHRec (Commander) - - - - - Show on EDHRec (Card) - - - - - Show Related cards - - - CardFilter @@ -746,22 +627,22 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid CardInfoPictureWidget - + View related cards Visualizar cartas relacionadas - + Add card to deck Adicionar carta ao deck - + Mainboard Main - + Sideboard Side @@ -784,12 +665,12 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid Número de Colecionador: - + Related cards: Cartas relacionadas: - + Unknown card: Carta desconhecida: @@ -797,146 +678,128 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid CardMenu - + Re&veal to... Revelar para... - + &All players Todos os &jogadores - + View related cards Visualizar cartas relacionadas - + Token: Ficha: - + All tokens Todas as fichas - + &Select All &Marque todos - + S&elect Row Selecionar Linha - + S&elect Column Selecionar Coluna - + &Play &Jogar - + &Hide &Ocultar - + Play &Face Down Jogue &virada para baixo - + &Tap / Untap Turn sideways or back again &Virar / Desvirar - + Skip &untapping - + T&urn Over Turn face up/face down &Virar - + &Peek at card face &Olhar a face da carta - + &Clone &Clonar - + Attac&h to card... Ane&xar na carta... - + Unattac&h De&sanexar - + &Draw arrow... &Desenhar seta... - + &Set annotation... Colocar &nota... - - Reduce life by power - - - - + Ca&rd counters Marcadores de carta - + &Add counter (%1) &Adicionar marcador(%1) - + &Remove counter (%1) &Remover marcador (%1) - + &Set counters (%1)... &Definir marcadores (%1)... - - CardPictureLoaderCacheMethod - - - Network Cache - - - - - Filesystem - - - CardSizeWidget @@ -948,133 +811,133 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid CardZoneLogic - + their hand nominative sua mão - + %1's hand nominative mão de %1 - + their library look at zone seu grimório - + %1's library look at zone grimório de %1 - + of their library top cards of zone, do seu grimório - + of %1's library top cards of zone do grimório de %1 - + their library reveal zone seu grimório - + %1's library reveal zone grimório de %1 - + their library shuffle seu grimório - + %1's library shuffle grimório de %1 - + their library nominative seu grimório - + %1's library nominative grimório de %1 - + their graveyard nominative seu cemitério - + %1's graveyard nominative cemitério de %1 - + their exile nominative seu exílio - + %1's exile nominative exílio de %1 - + their sideboard look at zone seu sideboard - + %1's sideboard look at zone sideboard de %1 - + their sideboard nominative seu sideboard - + %1's sideboard nominative sideboard de %1 - + their custom zone '%1' nominative sua zona customizada '%1' - + %1's custom zone '%2' nominative zona customizada '%2' de %1 @@ -1096,421 +959,16 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid Erro na linha %1 coluna %2: - - ColorButton - - - Click to pick a color - - - - - Pick colour - - - - - ConnectionController - - - - The server has reached its maximum user capacity, please check back later. - - - - - There are too many concurrent connections from your address. - - - - - Banned by moderator - - - - - Expected end time: %1 - - - - - This ban lasts indefinitely. - - - - - Scheduled server shutdown. - - - - - - Invalid username. - - - - - You have been logged out due to logging in at another location. - - - - - Connection closed - - - - - The server has terminated your connection. -Reason: %1 - - - - - The server is going to be restarted in %n minute(s). -All running games will be lost. -Reason for shutdown: %1 - - - - - Scheduled server shutdown - - - - - Failed Login - - - - - Your client seems to be missing features this server requires for connection. - - - - - To update your client, go to 'Help -> Check for Client Updates'. - - - - - - - - - - - - - - - - - - - - - - Error - - - - - Incorrect username or password. Please check your authentication information and try again. - - - - - There is already an active session using this user name. -Please close that session first and re-login. - - - - - - You are banned until %1. - - - - - - You are banned indefinitely. - - - - - This server requires user registration. Do you want to register now? - - - - - This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. -Please close and reopen your client to try again. - - - - - An internal error has occurred, please close and reopen Cockatrice before trying again. -If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - - - - Account activation - - - - - Your account has not been activated yet. -You need to provide the activation token received in the activation email. - - - - - Server Full - - - - - Unknown login error: %1 - - - - - - -This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - - - - - - - - - Registration denied - - - - - Registration is currently disabled on this server - - - - - There is already an existing account with the same user name. - - - - - It's mandatory to specify a valid email address when registering. - - - - - It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. - - - - - Password too short. - - - - - Registration failed for a technical problem on the server. - - - - - The connection to the server has been lost. - - - - - Unknown registration error: %1 - - - - - Account activation failed - - - - - Socket error: %1 - - - - - Server timeout - - - - - You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. -Local version is %1, remote version is %2. - - - - - Your Cockatrice client is obsolete. Please update your Cockatrice version. -Local version is %1, remote version is %2. - - - - - - Success - - - - - Registration accepted. -Will now login. - - - - - Account activation accepted. -Will now login. - - - - - Information - - - - - This server supports additional features that your client doesn't have. -This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. - -To update your client, go to Help -> Check for Updates. - - - - - - - Reset Password - - - - - Your password has been reset successfully, you can now log in using the new credentials. - - - - - Failed to reset user account password, please contact the server operator to reset your password. - - - - - Activation request received, please check your email for an activation token. - - - - - Connecting to %1... - - - - - Registering to %1 as %2... - - - - - Disconnected - - - - - Connected, logging in at %1 - - - - - Requesting forgotten password to %1 as %2... - - - - - Your username must respect these rules: - - - - - is %1 - %2 characters long - - - - - can %1 contain lowercase characters - - - - - - - - NOT - - - - - can %1 contain uppercase characters - - - - - can %1 contain numeric characters - - - - - can contain the following punctuation: %1 - - - - - first character can %1 be a punctuation mark - - - - - no unacceptable language as specified by these server rules: - note that the following lines will not be translated - - - - - can not contain any of the following words: %1 - - - - - can not match any of the following expressions: %1 - - - - - You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - - CustomZoneMenu - + C&ustom Zones Zonas Customizadas - - + + View custom zone '%1' Ver zona customizada '%1' @@ -1518,35 +976,30 @@ To update your client, go to Help -> Check for Updates. DeckAnalyticsWidget - + Add Panel Adicionar Painel - + Remove Panel Remover Painel - + Save Layout Salvar Layout - + Load Layout Carregar Layout - - - Include Sideboard - - DeckEditorCardDatabaseDockWidget - + Card Database Banco de Dados de Cartas @@ -1562,17 +1015,47 @@ To update your client, go to Help -> Check for Updates. DeckEditorDatabaseDisplayWidget - + Search by card name (or search expressions) Pesquisar pelo nome da carta (ou expressões de busca) - + + Add to Deck + Adicionar ao deck + + + + Add to Sideboard + Adicionar ao Sideboard + + + + Select Printing + Escolher Impressão + + + + Show on EDHRec (Commander) + + + + + Show on EDHRec (Card) + + + + + Show Related cards + Mostrar cartas Relacionadas + + + Add card to &maindeck Adicionar carta ao &baralho principal - + Add card to &sideboard Adicionar carta ao &sideboard @@ -1602,75 +1085,75 @@ To update your client, go to Help -> Check for Updates. Colors - Cores + - + Select Printing Escolher Impressão - + Deck Deck - + Deck &name: &Nome do Deck: - + Banner Card/Tags Visibility Settings - + Show banner card selection menu - + Show tags selection menu - + &Comments: &Comments: - + Group by: - Agrupar por: + - + Format: - Formato: + - + Hash: Hash: - + &Increment number &Aumentar número - + &Decrement number &Diminuir número - + &Remove row &Remover linha - + Swap card to/from sideboard Mover carta para/do Side @@ -1678,17 +1161,17 @@ To update your client, go to Help -> Check for Updates. DeckEditorFilterDockWidget - + Filters Filtros - + &Clear all filters &Limpar todos os filtros - + Delete selected Apagar selecionados @@ -1775,7 +1258,7 @@ To update your client, go to Help -> Check for Updates. Load deck from online service... - Carregar baralho de serviço online... + @@ -1819,130 +1302,186 @@ To update your client, go to Help -> Check for Updates. DeckEditorSettingsPage - - + + Update Spoilers Atualizar Spoilers - + + Success Sucesso - + Download URLs have been reset. As URLs de download foram redefinidas. - + + Downloaded card pictures have been reset. + As imagens de cartas baixadas foram redefinidas. + + + + Error + Erro + + + + One or more downloaded card pictures could not be cleared. + Uma ou mais imagens de cartas baixadas não puderam ser apagadas. + + + Add URL Adicionar URL - - + + URL: URL: - - + + Edit URL Editar URL - + + Network Cache Size: + Tamanho do Cache de Rede: + + + + Redirect Cache TTL: + TTL do Cache de Redirecionamento: + + + + How long cached redirects for urls are valid for. + Por quanto tempo os redirecionamentos em cache para URLs são válidos. + + + + Picture Cache Size: + Tamanho do Cache de Imagens: + + + Add New URL Adicionar nova URL - + Remove URL Remover URL - + + Day(s) + Dia(s) + + + Updating... Atualizando... - + Choose path Selecione o caminho - + URL Download Priority Prioridade de download de URL - + Spoilers 'Spoilers' - + Download Spoilers Automatically Baixar 'spoilers' automaticamente - + Spoiler Location: Localização do 'spoiler': - + Last Change Última Alteração - + Spoilers download automatically on launch Baixar automaticamente 'spoilers' ao iniciar - + Press the button to manually update without relaunching Pressione o botão para atualizar manualmente sem reinicializar - + Do not close settings until manual update is complete Não feche as configurações até que a atualização manual termine - + Download card pictures on the fly Baixar imagens de cartas em tempo real - + How to add a custom URL Como adicionar uma URL customizada - + + Delete Downloaded Images + Deletar imagens baixadas + + + Reset Download URLs Resetar URLs de download + + + On-disk cache for downloaded pictures + Cache em disco para imagens baixadas + + + + In-memory cache for pictures not currently on screen + Cache em memória para imagens que não estão atualmente na tela + DeckListHistoryManagerWidget Undo - Desfazer + Redo - Refazer + Undo/Redo history - Histórico Desfazer/Refazer + @@ -1952,12 +1491,12 @@ To update your client, go to Help -> Check for Updates. [redo] - [refazer] + [undo] - [desfazer] + @@ -1991,12 +1530,12 @@ To update your client, go to Help -> Check for Updates. DeckLoader - + Common deck formats (%1) Formatos de decks comuns (%1) - + All files (*.*) Todos arquivos (*.*) @@ -2062,7 +1601,7 @@ To update your client, go to Help -> Check for Updates. Edit default tags - Editar tags padrão + @@ -2190,12 +1729,12 @@ To update your client, go to Help -> Check for Updates. Rename deck to "%1" from "%2" - Renomear baralho de "%1" para "%2" + Updated comments (was %1 chars, now %2 chars) - Comentários atualizados (eram %1 caracteres, agora são %2 caracteres) + @@ -2205,42 +1744,42 @@ To update your client, go to Help -> Check for Updates. Tags changed - Tags alteradas + Set format to %1 - Definir formato para %1 + Added (%1): %2 (%3) %4 - Adicionado (%1): %2 (%3) %4 + - + Moved to %1 1 × "%2" (%3) - Movido para %1 1 × "%2" (%3) + - + Removed "%1" (all copies) - Removido "%1" (todas as cópias) + - + %1 1 × "%2" (%3) - %1 1 × "%2" (%3) + - + Added - Adicionado + - + Removed - Removido + @@ -2260,75 +1799,74 @@ To update your client, go to Help -> Check for Updates. DeckViewContainer - + Load deck... Carregar deck... - + Load remote deck... Carregar deck remoto... - + Load from clipboard... - Carregado da área de transferência... + - + Load from website... - Carregado do website... + - + Unload deck Descarregar deck - + Ready to start Preparadx para começar - + Force start Forçar início - + Sideboard unlocked Sideboard aberto - + Sideboard locked Sideboard fechado - - + + Error Erro - + The selected file could not be loaded. O arquivo selecionado não pode ser carregado - + Deck is greater than maximum file size. - O baralho é maior que o tamanho máximo de arquivo. + - + Are you sure you want to force start? This will kick all non-ready players from the game. - Tem certeza que deseja forçar o início? -Isso irá expulsar todos os jogadores não preparados do jogo. + - + Cockatrice Cockatrice @@ -2429,7 +1967,7 @@ Deseja converter o deck para .cod? - + Webpage Página da Web @@ -2469,37 +2007,37 @@ Deseja converter o deck para .cod? Conectar ao Servidor - + Server URL URL do Servidor - + Communication Port Porta de comunicação - + Unique Server Name Nome Único de Servidor - + Connection Warning Aviso de conexão - + You need to name your new connection profile. Você deve nomear seu novo perfil de conexão - + Connect Warning Aviso de conexão - + The player name can't be empty. O nome do jogador é obrigatório. @@ -2589,12 +2127,12 @@ Deseja converter o deck para .cod? Open decklists in lobby - Abrir lista de baralhos no lobby + Create game as judge - Criar jogo como juíz + @@ -2612,17 +2150,17 @@ Deseja converter o deck para .cod? Criar jogo - + Game information Informação de jogo - + Error Erro - + Server error. Erro do servidor. @@ -2630,97 +2168,97 @@ Deseja converter o deck para .cod? DlgCreateToken - + &Name: &Nome: - + Token Ficha - + C&olor: C&or: - + white branco - + blue azul - + black preto - + red vermelho - + green verde - + multicolor multicolorido - + colorless incolor - + &P/T: &P/R: - + &Annotation: &Nota: - + &Destroy token when it leaves the table Destruir a &ficha quando ela sair do campo de batalha - + Create face-down (Only hides name) - + Token data Informação de ficha - + Show &all tokens Mostre &todas fichas - + Show tokens from this &deck Mostre fichas deste &deck - + Choose token from list Mostre fichas da lista - + Create token Criar ficha @@ -2730,53 +2268,53 @@ Deseja converter o deck para .cod? Edit Tags - Editar Tags + Add - Adicionar + Confirm - Confirmar + Cancel - Cancelar + Enter a tag and press Enter - Insira a tag e aperte Enter + - + ✖ - ✖ + Invalid Input - Valor Inválido + Tag name cannot be empty! - Nomes de tags não podem ser vazios! + - + Duplicate Tag - Tag Duplicada + - + This tag already exists. - Essa tag já existe. + @@ -2961,12 +2499,12 @@ Para remover o avatar atual, confirme sem escolher uma nova imagem.Por favor, entre com o nome da ficha: - + Error Erro - + The chosen name conflicts with an existing card or token. Make sure to enable the 'Token' set in the "Manage sets" dialog to display them correctly. O nome escolhido está em conflito com uma carta ou ficha existente. @@ -2991,12 +2529,12 @@ Certifique-se de habilitar a expansão 'Fichas' em "Gerenciar exp Indefinido - + Real name: Nome real: - + Edit user profile Editar perfil @@ -3034,113 +2572,113 @@ Certifique-se de habilitar a expansão 'Fichas' em "Gerenciar exp 2 horas - + Hide 'buddies only' games Ocultar jogos 'apenas amigos' - + Hide full games Ocultar jogos cheios - + Hide games that have started Ocultar jogos já iniciados - + Hide password protected games Ocultar jogos com senha - + Hide 'ignored user' games Ocultar 'jogos de usuários ignorados' - + Hide games not created by buddies Hide games not created by buddy - Esconder jogos não criados por amigos + - + Hide games with forced open decklists - + &Newer than: &Mais novos que: - + Game &description: &Descrição do jogo: - + &Creator name: Nome do &criador: - + General Geral - + &Game types Tipos de &jogos - + at &least: &ao menos: - + at &most: no &máximo: - + Maximum player count Quantidade máxima de jogadores - + Restrictions Restrições - + Show games only if &spectators can watch Mostrar jogos apenas se &espectadores puderem assistir - + Show spectator password p&rotected games Mostrar jogos p&rotegidos por senha para espectador - + Show only if spectators can ch&at Mostrar apenas se espectadores puderem interagir com o chat - + Show only if spectators can see &hands Mostrar apenas se as mãos forem visíveis para os espectadores - + Spectators Espectadores - + Filter games Filtrar jogos @@ -3364,7 +2902,7 @@ Certifique-se de habilitar a expansão 'Fichas' em "Gerenciar exp Load Deck from Website - Carregar Baralho de Website + @@ -3375,7 +2913,7 @@ Certifique-se de habilitar a expansão 'Fichas' em "Gerenciar exp Network error: %1 - Erro de rede: %1 + @@ -3412,17 +2950,17 @@ https://tappedout.net/mtg-decks/your-deck-name/ Players: - Jogadores: + General - Geral + Starting life total: - Vida inicial total: + @@ -3432,48 +2970,48 @@ https://tappedout.net/mtg-decks/your-deck-name/ Remember settings - Lembrar configurações + Local game options - Opções de jogo local + DlgMoveTopCardsUntil - + Card name (or search expressions): Nome da carta (ou expressões de busca): - + Number of hits: Número de resultados: - + Auto play hits Reproduzir resultados automaticamente - + Put top cards on stack until... Colocar as cartas do topo na pilha até... - + No cards matching the search expression exists in the card database. Proceed anyways? Nenhuma carta correspondente à expressão de busca existe no banco de dados de cartas. Deseja continuar assim mesmo? - + Cockatrice Cockatrice - + Invalid filter Filtro inválido @@ -3533,40 +3071,40 @@ Seu e-mail será utilizado para verificar sua conta. Indefinido - + Real name: Nome real: - + Register to server Registrar ao servidor: - - - - + + + + Registration Warning Aviso de Registro - + Your password is too short. Sua senha é muito curta. - + Your passwords do not match, please try again. Suas senhas não coincidem, por favor tente novamente. - + Your email addresses do not match, please try again. Seus endereços de email não coincidem, por favor tente novamente. - + The player name can't be empty. O nome de jogador não pode estar vazio. @@ -3574,17 +3112,17 @@ Seu e-mail será utilizado para verificar sua conta. DlgRollDice - + Number of sides: Número de lados: - + Number of dice: Número de dados: - + Roll Dice Rolar dados @@ -3594,12 +3132,12 @@ Seu e-mail será utilizado para verificar sua conta. Unmodified Cards: - Cartas não modificadas: + Modified Cards: - Cartas Modificadas: + @@ -3635,12 +3173,12 @@ Seu e-mail será utilizado para verificar sua conta. DlgSettings - + Unknown Error loading card database Erro desconhecido ao carregar bando de dados de cartas - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -3657,7 +3195,7 @@ Você pode precisar rodar o Oracle novamente para atualizar o banco de dados de Você gostaria de mudar o local da configuração de seu banco de dados? - + Your card database version is too old. This can cause problems loading card information or images @@ -3674,7 +3212,7 @@ Usualmente isto pode ser consertado rodando novamente o Oracle para atualizar se Você gostaria de alterar o local da configuração de seu banco de dados? - + Your card database did not finish loading Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached @@ -3687,7 +3225,7 @@ Por favor, envie um ticket para https://github.com/Cockatrice/Cockatrice/issues Gostaria de mudar a definição da localização da sua base de dados? - + File Error loading your card database. Would you like to change your database location setting? @@ -3696,7 +3234,7 @@ Would you like to change your database location setting? Você gostaria de alterar seu local de configuração de seu banco de dados? - + Your card database was loaded but contains no cards. Would you like to change your database location setting? @@ -3705,7 +3243,7 @@ Would you like to change your database location setting? Você gostaria de alterar seu local de configuração de banco de dados? - + Unknown card database load status Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues @@ -3718,64 +3256,59 @@ Por favor, crie um ticket em https://github.com/Cockatrice/Cockatrice/issues Você gostaria de alterar seu local de configuração do banco de dados? - - - + + + Error Erro - + The path to your deck directory is invalid. Would you like to go back and set the correct path? O caminho para a sua pasta de decks é inválido. Você gostaria de voltar e corrigir o caminho? - + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? O caminho para a sua pasta de imagens de cards é inválido. Você gostaria de voltar e corrigir o caminho? - + Settings Configurações - + General Geral - + Appearance Aparência - + User Interface Interface do usuário - - Storage - - - - + Card Sources Fonte de Cartas - + Chat Conversa - + Sound Som - + Shortcuts Atalhos @@ -3785,7 +3318,7 @@ Você gostaria de alterar seu local de configuração do banco de dados? Card Update Check - Checar Atualização de Carta + @@ -3817,7 +3350,7 @@ You can always change this behavior in the 'General' settings tab. Don't run this time - Não executar desta vez + @@ -3867,9 +3400,9 @@ You can always change this behavior in the 'General' settings tab. - - - + + + Error Erro @@ -3921,31 +3454,31 @@ Please visit the download page to update manually. - + Update Available Atualização disponível - + A new version of Cockatrice is available! Uma nova versão do Cockatrice está disponível! - + New version Nova versão - + Released Lançado - + Changelog Log de mudanças @@ -3955,51 +3488,51 @@ Please visit the download page to update manually. Você quer atualizar agora? - + Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. Infelizmente, o atualizador automática não encontrou um download compatível. Talvez você tenha que baixar a nova versão manualmente. - + Please check the <a href="%1">releases page</a> on our Github and download the build for your system. Por favor confira a <a href="%1">página de releases</a> no nosso repositório do Github e baixe o programa para o seu sistema. - - - + + + Update Error Erro na atualização - + An error occurred while checking for updates: Ocorreu um erro enquanto procurávamos por atualizações: - + An error occurred while downloading an update: Um erro ocorreu enquanto uma atualização era baixada: - + Installing... Instalando... - + Cockatrice is unable to open the installer. Cockatrice está incapaz de abrir o instalador. - + Try to update manually by closing Cockatrice and running the installer. Tente atualizar o Cockatrice manualmente fechando-o e rodando o instalador. - + Download location Localização do download @@ -4014,7 +3547,7 @@ Talvez você tenha que baixar a nova versão manualmente. Copy to clipboard - Copiar para área de transferência + @@ -4032,126 +3565,126 @@ Talvez você tenha que baixar a nova versão manualmente. Criteria: - Critério: + Card Name - Nome da Carta + Type - Tipo + Subtype - Subtipo + Mana Value - Valor de mana + Exactness: - Exatidão + At least - Pelo menos + Exactly - Exatamente + Quantity (N): - Quantidade (N): + Cards drawn (M): - Cartas compradas (M): + cards - cartas + DrawProbabilityWidget - - - Draw Probability - Probabilidade de compra - - Probability of drawing + Draw Probability - Card Name - Nome da Carta - - - - Type - Tipo + Probability of drawing + - Subtype - Subtipo + Card Name + - Mana Value - Valor de Mana + Type + + + + + Subtype + - At least - Pelo menos + Mana Value + - - Exactly - Exatamente + + At least + + Exactly + + + + card(s) having drawn at least - + cards - cartas + - + Category - Categoria + - + Qty - Qtd + - + Odds (%) - Chances (%) + @@ -4182,7 +3715,7 @@ Talvez você tenha que baixar a nova versão manualmente. Card Market - Mercado de Cartas + @@ -4236,7 +3769,7 @@ Talvez você tenha que baixar a nova versão manualmente. Budget - Orçamento + @@ -4244,7 +3777,7 @@ Talvez você tenha que baixar a nova versão manualmente. Combos - Combos + @@ -4263,7 +3796,7 @@ Talvez você tenha que baixar a nova versão manualmente. FilterBuilder - + Type your filter here Digite seu filtro aqui @@ -4273,7 +3806,7 @@ Talvez você tenha que baixar a nova versão manualmente. Confirm Delete - Confirmar Exclusão + @@ -4283,174 +3816,174 @@ Talvez você tenha que baixar a nova versão manualmente. Delete Failed - Falha na Exclusão + Failed to delete filter '%1'. - Falha ao remover filtro '%1'. + GameEventHandler - + kicked by game host or moderator - + player left the game - jogador saiu do jogo + - + player disconnected from server - jogador desconectado do servidor + - + reason unknown - motivo desconhecido + GameSelector - - - - - - - - - + + + + + + + + + Error Erro - + Please join the appropriate room first. Por favor, entre na sala apropriada primeiramente - + Wrong password. Senha incorreta. - + Spectators are not allowed in this game. Não são permitidos visitantes neste jogo. - + The game is already full. O jogo está cheio. - + The game does not exist any more. O jogo não existe mais. - + This game is only open to registered users. Este jogo é aberto apenas para usuários registrados. - + This game is only open to its creator's buddies. Este jogo é aberto apenas para os amigos de quem criou o jogo. - + You are being ignored by the creator of this game. Você está sendo ignorado pelo criador deste jogo. - + Join Game Entrar no jogo - + Spectate Game Assistir ao jogo - + Game Information Informações do jogo - + Join Game as Judge - Entrar no Jogo como Juíz + - + Spectate Game as Judge - + Join game Entrar no jogo - + Password: Senha: - + Please join the respective room first. Por favor, entre na respectiva sala primeiro. - + &Filter games &Filtrar jogos. - + C&lear filter L&impar Filtros - + C&reate C&riar - + &Join &Entrar - + Join as judge - + J&oin as spectator E&ntrar como visitante - + Join as judge spectator - + Games shown: %1 / %2 Jogos mostrados: %1 / %2 - + Games Jogos @@ -4458,32 +3991,32 @@ Talvez você tenha que baixar a nova versão manualmente. GameSelectorQuickFilterToolBar - + All types - + Filter by game name... - + Filter by game type/format - + Hide games not created by buddies - + Hide full games - + Hide started games @@ -4491,105 +4024,105 @@ Talvez você tenha que baixar a nova versão manualmente. GamesModel - + >1 day >1 dia - + %1%2 hr short age in hours %1%2 h%1%2 h%1%2 h - + new novo - + %1%2 min short age in minutes %1%2 min%1%2 min%1%2 min - + password senha - + buddies only apenas amigos - + reg. users only usuários reg. apenas - + open decklists + - can chat pode conversar - + see hands ver mãos - + can see hands pode ver mãos - + not allowed não permitidos - + Room Sala - + Age Idade - + Description Descrição - + Creator Criador - + Type Tipo - + Restrictions Restrições - + Players Jogadores - + Spectators Visitantes @@ -4597,158 +4130,143 @@ Talvez você tenha que baixar a nova versão manualmente. GeneralSettingsPage - + Reset all paths Redefinir todos os diretórios - + All paths have been reset Todos os caminhos para diretórios foram redefinidos - - - - - - - + + + + + + + Choose path Escolher caminho - - Language settings - + + Personal settings + Configurações pessoais - + Language: Idioma: - - Version settings - - - - - Card database - - - - - Startup settings - - - - + Paths (editing disabled in portable mode) Caminhos (edição desabilitada no modo portátil) - + Paths Caminhos - + How to help with translations Como ajudar com as traduções - + Decks directory: Pasta de decks: - + Filters directory: - + Replays directory: Pasta de replays: - + Pictures directory: Pasta de imagens: - + Card database: Banco de dados de cartas: - + Custom database directory: Diretório do banco de dados de cartas customizadas - + Token database: Banco de dados de fichas: - + Update channel Canal de atualização - + Check for client updates on startup Verificar atualizações do cliente ao iniciar - + Check for card database updates on startup - + Don't check - + Prompt for update - + Always update in the background - + Check for card database updates every - + days - + Notify if a feature supported by the server is missing in my client Notificar se uma função suportada pelo servidor está faltando em meu programa. - + Automatically run Oracle when running a new version of Cockatrice Rodar Oracle automaticamente quando rodar uma nova versão de Cockatrice - + Show tips on startup Exibir dicas ao iniciar - + Last update check on %1 (%2 days ago) @@ -4756,47 +4274,47 @@ Talvez você tenha que baixar a nova versão manualmente. GraveyardMenu - + &Graveyard - + &View graveyard - + &Move graveyard to... - + &Top of library - + &Bottom of library - + &All players - + &Hand - + &Exile - + Reveal random card to... @@ -4804,88 +4322,88 @@ Talvez você tenha que baixar a nova versão manualmente. HandMenu - + &Hand - + &View hand - + Sort hand by... - + Name - + Type - + Mana Value - + Take &mulligan (Choose hand size) - + Take mulligan (Same hand size) - + Take mulligan (Hand size - 1) - + &Move hand to... - + &Top of library - + &Bottom of library - + &Graveyard - + &Exile - + &Reveal hand to... - - + + All players - + Reveal r&andom card to... @@ -4893,52 +4411,52 @@ Talvez você tenha que baixar a nova versão manualmente. HomeWidget - + Create New Deck - + Browse Decks - + Browse Card Database - + Browse EDHRec - + Browse Archidekt - + View Replays - + Quit - + Connecting... - + Connect - + Play @@ -4946,213 +4464,213 @@ Talvez você tenha que baixar a nova versão manualmente. LibraryMenu - + &Library - + &View library - + View &top cards of library... - + View bottom cards of library... - + Reveal &library to... - + Lend library to... - + Reveal &top cards to... - + &Top of library... - + &Bottom of library... - + &Always reveal top card - + &Always look at top card - + &Open deck in deck editor - + &Draw card - + D&raw cards... - + &Undo last draw - + Shuffle - + &Play top card - + Play top card &face down - + Put top card on &bottom - + Move top card to grave&yard - + Move top card to e&xile - + Move top cards to &graveyard... - + Move top cards to graveyard face down... - + Move top cards to &exile... - + Move top cards to exile face down... - + Put top cards on stack &until... - + Shuffle top cards... - + &Draw bottom card - + D&raw bottom cards... - + &Play bottom card - + Play bottom card &face down - + Move bottom card to grave&yard - + Move bottom card to e&xile - + Move bottom cards to &graveyard... - + Move bottom cards to graveyard face down... - + Move bottom cards to &exile... - + Move bottom cards to exile face down... - + Put bottom card on &top - + Shuffle bottom cards... - - + + &All players - + Reveal top cards of library - + Number of cards: (max. %1) @@ -5160,273 +4678,641 @@ Talvez você tenha que baixar a nova versão manualmente. MainWindow - - + + + The server has reached its maximum user capacity, please check back later. + O servidor atingiu a capacidade maxima de usuarios, tente novamente mais tarde. + + + + There are too many concurrent connections from your address. + Há conexões concorrentes demais vinds do seu endereço. + + + + Banned by moderator + Banido pelo moderador + + + + Expected end time: %1 + Esperado tempo para fim: %1 + + + + This ban lasts indefinitely. + Este banimento dura indefinidamente. + + + + Scheduled server shutdown. + Servidor de eventos fora do ar. + + + + + Invalid username. + Usuário inválido + + + + You have been logged out due to logging in at another location. + Você foi desconectado devido a um acesso em outra localidade. + + + + Connection closed + Conexão fechada + + + + The server has terminated your connection. +Reason: %1 + O servidor terminou sua conexão. +Razão: %1 + + + + The server is going to be restarted in %n minute(s). +All running games will be lost. +Reason for shutdown: %1 + O servidor será reiniciado em %n minuto(s). +Todos os jogos serão perdidos. +Motivo para desligar: %1O servidor será reiniciado em %n minuto(s). +Todos os jogos serão perdidos. +Motivo para desligar: %1O servidor será reiniciado em %n minuto(s). +Todos os jogos serão perdidos. +Motivo para desligar: %1 + + + + Scheduled server shutdown + Servidor de eventos fora do ar + + + + + Success + Sucesso + + + + Registration accepted. +Will now login. + Registro aceito +Irá entrar agora + + + + Account activation accepted. +Will now login. + Ativação da conta aceita. +Irá entrar agora. + + + + Player %1 Jogador %1 - + Load replay Carregar replay - + About Cockatrice Sobre o Cockatrice - + Version Versão - + Cockatrice Webpage Pagina da Web do Cockatrice - + Project Manager: Diretor do projeto: - + Past Project Managers: Antigos diretores do projeto: - + Developers: Desenvolvedores: - + Our Developers Nossos desenvolvedores - + Help Develop! Ajude a desenvolver! - + Translators: Tradutores: - + Our Translators Nossos tradutores. - + Help Translate! Ajude a traduzir! - + Support: Suporte: - + Report an Issue Reporte um problema: - + Troubleshooting Solução de problemas - + F.A.Q. F.A.Q. - - + + + + + + + + + + + + + + + + + + + + Error Erro - + + Server timeout + Tempo esgotado do servidor + + + + Failed Login + Login falhou + + + + Your client seems to be missing features this server requires for connection. + Seu cliente parece estar faltando recursos que este servidor requer para conexão. + + + + To update your client, go to 'Help -> Check for Client Updates'. + Para atualizar seu cliente, vá para 'Ajuda -> Procurar por atualizações do cliente'. + + + + Incorrect username or password. Please check your authentication information and try again. + Usuário ou senha incorretos. Por favor, verifique suas informações de autenticação e tente novamente. + + + + There is already an active session using this user name. +Please close that session first and re-login. + Já existe uma sessão ativa usando este nome de usuário. +Por favor, feche a sessão primeiro e logue novamente. + + + + + You are banned until %1. + Você está banido até %1. + + + + + You are banned indefinitely. + Você está banido indefinidamente. + + + + This server requires user registration. Do you want to register now? + Este servidor exige registro de usuário. Você gostaria de registrar agora? + + + + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. + Este servidor requer ID de cliente. Seu cliente ou não está conseguindo gerar um ID ou você está executando um cliente modificado. +Por favor feche e abra seu cliente para tentar novamente. + + + + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. + Ocorreu um erro interno, por favor, feche e reabra o Cockatrice antes de tentar novamente. +Se o erro persistir, verifique se você está executando a versão mais recente do software e, se necessário, entre em contato com os desenvolvedores de software. + + + + Account activation + Ativação da conta + + + + Your account has not been activated yet. +You need to provide the activation token received in the activation email. + Sua conta não foi ativada ainda +Você precisa fornecer o código de ativação recebido por email. + + + + Server Full + Servidor cheio. + + + + Unknown login error: %1 + Erro de login desconhecido: %1 + + + + + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. + +Isso geralmente significa que seu cliente está obsoleto, e o servidor enviou uma resposta que seu cliente não entende. + + + + Your username must respect these rules: + Seu nome de usuário precesia seguir essas regras: + + + + is %1 - %2 characters long + tem entre %1 e %2 caracteres + + + + can %1 contain lowercase characters + %1 pode conter caracteres minúsculos. + + + + + + + NOT + NÃO + + + + can %1 contain uppercase characters + %1 pode conter caracteres maiúsculos. + + + + can %1 contain numeric characters + %1 pode conter caracteres numéricos. + + + + can contain the following punctuation: %1 + Pode conter a seguinte pontuação: %1 + + + + first character can %1 be a punctuation mark + Primeiro caractere pode %1 ser um sinal de pontuação + + + + no unacceptable language as specified by these server rules: + note that the following lines will not be translated + Nenhuma linguagem inaceitável, conforme especificado por estas regras do servidor: + + + + can not contain any of the following words: %1 + Não pode conter nenhuma das seguintes palavras: %1 + + + + can not match any of the following expressions: %1 + Não pode corresponder a nenhuma das seguintes expressões: %1 + + + + You may only use A-Z, a-z, 0-9, _, ., and - in your username. + Você pode usar apenas A-Z, a-z, 0-9, _, ., e - em seu nome de usuário. + + + + + + + + + Registration denied + Registro negado + + + + Registration is currently disabled on this server + Registro está atualmente desabilitado neste servidor + + + + There is already an existing account with the same user name. + Já existe uma conta com este nome de usuário. + + + + It's mandatory to specify a valid email address when registering. + É obrigatório especificar um endereço de email válido para registrar. + + + + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + Aparentemente você está tentando registrar uma nova conta nesse servidor, porém você já tem uma conta registrada com o e-mail fornecido. Este servidor restringe a quantidade de contas que podem ser registradas por endereço. Por favor contate o operador do servidor para assistência posterior ou para obter informações das suas credenciais. + + + + Password too short. + Senha muito curta + + + + Registration failed for a technical problem on the server. + Registro falhou devido a um problema tecnico no servidor. + + + + The connection to the server has been lost. + + + + + Unknown registration error: %1 + Erro de registro desconhecido: %1 + + + + Account activation failed + A ativação de conta falhou + + + + Socket error: %1 + Erro de ligação:%1 + + + + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + Você está tentando conectar a um servidor obsoleto. Por favor, faça um downgrade na versão do seu Cockatrice ou conecte-se ao servidor correto. +A versão local é %1 e a versão remota é %2. + + + + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + A versão do seu Cockatrice é obsoleta. Por favor, atualize a sua versão. +A versão local é %1 e a versão remota é %2. + + + + Connecting to %1... + Conectando a %1... + + + + Registering to %1 as %2... + Registrando em %1 como %2... + + + + Disconnected + Desconectado + + + + Connected, logging in at %1 + Conectado, logando em %1 + + + + + + Requesting forgotten password to %1 as %2... + Solicitando senha esquecida para %1 como %2... + + + &Connect... &Conectar... - + &Disconnect &Desconectar - + Start &local game... Iniciar jogo &local... - + &Watch replay... &Assistir replay... - + &Full screen Tela &cheia - + &Register to server... &Registrar ao servidor: - + &Restore password... &Recuperar senha... - + &Settings... &Configurações... - + &Exit &Sair - + A&ctions Açõ&es - + &Cockatrice &Cockatrice - + C&ard Database Base de Cartas - + &Manage sets... &Gerenciar expansões... - + Edit custom &tokens... Editar &fichas personalizadas - + Open custom image folder Abrir pasta customizada de imagens. - + Open custom sets folder Abrir pasta de sets personalizados - + Add custom sets/cards Adicionar sets/cartas personalizadas - + Reload card database Recarregar banco de dados de cartas - + Tabs Abas - + &Help &Ajuda - + &About Cockatrice So&bre o Cockatrice - + &Tip of the Day &Dica do Dia - + Check for Client Updates Procurar por atualizações do cliente - + Check for Card Updates... Procurar por atualizações de cartas... - + Check for Card Updates (Automatic) - + Show Status Bar - + View &Debug Log Ver registro de &depuração - + Open Settings Folder Abrir Pasta de Configurações - + Show/Hide Mostrar/Ocultar - + New Version Nova Versão - + Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. Parabéns por atualizar o Cockatrice %1! Oracle será inicializado agora para atualizar sua base de cartas - + Cockatrice installed Cockatrice instalado - + Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. Parabéns pela instalação do Cockatrice %1! O Oracle agora será iniciado para instalar o banco de dados inicial de cartas. - + Card database Base de cartas - + Cockatrice is unable to load the card database. Do you want to update your card database now? If unsure or first time user, choose "Yes" @@ -5435,29 +5321,29 @@ Gostaria de atualizar seu banco de dados de cartas agora? Se estiver em dúvida ou for um novo usuário selecione "Sim" - - + + Yes Sim - - + + No Não - + Open settings Abrir configurações - + New sets found Novas expansões encontradas - + %n new set(s) found in the card database Set code(s): %1 Do you want to enable it/them? @@ -5470,22 +5356,17 @@ Códigos das coleções: %1 Deseja ativá-las? - - Yes, always enable - - - - + View sets Visualizar expansões - + Welcome Bem vindo - + Hi! It seems like you're running this version of Cockatrice for the first time. All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. @@ -5494,132 +5375,166 @@ Todas as expansões do banco de dados de cartas foram habilitadas. Leia mais sobre mudar a ordem das expansões ou desabilitando expansões específicas na aba "Gerenciar Expansões". - + + Information Informação - + A card database update is already running. Uma atualização da base de dados de cartas já está em andamento. - + Unable to run the card database updater: Não foi possível executar a atualização da base de dados de cartas. - + Card database update running. - + Failed to start. The file might be missing, or permissions might be incorrect. Falha ao começar. O arquivo pode não existir ou as permissões estão incorretas. - + The process crashed some time after starting successfully. - + Timed out. The process took too long to respond. The last waitFor...() function timed out. - + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. - + An error occurred when attempting to read from the process. For example, the process may not be running. - + Unknown error occurred. - + The card database updater exited with an error: %1 - - - - - + + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + Esse servidor oferece suporte a recursos adicionais que seu cliente não possui. +Provavelmente não é um problema, mas esta mensagem pode significar que existe uma nova versão do Cockatrice disponível ou este servidor está executando uma versão personalizada ou pré-lançamento. + +Para atualizar seu cliente, vá para Ajuda -> Verificar atualizações. + + + + + + + Load sets/cards Carregar expansões/cards - + Selected file cannot be found. Arquivo selecionado não pode ser encontrado - + You can only import XML databases at this time. Você só pode importar bancos de dados XML neste momento. - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. As novas cartas/coleções foram adicionadas com sucesso. O Cockatrice reiniciará imediatamente o banco de dados de cartas. - + Sets/cards failed to import. Falha ao importar expansões/cartas. + + + + + Reset Password + Redefinir Senha + + + + Your password has been reset successfully, you can now log in using the new credentials. + Sua senha foi alterada com sucesso, você pode se conectar usando suas novas credenciais + + + + Failed to reset user account password, please contact the server operator to reset your password. + Falha ao redefinir a senha da conta do usuário, entre em contato com o operador do servidor para redefinir sua senha. + + + + Activation request received, please check your email for an activation token. + Solicitação de ativação recebida, verifique seu e-mail para um token de ativação. + ManaBaseConfigDialog - + Mana Base Configuration - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): - + OK - + Cancel @@ -5691,27 +5606,27 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas. ManaDevotionConfigDialog - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): @@ -5781,615 +5696,610 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas. MessageLogWidget - + from play do jogo - + from their graveyard do seu cemitério - + from exile vindo do exílio - + from their hand da sua mão - + the top card of %1's library a carta do topo do grimório de %1 - + the top card of their library a carta do topo do seu grimório - + from the top of %1's library do topo do grimório de %1 - + from the top of their library do topo do seu grimório - + the bottom card of %1's library a carta do fundo do grimório de %1 - + the bottom card of their library a carta do fundo do seu grimório - + from the bottom of %1's library do fundo do grimório de %1 - + from the bottom of their library do fundo do seu grimório - + from %1's library do grimório de %1 - + from their library do seu grimório - + from sideboard vindo do sideboard - + from the stack vindo da pilha - + from custom zone '%1' - + %1 is now keeping the top card %2 revealed. %1 está mantendo as carta do topo %2 reveladas. - + %1 is not revealing the top card %2 any longer. %1 não está mais revelando as cartas do topo %2. - + %1 can now look at top card %2 at any time. %1 agora pode olhar a carta do topo de %2 a qualquer momento. - + %1 no longer can look at top card %2 at any time. %1 não pode mais olhar a carta do topo de %2 a qualquer momento. - + %1 attaches %2 to %3's %4. %1 vincula %2 a %4 de %3. - + %1 has conceded the game. %1 concedeu o jogo. - + %1 has unconceded the game. %1 desfez a concessão do jogo - + %1 has restored connection to the game. %1 restaurou a conexão com o jogo. - + %1 has lost connection to the game. %1 perdeu conexão com o jogo. - + %1 points from their %2 to themselves. %1 aponta de sua %2 para si - + %1 points from their %2 to %3. %1 aponta de sua %2 para %3. - + %1 points from %2's %3 to themselves. %1 aponta da %3 de %2 para si - + %1 points from %2's %3 to %4. %1 aponta da %3 de %2 para %4 - + %1 points from their %2 to their %3. %1 aponta da sua %2 para sua %3 - + %1 points from their %2 to %3's %4. %1 aponta de sua %2 para %4 de %3 - + %1 points from %2's %3 to their own %4. %1 aponta da %3 de %2 para seu próprio %4. - + %1 points from %2's %3 to %4's %5. %1 aponta da %3 de %2 para a %5 de %4. - + %1 creates a face down token. - + %1 creates token: %2%3. %1 cria uma ficha: %2%3. - + %1 has loaded a deck (%2). %1 carregou um deck (%2). - + %1 has loaded a deck with %2 sideboard cards (%3). %1 carregou um deck com %2 cartas no sideboard (%3). - + %1 destroys %2. %1 destrói %2. - + a card um card - + %1 gives %2 control over %3. %1 dá controle para %2 sobre %3. - + %1 puts %2 into play%3 face down. %1 coloca %2 em jogo%3 com a face voltada para baixo. - + %1 puts %2 into play%3. %1 põe %2 no campo de batalha %3. - + %1 puts %2%3 into their graveyard face down. - + %1 puts %2%3 into their graveyard. %1 coloca %2%3 em seu cemitério. - + %1 exiles %2%3 face down. - + %1 exiles %2%3. %1 exila %2%3. - + %1 moves %2%3 to their hand. %1 moveu %2%3 para sua mão. - + %1 puts %2%3 into their library. %1 coloca %2%3 em seu grimório - + %1 puts %2%3 onto the bottom of their library. %1 coloca %2%3 no fundo de seu grimório. - + %1 puts %2%3 on top of their library. %1 coloca %2%3 no topo de seu grimório. - + %1 puts %2%3 into their library %4 cards from the top. %1 coloca %2%3 do seu grimório %4 cartas abaixo do topo. - + %1 moves %2%3 to sideboard. %1 move %2%3 para o sideboard. - + %1 plays %2%3 face down. - + %1 plays %2%3. %1 põe %2 na pilha%3. - + %1 moves %2%3 to custom zone '%4' face down. - + %1 moves %2%3 to custom zone '%4'. - + %1 tries to draw from an empty library %1 tenta comprar de uma biblioteca vazia - + %1 draws %2 card(s). %1 comprou %2 carta(s).%1 comprou %2 carta(s).%1 comprou %2 carta(s). - + %1 is looking at %2. %1 está olhando para %2. - + %1 is looking at the %4 %3 card(s) %2. top card for singular, top %3 cards for plural %1 está olhando para a(s) %3 carta(s) %4 %2.%1 está olhando para a(s) %3 carta(s) %4 %2.%1 está olhando para a(s) %3 carta(s) %4 %2. - + bottom de fundo - + top de topo - + %1 turns %2 face-down. %1 turnos %2 cartas viradas para baixo. - + %1 turns %2 face-up. %1 turnos %2 cartas viradas para cima. - + The game has been closed. O jogo foi fechado. - + The game has started. O jogo começou. - + You are flooding the game. Please wait a couple of seconds. - + %1 has joined the game. %1 entrou no jogo. - + %1 is now watching the game. %1 está assistindo o jogo agora. - + You have been kicked out of the game. Você foi 'chutado' do jogo. - + %1 has left the game (%2). %1 deixou o jogo (%2) - + %1 is not watching the game any more (%2). %1 não está mais assistindo o jogo (%2). - + %1 is not ready to start the game any more. %1 não está mais pronto para inciar o jogo. - + %1 shuffles their deck and draws a new hand of %2 card(s). %1 embaralhou seu grimório e comprou uma nova mão com %2 card.%1 embaralhou seu grimório e comprou uma nova mão com %2 cards.%1 embaralhou seu grimório e comprou uma nova mão com %2 cards. - + %1 shuffles their deck and draws a new hand. %1 embaralhou seu grimório e comprou uma nova mão. - + You are watching a replay of game #%1. Você está assistindo o replay do jogo #%1. - + %1 is ready to start the game. %1 está pronto para inciar o jogo. - + cards an unknown amount of cards cartas - + %1 card(s) a card for singular, %1 cards for plural %1 carta%1 carta(s)%1 carta(s) - + %1 lends %2 to %3. %1 empresta %2 para %3. - + %1 reveals %2 to %3. %1 revela %2 para %3. - + %1 reveals %2. %1 revela %2. - + %1 randomly reveals %2%3 to %4. %1 revela aleatoriamente %2%3 para %4. - + %1 randomly reveals %2%3. %1 revela aleatoriamente %2%3. - + %1 peeks at face down card #%2. %1 olha a carta virada para baixo #%2. - + %1 peeks at face down card #%2: %3. %1 espia a face para baixo da carta #%2: %3. - + %1 reveals %2%3 to %4. %1 revela %2 %3 para %4. - + %1 reveals %2%3. %1 revela %2%3. - + %1 reversed turn order, now it's %2. %1 reverteu a ordem dos turnos, agora é a vez de %2. - + reversed revertido - + normal normal - + Heads Cara - + Tails Coroa - + %1 flipped a coin. It landed as %2. %1 jogou uma moeda. Saiu %2. - + %1 rolls a %2 with a %3-sided die. %1 tirou %2 em um D%3. - + %1 flips %2 coins. There are %3 heads and %4 tails. %1 joga %2 moedas. São %3 caras e %4 coroas. - + %1 rolls a %2-sided dice %3 times: %4. %1 rola um dado de %2 lados %3 vezes: %4. - + %1's turn. Turno de %1. - + %1 sets annotation of %2 to %3. %1 altera a anotação de %2 para %3. - - %1 places %2 %3%4 counter(s) on %5 (now %6). + + %1 places %2 "%3" counter(s) on %4 (now %5). - - %1 removes %2 %3%4 counter(s) from %5 (now %6). + + %1 removes %2 "%3" counter(s) from %4 (now %5). - - %1 failed to undo their last draw. - - - - + %1 sets counter %2 to %3 (%4%5). %1 ajusta o marcador %2 para %3 (%4%5). - + %1 sets %2 to not untap normally. %1 determina que %2 não desvira normalmente. - + %1 sets %2 to untap normally. %1 determina que %2 desvira normalmente. - + %1 removes the PT of %2. %1 remove o P/R de %2 - + %1 changes the PT of %2 from nothing to %4. %1 alterar o PR de %2 de nada para %4. - + %1 changes the PT of %2 from %3 to %4. %1 alterar o P/R de %2 de %3 para %4. - + %1 has locked their sideboard. %1 bloqueou seu sideboard - + %1 has unlocked their sideboard. %1 desbloqueou seu sideboard - + %1 taps their permanents. %1 vira suas permanentes. - + %1 untaps their permanents. %1 desvira suas permanentes. - + %1 taps %2. %1 vira %2 - + %1 untaps %2. %1 desvira %2. - + %1 shuffles %2. %1 embaralha %2 - + %1 shuffles the bottom %3 cards of %2. %1 embaralha as %3 cartas do fundo de %2 - + %1 shuffles the top %3 cards of %2. %1 embaralha as %3 cartas do topo de %2 - + %1 shuffles cards %3 - %4 of %2. %1 embaralha as cartas %3 - %4 de %2 - + %1 unattaches %2. %1 desanexa %2. - + %1 undoes their last draw. %1 desfaz sua última compra. - + %1 undoes their last draw (%2). %1 desfaz sua última compra (%2). @@ -6397,115 +6307,110 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas. MessagesSettingsPage - + Word1 Word2 Word3 Palavra1 Palavra2 Palavra3 - + Add New Message Adicionar nova mensagem - + Edit Message Editar mensagem - + Remove Message Remover mensagem - + Add message Adicionar mensagem - - + + Message: Mensagem: - + Edit message Editar mensagem - + Chat settings Configurações de Conversa - + Custom alert words Palavras de alertas customizadas. - + Enable chat mentions Habilitar menções em conversa - + Enable mention completer Habilitar completador de menções. - + In-game message macros Mensagem no jogo - + How to use in-game message macros Como usar macros de mensagens no jogo - + Ignore chat room messages sent by unregistered users Ignorar mensagens na sala enviadas por usuários não registrados - + Ignore private messages sent by unregistered users Ignorar mensagens privadas enviadas por usuários não registrados - - Ignore private messages sent by non-buddy users - - - - - + + Invert text color Inverter cor do texto - + Enable desktop notifications for private messages Ativar notificações da área de trabalho para mensagens privadas. - + Enable desktop notification for mentions Habilitar notificações de desktop para menções. - + Enable room message history on join Ativar histórico de mensagens da sala ao entrar - - + + (Color is hexadecimal) (Cor em hexadecimal) - + Separate words with a space, alphanumeric characters only Separar palavras com um espaço, apenas caracteres alfanuméricos @@ -6513,42 +6418,42 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas. MoveMenu - + Move to - + &Top of library in random order - + X cards from the top of library... - + &Bottom of library in random order - + T&able - + &Hand - + &Graveyard - + &Exile @@ -6561,47 +6466,47 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas. Tipo de Carta - + Mana Value Valor de Mana - + Color(s) Cor(es) - + Loyalty Lealdade - + Main Card Type Tipo de Carta Principal - + Mana Cost Custo de Mana - + P/T P/R - + Side Side - + Layout Layout - + Color Identity Identidade de Cor @@ -6624,152 +6529,6 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas. Direção da sobreposição: - - PaletteEditorDialog - - - - Reset - - - - - - Apply - - - - - - Save && Apply - - - - - ▼ Edit Palette - - - - - - ▶ Edit Palette - - - - - Palette Editor — %1 - - - - - <b>Palette Editor</b> &nbsp;·&nbsp; %1 - - - - - This theme ships no default palette files - - - - - Replace current colours with the theme author's defaults - - - - - Switch between the light and dark palette files - - - - - Editing: - - - - - Show or hide the per-role colour grid for manual tweaks - - - - - ↺ Revert to theme default - - - - - Discard unsaved edits and restore the last saved palette - - - - - Preview this palette without saving to disk - - - - - Write palette-%1.toml and reload the theme - - - - - Cannot save: this theme has no directory on disk - - - - - Save failed - - - - - Could not write %1 to: -%2 - - - - - No default found - - - - - No default palette file found for the "%1" scheme. - - - - - PaletteGridWidget - - - Active - - - - - Disabled - - - - - Inactive - - - - - Normal interactive state - - - - - Widget is disabled / not interactive - - - - - Window is in background / unfocused - - - Phase @@ -6836,57 +6595,57 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas. PhasesToolbar - + Untap step Etapa de desvirar - + Upkeep step Etapa de manutenção - + Draw step Etapa de compra - + First main phase Primeira fase principal - + Beginning of combat step Etapa de início de combate - + Declare attackers step Etapa de declaracão de atacantes - + Declare blockers step Etapa de declaração de bloqueadores - + Combat damage step Etapa de dano de combate - + End of combat step Etapa de fim de combate - + Second main phase Segunda fase principal - + End of turn step Etapa de fim de combate @@ -6894,7 +6653,7 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas. PictureLoader - + en code for scryfall's language property, not available for all languages pt @@ -6903,142 +6662,151 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas. PlayerActions - - - - - grave - - - - - - - - exile - - - - - PlayerDialogs - - + View top cards of library - - - - - - - - - + + + + + + + + + Number of cards: (max. %1) - + View bottom cards of library - + Shuffle top cards of library - + Shuffle bottom cards of library - + Draw hand - + 0 and lower are in comparison to current hand size - + Draw cards - + + + + + grave + + + + + + + + exile + + + + Move top cards to %1 - + Move bottom cards to %1 - + Draw bottom cards - + + + C&reate another %1 token + + + + Create tokens - + + Number: - + Place card X cards from top of library - + Which position should this card be placed: - + (max. %1) - + Change power/toughness - + Change stats to: - + Set annotation - + Please enter the new annotation: + + + Set counters + + PlayerMenu - + Player "%1" - + &Counters @@ -7068,7 +6836,7 @@ This setting means you'll only see the default printing for each card, instead o - + Printing Selector @@ -7076,22 +6844,22 @@ This setting means you'll only see the default printing for each card, instead o PrintingSelectorCardOverlayWidget - + Preference Preferência - + Pin Printing Fixar Impressão - + Unpin Printing Desafixar Impressão - + Show Related cards Mostrar Cartas Relacionadas @@ -7162,57 +6930,57 @@ This setting means you'll only see the default printing for each card, instead o PtMenu - + Power / toughness - + &Increase power - + &Decrease power - + I&ncrease toughness - + D&ecrease toughness - + In&crease power and toughness - + Dec&rease power and toughness - + Increase power and decrease toughness - + Decrease power and increase toughness - + Set &power and toughness... - + Reset p&ower and toughness @@ -7220,37 +6988,37 @@ This setting means you'll only see the default printing for each card, instead o QMenuBar - + Services Serviços - + Hide %1 Esconder %1 - + Hide Others Esconder outros - + Show All Mostrar tudo - + Preferences... Preferências - + Quit %1 Sair %1 - + About %1 Sobre %1 @@ -7258,17 +7026,17 @@ This setting means you'll only see the default printing for each card, instead o QObject - + Cockatrice card database (*.xml) Banco de dados de cartas do Cockatrice (*.xml) - + All files (*.*) Todos arquivos (*.*) - + Cockatrice replays (*.cor) Cockatrice replays (*.cor) @@ -7328,177 +7096,110 @@ Are you sure you would like to disable this feature? QPlatformTheme - + OK OK - + Save Salvar - + Save All Salvar Todos - + Open Abrir - + &Yes &Sim - + Yes to &All Sim para &Todos - + &No &Não - + N&o to All Não para &Todos - + Abort Abortar - + Retry Tentar Novamente - + Ignore Ignorar - + Close Fechar - + Cancel Cancelar - + Discard Descartar - + Help Ajuda - + Apply Aplicar - + Reset Resetar - + Restore Defaults Restaurar Padrão - - QuickSetupPanel - - - %1% - - - - - <b>Quick Setup</b> - - - - - Generate all palette roles automatically from a single accent colour - - - - - Accent: - - - - - Primary hue. Used directly for highlights and links. -At high intensity it also tints buttons and backgrounds. - - - - - Intensity: - - - - - Subtle - - - - - Full colour - - - - - 0–30 Subtle tint — only highlights and links change hue -30–70 Accented — buttons, tooltips, and borders join in -70–100 Full colour — backgrounds, everything - - - - - 70% - - - - - Generate ↓ - - - - - Derive all palette roles from the accent colour above. -Fine-tune individual colours in the grid afterwards. - - - RemoteDeckList_TreeModel - + Name Nome - + ID ID - + Upload time Hora do upload @@ -7506,32 +7207,32 @@ Fine-tune individual colours in the grid afterwards. RemoteReplayList_TreeModel - + ID Código - + Name Nome - + Players Jogadores - + Keep Manter - + Time started Tempo iniciado - + Duration (sec) Duração (seg) @@ -7539,37 +7240,37 @@ Fine-tune individual colours in the grid afterwards. RfgMenu - + &Exile - + &View exile - + &Move exile to... - + &Top of library - + &Bottom of library - + &Hand - + &Graveyard @@ -7615,7 +7316,7 @@ Fine-tune individual colours in the grid afterwards. SayMenu - + S&ay @@ -7656,27 +7357,27 @@ Fine-tune individual colours in the grid afterwards. SetsModel - + Enabled Ativado - + Set type Selecione tipo - + Set code Selecione código - + Long name Nome longo - + Release date Data lançamento @@ -7684,53 +7385,53 @@ Fine-tune individual colours in the grid afterwards. ShortcutSettingsPage - - + + Restore all default shortcuts Restaurar todos atalhos padrões - + Do you really want to restore all default shortcuts? Você tem certeza que deseja restaurar todos atalhos padrões? - + Clear all default shortcuts Limpar todos os atalhos padrão - + Do you really want to clear all shortcuts? Você realmente quer limpar todos os atalhos? - + Section: Seção: - + Action: Ação: - + Shortcut: Atalho: - + How to set custom shortcuts Como definir atalhos personalizados - + Clear all shortcuts Limpar todos os atalhos - + Search by shortcut name Pesquisar pelo nome do atalho @@ -7786,12 +7487,12 @@ Por favor, verifique suas configurações de atalho! SideboardMenu - + &Sideboard - + &View sideboard @@ -7799,27 +7500,27 @@ Por favor, verifique suas configurações de atalho! SoundSettingsPage - + Enable &sounds Habilitar &sons - + Current sounds theme: Tema sonoro atual: - + Test system sound engine Testar sistema de som - + Sound settings Configurações de som - + Master volume Volume principal @@ -7891,146 +7592,16 @@ Por favor, verifique suas configurações de atalho! Resposta inválida do servidor de atualização - + No reply received from the tag update server. Nenhuma resposta recebida do servidor de atualização de tags. - + Invalid reply received from the tag update server. Resposta inválida recebida do servidor de atualização de tags. - - StorageSettingsPage - - - - - Success - - - - - Cached card pictures have been reset. - - - - - Downloaded card pictures have been reset. - - - - - Error - - - - - One or more downloaded card pictures could not be cleared. - - - - - In-memory (currently loaded) card pictures have been reset. - - - - - Card Picture Loader Caching Method: - - - - - The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size. - - - - - Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while. - - - - - This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk. - - - - - Delete Cached Images - - - - - Delete Saved Images - - - - - Clear In-Memory Images - - - - - Card Picture Loader Cache Method - - - - - Network Cache - - - - - Filesystem - - - - - In-Memory Picture Cache - - - - - Network Cache Size: - - - - - On-disk cache for downloaded pictures - - - - - Redirect Cache TTL: - - - - - How long cached redirects for urls are valid for. - - - - - Picture Cache Size: - - - - - In-memory cache for pictures not currently on screen - - - - - Naming scheme: - - - - - Day(s) - - - TabAccount @@ -8166,117 +7737,117 @@ Por favor, verifique suas configurações de atalho! TabArchidekt - - + + Desc. - - + + AND - - + + Require ALL selected colors - - + + Deck name... - - + + Owner... - - + + Packages - - + + Advanced Filters - + Bracket: - - + + Any - - + + Contains card... - - + + Commander... - - + + Tag... - - + + Deck Size - + Cards: - - + + Asc. - + Sort by: - + Filter by: - + Display Settings - - + + Search - - + + Formats @@ -8286,54 +7857,6 @@ Por favor, verifique suas configurações de atalho! - - TabCardArtRules - - - Card: - - - - - ProviderId: - - - - - Mode: - - - - - Reason: - - - - - Type a card name... - - - - - Add rule - - - - - Remove rule - - - - - Refresh - - - - - Card Art Rules - - - TabDeckEditor @@ -8382,7 +7905,7 @@ Por favor, verifique suas configurações de atalho! Reiniciar layout - + Deck: %1 Deck: %1 @@ -8390,49 +7913,55 @@ Por favor, verifique suas configurações de atalho! TabDeckEditorVisual - + Visual Deck: %1 - + &Visual Deck Editor - - + + Card Info - - + + Deck - + + + Filters + + + + &View - + Printing - + Visible - + Floating - + Reset layout @@ -8440,22 +7969,22 @@ Por favor, verifique suas configurações de atalho! TabDeckEditorVisualTabWidget - + Visual Deck View - + Visual Database Display - + Deck Analytics - + Sample Hand @@ -8463,134 +7992,134 @@ Por favor, verifique suas configurações de atalho! TabDeckStorage - + Local file system Sistema de arquivos local - + Server deck storage Armazenamento de decks no servidor - - + + Open in deck editor Abrir no editor de decks - + Rename deck or folder - + Upload deck Upload do deck - + Download deck Download do deck + - - - + + New folder Nova pasta + - Delete Apagar - + Open decks folder Abrir pasta de decks - + Rename local folder - + Rename local file - + New name: - - - - + + + + Error Error - + Rename failed - - + + Invalid deck file Arquivo de deck inválido - + Enter deck name Entre o nome do deck - + This decklist does not have a name. Please enter a name: Este deck não tem um nome. Por favor, entre um nome: - + Unnamed deck Deck sem nome - + Failed to upload deck to server Falha ao enviar deck ao servidor - + Delete local file Excluir arquivo local - + Are you sure you want to delete the selected files? Tem certeza de que deseja excluir os arquivos selecionados? - + Delete remote decks Excluir decks remotos - + Are you sure you want to delete the selected decks? Tem certeza de que deseja excluir os decks selecionados? - - + + Name of new folder: Nome da nova pasta: @@ -8662,191 +8191,191 @@ Por favor, entre um nome: TabGame - - - + + + Replay Replay - - + + Game Jogo - - + + Player List Lista de jogadores. - - + + Card Info Informação da carta - - + + Messages Mensagens - - + + Replay Timeline Linha do tempo do Replay - + &Phases &Etapas - + &Game &Jogo - + Next &phase Próxima &etapa - + Next phase with &action Próxima etapa com &acao - + Next &turn Próximo &turno - + Reverse turn order Ordem dos turnos revertida - + &Remove all local arrows &Apagar todas as setas locais - + Rotate View Cl&ockwise Girar visualização em sentido h&orário - + Rotate View Co&unterclockwise Girar visualização em sentido a&nti-horário - + Game &information &Informação de jogo - + Un&concede Cancelar Rendição - - - + + + &Concede &Conceder - + &Leave game &Sair do jogo - + C&lose replay &Fechar replay - + &Focus Chat &Focar no chat - + &Say: &Falar: - + Selected cards - + &View &Visualizar - + Visible Visível - + Floating Flutuante - + Reset layout Reiniciar layout - + Concede Conceder - + Are you sure you want to concede this game? Você tem certeza que deseja conceder este jogo? - + Unconcede Defazer concessão - + You have already conceded. Do you want to return to this game? Você já concedeu. Quer retornar a esse jogo? - + Leave game Sair do jogo - + Are you sure you want to leave this game? Você tem certeza que deseja sair deste jogo? - + A player has joined game #%1 Um jogador entrou no jogo #%1 - + %1 has joined the game %1 entrou no jogo - + You have been kicked out of the game. Você foi 'chutado' do jogo. @@ -8905,115 +8434,115 @@ Por favor, entre um nome: Você precisa selecionar um número de dias válido para localizar - + Username: Nome de usuário. - + IP Address: Endereço de IP: - + Game Name: Nome do jogo: - + GameID: ID do Jogo: - + Message: Mensagem: - + Main Room Sala Principal - + Game Room Sala de Jogo - + Private Chat Chat Privado. - + Past X Days: X dias anteriores: - + Today Hoje - + Last Hour Última hora - + Maximum Results: Máximo de resultados: - + At least one filter is required. The more information you put in, the more specific your results will be. Ao menos um filtro deve ser selecionado. Quanto mais informação você inserir, mais específicos seus resultados serão. - + Get User Logs Obter logs de usuário - + Clear Filters Limpar Filtros - + Filters Filtros - + Log Locations Logs de localização - + Date Range Intervalo de data - + Maximum Results Máximo de resultados - - + + Message History Histórico de Mensagens - + Failed to collect message history information. Falha ao coletar informação do histórico de mensagens. - + There are no messages for the selected filters. Não existe mensagem que corresponda aos filtros selecionados. @@ -9031,27 +8560,27 @@ Quanto mais informação você inserir, mais específicos seus resultados serão &Sair - + %1 - Private chat %1 - Conversa privada - + This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. Este usuário esta ignorando você, ele não pode ver suas mensagens no chat principal e você não pode entrar nos jogos dele. - + Private message from Mensagem privada de - + %1 has left the server. %1 saiu do servidor. - + %1 has joined the server. %1 entrou no servidor. @@ -9059,180 +8588,180 @@ Quanto mais informação você inserir, mais específicos seus resultados serão TabReplays - + Local file system Sistema de arquivos local - + Server replay storage Servidor de armazenamento de replays - - + + Watch replay Assistir replay - + Rename Renomear - - + + New folder Nova pasta - - + + Delete Excluir - + Open replays folder Abrir pasta de repetições - + Download replay Baixar replay - + Toggle expiration lock Trocar expiração da trava - + Get replay share code - - + + Look up replay by share code - + Rename local folder Renomear pasta local - + Rename local file Renomear arquivo local - + New name: Novo nome: - + Error Erro - + Rename failed Falha ao renomear - + Name of new folder: Nome da nova pasta: - + Delete local file Excluir arquivo local - + Are you sure you want to delete the selected files? Tem certeza de que deseja excluir os arquivos selecionados? - + Are you sure you want to delete the selected replays? Tem certeza de que deseja excluir as repetições selecionadas? - + Failed to get code - - + + Either this server does not support replay sharing, or does not permit replay sharing for you. - - - + + + Failed - + Could not get replay code - + Replay Share Code - + Others can use this code to add the replay to their list of remote replays: %1 - + Copy to clipboard - + Replay share code - + Replay code found - + Replay was added, or you already had access to it. - + Replay code not found - + Failed to submit code - + Unexpected error - + Delete remote replay Excluir replay remoto @@ -9245,62 +8774,47 @@ Quanto mais informação você inserir, mais específicos seus resultados serão TabRoom - - Friends - - - - - Online - - - - - Ignored - - - - + &Say: &Falar: - + Chat Chat - + &Room &Sala - + &Leave room S&air da sala - + &Clear chat Limpar conversa - + Chat Settings... Configurações de Conversa - + mentioned you. mencionou você. - + Click to view Clique para ver - + You are flooding the chat. Please wait a couple of seconds. Você está flodando o chat. Por favor, espere alguns segundos. @@ -9313,30 +8827,30 @@ Quanto mais informação você inserir, mais específicos seus resultados serão Servidor - - - - + + + + Error Erro - + Failed to join the server room: it doesn't exist on the server. Falha ao entrar na sala: ela não existe no servidor. - + The server thinks you are in the server room but your client is unable to display it. Try restarting your client. O servidor pensa que você está na sala, mas seu cliente não consegue exibi-la. Tente reiniciar o seu cliente. - + You do not have the required permission to join this server room. Você não tem permissão para entrar nesta sala. - + Failed to join the server room due to an unknown error: %1. Falha ao entrar na sala devido a um erro desconhecido: %1. @@ -9344,97 +8858,97 @@ Quanto mais informação você inserir, mais específicos seus resultados serão TabSupervisor - + Deck Editor Editor de Deck - + Visual Deck Editor - + EDHRec - + Archidekt - + Home - + &Visual Deck Storage &Decks Visuais - + Visual Database Display - + Server Servidor - + Account Conta - + Deck Storage Armazenamento de Deck - + Game Replays Repetições de jogo - + Administration Administração - + Logs Registros - + Are you sure? Você tem certeza? - + There are still open games. Are you sure you want to quit? Ainda existem jogos abertos. Você tem certeza que deseja sair? - + Click to view Clique para visualizar - + Your buddy %1 has signed on! Seu amigo %1 entrou no servidor! - + Unknown Event Evento desconhecido. - + The server has sent you a message that your client does not understand. This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. @@ -9445,39 +8959,39 @@ Esta mensagem pode significar que existe uma nova versão do Cockatrice disponí Para atualizar seu cliente, vá para Ajuda -> Verificar atualizações. - + Idle Timeout Tempo esgotado de inatividade - + You are about to be logged out due to inactivity. Você irá ser desconectado por inatividade - + Promotion Promoção - + You have been promoted. Please log out and back in for changes to take effect. Você foi promovido a moderador(a). Por favor faça logout e depois acesse novamente para que as mudanças sejam efetivadas. - + Warned Advertido - + You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. Você recebeu uma advertência por %1. Por favor evite tais ações ou outras medidas poderão ser tomadas contra você. Se você tem qualquer dúvida, por favor envie uma mensagem privada um dos moderadores. - + You have received the following message from the server. (custom messages like these could be untranslated) Você recebeu a seguinte mensagem do servidor. @@ -9487,12 +9001,12 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você TabVisualDatabaseDisplay - + Database Display - + Visual Database Display @@ -9531,42 +9045,42 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você TranslateCounterName - + Life Vida - + White Branco - + Blue Azul - + Black Preto - + Red Vermelho - + Green Verde - + Colorless Incolor - + Other Outro @@ -9574,69 +9088,11 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você UpdateDownloader - + Could not open the file for reading. Não foi possível abrir o arquivo para leitura. - - UserCardArtSettingsDialog - - - Card Art Settings - - - - - Type a card name... - - - - - Card name: - - - - - Card ProviderId: - - - - - Left margin (%): - - - - - Right margin (%): - - - - - Vertical offset: - - - - - Zoom: - - - - - Parameters - - - - - Preview - - - - - Remove Banner Card - - - UserContextMenu @@ -9754,7 +9210,7 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você - + Ban History Histórico de banimento @@ -9769,87 +9225,77 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você O usuário nunca foi banido. - + Failed to collect ban information. Falha ao coletar informações de banidas. - - - + + + Warning History Histórico de advertências - + Warning Time;Moderator;User Name;Reason Tempo de advertência;Moderador;Nome de Usuário;Razão - + User has never been warned. Usuário nunca foi advertido. - + Failed to collect warning information. Falha ao coletar informações de aviso. - + Failed to get admin notes. Falha ao obter as notas do administrador. - - + + Success Sucesso - + Successfully promoted user. Usuário promovido com sucesso. - + Successfully demoted user. Permissões de moderação revogadas com sucesso. - - Kick Player - - - - - Are you sure you want to kick this player from the game? - - - - - - + + + Failed Falha - + Failed to promote user. Falha ao promover usuário. - + Failed to demote user. Falha ao revogar permissões de moderação do usuário. - + Copy hash to clipboard Copiar hash para área de transferência - + Remove this user's messages Remover mensagens deste usuário @@ -9857,554 +9303,326 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você UserInfoBox - + Location: Localização: - + Account Age: Idade conta: - + Edit Editar - + Change password Alterar senha - + Change avatar Alterar avatar - + Administrator Administrador - + Moderator Moderador - + Registered user Usuário registrado - - + + Unregistered user Usuário não registrado - + Judge Juíz - + Unknown Desconhecido - + The entered password does not match your account. A senha inserida não coincide com de sua conta. - - - - + + + Information Informação - + User information updated. Informações do usuário atualizadas - - - - - - - - - - - + + + + + + + + + + Error Erro - + User Information Informação do usuário - + Real Name: Nome real: - + User Level: Nível do usuário: - - - Edit Banner Card - - - + %n Year(s), amount of years (only shown if more than 0) %n ano(s),%n ano(s),%n ano(s), - + %10%n Day(s) %20 amount of years (if more than 0), amount of days, date in local short format %10%n dia(s) %20%10%n dia(s) %20%10%n dia(s) %20 - + Enter Password Insira a senha - + Password verification is required in order to change your email address Uma verificação de senha é obrigatória para alterar seu endereço de e-mail - - - + + + An error occurred while trying to update your user information. Ocorreu um erro ao tentar atualizar suas informações de usuário. - - The selected card is blacklisted on this server or another error occurred. - - - - - Banner card removed. - - - - - Banner card updated. - - - - + This server does not permit you to update your user informations. Este servidor não permite que você atualize suas informações de usuário. - + Password changed. Senha alterada. - + This server does not permit you to change your password. Este servidor não permite que você altere sua senha. - + The new password is too short. A nova senha é muito curta. - + The old password is incorrect. A senha antiga está incorreta. - + Avatar updated. Avatar alterado. - + This server does not permit you to update your avatar. Este servidor não permite que você altere seu avatar. - - - An error occured while trying to update your avatar. - - - This server does not permit you to update your user informations. - An error occured while trying to updater your avatar. - Este servidor não permite que você atualize suas informações de usuário. - - - - UserInfoPopup - - - - Games - - - - - Chat - - - - - Open private chat - - - - - Profile - - - - - View user profile - - - - - Show this user's games - - - - - − Buddy - - - - - Remove from buddy list - - - - - + Buddy - - - - - Add to buddy list - - - - - − Ignore - - - - - Remove from ignore list - - - - - + Ignore - - - - - Add to ignore list - - - - - Ban - - - - - Ban from server - - - - - Warn - - - - - Warn user - - - - - Ban log - - - - - View ban history - - - - - Warn log - - - - - View warning history - - - - - Notes - - - - - View admin notes - - - - - − Mod - - - - - Demote from moderator - - - - - + Mod - - - - - Promote to moderator - - - - - − Judge - - - - - Demote from judge - - - - - + Judge - - - - - Promote to judge - - - - - Join game - - - - - Spectate - - - - - - Loading games… - - - - - Could not load games. - - - - - No active games. - + An error occured while trying to updater your avatar. + Um erro ocorreu enquanto seu avatar era atualizado. UserInterfaceSettingsPage - + General interface settings Configurações gerais de interface - + &Double-click cards to play them (instead of single-click) &Duplo clique nos cards para jogá-los (ao invés de clique simples) - + &Clicking plays all selected cards (instead of just the clicked card) Clicar reproduz todas as cartas selecionadas (em vez de apenas a carta clicada) - + &Play all nonlands onto the stack (not the battlefield) by default &Jogar todos não terrenos na pilha (não campo de batalha) por padrão - + Do not delete &arrows inside of subphases - + Close card view window when last card is removed Fechar janela de visualização ao remover a última carta - + Auto focus search bar when card view window is opened - + Annotate card text on tokens Anotar texto de card nas fichas - - Show selection count during drag selection + + Show selection counter during drag selection - - Show total selection count + + Show total selection counter - - Show subtype breakdown in selection tally - - - - + Use tear-off menus, allowing right click menus to persist on screen Usar menus tear-off, permitindo que menus de clique com botão direito persistam na tela - - Keep game chat focused when clicking in game (Note: disables card view search bar) - - - - + Notifications settings Configurações de Notificações - + Enable notifications in taskbar Habilitar notificações na barra de tarefas - + Notify in the taskbar for game events while you are spectating Notificar na barra de tarefas para eventos do jogo enquanto você está como espectador - + Notify in the taskbar when users in your buddy list connect Notificar na barra de tarefas quando usuários na sua lista de amigos se conectar - + Animation settings Configurações de animação - + &Tap/untap animation Animação de &virar/desvirar - + Deck editor/storage settings Configurações do editor/armazenamento de decks - + Open deck in new tab by default Abrir deck em uma nova aba por padrão - + Use visual deck storage in game lobby Usar decks visuais no lobby do jogo - + Use selection animation for Visual Deck Storage - + When adding a tag in the visual deck storage to a .txt deck: - + do nothing - + ask to convert to .cod - + always convert to .cod - + Default deck editor type - + Classic Deck Editor - + Visual Deck Editor - + Replay settings Configurações de repetição - + Buffer time for backwards skip via shortcut: Tempo de buffer para retroceder usando atalho: @@ -10412,22 +9630,22 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você UserListWidget - + Users connected to server: %1 Usuários conectados ao servidor: %1 - + Users in this room: %1 Usuários nesta sala: %1 - + Buddies online: %1 / %2 Amigos online: %1 / %2 - + Ignored users online: %1 / %2 Usuários ignorados online: %1 / %2 @@ -10435,45 +9653,35 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você UtilityMenu - + Increment all card counters - + &Untap all permanents - + R&oll die... - - Flip coin - - - - + &Create token... - + C&reate another token - + Cr&eate predefined token - - - C&reate another %1 token - - VisualDatabaseDisplayColorFilterWidget @@ -10525,72 +9733,72 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você VisualDatabaseDisplayFilterToolbarWidget - + Sort by - + Filter by - + Save and load filters - + Filter by exact card name - + Filter by card main-type - + Filter by card sub-type - + Filter by set - + Filter by format legality - + Save/Load - + Name - + Main Type - + Sub Type - + Sets - + Formats @@ -10598,22 +9806,22 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você VisualDatabaseDisplayFormatLegalityFilterWidget - + Show formats with at least: - + cards - + Do not display formats with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) @@ -10631,32 +9839,32 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você VisualDatabaseDisplayMainTypeFilterWidget - + Show main types with at least: - + cards - + Do not display card main-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10664,27 +9872,27 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você VisualDatabaseDisplayNameFilterWidget - + Filter by name... (Exact match) - + Load from Deck - + Apply all card names in currently loaded deck as exact match name filters - + Load from Clipboard - + Apply all card names in clipboard as exact match name filters @@ -10692,7 +9900,7 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você VisualDatabaseDisplayRecentSetFilterSettingsWidget - + Filter to most recent sets @@ -10700,19 +9908,19 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você VisualDatabaseDisplaySetFilterWidget - + Search sets... - - + + Mode: Exact Match - - + + Mode: Includes @@ -10720,37 +9928,37 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você VisualDatabaseDisplaySubTypeFilterWidget - + Search subtypes... - + Show sub types with at least: - + cards - + Do not display card sub-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10758,23 +9966,23 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você VisualDatabaseDisplayWidget - + Search by card name (or search expressions) - + Visual - + Loading database ... - + Clear all filters @@ -10813,17 +10021,17 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você - + Toggle Layout: Overlap - + Change how cards are displayed within zones (i.e. overlapped or fully visible.) - + Toggle Layout: Flat @@ -10852,17 +10060,17 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você VisualDeckEditorWidget - + Type a card name here for suggestions from the database... - + Quick search and add card - + Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter @@ -10980,43 +10188,43 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você WarningDialog - + Which warning would you like to send? Qual advertência você gostaria de enviar? - + Redact all messages from this user in all rooms Remover todas mensagens deste usuário em todas salas - + &OK %OK - + &Cancel &Cancelar - + Warn user for misconduct Advertir usuario por mau comportamento. - - + + Error Erro - + User name to send a warning to can not be blank, please specify a user to warn. O campo "nome de usuário" ao qual se deseja enviar uma advertência não pode permanecer em branco, por favor especifique um usuário para ser advertido. - + Warning to use can not be blank, please select a valid warning to send. O campo "advertência" não pode permanecer em branco, por favor selecione uma advertência para ser enviada. @@ -11024,133 +10232,133 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você WndSets - + Move selected set to the top Mover o selecionado para o topo - + Move selected set up Mover o selecionado para cima - + Move selected set down Mover o selecionado para baixo - + Move selected set to the bottom Mover o selecionado para o fundo - + Search by set name, code, or type Procurar por expansão, código ou tipo - + Default order Ordem padrão - + Restore original art priority order Restaurar prioridade da ordem de arte original - + Enable all sets Habilitar todas expansões - + Disable all sets Desabilitar todas expansões - + Enable selected set(s) Habilitar expansão/expansões selecionada(s) - + Disable selected set(s) Desabilitar expansão/expansões selecionada(s) - + Deck Editor Editor de Deck - + Use CTRL+A to select all sets in the view. Use CTRL+A para selecionar todas expansões visíveis. - + Only cards in enabled sets will appear in the card list of the deck editor. Apenas cartas em expansões ativadas irão aparecer na lista de cartas do editor de deck. - + Image priority is decided in the following order: Prioridade da imagem é decidida na seguinte ordem: - + first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) %1 is a link to the wiki primeiro a pasta de PERSONALIDADAS (%1), depois as expansões habilitadas neste diálogo (de cima para baixo) - + Include cards rebalanced for Alchemy [requires restart] - + Card Art Arte da Carta - + How to use custom card art Como usar arte de carta personalizada - + Hints Dicas - + Note Nota - + Sorting by column allows you to find a set while not changing set priority. Classificar por coluna te permite encontrar um set sem mudar a prioridade de sets - + To enable ordering again, click the column header until this message disappears. Para reabilitar a ordenação, clique no cabeçalho da coluna até que esta mensagem desapareça - + Use the current sorting as the set priority instead Usar a classificação atual como a prioridade de sets - + Sorts the set priority using the same column Classificar a prioridade de sets usando a mesma coluna - + Manage sets Gerenciar expansões @@ -11158,72 +10366,72 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você ZoneViewWidget - + Search by card name (or search expressions) - + Ungrouped Não agrupado - + Group by Type Agrupar por Tipo - + Group by Mana Value Agrupar por Valor de Mana - + Group by Color Agrupar por Cor - + Unsorted Não ordenado - + Sort by Name Ordenar por Nome - + Sort by Type Ordenar por Tipo - + Sort by Mana Cost Ordenar por Custo de Mana - + Sort by Colors Ordenar por Cores - + Sort by P/T Ordenar por P/T - + Sort by Set Ordenar por Conjunto - + shuffle when closing embaralhar quando fechar - + pile view visualização da pilha @@ -11231,7 +10439,7 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você i18n - + English Português do Brasil (Brazilian Portuguese) @@ -11239,12 +10447,12 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você main - + Connect on startup Conectar ao iniciar - + Debug to file Depurar para um arquivo @@ -11258,7 +10466,7 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você - + Deck Editor Editor de Deck @@ -11339,7 +10547,7 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você - + Replays Repetições @@ -11454,129 +10662,129 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você Carregar Deck... - - + + Load Deck from Clipboard... Carregar deck da área de transferência... - + Edit Deck in Clipboard, Annotated - + Edit Deck in Clipboard - + New Deck Novo Deck - + Open Custom Pictures Folder Abrir pasta de imagens customizadas - + Print Deck... Imprimir Deck... - + Delete Card Deletar carta - - + + Reset Layout Redefinir layout - + Save Deck Salvar Deck - + Save Deck as... Salvar Deck Como... - + Save Deck to Clipboard, Annotated Salvar deck na área de transferência, anotado - + Save Deck to Clipboard, Annotated (No Set Info) - + Save Deck to Clipboard Salvar deck na área de transferência - + Save Deck to Clipboard (No Set Info) - + Load Local Deck... Carregar deck local... - + Load Remote Deck... Carregar deck remoto... - + Set Ready to Start Preparade para começar - + Toggle Sideboard Lock Alternar trava de sideboard - + Add Green Counter Adicionar marcador verde - + Remove Green Counter Remover marcador verde - + Set Green Counters... Definir marcadores verde... - + Add Red Counter Adicionar marcador vermelho - + Remove Red Counter Remover marcador vermelho - + Set Red Counters... Definir marcadores vermelhos - + Add Life Counter Adicionar ponto de vida @@ -11586,744 +10794,724 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você - - Load deck from online service... - - - - - Load from website... - - - - + Unload Deck - + Force Start - + Add Card Counter (F) - + Remove Card Counter (F) - + Set Card Counters (F)... - + Add Card Counter (E) - + Remove Card Counter (E) - + Set Card Counters (E)... - + Add Card Counter(D) - + Remove Card Counter (D) - + Set Card Counters (D)... - + Add Card Counter (C) - + Remove Card Counter (C) - + Set Card Counters (C)... - + Add Card Counter (B) - + Remove Card Counter (B) - + Set Card Counters (B)... - + Add Card Counter (A) - + Remove Card Counter (A) - + Set Card Counters (A)... - + Remove Life Counter Remover ponto de vida - + Set Life Counters... Definir pontos de vida... - + Add White Counter Adicionar marcador branco - + Remove White Counter Remover marcador branco - + Set White Counters... Definir marcadores brancos... - + Add Blue Counter Adicionar marcador azul - + Remove Blue Counter Remover marcador azul - + Set Blue Counters... Definir marcadores azul - + Add Black Counter Adicionar marcador preto - + Remove Black Counter Remover marcador preto - + Set Black Counters... Definir marcadores pretos... - + Add Colorless Counter Adicionar marcador incolor - + Remove Colorless Counter Remover marcador incolor - + Set Colorless Counters... Definir marcadores incolor... - + Add Other Counter Adicionar outro marcador - + Remove Other Counter Remover outro marcador - + Set Other Counters... Definir outros marcadores... - + Increment all card counters - + Add Power (+1/+0) adicionar Poder (+1/+0) - + Remove Power (-1/-0) Remover Poder (-1/-0) - + Move Toughness to Power (+1/-1) Mover Resistência Para Poder (+1/-1) - + Add Toughness (+0/+1) Adicionar Resistência (+0/+1) - + Remove Toughness (-0/-1) Remover Resistência (-0/-1) - + Move Power to Toughness (-1/+1) Mover Poder Para Resistência (-1/+1) - + Add Power and Toughness (+1/+1) Adicionar Poder e Resistência (+1/+1) - + Remove Power and Toughness (-1/-1) Remover Poder e Resistência (-1/-1) - + Set Power and Toughness... Definir poder e resistência... - + Reset Power and Toughness Redefinir poder e resistência - + Untap Desvirar - + Upkeep Manutenção - + Draw Compra - + First Main Phase Primeira Fase Principal - + Start Combat Iniciar Combate - + Attack Atacar - + Block Bloquear - + Damage Dano - + End Combat Terminar Combate - + Second Main Phase Segunda Fase Principal - + End Fim - + Next Phase Próxima Fase - + Next Phase Action Ação de Próxima Etapa - + Next Turn Próximo Turno - + Hide Card in Reveal Window Ocultar Carta na Janela de Revelação - + Tap / Untap Card Virar / Desvirar Carta - + Untap All Desvirar Tudo - + Toggle Skip Untapping Toggle Untap - + Turn Card Over Virar carta para cima - + Peek Card Olhar carta - + Play Card Jogar Carta - + Play Card, Face Down - + Attach Card... Anexar carta... - + Unattach Card Desanexar carta... - + Clone Card Duplicar Carta - + Create Token... Criar Ficha - + Create All Related Tokens Criar todas as fichas relacionadas - + Create Another Token Criar Outra Ficha - + Set Annotation... Definir anotação - - Reduce Life by Power - - - - + Select All Cards in Zone Selecionar Todas as Cartas na Zona - + Select All Cards in Row Selecionar Todas as Cartas na Linha - + Select All Cards in Column Selecionar Todas as Cartas na Coluna - + Reveal Selected Cards to All Players - - + + Bottom of Library Fundo do Grimório - - - - + + + + Exile Exilar - - - - + + + + Graveyard Cemitério - - + + Hand Mão - - + + Top of Library Topo do Grimório - - + + Battlefield, Face Down Campo de batalha, Voltada para baixo - + Battlefield Campo de Batalha - + Library Grimório - + Sideboard Sideboard - + Top Cards of Library Cartas do topo do grimório - + Bottom Cards of Library Cartas do Fundo da Biblioteca - + Close Recent View Fechar visualização recente - - + + Stack Pilha - - + + Graveyard (Multiple) Cemitério (Vários) - - + + Graveyard (Multiple), Face Down - - + + Exile (Multiple) Exílio (Vários) - - + + Exile (Multiple), Face Down - + Stack Until Found Empilhar Até Encontrar - + Draw Bottom Card Comprar carta do fundo - + Draw Multiple Cards from Bottom... Comprar várias cartas do fundo... - + Draw Arrow... Desenhar seta... - + Remove Local Arrows Remover setas locais - + Leave Game Sair do jogo - + Concede Conceder - + Roll Dice... Rolar dados... - - Flip Coin - - - - + Shuffle Library Embaralhar grimório - + Shuffle Top Cards of Library - + Shuffle Bottom Cards of Library - + Mulligan Mulligan - + Mulligan (Same hand size) - + Mulligan (Hand size - 1) - + Draw a Card Comprar uma carta - + Draw Multiple Cards... Comprar várias cartas - + Undo Draw Desfazer compra - + Always Reveal Top Card Sempre revelar a carta do topo do grimório - + Always Look At Top Card Sempre olhar para a carta do topo do grimório - + Sort Hand by Name - + Sort Hand by Type - + Sort Hand by Mana Value - + Reveal Hand to All Players - + Reveal Random Card to All Players - + Rotate View Clockwise Rotacionar visão no sentido horário - + Rotate View Counterclockwise Rotacionar visão no sentido anti-horário - + Unfocus Text Box Desfocar caixa de texto - + Focus Chat Focar no chat - + Clear Chat Limpar chat - + Refresh Atualizar - + Skip Forward Avançar - + Skip Backward Retroceder - + Skip Forward by a lot Avançar Bastante - + Skip Backward by a lot Retroceder Bastante - + Play/Pause Reproduzir/Pausar - + Toggle Fast Forward Ativar/Desativar Avanço Rápido - + Home - + Visual Deck Storage Decks Visuais - + Deck Storage Armazenamento de Deck - + Server Servidor - + Account Servidor - + Administration Administração - + Logs Registros diff --git a/cockatrice/translations/cockatrice_ru.ts b/cockatrice/translations/cockatrice_ru.ts index 26d95fe1c..e666bf0de 100644 --- a/cockatrice/translations/cockatrice_ru.ts +++ b/cockatrice/translations/cockatrice_ru.ts @@ -2,7 +2,7 @@ AbstractCounter - + &Set counter... &Установить жетоны... @@ -10,12 +10,12 @@ AbstractCounterDialog - + Set counter Установить жетоны - + New value for counter '%1': Новое значение жетонов '%1': @@ -36,62 +36,62 @@ AbstractTabDeckEditor - + Open in new tab Открыть в новой вкладке - + Are you sure? Вы уверены? - + The decklist has been modified. Do you want to save the changes? Деклист был изменен. Вы хотите сохранить изменения? - - - - - - + + + + + + Error Ошибка - + Could not open deck at %1 Не удалось открыть колоду по пути «%1» - + Could not save remote deck Не удалось сохранить сетевую колоду - - + + The deck could not be saved. Please check that the directory is writable and try again. Колода не может быть сохранена. Проверьте что директория доступна для записи и попробуйте снова. - + Save deck Сохранить колоду - + The deck could not be saved. Не удалось сохранить колоду. - + There are no cards in your deck to be exported В колоде нет карт для экспорта @@ -107,12 +107,12 @@ Please check that the directory is writable and try again. AdminNotesDialog - + Update Notes Список изменений - + Admin Notes for %1 Примечания администратора для %1 @@ -129,227 +129,172 @@ Please check that the directory is writable and try again. Sideboard Сайдборд - - - Tokens - - AppearanceSettingsPage - + seconds секунд - + Error Ошибка - + Could not create themes directory at '%1'. Не удалость создать папку для тем в '%1'. - + Theme settings Настройки темы - + Current theme: Текущая тема: - + Open themes folder Открыть папку с темами - + Home tab background source: Путь до обоев на домашней вкладке: - + Home tab background shuffle frequency: Частота смены обоев: - + Disabled Отключено - + + Display card name of background in bottom right: + + + + Menu settings Настройки меню - + Show keyboard shortcuts in right-click menus Отображать сочетания клавиш в контекстном меню - + Show game filter toolbar above list in room tab - + Card rendering Отрисовка карт - + Display card names on cards having a picture Отображать название карты поверх изображения - + Auto-Rotate cards with sideways layout Автоматически поворачивать карты альбомной ориентации - + Override all card art with personal set preference (Pre-ProviderID change behavior) Перезаписать все арты в соответствии с выбранными изданиями (Pre-ProviderID меняет это поведение) - - Light - - - - - Dark - - - - - System - - - - - Active theme palette: - - - - - Edit theme palette - - - - - Home tab settings - - - - - Display card name of background in bottom right - - - - - Styling settings - - - - - Style user list - - - - - Card printings - - - - + Bump sets that the deck contains cards from to the top in the printing selector Перемещать в начало списка выбора издания те выпуски, из которых в колоде есть карты. - + Scale cards on mouse over Увеличивать карты при наведении мыши - + Use rounded card corners Использовать скругленные углы карт - - Card layout - - - - + Minimum overlap percentage of cards on the stack and in vertical hand Минимальный процент наложения карт в стеке и вертикальной руке - + Maximum initial height for card view window: Максимальная начальная высота для окна просмотра карты - - + + rows строки - + Maximum expanded height for card view window: Макс. высота окна для просмотра карт - + Card counters Жетоны на картах - + Counter %1 Жетон %1 - + Hand layout Раскладка руки - + Display hand horizontally (wastes space) Отображать руку горизонтально (требует места) - + Enable left justification Выравнивание по левому краю - + Table grid layout Сетка - + Invert vertical coordinate Инвертировать вертикальные координаты - + Minimum player count for multi-column layout: Минимальное количество игроков для столбчатого расположения: - + Maximum font size for information displayed on cards: Максимальный размер шрифта для текста карт: @@ -357,12 +302,12 @@ Please check that the directory is writable and try again. ArchidektApiResponseDeckDisplayWidget - + Back to results - + Open Deck in Deck Editor @@ -388,112 +333,112 @@ Please check that the directory is writable and try again. BanDialog - + ban &user name Забанить по &Имени игрока - + ban &IP address Забанить по &адресу IP - + ban client I&D Забанить по I&D клиента - + Ban type Тип бана - + &permanent ban &постоянный бан - + &temporary ban &временный бан - + &Days: &Дни - + &Hours: &Часы - + &Minutes: &Минуты - + Duration of the ban Длительность бана - + Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. Пожалуйста, назовите причину бана. Эта информация сохраняется для модераторов и не будет видна забаненному игроку - + Please enter the reason for the ban that will be visible to the banned person. Пожалуйста, назовите причину бана, которая будет видна забаненному игроку. - + Redact all messages from this user in all rooms Отредактировать все сообщения от этого пользователя во всех комнатах - + &OK &ОК - + &Cancel &Отмена - + Ban user from server Забанить игрока на этом сервере - - - - + + + + Error Ошибка - + You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. Необходимо выбрать тип бана: по имени, по адресу IP, по ID клиента или комбинацию этих трех типов. - + You must have a value in the name ban when selecting the name ban checkbox. Необходимо ввести имя игрока при выборе опции бана по имени. - + You must have a value in the ip ban when selecting the ip ban checkbox. Необходимо ввести адрес IP при выборе опции бана по IP. - + You must have a value in the clientid ban when selecting the clientid ban checkbox. Необходимо ввести ID клиента при выборе опции бана по ID. @@ -501,123 +446,59 @@ This is only saved for moderators and cannot be seen by the banned person. BetaReleaseChannel - + Beta Бета - + No reply received from the release update server. Нет ответа от сервера обновления версий. - + Invalid reply received from the release update server. Неправильный ответ от сервера обновления версий. - + No reply received from the file update server. Нет ответа от сервера обновления файлов. - - CardArtPreviewWidget - - - No card selected - - - - - CardArtRulesModel - - - Card - - - - - ProviderId - - - - - Mode - - - - - Reason - - - CardDatabaseModel - + Name Название - + Sets Издания - + Mana cost Мана-стоимость - + Card type Тип - + P/T Сила/Выносливость: - + Color(s) Цвет(а) - - CardDatabaseView - - - Add to Deck - - - - - Add to Sideboard - - - - - Select Printing - - - - - Show on EDHRec (Commander) - - - - - Show on EDHRec (Card) - - - - - Show Related cards - - - CardFilter @@ -746,22 +627,22 @@ This is only saved for moderators and cannot be seen by the banned person. CardInfoPictureWidget - + View related cards Посмотреть связанные карты - + Add card to deck Добавить карту в колоду - + Mainboard Колода - + Sideboard Сайд @@ -784,12 +665,12 @@ This is only saved for moderators and cannot be seen by the banned person. - + Related cards: Связанные карты: - + Unknown card: Неизвестная карта: @@ -797,146 +678,128 @@ This is only saved for moderators and cannot be seen by the banned person. CardMenu - + Re&veal to... Показать... - + &All players Всем игрокам - + View related cards Посмотреть связанные карты - + Token: Фишка: - + All tokens Все фишки: - + &Select All Выбрать все - + S&elect Row Выбрать строку - + S&elect Column Выбрать колонку - + &Play Разыграть - + &Hide Спрятать - + Play &Face Down Разыграть лицом вниз - + &Tap / Untap Turn sideways or back again Повернуть / Развернуть - + Skip &untapping - + T&urn Over Turn face up/face down Перевернуть - + &Peek at card face Посмотреть лицевую сторону - + &Clone Клонировать - + Attac&h to card... Прикрепить к карте... - + Unattac&h Открепить - + &Draw arrow... Нарисовать стрелку - + &Set annotation... Добавить заметку - - Reduce life by power - - - - + Ca&rd counters Жетоны на карте - + &Add counter (%1) &Добавить жетон (%1) - + &Remove counter (%1) &Убрать жетон (%1) - + &Set counters (%1)... &Установить жетоны (%1)... - - CardPictureLoaderCacheMethod - - - Network Cache - - - - - Filesystem - - - CardSizeWidget @@ -948,133 +811,133 @@ This is only saved for moderators and cannot be seen by the banned person. CardZoneLogic - + their hand nominative своей руки - + %1's hand nominative %1 руки - + their library look at zone своей библиотеки - + %1's library look at zone библиотеки %1 - + of their library top cards of zone, своей библиотеки - + of %1's library top cards of zone библиотеки %1 - + their library reveal zone своей библиотеки - + %1's library reveal zone библиотеки %1 - + their library shuffle своей библиотеки - + %1's library shuffle библиотеки %1 - + their library nominative своей библиотеки - + %1's library nominative библиотеки %1 - + their graveyard nominative своего кладбища - + %1's graveyard nominative кладбища %1 - + their exile nominative своего изгнания - + %1's exile nominative изгнание %1 - + their sideboard look at zone своего сайда - + %1's sideboard look at zone сайда %1 - + their sideboard nominative своего сайда - + %1's sideboard nominative сайда %1 - + their custom zone '%1' nominative кастомной зоны '%1' - + %1's custom zone '%2' nominative кастомной зоны '%2' игрока '%1' @@ -1096,421 +959,16 @@ This is only saved for moderators and cannot be seen by the banned person.Ошибка распознавания, строка %1 колонка %2: - - ColorButton - - - Click to pick a color - - - - - Pick colour - - - - - ConnectionController - - - - The server has reached its maximum user capacity, please check back later. - - - - - There are too many concurrent connections from your address. - - - - - Banned by moderator - - - - - Expected end time: %1 - - - - - This ban lasts indefinitely. - - - - - Scheduled server shutdown. - - - - - - Invalid username. - - - - - You have been logged out due to logging in at another location. - - - - - Connection closed - - - - - The server has terminated your connection. -Reason: %1 - - - - - The server is going to be restarted in %n minute(s). -All running games will be lost. -Reason for shutdown: %1 - - - - - Scheduled server shutdown - Плановый перерыв в работе сервера - - - - Failed Login - Не удалось подключиться - - - - Your client seems to be missing features this server requires for connection. - - - - - To update your client, go to 'Help -> Check for Client Updates'. - - - - - - - - - - - - - - - - - - - - - - Error - Ошибка - - - - Incorrect username or password. Please check your authentication information and try again. - - - - - There is already an active session using this user name. -Please close that session first and re-login. - - - - - - You are banned until %1. - - - - - - You are banned indefinitely. - - - - - This server requires user registration. Do you want to register now? - - - - - This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. -Please close and reopen your client to try again. - - - - - An internal error has occurred, please close and reopen Cockatrice before trying again. -If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - - - - Account activation - - - - - Your account has not been activated yet. -You need to provide the activation token received in the activation email. - - - - - Server Full - - - - - Unknown login error: %1 - - - - - - -This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - - - - - - - - - Registration denied - - - - - Registration is currently disabled on this server - - - - - There is already an existing account with the same user name. - - - - - It's mandatory to specify a valid email address when registering. - - - - - It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. - - - - - Password too short. - - - - - Registration failed for a technical problem on the server. - - - - - The connection to the server has been lost. - - - - - Unknown registration error: %1 - - - - - Account activation failed - - - - - Socket error: %1 - - - - - Server timeout - - - - - You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. -Local version is %1, remote version is %2. - - - - - Your Cockatrice client is obsolete. Please update your Cockatrice version. -Local version is %1, remote version is %2. - - - - - - Success - - - - - Registration accepted. -Will now login. - - - - - Account activation accepted. -Will now login. - - - - - Information - - - - - This server supports additional features that your client doesn't have. -This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. - -To update your client, go to Help -> Check for Updates. - - - - - - - Reset Password - - - - - Your password has been reset successfully, you can now log in using the new credentials. - - - - - Failed to reset user account password, please contact the server operator to reset your password. - - - - - Activation request received, please check your email for an activation token. - - - - - Connecting to %1... - - - - - Registering to %1 as %2... - - - - - Disconnected - - - - - Connected, logging in at %1 - - - - - Requesting forgotten password to %1 as %2... - - - - - Your username must respect these rules: - - - - - is %1 - %2 characters long - - - - - can %1 contain lowercase characters - - - - - - - - NOT - - - - - can %1 contain uppercase characters - - - - - can %1 contain numeric characters - - - - - can contain the following punctuation: %1 - - - - - first character can %1 be a punctuation mark - - - - - no unacceptable language as specified by these server rules: - note that the following lines will not be translated - - - - - can not contain any of the following words: %1 - - - - - can not match any of the following expressions: %1 - - - - - You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - - CustomZoneMenu - + C&ustom Zones Кастомная зона - - + + View custom zone '%1' Посмотреть кастомную зону '%1' @@ -1518,35 +976,30 @@ To update your client, go to Help -> Check for Updates. DeckAnalyticsWidget - + Add Panel - + Remove Panel - + Save Layout - + Load Layout - - - Include Sideboard - - DeckEditorCardDatabaseDockWidget - + Card Database @@ -1562,17 +1015,47 @@ To update your client, go to Help -> Check for Updates. DeckEditorDatabaseDisplayWidget - + Search by card name (or search expressions) Искать по названию карты (или по поисковому запросу) - + + Add to Deck + Добавить в колоду + + + + Add to Sideboard + Добавить в сайд + + + + Select Printing + Выбрать издание + + + + Show on EDHRec (Commander) + Посмотреть на EDHRec (Командир) + + + + Show on EDHRec (Card) + Посмотреть на EDHRec (карта) + + + + Show Related cards + Посмотреть связанные карты + + + Add card to &maindeck Добавить карту в колоду - + Add card to &sideboard Добавить карту в сайд @@ -1605,72 +1088,72 @@ To update your client, go to Help -> Check for Updates. Цвет - + Select Printing Выбрать издание - + Deck Колода - + Deck &name: Название колоды: - + Banner Card/Tags Visibility Settings Настройки отоборажение обложки и тегов - + Show banner card selection menu Показать меню выбора обложки - + Show tags selection menu Показать меню выбора тегов - + &Comments: Комментарий: - + Group by: Группировать по: - + Format: - + Hash: Хэш-сумма - + &Increment number Увеличить количество - + &Decrement number Уменьшить количество - + &Remove row Удалить строку - + Swap card to/from sideboard Переместить карту в/из сайда @@ -1678,17 +1161,17 @@ To update your client, go to Help -> Check for Updates. DeckEditorFilterDockWidget - + Filters Фильтры - + &Clear all filters Убрать все фильтры - + Delete selected Удалить выбранное @@ -1819,113 +1302,169 @@ To update your client, go to Help -> Check for Updates. DeckEditorSettingsPage - - + + Update Spoilers Обновить спойлеры - + + Success Успешно - + Download URLs have been reset. Адреса URL загрузки были сброшены. - + + Downloaded card pictures have been reset. + Загруженные изображения карт были сброшены. + + + + Error + Ошибка + + + + One or more downloaded card pictures could not be cleared. + Одно или более загруженных изображений карт не может быть удалено. + + + Add URL Добавить URL - - + + URL: URL: - - + + Edit URL Изменить URL: - + + Network Cache Size: + Размер сетевого кеша: + + + + Redirect Cache TTL: + TTL кеша перенаправлений: + + + + How long cached redirects for urls are valid for. + Время жизни кеша редиректов + + + + Picture Cache Size: + Размер кеша изображений: + + + Add New URL Добавить новый URL - + Remove URL Удалить URL - + + Day(s) + Дней + + + Updating... Обновление... - + Choose path Выбрать путь - + URL Download Priority Приоритет загрузки URL - + Spoilers Спойлеры - + Download Spoilers Automatically Скачивать спойлеры автоматически - + Spoiler Location: Расположение спойлеров: - + Last Change Последние изменения - + Spoilers download automatically on launch Спойлеры скачиваются автоматически при запуске - + Press the button to manually update without relaunching Нажмите, чтобы обновить вручную без перезапуска - + Do not close settings until manual update is complete Не закрывать настройки до завершения ручного обновления - + Download card pictures on the fly Синхронная загрузка изображений карт - + How to add a custom URL Как добавить пользовательский URL - + + Delete Downloaded Images + Удалить загруженные изображения + + + Reset Download URLs Обнулить загруженные URL + + + On-disk cache for downloaded pictures + Размер кеша для загруженных артов + + + + In-memory cache for pictures not currently on screen + Размер кеша в памяти для загруженных артов + DeckListHistoryManagerWidget @@ -1991,12 +1530,12 @@ To update your client, go to Help -> Check for Updates. DeckLoader - + Common deck formats (%1) Формат колоды (%1) - + All files (*.*) Все файлы (*.*) @@ -2218,29 +1757,29 @@ To update your client, go to Help -> Check for Updates. - + Moved to %1 1 × "%2" (%3) - + Removed "%1" (all copies) - + %1 1 × "%2" (%3) - + Added - Добавлено + - + Removed - Удалено + @@ -2260,75 +1799,75 @@ To update your client, go to Help -> Check for Updates. DeckViewContainer - + Load deck... Загрузить колоду... - + Load remote deck... Загрузить колоду удаленно... - + Load from clipboard... Загрузить из буфера обмена... - + Load from website... Загрузить из интернета... - + Unload deck Выгрузить колоду - + Ready to start &Готов - + Force start Принудительный старт - + Sideboard unlocked Сайдборд разблокирован - + Sideboard locked Сайдборд заблокирован - - + + Error Ошибка - + The selected file could not be loaded. Выбранный файл не может быть загружен - + Deck is greater than maximum file size. Колода больше максимально возможного размера файла - + Are you sure you want to force start? This will kick all non-ready players from the game. Уверены что хотите принудительно начать? Это кикнет всех неготовых игроков из игры - + Cockatrice Cockatrice @@ -2429,7 +1968,7 @@ This will kick all non-ready players from the game. - + Webpage Веб-страница @@ -2469,37 +2008,37 @@ This will kick all non-ready players from the game. Подключиться к серверу - + Server URL URL сервера - + Communication Port Порт связи - + Unique Server Name Уникальное имя сервера - + Connection Warning Предупреждение при соединении - + You need to name your new connection profile. Назовите ваш профиль для соединения. - + Connect Warning Ошибка при соединении - + The player name can't be empty. Необходимо указать имя пользователя. @@ -2612,17 +2151,17 @@ This will kick all non-ready players from the game. Создать игру - + Game information Информация об игре - + Error Ошибка - + Server error. Ошибка сервера. @@ -2630,97 +2169,97 @@ This will kick all non-ready players from the game. DlgCreateToken - + &Name: &Название: - + Token Фишка - + C&olor: &Цвет: - + white белый - + blue синий - + black черный - + red красный - + green зеленый - + multicolor многоцветный - + colorless бесцветный - + &P/T: &Сила/Выносливость: - + &Annotation: &Примечание: - + &Destroy token when it leaves the table &Уничтожить фишку, когда она покинет поле битвы - + Create face-down (Only hides name) Создать лицом вниз (скроет только название) - + Token data Описание фишки - + Show &all tokens Показать &все фишки - + Show tokens from this &deck Показать фишки из указанной &колоды - + Choose token from list Выбрать фишку из списка - + Create token Создать фишку @@ -2754,7 +2293,7 @@ This will kick all non-ready players from the game. - + ✖ ✖ @@ -2769,12 +2308,12 @@ This will kick all non-ready players from the game. Название тега не может быть пустым! - + Duplicate Tag Копировать тег - + This tag already exists. Этот тег уже существует @@ -2961,12 +2500,12 @@ To remove your current avatar, confirm without choosing a new image. Введите имя фишки: - + Error Ошибка - + The chosen name conflicts with an existing card or token. Make sure to enable the 'Token' set in the "Manage sets" dialog to display them correctly. Выбранное имя конфликтует с существующей картой или токеном. @@ -2991,12 +2530,12 @@ Make sure to enable the 'Token' set in the "Manage sets" dia Не указано - + Real name: Настоящее имя: - + Edit user profile Редактировать профиль @@ -3034,113 +2573,113 @@ Make sure to enable the 'Token' set in the "Manage sets" dia 2 часа - + Hide 'buddies only' games Скрывать игры "только для друзей" - + Hide full games Скрыть заполненные игры - + Hide games that have started Скрыть уже начавшиеся игры - + Hide password protected games Скрыть игры, защищенные паролем - + Hide 'ignored user' games Скрыть игры от игнорируемых пользователей - + Hide games not created by buddies Hide games not created by buddy - + Hide games with forced open decklists Скрыть игры "только с открытыми деклистами" - + &Newer than: &Новее чем: - + Game &description: &Описание игры - + &Creator name: Имя &создателя - + General Основные - + &Game types Форматы &игры - + at &least: не &менее - + at &most: не &более - + Maximum player count Максимальное количество игроков - + Restrictions Ограничения - + Show games only if &spectators can watch Показывать игры со &зрителями - + Show spectator password p&rotected games Показывать &игры с паролем для зрителей - + Show only if spectators can ch&at Показывать игры где зрители могут &писать в чат - + Show only if spectators can see &hands Показывать игры где зрители могут видеть &руки игроков - + Spectators Зрители - + Filter games Фильтровать игры @@ -3420,7 +2959,7 @@ https://tappedout.net/mtg-decks/your-deck-name/ Players: - Игроки + @@ -3451,37 +2990,37 @@ https://tappedout.net/mtg-decks/your-deck-name/ DlgMoveTopCardsUntil - + Card name (or search expressions): Название карты (или поисковый запрос) - + Number of hits: Количество: - + Auto play hits Автоматически разыгрывать найденные карты - + Put top cards on stack until... Поместить вернюю карту в стек, пока... - + No cards matching the search expression exists in the card database. Proceed anyways? В базе данных карт ничего не найдено. Все равно продолжить? - + Cockatrice Cockatrice - + Invalid filter Неправильный фильтр @@ -3541,40 +3080,40 @@ Your email will be used to verify your account. Не определено - + Real name: Настоящее имя: - + Register to server Зарегистрироваться на сервере - - - - + + + + Registration Warning Предкпреждение - + Your password is too short. Пароль слишком короткий - + Your passwords do not match, please try again. Введенные пароли не совпадают, повторите снова. - + Your email addresses do not match, please try again. Введенные адреса email не совпадают, повторите снова. - + The player name can't be empty. Необходимо указать имя пользователя. @@ -3582,17 +3121,17 @@ Your email will be used to verify your account. DlgRollDice - + Number of sides: Количество граней: - + Number of dice: Количество кубов: - + Roll Dice Бросить кубик @@ -3643,12 +3182,12 @@ Your email will be used to verify your account. DlgSettings - + Unknown Error loading card database Неизвестная ошибка при загрузке базы карт. - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -3662,7 +3201,7 @@ Cockatrice не может корректно работать с испорче Вы хотите сменить расположение файла базы карт? - + Your card database version is too old. This can cause problems loading card information or images @@ -3676,7 +3215,7 @@ Would you like to change your database location setting? Вы хотите сменить расположение файла базы карт? - + Your card database did not finish loading Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached @@ -3689,7 +3228,7 @@ Would you like to change your database location setting? Вы хотите изменить путь до локальной базы карт? - + File Error loading your card database. Would you like to change your database location setting? @@ -3697,7 +3236,7 @@ Would you like to change your database location setting? Вы хотите сменить расположение файла базы карт? - + Your card database was loaded but contains no cards. Would you like to change your database location setting? @@ -3705,7 +3244,7 @@ Would you like to change your database location setting? Вы хотите сменить расположение файла базы карт? - + Unknown card database load status Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues @@ -3718,64 +3257,59 @@ Would you like to change your database location setting? Вы хотите изменить путь до локальной базы карт? - - - + + + Error Ошибка - + The path to your deck directory is invalid. Would you like to go back and set the correct path? Ваши колоды отсутствуют в указанной папке. Вернуться и задать правильный путь? - + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? Изображения карт не найдены. Вернуться и задать правильный путь? - + Settings Настройки - + General Основные - + Appearance Вид - + User Interface Интерфейс - - Storage - - - - + Card Sources Источник карт - + Chat Чат - + Sound Звук - + Shortcuts Горячие клавиши @@ -3869,9 +3403,9 @@ You can always change this behavior in the 'General' settings tab. - - - + + + Error Ошибка @@ -3925,31 +3459,31 @@ Please visit the download page to update manually. - + Update Available Обновление доступно - + A new version of Cockatrice is available! Доступна новая версия Cockatrice! - + New version Новая версия - + Released Выпущена - + Changelog Список изменений @@ -3959,50 +3493,50 @@ Please visit the download page to update manually. Вы хотите обновить сейчас? - + Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. Автообновление не удалось - подходящая версия не найдена. Скачайте новую версию вручную. - + Please check the <a href="%1">releases page</a> on our Github and download the build for your system. Проверьте <a href="%1">страницу релиза</a> в нашем репозитории на Github и скачайте сборку для своей системы. - - - + + + Update Error Ошибка при оновлении - + An error occurred while checking for updates: В процессе проверки обновлений произошла ошибка: - + An error occurred while downloading an update: В процессе загрузки обновления произошла ошибка: - + Installing... Установка... - + Cockatrice is unable to open the installer. Невозможно открыть установщик. - + Try to update manually by closing Cockatrice and running the installer. Попробуйте обновить вручную, закрыв Cockatrice и запустив инсталлятор. - + Download location @@ -4092,67 +3626,67 @@ You may have to manually download the new version. DrawProbabilityWidget - + Draw Probability - + Probability of drawing - + Card Name - + Type - + Subtype - + Mana Value - + At least - + Exactly - + card(s) having drawn at least - + cards - + Category - + Qty - + Odds (%) @@ -4266,7 +3800,7 @@ You may have to manually download the new version. FilterBuilder - + Type your filter here Укажите свой фильтр @@ -4297,22 +3831,22 @@ You may have to manually download the new version. GameEventHandler - + kicked by game host or moderator кикнут из игры хостом или модератором - + player left the game игрок покинул игру - + player disconnected from server игрок отсоединился от сервера - + reason unknown причина неизвестна @@ -4320,140 +3854,140 @@ You may have to manually download the new version. GameSelector - - - - - - - - - + + + + + + + + + Error Ошибка - + Please join the appropriate room first. Пожалуйста, сперва войдите в соответствующую комнату. - + Wrong password. Неверный пароль. - + Spectators are not allowed in this game. Зрители не допускаются в эту игру. - + The game is already full. Все места уже заняты! - + The game does not exist any more. Эта игра больше не существует. - + This game is only open to registered users. Доступно только для зарегистрированных. - + This game is only open to its creator's buddies. Доступно только для друзей. - + You are being ignored by the creator of this game. Вы добавлены в игнор-лист данного игрока. - + Join Game Присоединиться - + Spectate Game Наблюдать - + Game Information Информация об игре - + Join Game as Judge - + Spectate Game as Judge - + Join game Присоединиться - + Password: Пароль: - + Please join the respective room first. Пожалуйста, сначала присоединитесь к соответствующей комнате. - + &Filter games &Фильтр игр - + C&lear filter О&чистить фильтр - + C&reate &Создать - + &Join &Присоединиться - + Join as judge - + J&oin as spectator Присоединиться как &зритель - + Join as judge spectator - + Games shown: %1 / %2 Показано игр: %1 / %2 - + Games Игры @@ -4461,32 +3995,32 @@ You may have to manually download the new version. GameSelectorQuickFilterToolBar - + All types - + Filter by game name... - + Filter by game type/format - + Hide games not created by buddies - + Hide full games - + Hide started games @@ -4494,105 +4028,105 @@ You may have to manually download the new version. GamesModel - + >1 day > 1 дня - + %1%2 hr short age in hours %1%2 час%1%2 часа%1%2 часов%1%2 часов - + new создать - + %1%2 min short age in minutes %1%2 минута%1%2 минут%1%2 минут%1%2 минут - + password пароль - + buddies only только друзья - + reg. users only только для зарегистрированных пользователей - + open decklists открыть деклист + - can chat зрители могут комментировать в чате - + see hands видеть руки игроков - + can see hands могут видеть руки - + not allowed не допускаются - + Room Комната - + Age Возраст - + Description Описание - + Creator Создатель - + Type Тип - + Restrictions Ограничения - + Players Количество игроков - + Spectators Зрители @@ -4600,158 +4134,143 @@ You may have to manually download the new version. GeneralSettingsPage - + Reset all paths Сбросить - + All paths have been reset Все пути были сброшены - - - - - - - + + + + + + + Choose path Путь - - Language settings - Выбор языка + + Personal settings + Настройки пользователя - + Language: Язык: - - Version settings - - - - - Card database - - - - - Startup settings - - - - + Paths (editing disabled in portable mode) Путь (в портативном режиме редактирование недоступно) - + Paths Пути расположения - + How to help with translations Как помочь с переводом - + Decks directory: Колоды: - + Filters directory: Фильтровать директории: - + Replays directory: Повторы: - + Pictures directory: Изображения карт: - + Card database: База данных карт: - + Custom database directory: Пользовательские сеты: - + Token database: База данных токенов: - + Update channel Обновить канал - + Check for client updates on startup Проверять обновления при запуске - + Check for card database updates on startup Проверять обновления базы карт при запуске - + Don't check Не проверять - + Prompt for update Поиск обновлений - + Always update in the background Всегда обновлять на фоне - + Check for card database updates every Проверять обновления каждые - + days дней - + Notify if a feature supported by the server is missing in my client Предупреждать, если функции, используемые сервером, отсутствуют в этом клиенте. - + Automatically run Oracle when running a new version of Cockatrice Автоматически запускать Oracle в новой версии Cockatrice - + Show tips on startup Показывать советы при запуске клиента - + Last update check on %1 (%2 days ago) Последнее проверка обновлений была %1 (%2 дней назад) @@ -4759,47 +4278,47 @@ You may have to manually download the new version. GraveyardMenu - + &Graveyard Кладбище - + &View graveyard Посмотреть кладбище - + &Move graveyard to... Переместить кладбище в... - + &Top of library Верх библиотеки - + &Bottom of library Низ библиотеки - + &All players Всем игрокам - + &Hand Рука - + &Exile Изгнание - + Reveal random card to... Показать случайно карту... @@ -4807,88 +4326,88 @@ You may have to manually download the new version. HandMenu - + &Hand Рука - + &View hand Посмотреть руку - + Sort hand by... - + Name - + Type - + Mana Value - + Take &mulligan (Choose hand size) - + Take mulligan (Same hand size) - + Take mulligan (Hand size - 1) - + &Move hand to... Переместить руку... - + &Top of library Верх библиотеки - + &Bottom of library Низ библиотеки - + &Graveyard Кладбище - + &Exile Изгнание - + &Reveal hand to... Показать руку... - - + + All players - + Reveal r&andom card to... Показать случайную карту... @@ -4896,52 +4415,52 @@ You may have to manually download the new version. HomeWidget - + Create New Deck Создать новую колоду - + Browse Decks Посмотреть колоды - + Browse Card Database Посмотреть базу карт - + Browse EDHRec Посмотреть EDHRec - + Browse Archidekt - + View Replays Посмотреть повтор - + Quit Выход - + Connecting... Подключение... - + Connect Подключиться - + Play Играть @@ -4949,213 +4468,213 @@ You may have to manually download the new version. LibraryMenu - + &Library Библиотека - + &View library Посмотреть библиотеку - + View &top cards of library... Посмотреть топдек - + View bottom cards of library... Посмотреть нижнюю карту библиотеки - + Reveal &library to... Показать библиотеку... - + Lend library to... Предоставить доступ к библиотеке... - + Reveal &top cards to... Показать топдек... - + &Top of library... Топдек - + &Bottom of library... Низ библиотеки - + &Always reveal top card &Всегда показывать верхюю карту - + &Always look at top card &Всегда смотреть верхнюю карту - + &Open deck in deck editor Открыть колоду в редакторе - + &Draw card Взять карту - + D&raw cards... Взять карты - + &Undo last draw Отменить последнее взятие карты - + Shuffle Перемешать - + &Play top card Сыграть топдек - + Play top card &face down Сыграть топдек лицом вниз - + Put top card on &bottom Положить топдек на низ библиотеки - + Move top card to grave&yard Положить топдек в кладбище - + Move top card to e&xile Положить топдек в изгнание - + Move top cards to &graveyard... Положить верхние карты в кладбище - + Move top cards to graveyard face down... - + Move top cards to &exile... Положить верхние карты в кладбище - + Move top cards to exile face down... - + Put top cards on stack &until... Поместить вернюю карту в стек, пока... - + Shuffle top cards... Перемешать верхние карты - + &Draw bottom card &Взять нижнюю карту - + D&raw bottom cards... Взять нижнюю карту библиотеки - + &Play bottom card Разыграть нижнюю карту библиотеки - + Play bottom card &face down Разыграть нижнюю карту библиотеки лицом вниз - + Move bottom card to grave&yard Положить нижнюю карту библиотеки в кладбище - + Move bottom card to e&xile Положить нижнюю карту библиотеки в кладбище - + Move bottom cards to &graveyard... Положить нижние карты библиотеки в кладбище - + Move bottom cards to graveyard face down... - + Move bottom cards to &exile... Положить нижние карты в изгнание... - + Move bottom cards to exile face down... - + Put bottom card on &top Переместить нижнюю карту на топдек - + Shuffle bottom cards... Перемешать нижние карты... - - + + &All players Все игроки - + Reveal top cards of library Показать верхние карты библиотеки - + Number of cards: (max. %1) Количество карт: (макс. %1) @@ -5163,454 +4682,850 @@ You may have to manually download the new version. MainWindow - - + + + The server has reached its maximum user capacity, please check back later. + Этот сервер достиг максимального количества пользователей, попробуйте позже. + + + + There are too many concurrent connections from your address. + Слишком много одновременных подключений с Вашего адреса. + + + + Banned by moderator + Забанен модератором + + + + Expected end time: %1 + Ожидаемое время: %1 + + + + This ban lasts indefinitely. + Этот бан не ограничен по времени. + + + + Scheduled server shutdown. + Плановый перерыв в работе сервера. + + + + + Invalid username. + Неверное имя пользователя. + + + + You have been logged out due to logging in at another location. + Вы вышли из аккаунта, так как был выполнен вход из другого расположения. + + + + Connection closed + Соединение прервано + + + + The server has terminated your connection. +Reason: %1 + Ваше подключение было прервано сервером. +Причина: %1 + + + + The server is going to be restarted in %n minute(s). +All running games will be lost. +Reason for shutdown: %1 + Сервер будет перезагружен через %n минут(ы). +Все незавершенные игры будут потеряны. +Причина перезагрузки: %1Сервер будет перезагружен через %n минут(ы). +Все незавершенные игры будут потеряны. +Причина перезагрузки: %1Сервер будет перезагружен через %n минут(ы). +Все незавершенные игры будут потеряны. +Причина перезагрузки: %1Сервер будет перезагружен через %n минут(ы). +Все незавершенные игры будут потеряны. +Причина перезагрузки: %1 + + + + Scheduled server shutdown + Плановый перерыв в работе сервера + + + + + Success + Успешно + + + + Registration accepted. +Will now login. + Регистрация прошла успешно. +Идет соединение. + + + + Account activation accepted. +Will now login. + Активация аккаунта прошла успешно. +Идет соединение. + + + + Player %1 Игрок %1 - + Load replay Загрузить повтор - + About Cockatrice О программе - + Version Версия - + Cockatrice Webpage Страница Cockatrice - + Project Manager: Руководитель проекта: - + Past Project Managers: Предыдущие руководители проекта: - + Developers: Разработчики: - + Our Developers Наши разработчики - + Help Develop! Помочь в разработке! - + Translators: Переводчики: - + Our Translators Наши переводчики - + Help Translate! Помочь с переводом! - + Support: Поддержать проект: - + Report an Issue Сообщить о проблеме - + Troubleshooting Устранение неполадок - + F.A.Q. ЧАВо - - + + + + + + + + + + + + + + + + + + + + Error Ошибка - + + Server timeout + Нет связи с сервером + + + + Failed Login + Не могу подключиться + + + + Your client seems to be missing features this server requires for connection. + Ваш клиент не поддерживает некоторые функции, необходимые для соединения с сервером. + + + + To update your client, go to 'Help -> Check for Client Updates'. + + + + + Incorrect username or password. Please check your authentication information and try again. + Неверное имя пользователя или пароль. Пожалуйста, уточните регистрационные данные и попробуйте снова. + + + + There is already an active session using this user name. +Please close that session first and re-login. + Пользователь с таким именем уже подключен. +Пожалуйста, закройте это подключение и войдите заново. + + + + + You are banned until %1. + Вы забанены до %1. + + + + + You are banned indefinitely. + Вы забанены бессрочно. + + + + This server requires user registration. Do you want to register now? + На этом сервере требуется регистрация. Вы хотите зарегистрироваться сейчас? + + + + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. + + + + + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. + + + + + Account activation + Активация аккаунта + + + + Your account has not been activated yet. +You need to provide the activation token received in the activation email. + Ваш аккаунт ещё не активирован. Вам нужно предоставить жетон/код активации, полученный по электронной почте. + + + + Server Full + Сервер заполнен + + + + Unknown login error: %1 + Неизвестная ошибка входа: %1 + + + + + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. + +Обычно это означает, что Вы используете устаревшую версию клиента, и тот не отвечает запросам сервера. + + + + Your username must respect these rules: + Имя пользователя должно удовлетворять следующим условиям: + + + + is %1 - %2 characters long + длиной в %1 - %2 символов + + + + can %1 contain lowercase characters + %1 может содержать строчные буквы + + + + + + + NOT + НЕ + + + + can %1 contain uppercase characters + %1 может содержать заглавные буквы + + + + can %1 contain numeric characters + %1 может содержать цифры + + + + can contain the following punctuation: %1 + Может содержать следующие символы: %1 + + + + first character can %1 be a punctuation mark + Первый знак %1 может быть знаком пунктуации + + + + no unacceptable language as specified by these server rules: + note that the following lines will not be translated + + + + + can not contain any of the following words: %1 + не может содержать следующие слова: %1 + + + + can not match any of the following expressions: %1 + не может соответствовать следующим выражениям: %1 + + + + You may only use A-Z, a-z, 0-9, _, ., and - in your username. + Имя пользователя может включать только следующие символы: A-Z, a-z, 0-9, "_", "." и "-" + + + + + + + + + Registration denied + Запрос на регистрацию отклонен + + + + Registration is currently disabled on this server + Регистрация на данном сервере в настоящий момент недоступна + + + + There is already an existing account with the same user name. + Аккаунт с таким именем уже существует. + + + + It's mandatory to specify a valid email address when registering. + При регистрации необходимо указать действующий e-mail. + + + + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + + + + + Password too short. + Слишком короткий пароль. + + + + Registration failed for a technical problem on the server. + Регистрация не удалась из-за технических неполадок на сервере. + + + + The connection to the server has been lost. + + + + + Unknown registration error: %1 + Неизвестная ошибка при регистрации: %1 + + + + Account activation failed + Не удалось активировать аккаунт + + + + Socket error: %1 + Ошибка сокета: %1 + + + + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + Вы пытаетесь подключиться к несуществующему серверу. Пожалуйста, обновите Cockatrice или выберите другой сервер. +Локальная версия %1, удаленная версия %2. + + + + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + Ваш клиент Cockatrice устарел. Пожалуйста, обновите Cockatrice. +Локальная версия %1, удаленная версия %2. + + + + Connecting to %1... + Подключение к %1... + + + + Registering to %1 as %2... + Регистрация на %1 как %2... + + + + Disconnected + Подключение прервано + + + + Connected, logging in at %1 + Соединение установлено, выполняется вход на %1 + + + + + + Requesting forgotten password to %1 as %2... + + + + &Connect... Подключение... &С - + &Disconnect П&рервать подключение - + Start &local game... &Начать локальную игру... - + &Watch replay... &Смотреть повтор... - + &Full screen Полный экран &F - + &Register to server... &Регистрация на сервере... - + &Restore password... - + &Settings... &Настройки - + &Exit &Выход - + A&ctions &Действия - + &Cockatrice &Cockatrice - + C&ard Database &База карт - + &Manage sets... - + Edit custom &tokens... - + Open custom image folder Открыть папку с изображениями - + Open custom sets folder Открыть папку с изданиями - + Add custom sets/cards Добавить издания/карты - + Reload card database - + Tabs - Быстрый доступ + - + &Help &Справка - + &About Cockatrice О про&грамме - + &Tip of the Day - + Check for Client Updates - + Check for Card Updates... - + Check for Card Updates (Automatic) - + Show Status Bar - + View &Debug Log - + Open Settings Folder - + Show/Hide - + New Version - + Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. - + Cockatrice installed - + Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. - + Card database База карт - + Cockatrice is unable to load the card database. Do you want to update your card database now? If unsure or first time user, choose "Yes" Cockatrice не может загрузить базу карт. Обновить вашу базу карт сейчас? Если Вы не уверены, или впервые запустили программу, нажмите "Да" - - + + Yes Да - - + + No Нет - + Open settings Открыть настройки - + New sets found Найдены новые издания - + %n new set(s) found in the card database Set code(s): %1 Do you want to enable it/them? - - Yes, always enable - - - - + View sets Просмотреть издания - + Welcome Добро пожаловать - + Hi! It seems like you're running this version of Cockatrice for the first time. All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. - + + Information Информация - + A card database update is already running. Обновление базы карт уже идет. - + Unable to run the card database updater: Не удалось запустить обновление базы карт: - + Card database update running. - + Failed to start. The file might be missing, or permissions might be incorrect. - + The process crashed some time after starting successfully. - + Timed out. The process took too long to respond. The last waitFor...() function timed out. - + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. - + An error occurred when attempting to read from the process. For example, the process may not be running. - + Unknown error occurred. - + The card database updater exited with an error: %1 - - - - - + + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + Этот сервер использует функции, отсутствующие в вашем клиенте. +Вероятно, это не вызовет затруднений, а это сообщение означает, что доступна новая версия Cockatrice или сервер использует неофициальную пре-релизную версию. + +Чтобы обновить клиент, перейдите в Справка-> Проверка обновлений. + + + + + + + Load sets/cards Загрузить издания/карты - + Selected file cannot be found. Выбранный файл не найден. - + You can only import XML databases at this time. На данный момент вы только можете предостовлять базы данных в формате XML. - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. Новые издания/карты успешно добавлены. Сейчас Cockatrice перезагрузит базу карт. - + Sets/cards failed to import. Не удалось импортировать издания/карты. + + + + + Reset Password + + + + + Your password has been reset successfully, you can now log in using the new credentials. + + + + + Failed to reset user account password, please contact the server operator to reset your password. + Невозможно сбросить пароль. Пожалуйста, свяжитесь с оператором сервера. + + + + Activation request received, please check your email for an activation token. + Запрос активации получен. Вам отправлен код активации. Пожалуйста, проверьте свой e-mail. + ManaBaseConfigDialog - + Mana Base Configuration - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): - + OK - + Cancel @@ -5682,27 +5597,27 @@ Cockatrice will now reload the card database. ManaDevotionConfigDialog - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): @@ -5772,615 +5687,610 @@ Cockatrice will now reload the card database. MessageLogWidget - + from play из игры - + from their graveyard из их кладбищ - + from exile из изгнания - + from their hand из их рук - + the top card of %1's library верхняя карта библиотеки %1 - + the top card of their library верхнюю карту своей библиотеки - + from the top of %1's library с верха библиотеки %1 - + from the top of their library с верха своей библиотеки - + the bottom card of %1's library нижняя карта библиотеки %1 - + the bottom card of their library нижнюю карту своей библиотеки - + from the bottom of %1's library Со дна библиотеки %1 - + from the bottom of their library с низа своей библиотеки - + from %1's library из библиотеки %1 - + from their library из своей библиотеки - + from sideboard из сайдборда - + from the stack из стека - + from custom zone '%1' - + %1 is now keeping the top card %2 revealed. %1 оставляет верхнюю карту %2 открытой. - + %1 is not revealing the top card %2 any longer. Верхняя карта %2 %1 больше не остается открытой. - + %1 can now look at top card %2 at any time. - + %1 no longer can look at top card %2 at any time. - + %1 attaches %2 to %3's %4. %1 прикрепляет %2 к %4 под контролем %3. - + %1 has conceded the game. %1 сдался. - + %1 has unconceded the game. - + %1 has restored connection to the game. %1 восстановил связь с игрой. - + %1 has lost connection to the game. %1 потерял связь с игрой. - + %1 points from their %2 to themselves. %1 указывает с их %2 на себя. - + %1 points from their %2 to %3. %1 указывает с их %2 на %3. - + %1 points from %2's %3 to themselves. %1 указывает с %3 под контролем %2 на себя. - + %1 points from %2's %3 to %4. %1 указывает с %3, контролируемого %2, на %4. - + %1 points from their %2 to their %3. %1 указывает с их %2 на их %3. - + %1 points from their %2 to %3's %4. %1 указывает с их %2 на %4 под контролем %3. - + %1 points from %2's %3 to their own %4. %1 указывает с %3 под контролем %2 на %4, владельцем которого они являются. - + %1 points from %2's %3 to %4's %5. %1 указывает с %3 контролируемого %2 на %5 под контролем %4. - + %1 creates a face down token. - + %1 creates token: %2%3. %1 создает фишку: %2%3. - + %1 has loaded a deck (%2). %1 загрузил колоду (%2). - + %1 has loaded a deck with %2 sideboard cards (%3). %1 загрузил колоду с %2 картами из сайдборда (%3). - + %1 destroys %2. %1 уничтожает %2. - + a card карту - + %1 gives %2 control over %3. %1 передает %2 контроль над %3. - + %1 puts %2 into play%3 face down. - + %1 puts %2 into play%3. %1 поместил %2 на поле битвы %3. - + %1 puts %2%3 into their graveyard face down. - + %1 puts %2%3 into their graveyard. %1 кладет %2%3 на своё кладбище. - + %1 exiles %2%3 face down. - + %1 exiles %2%3. %1 изгоняет %2%3. - + %1 moves %2%3 to their hand. %1 кладет %2%3 в свою руку. - + %1 puts %2%3 into their library. %1 кладет %2%3 в свою библиотеку. - + %1 puts %2%3 onto the bottom of their library. - + %1 puts %2%3 on top of their library. %1 кладет %2%3 на верх своей библиотеки. - + %1 puts %2%3 into their library %4 cards from the top. - + %1 moves %2%3 to sideboard. %1 поместил %2%3 в сайд. - + %1 plays %2%3 face down. - + %1 plays %2%3. %1 разыгрывает %2%3. - + %1 moves %2%3 to custom zone '%4' face down. - + %1 moves %2%3 to custom zone '%4'. - + %1 tries to draw from an empty library - + %1 draws %2 card(s). %1 берет %2 карту.%1 берет %2 карты.%1 берет %2 карт.%1 берет %2 карты. - + %1 is looking at %2. %1 просматривает %2. - + %1 is looking at the %4 %3 card(s) %2. top card for singular, top %3 cards for plural - + bottom - + top - + %1 turns %2 face-down. - + %1 turns %2 face-up. - + The game has been closed. Игра закрыта. - + The game has started. Игра началась. - + You are flooding the game. Please wait a couple of seconds. - + %1 has joined the game. %1 присоединился к игре. - + %1 is now watching the game. %1 вошел как зритель. - + You have been kicked out of the game. Вы были отключены от игры - + %1 has left the game (%2). - + %1 is not watching the game any more (%2). - + %1 is not ready to start the game any more. %1 пока не готов начать игру. - + %1 shuffles their deck and draws a new hand of %2 card(s). %1 тасует колоду и берет новую руку из %2 карты%1 тасует колоду и берет новую руку из %2 карт%1 тасует колоду и берет новую руку из %2 карт%1 тасует колоду и берет новую руку из %2 карт - + %1 shuffles their deck and draws a new hand. - + You are watching a replay of game #%1. Вы просматриваете запись игры #%1. - + %1 is ready to start the game. %1 готов начать игру. - + cards an unknown amount of cards - + %1 card(s) a card for singular, %1 cards for plural - + %1 lends %2 to %3. - + %1 reveals %2 to %3. %1 открывает %2 для %3. - + %1 reveals %2. %1 открывает %2. - + %1 randomly reveals %2%3 to %4. %1 случайным образом открывает %2%3 для %4. - + %1 randomly reveals %2%3. %1 случайным образом открывает %2%3. - + %1 peeks at face down card #%2. %1 указывает на перевернутую рубашкой вверх карту #%2. - + %1 peeks at face down card #%2: %3. %1 указывает на перевернутую рубашкой вверх карту #%2: %3. - + %1 reveals %2%3 to %4. %1 открывает %2%3 для %4. - + %1 reveals %2%3. %1 открывает %2%3. - + %1 reversed turn order, now it's %2. - + reversed - + normal - + Heads Орел - + Tails Решка - + %1 flipped a coin. It landed as %2. %1 подбросил монету. Выпал(а) %2. - + %1 rolls a %2 with a %3-sided die. %1 выбросил %2 на %3-гранном кубике. - + %1 flips %2 coins. There are %3 heads and %4 tails. - + %1 rolls a %2-sided dice %3 times: %4. - + %1's turn. - + %1 sets annotation of %2 to %3. %1 помечает %2 "%3". - - %1 places %2 %3%4 counter(s) on %5 (now %6). - + + %1 places %2 "%3" counter(s) on %4 (now %5). + %1 разместил %2 "%3" жетон на %4 (теперь %5).%1 разместил %2 "%3" жетонов на %4 (теперь %5).%1 разместил %2 "%3" жетонов на %4 (теперь %5).%1 разместил %2 "%3" жетонов на %4 (теперь %5). - - %1 removes %2 %3%4 counter(s) from %5 (now %6). - + + %1 removes %2 "%3" counter(s) from %4 (now %5). + %1 удалил %2 "%3" жетон на %4 (теперь %5).%1 удалил %2 "%3" жетона на %4 (теперь %5).%1 удалил %2 "%3" жетонов на %4 (теперь %5).%1 удалил %2 "%3" жетона на %4 (теперь %5). - - %1 failed to undo their last draw. - - - - + %1 sets counter %2 to %3 (%4%5). %1 устанавливает жетон %2 на %3 (%4%5). - + %1 sets %2 to not untap normally. %2 теперь не разворачивается как обычно (%1). - + %1 sets %2 to untap normally. %2 теперь разворачивается как обычно (%1). - + %1 removes the PT of %2. - + %1 changes the PT of %2 from nothing to %4. - + %1 changes the PT of %2 from %3 to %4. - + %1 has locked their sideboard. %1 заблокировал(а) свой сайдборд. - + %1 has unlocked their sideboard. %1 разблокировал(а) свой сайдборд. - + %1 taps their permanents. %1 поворачивает свои перманенты. - + %1 untaps their permanents. %1 разворачивает свои перманенты. - + %1 taps %2. %1 поворачивает %2. - + %1 untaps %2. %1 разворачивает %2. - + %1 shuffles %2. %1 размешал %2. - + %1 shuffles the bottom %3 cards of %2. - + %1 shuffles the top %3 cards of %2. - + %1 shuffles cards %3 - %4 of %2. - + %1 unattaches %2. %1 открепляет %2. - + %1 undoes their last draw. %1 отменяет последние взятия. - + %1 undoes their last draw (%2). %1 отменяет последние взятия (%2). @@ -6388,115 +6298,110 @@ Cockatrice will now reload the card database. MessagesSettingsPage - + Word1 Word2 Word3 - + Add New Message - + Edit Message - + Remove Message - + Add message Добавить сообщение - - + + Message: Сообщение: - + Edit message - + Chat settings Настройки чата - + Custom alert words Пользовательские предупреждения - + Enable chat mentions Включить упоминания в чате - + Enable mention completer Включить автозавершение упоминаний - + In-game message macros Макросы сообщений игрового чата - + How to use in-game message macros Как использовать внутриигровые макросы для сообщений - + Ignore chat room messages sent by unregistered users Не уведомлять о сообщениях в чате от незарегистрированных пользователей - + Ignore private messages sent by unregistered users Не уведомлять о личных сообщениях от незарегистрированных пользователей - - Ignore private messages sent by non-buddy users - - - - - + + Invert text color Инвертировать цвет текста - + Enable desktop notifications for private messages Включить оповещения о личных сообщениях - + Enable desktop notification for mentions Включить оповещения об упоминаниях - + Enable room message history on join Отображать историю сообщений при присоединении к комнате. - - + + (Color is hexadecimal) (Шестнадцатеричный цвет) - + Separate words with a space, alphanumeric characters only Разделять слова пробелом, только для букв и цифр @@ -6504,42 +6409,42 @@ Cockatrice will now reload the card database. MoveMenu - + Move to - + &Top of library in random order - + X cards from the top of library... - + &Bottom of library in random order - + T&able - + &Hand - + &Graveyard - + &Exile @@ -6552,47 +6457,47 @@ Cockatrice will now reload the card database. - + Mana Value - + Color(s) - + Loyalty - + Main Card Type - + Mana Cost - + P/T - + Side - + Layout - + Color Identity @@ -6615,152 +6520,6 @@ Cockatrice will now reload the card database. - - PaletteEditorDialog - - - - Reset - - - - - - Apply - - - - - - Save && Apply - - - - - ▼ Edit Palette - - - - - - ▶ Edit Palette - - - - - Palette Editor — %1 - - - - - <b>Palette Editor</b> &nbsp;·&nbsp; %1 - - - - - This theme ships no default palette files - - - - - Replace current colours with the theme author's defaults - - - - - Switch between the light and dark palette files - - - - - Editing: - - - - - Show or hide the per-role colour grid for manual tweaks - - - - - ↺ Revert to theme default - - - - - Discard unsaved edits and restore the last saved palette - - - - - Preview this palette without saving to disk - - - - - Write palette-%1.toml and reload the theme - - - - - Cannot save: this theme has no directory on disk - - - - - Save failed - - - - - Could not write %1 to: -%2 - - - - - No default found - - - - - No default palette file found for the "%1" scheme. - - - - - PaletteGridWidget - - - Active - - - - - Disabled - - - - - Inactive - - - - - Normal interactive state - - - - - Widget is disabled / not interactive - - - - - Window is in background / unfocused - - - Phase @@ -6827,57 +6586,57 @@ Cockatrice will now reload the card database. PhasesToolbar - + Untap step Шаг разворота - + Upkeep step Шаг поддержки - + Draw step Шаг взятия карты - + First main phase Первая главная фаза - + Beginning of combat step Шаг начала боя - + Declare attackers step Шаг назначения атакующих - + Declare blockers step Шаг назначения блокирующих - + Combat damage step Шаг нанесения повреждений - + End of combat step Шаг завершения боя - + Second main phase Вторая главная фаза - + End of turn step Заключительный шаг @@ -6885,7 +6644,7 @@ Cockatrice will now reload the card database. PictureLoader - + en code for scryfall's language property, not available for all languages ru @@ -6894,142 +6653,151 @@ Cockatrice will now reload the card database. PlayerActions - - - - - grave - - - - - - - - exile - - - - - PlayerDialogs - - + View top cards of library - - - - - - - - - + + + + + + + + + Number of cards: (max. %1) - + View bottom cards of library - + Shuffle top cards of library - + Shuffle bottom cards of library - + Draw hand - + 0 and lower are in comparison to current hand size - + Draw cards + Взять карты + + + + + + + grave - + + + + + exile + + + + Move top cards to %1 - + Move bottom cards to %1 - + Draw bottom cards + Взять карты с низа библиотеки + + + + + C&reate another %1 token - + Create tokens - + + Number: - + Place card X cards from top of library - + Which position should this card be placed: - + (max. %1) - + Change power/toughness - + Change stats to: - + Set annotation - + Please enter the new annotation: + + + Set counters + Установить жетоны + PlayerMenu - + Player "%1" - + &Counters &Жетоны @@ -7059,7 +6827,7 @@ This setting means you'll only see the default printing for each card, instead o - + Printing Selector @@ -7067,22 +6835,22 @@ This setting means you'll only see the default printing for each card, instead o PrintingSelectorCardOverlayWidget - + Preference - + Pin Printing - + Unpin Printing - + Show Related cards @@ -7153,57 +6921,57 @@ This setting means you'll only see the default printing for each card, instead o PtMenu - + Power / toughness - + &Increase power - + &Decrease power - + I&ncrease toughness - + D&ecrease toughness - + In&crease power and toughness - + Dec&rease power and toughness - + Increase power and decrease toughness - + Decrease power and increase toughness - + Set &power and toughness... - + Reset p&ower and toughness @@ -7211,37 +6979,37 @@ This setting means you'll only see the default printing for each card, instead o QMenuBar - + Services Сервисы - + Hide %1 Скрыть %1 - + Hide Others Скрыть остальные - + Show All Показать все - + Preferences... Параметры... - + Quit %1 Выйти %1 - + About %1 О %1 @@ -7249,17 +7017,17 @@ This setting means you'll only see the default printing for each card, instead o QObject - + Cockatrice card database (*.xml) База карт Cockatrice (*.xml) - + All files (*.*) Все файлы (*.*) - + Cockatrice replays (*.cor) Записи игр Cockatrice (*.cor) @@ -7319,177 +7087,110 @@ Are you sure you would like to disable this feature? QPlatformTheme - + OK - + Save - + Save All - + Open - + &Yes - + Yes to &All - + &No - + N&o to All - + Abort - + Retry - + Ignore - + Close - + Cancel - + Discard - + Help - + Apply - + Reset - + Restore Defaults - - QuickSetupPanel - - - %1% - - - - - <b>Quick Setup</b> - - - - - Generate all palette roles automatically from a single accent colour - - - - - Accent: - - - - - Primary hue. Used directly for highlights and links. -At high intensity it also tints buttons and backgrounds. - - - - - Intensity: - - - - - Subtle - - - - - Full colour - - - - - 0–30 Subtle tint — only highlights and links change hue -30–70 Accented — buttons, tooltips, and borders join in -70–100 Full colour — backgrounds, everything - - - - - 70% - - - - - Generate ↓ - - - - - Derive all palette roles from the accent colour above. -Fine-tune individual colours in the grid afterwards. - - - RemoteDeckList_TreeModel - + Name Название - + ID ID - + Upload time Дата загрузки @@ -7497,32 +7198,32 @@ Fine-tune individual colours in the grid afterwards. RemoteReplayList_TreeModel - + ID ID - + Name Имя - + Players Игроки - + Keep Хранение - + Time started Время начала - + Duration (sec) Длительность (сек) @@ -7530,37 +7231,37 @@ Fine-tune individual colours in the grid afterwards. RfgMenu - + &Exile - + &View exile - + &Move exile to... - + &Top of library - + &Bottom of library - + &Hand - + &Graveyard @@ -7606,7 +7307,7 @@ Fine-tune individual colours in the grid afterwards. SayMenu - + S&ay @@ -7647,27 +7348,27 @@ Fine-tune individual colours in the grid afterwards. SetsModel - + Enabled Включено - + Set type Установить тип - + Set code Установить код - + Long name Полное название - + Release date Дата релиза @@ -7675,53 +7376,53 @@ Fine-tune individual colours in the grid afterwards. ShortcutSettingsPage - - + + Restore all default shortcuts - + Do you really want to restore all default shortcuts? - + Clear all default shortcuts - + Do you really want to clear all shortcuts? - + Section: - + Action: - + Shortcut: - + How to set custom shortcuts - + Clear all shortcuts - + Search by shortcut name @@ -7775,12 +7476,12 @@ Please check your shortcut settings! SideboardMenu - + &Sideboard - + &View sideboard @@ -7788,27 +7489,27 @@ Please check your shortcut settings! SoundSettingsPage - + Enable &sounds Включить &звуки - + Current sounds theme: Звуковая тема: - + Test system sound engine Протестировать системный звук - + Sound settings Настройки звука - + Master volume Громкости @@ -7834,7 +7535,7 @@ Please check your shortcut settings! No internet connection - Нет подключения к Интернету + @@ -7880,146 +7581,16 @@ Please check your shortcut settings! Ошибка отклика сервера обновлений версии. - + No reply received from the tag update server. Сервер обновлений меток не отвечает. - + Invalid reply received from the tag update server. Ошибка отклика сервера обновлений меток. - - StorageSettingsPage - - - - - Success - - - - - Cached card pictures have been reset. - - - - - Downloaded card pictures have been reset. - - - - - Error - - - - - One or more downloaded card pictures could not be cleared. - - - - - In-memory (currently loaded) card pictures have been reset. - - - - - Card Picture Loader Caching Method: - - - - - The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size. - - - - - Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while. - - - - - This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk. - - - - - Delete Cached Images - - - - - Delete Saved Images - - - - - Clear In-Memory Images - - - - - Card Picture Loader Cache Method - - - - - Network Cache - - - - - Filesystem - - - - - In-Memory Picture Cache - - - - - Network Cache Size: - - - - - On-disk cache for downloaded pictures - - - - - Redirect Cache TTL: - - - - - How long cached redirects for urls are valid for. - - - - - Picture Cache Size: - - - - - In-memory cache for pictures not currently on screen - - - - - Naming scheme: - - - - - Day(s) - - - TabAccount @@ -8155,117 +7726,117 @@ Please check your shortcut settings! TabArchidekt - - + + Desc. - - + + AND - - + + Require ALL selected colors - - + + Deck name... - - + + Owner... - - + + Packages - - + + Advanced Filters - + Bracket: - - + + Any - - + + Contains card... - - + + Commander... - - + + Tag... - - + + Deck Size - + Cards: - - + + Asc. - + Sort by: - + Filter by: - + Display Settings - - + + Search - - + + Formats @@ -8275,54 +7846,6 @@ Please check your shortcut settings! - - TabCardArtRules - - - Card: - - - - - ProviderId: - - - - - Mode: - - - - - Reason: - - - - - Type a card name... - - - - - Add rule - - - - - Remove rule - - - - - Refresh - - - - - Card Art Rules - - - TabDeckEditor @@ -8371,7 +7894,7 @@ Please check your shortcut settings! Сбросить слой - + Deck: %1 Колода: %1 @@ -8379,49 +7902,55 @@ Please check your shortcut settings! TabDeckEditorVisual - + Visual Deck: %1 - + &Visual Deck Editor - - + + Card Info - - + + Deck - + + + Filters + + + + &View - + Printing - + Visible - + Floating - + Reset layout @@ -8429,22 +7958,22 @@ Please check your shortcut settings! TabDeckEditorVisualTabWidget - + Visual Deck View - + Visual Database Display - + Deck Analytics - + Sample Hand @@ -8452,134 +7981,134 @@ Please check your shortcut settings! TabDeckStorage - + Local file system Локальная файловая система - + Server deck storage Хранилище колод на сервере - - + + Open in deck editor Открыть колоду в редакторе - + Rename deck or folder - + Upload deck Загрузить колоду в хранилище - + Download deck Загрузить колоду из хранилища + - - - + + New folder Новая папка + - Delete Удалить - + Open decks folder - + Rename local folder - + Rename local file - + New name: - - - - + + + + Error - + Rename failed - - + + Invalid deck file - + Enter deck name Введите название колоды - + This decklist does not have a name. Please enter a name: У этой колоды нет названия. Пожалуйста, введите имя: - + Unnamed deck Безымянная колода - + Failed to upload deck to server - + Delete local file Удалить файл - + Are you sure you want to delete the selected files? - + Delete remote decks - + Are you sure you want to delete the selected decks? - - + + Name of new folder: Название новой папки: @@ -8651,191 +8180,191 @@ Please enter a name: TabGame - - - + + + Replay Запись игры - - + + Game Игра - - + + Player List Список игроков - - + + Card Info Информация о карте - - + + Messages Сообщения - - + + Replay Timeline Полоса прокрутки записи - + &Phases &Фазы - + &Game &Игра - + Next &phase Следующая &фаза - + Next phase with &action - + Next &turn Следующий &ход - + Reverse turn order - + &Remove all local arrows &Удалить все указатели - + Rotate View Cl&ockwise Повернуть вид по часовой стрелке - + Rotate View Co&unterclockwise Повернуть вид против часовой стрелки - + Game &information Информация &об игре - + Un&concede - - - + + + &Concede &Сдаться... - + &Leave game Покинуть и&гру - + C&lose replay З&акрыть повтор - + &Focus Chat &Установить фокус на чат - + &Say: Ска&зать: - + Selected cards - + &View Вид - + Visible Видимый - + Floating Плавающий - + Reset layout Сбросить слой - + Concede Сдаться - + Are you sure you want to concede this game? Вы точно хотите сдаться? - + Unconcede - + You have already conceded. Do you want to return to this game? - + Leave game Покинуть игру - + Are you sure you want to leave this game? Вы уверены, что хотите уйти? - + A player has joined game #%1 - + %1 has joined the game - + You have been kicked out of the game. Вы были отключены от игры @@ -8894,115 +8423,115 @@ Please enter a name: Вы должны указать верное количество дней для размещения. - + Username: Имя пользователя: - + IP Address: IP адрес - + Game Name: Имя игры: - + GameID: ID Игры: - + Message: Сообщение: - + Main Room Основная комната - + Game Room Игровая комната - + Private Chat Приватный чат - + Past X Days: Последние X Дней: - + Today Сегодня - + Last Hour За последний час - + Maximum Results: Максимальный результат: - + At least one filter is required. The more information you put in, the more specific your results will be. Должен быть как минимум один фильтр. Чем больше информации Вы укажете, тем точнее будет результат. - + Get User Logs Получить логи пользователя - + Clear Filters Очистить фильтры - + Filters Фильтры - + Log Locations Размещение логов - + Date Range Интервал дат - + Maximum Results Максимальный результат - - + + Message History История сообщений - + Failed to collect message history information. Не удалось собрать историю сообщений. - + There are no messages for the selected filters. Нет сообщений для указанных фильтров. @@ -9020,27 +8549,27 @@ The more information you put in, the more specific your results will be.&Покинуть - + %1 - Private chat %1 - Приватный чат - + This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. Это пользователь добавил Вас в игнор-лист и не видит ваши сообщения в главном чате, а Вы не можете присоединяться к созданным им (ею) играм. - + Private message from Личное сообщение от - + %1 has left the server. %1 отключился. - + %1 has joined the server. %1 зашел на сервер. @@ -9048,180 +8577,180 @@ The more information you put in, the more specific your results will be. TabReplays - + Local file system Локальная файловая система - + Server replay storage Хранилище записей игр на сервере - - + + Watch replay Посмотреть повтор - + Rename - - + + New folder - - + + Delete Удалить - + Open replays folder - + Download replay Скачать запись игры - + Toggle expiration lock Переключить блокировку срока - + Get replay share code - - + + Look up replay by share code - + Rename local folder - + Rename local file - + New name: - + Error - + Rename failed - + Name of new folder: - + Delete local file Удалить локальный файл - + Are you sure you want to delete the selected files? - + Are you sure you want to delete the selected replays? - + Failed to get code - - + + Either this server does not support replay sharing, or does not permit replay sharing for you. - - - + + + Failed - + Could not get replay code - + Replay Share Code - + Others can use this code to add the replay to their list of remote replays: %1 - + Copy to clipboard - + Replay share code - + Replay code found - + Replay was added, or you already had access to it. - + Replay code not found - + Failed to submit code - + Unexpected error - + Delete remote replay Удалить запись игры @@ -9234,62 +8763,47 @@ The more information you put in, the more specific your results will be. TabRoom - - Friends - - - - - Online - - - - - Ignored - - - - + &Say: &Сказать: - + Chat Чат - + &Room &Комната - + &Leave room &Покинуть комнату - + &Clear chat & Обновить чат - + Chat Settings... Установки чата - + mentioned you. упомянул(а) Вас. - + Click to view Нажмите для просмотра - + You are flooding the chat. Please wait a couple of seconds. Кажется, Вы нафлудили. Пожалуйста, подождите пару секунд. @@ -9302,30 +8816,30 @@ The more information you put in, the more specific your results will be.Сервер - - - - + + + + Error Ошибка - + Failed to join the server room: it doesn't exist on the server. - + The server thinks you are in the server room but your client is unable to display it. Try restarting your client. - + You do not have the required permission to join this server room. - + Failed to join the server room due to an unknown error: %1. @@ -9333,97 +8847,97 @@ The more information you put in, the more specific your results will be. TabSupervisor - + Deck Editor - + Visual Deck Editor - + EDHRec - + Archidekt - + Home - + &Visual Deck Storage - + Visual Database Display - + Server - + Account - + Deck Storage - + Game Replays - + Administration - + Logs - + Are you sure? Вы уверены? - + There are still open games. Are you sure you want to quit? У вас все еще есть активные игры. Уверены, что хотите выйти? - + Click to view - + Your buddy %1 has signed on! - + Unknown Event Неопознанное событие - + The server has sent you a message that your client does not understand. This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. @@ -9434,38 +8948,38 @@ To update your client, go to Help -> Check for Updates. Чтобы обновить клиент, перейдите в Справка-> Проверка обновлений. - + Idle Timeout Исчерпано время бездействия - + You are about to be logged out due to inactivity. Вы были отключены из-за отсутствия активности. - + Promotion Повышение - + You have been promoted. Please log out and back in for changes to take effect. - + Warned Предупрежден - + You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. Вы получили предупреждение по причине %1. Пожалуйста, воздержитесь от подобных действий, иначе в ваш адрес будут применены дальнейшие меры. При возникновении каких-либо вопросов напишите личное сообщение любому модератору. - + You have received the following message from the server. (custom messages like these could be untranslated) Вы получили сообщение от сервера. @@ -9475,12 +8989,12 @@ Please refrain from engaging in this activity or further actions may be taken ag TabVisualDatabaseDisplay - + Database Display - + Visual Database Display @@ -9517,42 +9031,42 @@ Please refrain from engaging in this activity or further actions may be taken ag TranslateCounterName - + Life - + White - + Blue - + Black - + Red - + Green - + Colorless - + Other @@ -9560,69 +9074,11 @@ Please refrain from engaging in this activity or further actions may be taken ag UpdateDownloader - + Could not open the file for reading. Невозможно открыть файл для чтения. - - UserCardArtSettingsDialog - - - Card Art Settings - - - - - Type a card name... - - - - - Card name: - - - - - Card ProviderId: - - - - - Left margin (%): - - - - - Right margin (%): - - - - - Vertical offset: - - - - - Zoom: - - - - - Parameters - - - - - Preview - - - - - Remove Banner Card - - - UserContextMenu @@ -9740,7 +9196,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Ban History История банов @@ -9755,87 +9211,77 @@ Please refrain from engaging in this activity or further actions may be taken ag Пользователя никогда не банили. - + Failed to collect ban information. - - - + + + Warning History История предупреждений - + Warning Time;Moderator;User Name;Reason ВремяПредупреждения;Модератор;ИмяПольозователя;Причина - + User has never been warned. Пользователя никогда не предупреждали. - + Failed to collect warning information. - + Failed to get admin notes. - - + + Success Успешно - + Successfully promoted user. Пользователь успешно повышен. - + Successfully demoted user. Пользователь успешно понижен. - - Kick Player - - - - - Are you sure you want to kick this player from the game? - - - - - - + + + Failed Не удалось - + Failed to promote user. Не удалось повысить пользователя. - + Failed to demote user. Не удалось понизить пользователя. - + Copy hash to clipboard - + Remove this user's messages @@ -9843,554 +9289,326 @@ Please refrain from engaging in this activity or further actions may be taken ag UserInfoBox - + Location: Местонахождение: - + Account Age: Возраст учетной записи: - + Edit Редактировать - + Change password Сменить пароль - + Change avatar Сменить аватар - + Administrator Администратор - + Moderator Модератор - + Registered user Зарегистрированный пользователь - - + + Unregistered user Рандом - + Judge - + Unknown Неизвестный - + The entered password does not match your account. - - - - + + + Information Информация - + User information updated. Информация о пользователе обновлена. - - - - - - - - - - - + + + + + + + + + + Error Ошибка - + User Information - + Real Name: - + User Level: - - - Edit Banner Card - - - + %n Year(s), amount of years (only shown if more than 0) - + %10%n Day(s) %20 amount of years (if more than 0), amount of days, date in local short format - + Enter Password - + Password verification is required in order to change your email address - - - + + + An error occurred while trying to update your user information. - - The selected card is blacklisted on this server or another error occurred. - - - - - Banner card removed. - - - - - Banner card updated. - - - - + This server does not permit you to update your user informations. Этот сервер не позволяет обновить пользовательскую информацию. - + Password changed. Пароль изменен. - + This server does not permit you to change your password. Этот сервер не позволяет Вам сменить пароль. - + The new password is too short. Новый пароль слишком короткий. - + The old password is incorrect. Предыдущий пароль неверен. - + Avatar updated. Аватар изменен. - + This server does not permit you to update your avatar. Этот сервер не позволяет Вам изменить аватар. - - - An error occured while trying to update your avatar. - - - This server does not permit you to update your user informations. - An error occured while trying to updater your avatar. - Этот сервер не позволяет обновить пользовательскую информацию. - - - - UserInfoPopup - - - - Games - - - - - Chat - - - - - Open private chat - - - - - Profile - - - - - View user profile - - - - - Show this user's games - - - - - − Buddy - - - - - Remove from buddy list - - - - - + Buddy - - - - - Add to buddy list - - - - - − Ignore - - - - - Remove from ignore list - - - - - + Ignore - - - - - Add to ignore list - - - - - Ban - - - - - Ban from server - - - - - Warn - - - - - Warn user - - - - - Ban log - - - - - View ban history - - - - - Warn log - - - - - View warning history - - - - - Notes - - - - - View admin notes - - - - - − Mod - - - - - Demote from moderator - - - - - + Mod - - - - - Promote to moderator - - - - - − Judge - - - - - Demote from judge - - - - - + Judge - - - - - Promote to judge - - - - - Join game - - - - - Spectate - - - - - - Loading games… - - - - - Could not load games. - - - - - No active games. - + An error occured while trying to updater your avatar. + При изменении аватара произошла ошибка. UserInterfaceSettingsPage - + General interface settings Основные настройки интерфейса - + &Double-click cards to play them (instead of single-click) &Двойной клик, чтобы разыграть карту (вместо одинарного) - + &Clicking plays all selected cards (instead of just the clicked card) &Клик для разыгрывания всех выбранных карт (вместо только выбранной) - + &Play all nonlands onto the stack (not the battlefield) by default &Помещать все заклинания в стек при разыгрывании (вместо поля боя) - + Do not delete &arrows inside of subphases - + Close card view window when last card is removed Закрыть окно просмотра карт когда последняя карта удалена из него - + Auto focus search bar when card view window is opened - + Annotate card text on tokens Изменить текст карты на токенах - - Show selection count during drag selection + + Show selection counter during drag selection - - Show total selection count + + Show total selection counter - - Show subtype breakdown in selection tally - - - - + Use tear-off menus, allowing right click menus to persist on screen Разрешить закрепление контекстных меню на экране - - Keep game chat focused when clicking in game (Note: disables card view search bar) - - - - + Notifications settings - + Enable notifications in taskbar Включить оповещения в панели задач. - + Notify in the taskbar for game events while you are spectating Уведомлять об игровых событиях в панели задач, когда вы наблюдаете за игрой - + Notify in the taskbar when users in your buddy list connect Уведомлять при заходе в игру друга - + Animation settings Настройки анимации - + &Tap/untap animation &Анимировать поворот/разворот карты - + Deck editor/storage settings Редактор колод/Настройки хранилища - + Open deck in new tab by default Открывать колоду в новой вкладке - + Use visual deck storage in game lobby Использовать графическое представление карт в лобби игры - + Use selection animation for Visual Deck Storage Использовать анимацию при выборе карты в графическом хранилище - + When adding a tag in the visual deck storage to a .txt deck: - + do nothing - + ask to convert to .cod - + always convert to .cod всегда конвертировать в .cod - + Default deck editor type - + Classic Deck Editor - + Visual Deck Editor - + Replay settings - + Buffer time for backwards skip via shortcut: Время отката назад при нажатии шортката @@ -10398,22 +9616,22 @@ Please refrain from engaging in this activity or further actions may be taken ag UserListWidget - + Users connected to server: %1 - + Users in this room: %1 - + Buddies online: %1 / %2 - + Ignored users online: %1 / %2 @@ -10421,45 +9639,35 @@ Please refrain from engaging in this activity or further actions may be taken ag UtilityMenu - + Increment all card counters Добавить по одному каждого жетона - + &Untap all permanents - + R&oll die... - - Flip coin - - - - + &Create token... - + C&reate another token - + Cr&eate predefined token - - - C&reate another %1 token - - VisualDatabaseDisplayColorFilterWidget @@ -10511,72 +9719,72 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFilterToolbarWidget - + Sort by - + Filter by - + Save and load filters - + Filter by exact card name - + Filter by card main-type - + Filter by card sub-type - + Filter by set - + Filter by format legality - + Save/Load - + Name - + Main Type - + Sub Type - + Sets - + Formats @@ -10584,22 +9792,22 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFormatLegalityFilterWidget - + Show formats with at least: - + cards - + Do not display formats with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) @@ -10617,32 +9825,32 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayMainTypeFilterWidget - + Show main types with at least: - + cards - + Do not display card main-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10650,27 +9858,27 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayNameFilterWidget - + Filter by name... (Exact match) - + Load from Deck - + Apply all card names in currently loaded deck as exact match name filters - + Load from Clipboard - + Apply all card names in clipboard as exact match name filters @@ -10678,7 +9886,7 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayRecentSetFilterSettingsWidget - + Filter to most recent sets @@ -10686,19 +9894,19 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySetFilterWidget - + Search sets... - - + + Mode: Exact Match - - + + Mode: Includes @@ -10706,37 +9914,37 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySubTypeFilterWidget - + Search subtypes... - + Show sub types with at least: - + cards - + Do not display card sub-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10744,23 +9952,23 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayWidget - + Search by card name (or search expressions) - + Visual - + Loading database ... - + Clear all filters @@ -10799,17 +10007,17 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Toggle Layout: Overlap - + Change how cards are displayed within zones (i.e. overlapped or fully visible.) - + Toggle Layout: Flat @@ -10838,17 +10046,17 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDeckEditorWidget - + Type a card name here for suggestions from the database... - + Quick search and add card - + Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter @@ -10966,43 +10174,43 @@ Please refrain from engaging in this activity or further actions may be taken ag WarningDialog - + Which warning would you like to send? Какое предупреждение Вы бы хотели отправить? - + Redact all messages from this user in all rooms - + &OK &ОК - + &Cancel &Отменить - + Warn user for misconduct Дать предупреждение пользователю за проступок - - + + Error Ошибка - + User name to send a warning to can not be blank, please specify a user to warn. Поле не может быть пустым. Пожалуйста, уточните имя пользователя для выдачи предупреждения. - + Warning to use can not be blank, please select a valid warning to send. Поле предупреждения не может быть пустым. Пожалуйста, выберите корректную причину. @@ -11010,133 +10218,133 @@ Please refrain from engaging in this activity or further actions may be taken ag WndSets - + Move selected set to the top Переместить выбранное издание наверх - + Move selected set up Переместить выбранное издание вверх - + Move selected set down Переместить выбранное издание вниз - + Move selected set to the bottom Переместить выбранное издание в конец. - + Search by set name, code, or type - + Default order - + Restore original art priority order - + Enable all sets Включить все издания - + Disable all sets Отключить все издания - + Enable selected set(s) Включить выбранные издания - + Disable selected set(s) Отключить выбранные издания - + Deck Editor Редактор колод - + Use CTRL+A to select all sets in the view. - + Only cards in enabled sets will appear in the card list of the deck editor. - + Image priority is decided in the following order: - + first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) %1 is a link to the wiki - + Include cards rebalanced for Alchemy [requires restart] - + Card Art - + How to use custom card art Как использовать кастомный арт для карты - + Hints - + Note - + Sorting by column allows you to find a set while not changing set priority. - + To enable ordering again, click the column header until this message disappears. - + Use the current sorting as the set priority instead - + Sorts the set priority using the same column - + Manage sets @@ -11144,72 +10352,72 @@ Please refrain from engaging in this activity or further actions may be taken ag ZoneViewWidget - + Search by card name (or search expressions) - + Ungrouped - + Group by Type - + Group by Mana Value - + Group by Color - + Unsorted - + Sort by Name - + Sort by Type - + Sort by Mana Cost - + Sort by Colors - + Sort by P/T - + Sort by Set - + shuffle when closing Перемешать после просмотра - + pile view просмотр вразнобой @@ -11217,7 +10425,7 @@ Please refrain from engaging in this activity or further actions may be taken ag i18n - + English Русский (Russian) @@ -11225,12 +10433,12 @@ Please refrain from engaging in this activity or further actions may be taken ag main - + Connect on startup - + Debug to file @@ -11244,7 +10452,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Deck Editor Редактор колоды @@ -11325,7 +10533,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Replays @@ -11440,129 +10648,129 @@ Please refrain from engaging in this activity or further actions may be taken ag - - + + Load Deck from Clipboard... - + Edit Deck in Clipboard, Annotated - + Edit Deck in Clipboard - + New Deck - + Open Custom Pictures Folder - + Print Deck... - + Delete Card - - + + Reset Layout - + Save Deck - + Save Deck as... - + Save Deck to Clipboard, Annotated - + Save Deck to Clipboard, Annotated (No Set Info) - + Save Deck to Clipboard - + Save Deck to Clipboard (No Set Info) - + Load Local Deck... - + Load Remote Deck... - + Set Ready to Start - + Toggle Sideboard Lock - + Add Green Counter Добавить зелёный жетон - + Remove Green Counter Удалить зелёный жетон - + Set Green Counters... Установить зелёные жетоны - + Add Red Counter Добавить красный жетон - + Remove Red Counter Убрать красный жетон - + Set Red Counters... Установить кол-во красных жетонов... - + Add Life Counter Добавить 1 ед. жизни @@ -11572,744 +10780,724 @@ Please refrain from engaging in this activity or further actions may be taken ag - - Load deck from online service... - - - - - Load from website... - - - - + Unload Deck - + Force Start - + Add Card Counter (F) Добавить жетон (F) - + Remove Card Counter (F) Удалить жетон (F) - + Set Card Counters (F)... Установить жетоны (F) - + Add Card Counter (E) Добавить жетон (E) - + Remove Card Counter (E) Удалить жетон (E) - + Set Card Counters (E)... Установить жетоны (E)... - + Add Card Counter(D) Добавить жетон(D) - + Remove Card Counter (D) Удалить жетон (D) - + Set Card Counters (D)... Установить жетоны (D)... - + Add Card Counter (C) Добавить жетон (C) - + Remove Card Counter (C) Удалить жетон (C) - + Set Card Counters (C)... Установить жетоны (C) - + Add Card Counter (B) Добавить жетон (B) - + Remove Card Counter (B) Удалить жетон (B) - + Set Card Counters (B)... Установить жетоны (B)... - + Add Card Counter (A) Добавить жетон (A) - + Remove Card Counter (A) Удалить жетон (A) - + Set Card Counters (A)... Установить жетоны (A)... - + Remove Life Counter Убрать 1 ед. жизни - + Set Life Counters... Установить кол-во жизней - + Add White Counter Добавить белый жетон - + Remove White Counter Убрать белый жетон - + Set White Counters... Установить белые жетоны... - + Add Blue Counter Добавить синий жетон - + Remove Blue Counter Убрать синие жетоны - + Set Blue Counters... Установить синие жетоны... - + Add Black Counter Добавить черные жетон - + Remove Black Counter Удалить черные жетон - + Set Black Counters... Установить черные жетоны... - + Add Colorless Counter Добавить бесцветные жетон - + Remove Colorless Counter Удалить бесцветные жетон - + Set Colorless Counters... Установить бесцветные жетоны - + Add Other Counter Добавить другие жетоны - + Remove Other Counter Удалить другие жетоны - + Set Other Counters... Установить другие жетоны... - + Increment all card counters Добавить по одному каждого жетона - + Add Power (+1/+0) - + Remove Power (-1/-0) - + Move Toughness to Power (+1/-1) - + Add Toughness (+0/+1) - + Remove Toughness (-0/-1) - + Move Power to Toughness (-1/+1) - + Add Power and Toughness (+1/+1) - + Remove Power and Toughness (-1/-1) - + Set Power and Toughness... - + Reset Power and Toughness - + Untap Шаг разворота - + Upkeep Шаг поддержки - + Draw Шаг взятия карты - + First Main Phase - + Start Combat - + Attack Атака - + Block Блок - + Damage Повреждения - + End Combat - + Second Main Phase - + End Конец хода - + Next Phase - + Next Phase Action - + Next Turn - + Hide Card in Reveal Window - + Tap / Untap Card Повернуть / развернуть карту - + Untap All - + Toggle Skip Untapping Toggle Untap - + Turn Card Over - + Peek Card - + Play Card - + Play Card, Face Down - + Attach Card... - + Unattach Card - + Clone Card - + Create Token... - + Create All Related Tokens - + Create Another Token - + Set Annotation... - - Reduce Life by Power - - - - + Select All Cards in Zone - + Select All Cards in Row - + Select All Cards in Column - + Reveal Selected Cards to All Players - - + + Bottom of Library - - - - + + + + Exile Изгнание - - - - + + + + Graveyard Кладбище - - + + Hand Рука - - + + Top of Library - - + + Battlefield, Face Down - + Battlefield - + Library Библиотека - + Sideboard Сайдборд - + Top Cards of Library - + Bottom Cards of Library - + Close Recent View - - + + Stack - - + + Graveyard (Multiple) - - + + Graveyard (Multiple), Face Down - - + + Exile (Multiple) - - + + Exile (Multiple), Face Down - + Stack Until Found - + Draw Bottom Card Взять карту с низа библиотеки - + Draw Multiple Cards from Bottom... Взять несколько карт с низа библиотеки... - + Draw Arrow... - + Remove Local Arrows - + Leave Game - + Concede Сдаться - + Roll Dice... - - Flip Coin - - - - + Shuffle Library - + Shuffle Top Cards of Library - + Shuffle Bottom Cards of Library - + Mulligan Муллиган - + Mulligan (Same hand size) - + Mulligan (Hand size - 1) - + Draw a Card Взять карту - + Draw Multiple Cards... Взять несколько карт - + Undo Draw - + Always Reveal Top Card Всегда показывать верхнюю карту - + Always Look At Top Card Всегда смотреть верхнюю карту - + Sort Hand by Name - + Sort Hand by Type - + Sort Hand by Mana Value - + Reveal Hand to All Players - + Reveal Random Card to All Players - + Rotate View Clockwise - + Rotate View Counterclockwise - + Unfocus Text Box Убрать фокус с окна ввода - + Focus Chat Установить фокус на чат - + Clear Chat Очистить чат - + Refresh Обновить - + Skip Forward - + Skip Backward - + Skip Forward by a lot - + Skip Backward by a lot - + Play/Pause - + Toggle Fast Forward - + Home - + Visual Deck Storage - + Deck Storage - + Server - + Account - + Administration - + Logs Логи diff --git a/cockatrice/translations/cockatrice_sv.ts b/cockatrice/translations/cockatrice_sv.ts index 2f9eb911b..376b9fe5f 100644 --- a/cockatrice/translations/cockatrice_sv.ts +++ b/cockatrice/translations/cockatrice_sv.ts @@ -2,7 +2,7 @@ AbstractCounter - + &Set counter... &Placera polett... @@ -10,12 +10,12 @@ AbstractCounterDialog - + Set counter - + New value for counter '%1': @@ -36,60 +36,60 @@ AbstractTabDeckEditor - + Open in new tab - + Are you sure? - + The decklist has been modified. Do you want to save the changes? - - - - - - + + + + + + Error - + Could not open deck at %1 - + Could not save remote deck - - + + The deck could not be saved. Please check that the directory is writable and try again. - + Save deck - + The deck could not be saved. - + There are no cards in your deck to be exported @@ -105,12 +105,12 @@ Please check that the directory is writable and try again. AdminNotesDialog - + Update Notes - + Admin Notes for %1 @@ -127,227 +127,172 @@ Please check that the directory is writable and try again. Sideboard - - - Tokens - - AppearanceSettingsPage - + seconds - + Error - + Could not create themes directory at '%1'. - + Theme settings Temainställningar - + Current theme: Aktuellt tema: - + Open themes folder - + Home tab background source: - + Home tab background shuffle frequency: - + Disabled - + + Display card name of background in bottom right: + + + + Menu settings - + Show keyboard shortcuts in right-click menus - + Show game filter toolbar above list in room tab - + Card rendering Kortrendering - + Display card names on cards having a picture Visa kortnamn på kort som har bilder - + Auto-Rotate cards with sideways layout - + Override all card art with personal set preference (Pre-ProviderID change behavior) - - Light - - - - - Dark - - - - - System - - - - - Active theme palette: - - - - - Edit theme palette - - - - - Home tab settings - - - - - Display card name of background in bottom right - - - - - Styling settings - - - - - Style user list - - - - - Card printings - - - - + Bump sets that the deck contains cards from to the top in the printing selector - + Scale cards on mouse over Skala kort på musen över - + Use rounded card corners - - Card layout - - - - + Minimum overlap percentage of cards on the stack and in vertical hand - + Maximum initial height for card view window: - - + + rows - + Maximum expanded height for card view window: - + Card counters - + Counter %1 - + Hand layout Handlayout - + Display hand horizontally (wastes space) Visa hand horisontellt (slösar plats) - + Enable left justification Aktivera vänsterjustering - + Table grid layout Bordets rutnätlayout - + Invert vertical coordinate Invertera vertikal koordinat - + Minimum player count for multi-column layout: Minst antal spelare för multi-kolumnlayout: - + Maximum font size for information displayed on cards: Maximal teckenstorlek för information som visas på kort: @@ -355,12 +300,12 @@ Please check that the directory is writable and try again. ArchidektApiResponseDeckDisplayWidget - + Back to results - + Open Deck in Deck Editor @@ -386,112 +331,112 @@ Please check that the directory is writable and try again. BanDialog - + ban &user name bannlys användar&namn - + ban &IP address bannlys &IP address - + ban client I&D förbjuda klienten I & D - + Ban type Typ av bannlysning - + &permanent ban &permanent bannlysning - + &temporary ban &temporär bannlysning - + &Days: &Dagar: - + &Hours: &Timmar: - + &Minutes: &Minuter: - + Duration of the ban Bannlysningens längd - + Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. Vänligen ange anledningen till bannlysningen. Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen. - + Please enter the reason for the ban that will be visible to the banned person. Vänligen ange en anledning för bannlysningen som kommer att visas för den bannlysta personen. - + Redact all messages from this user in all rooms - + &OK &OK - + &Cancel &Avbryt - + Ban user from server Bannlys användaren från servern - - - - + + + + Error Fel - + You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. Du måste välja en namnbaserad, IP-baserad, clientId-baserad eller en kombination av de tre för att lägga ett förbud. - + You must have a value in the name ban when selecting the name ban checkbox. Du måste ha ett värde i namnförbudet när du markerar kryssrutan för namnförbud. - + You must have a value in the ip ban when selecting the ip ban checkbox. Du måste ha ett värde i ip-förbudet när du markerar kryssrutan ip-banan. - + You must have a value in the clientid ban when selecting the clientid ban checkbox. Du måste ha ett värde i clientidförbudet när du markerar kryssrutan för klientidförbud. @@ -499,123 +444,59 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen. BetaReleaseChannel - + Beta - + No reply received from the release update server. Inget svar mottaget från uppdateringsservern. - + Invalid reply received from the release update server. Ogiltigt svar mottaget från uppdateringsserveren. - + No reply received from the file update server. Inget svar mottaget från filuppdateringsservern. - - CardArtPreviewWidget - - - No card selected - - - - - CardArtRulesModel - - - Card - - - - - ProviderId - - - - - Mode - - - - - Reason - - - CardDatabaseModel - + Name Namn - + Sets Utgåvor - + Mana cost Manakostnad - + Card type Korttyp - + P/T P/T - + Color(s) Färg(er) - - CardDatabaseView - - - Add to Deck - - - - - Add to Sideboard - - - - - Select Printing - - - - - Show on EDHRec (Commander) - - - - - Show on EDHRec (Card) - - - - - Show Related cards - - - CardFilter @@ -744,22 +625,22 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen. CardInfoPictureWidget - + View related cards - + Add card to deck - + Mainboard - + Sideboard @@ -782,12 +663,12 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen. - + Related cards: - + Unknown card: @@ -795,146 +676,128 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen. CardMenu - + Re&veal to... - + &All players - + View related cards - + Token: - + All tokens - + &Select All - + S&elect Row - + S&elect Column - + &Play - + &Hide - + Play &Face Down - + &Tap / Untap Turn sideways or back again - + Skip &untapping - + T&urn Over Turn face up/face down - + &Peek at card face - + &Clone - + Attac&h to card... - + Unattac&h - + &Draw arrow... - + &Set annotation... - - Reduce life by power - - - - + Ca&rd counters - + &Add counter (%1) - + &Remove counter (%1) - + &Set counters (%1)... - - CardPictureLoaderCacheMethod - - - Network Cache - - - - - Filesystem - - - CardSizeWidget @@ -946,133 +809,133 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen. CardZoneLogic - + their hand nominative - + %1's hand nominative - + their library look at zone - + %1's library look at zone - + of their library top cards of zone, - + of %1's library top cards of zone - + their library reveal zone - + %1's library reveal zone - + their library shuffle - + %1's library shuffle - + their library nominative - + %1's library nominative - + their graveyard nominative - + %1's graveyard nominative - + their exile nominative - + %1's exile nominative - + their sideboard look at zone - + %1's sideboard look at zone - + their sideboard nominative - + %1's sideboard nominative - + their custom zone '%1' nominative - + %1's custom zone '%2' nominative @@ -1094,421 +957,16 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen. - - ColorButton - - - Click to pick a color - - - - - Pick colour - - - - - ConnectionController - - - - The server has reached its maximum user capacity, please check back later. - - - - - There are too many concurrent connections from your address. - - - - - Banned by moderator - - - - - Expected end time: %1 - - - - - This ban lasts indefinitely. - - - - - Scheduled server shutdown. - - - - - - Invalid username. - - - - - You have been logged out due to logging in at another location. - - - - - Connection closed - - - - - The server has terminated your connection. -Reason: %1 - - - - - The server is going to be restarted in %n minute(s). -All running games will be lost. -Reason for shutdown: %1 - - - - - Scheduled server shutdown - - - - - Failed Login - - - - - Your client seems to be missing features this server requires for connection. - - - - - To update your client, go to 'Help -> Check for Client Updates'. - - - - - - - - - - - - - - - - - - - - - - Error - - - - - Incorrect username or password. Please check your authentication information and try again. - - - - - There is already an active session using this user name. -Please close that session first and re-login. - - - - - - You are banned until %1. - - - - - - You are banned indefinitely. - - - - - This server requires user registration. Do you want to register now? - - - - - This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. -Please close and reopen your client to try again. - - - - - An internal error has occurred, please close and reopen Cockatrice before trying again. -If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - - - - Account activation - - - - - Your account has not been activated yet. -You need to provide the activation token received in the activation email. - - - - - Server Full - - - - - Unknown login error: %1 - - - - - - -This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - - - - - - - - - Registration denied - - - - - Registration is currently disabled on this server - - - - - There is already an existing account with the same user name. - - - - - It's mandatory to specify a valid email address when registering. - - - - - It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. - - - - - Password too short. - - - - - Registration failed for a technical problem on the server. - - - - - The connection to the server has been lost. - - - - - Unknown registration error: %1 - - - - - Account activation failed - - - - - Socket error: %1 - - - - - Server timeout - - - - - You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. -Local version is %1, remote version is %2. - - - - - Your Cockatrice client is obsolete. Please update your Cockatrice version. -Local version is %1, remote version is %2. - - - - - - Success - - - - - Registration accepted. -Will now login. - - - - - Account activation accepted. -Will now login. - - - - - Information - - - - - This server supports additional features that your client doesn't have. -This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. - -To update your client, go to Help -> Check for Updates. - - - - - - - Reset Password - - - - - Your password has been reset successfully, you can now log in using the new credentials. - - - - - Failed to reset user account password, please contact the server operator to reset your password. - - - - - Activation request received, please check your email for an activation token. - - - - - Connecting to %1... - - - - - Registering to %1 as %2... - - - - - Disconnected - - - - - Connected, logging in at %1 - - - - - Requesting forgotten password to %1 as %2... - - - - - Your username must respect these rules: - - - - - is %1 - %2 characters long - - - - - can %1 contain lowercase characters - - - - - - - - NOT - - - - - can %1 contain uppercase characters - - - - - can %1 contain numeric characters - - - - - can contain the following punctuation: %1 - - - - - first character can %1 be a punctuation mark - - - - - no unacceptable language as specified by these server rules: - note that the following lines will not be translated - - - - - can not contain any of the following words: %1 - - - - - can not match any of the following expressions: %1 - - - - - You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - - CustomZoneMenu - + C&ustom Zones - - + + View custom zone '%1' @@ -1516,35 +974,30 @@ To update your client, go to Help -> Check for Updates. DeckAnalyticsWidget - + Add Panel - + Remove Panel - + Save Layout - + Load Layout - - - Include Sideboard - - DeckEditorCardDatabaseDockWidget - + Card Database @@ -1560,17 +1013,47 @@ To update your client, go to Help -> Check for Updates. DeckEditorDatabaseDisplayWidget - + Search by card name (or search expressions) - + + Add to Deck + + + + + Add to Sideboard + + + + + Select Printing + + + + + Show on EDHRec (Commander) + + + + + Show on EDHRec (Card) + + + + + Show Related cards + + + + Add card to &maindeck - + Add card to &sideboard @@ -1603,72 +1086,72 @@ To update your client, go to Help -> Check for Updates. - + Select Printing - + Deck - + Deck &name: - + Banner Card/Tags Visibility Settings - + Show banner card selection menu - + Show tags selection menu - + &Comments: - + Group by: - + Format: - + Hash: - + &Increment number - + &Decrement number - + &Remove row - + Swap card to/from sideboard @@ -1676,17 +1159,17 @@ To update your client, go to Help -> Check for Updates. DeckEditorFilterDockWidget - + Filters - + &Clear all filters - + Delete selected @@ -1817,113 +1300,169 @@ To update your client, go to Help -> Check for Updates. DeckEditorSettingsPage - - + + Update Spoilers Uppdatera Spoilers - + + Success - + Download URLs have been reset. - + + Downloaded card pictures have been reset. + + + + + Error + Fel + + + + One or more downloaded card pictures could not be cleared. + + + + Add URL Lägg till webbadress - - + + URL: - - + + Edit URL - + + Network Cache Size: + + + + + Redirect Cache TTL: + + + + + How long cached redirects for urls are valid for. + + + + + Picture Cache Size: + + + + Add New URL - + Remove URL - + + Day(s) + + + + Updating... Uppdaterar ... - + Choose path Välj sökväg - + URL Download Priority - + Spoilers Spoilers - + Download Spoilers Automatically Ladda ner Spoilers automatiskt - + Spoiler Location: Spoiler Plats: - + Last Change Senaste ändring - + Spoilers download automatically on launch Spoilers laddas ner automatiskt vid lanseringen - + Press the button to manually update without relaunching Tryck på knappen för att manuellt uppdatera utan omstart - + Do not close settings until manual update is complete - + Download card pictures on the fly Ladda enkelt ned bilder på kort - + How to add a custom URL Hur man lägger till en valfri webbadress - + + Delete Downloaded Images + Ta bort nedladdade bilder + + + Reset Download URLs Återställ nedladdnings-webbadresser + + + On-disk cache for downloaded pictures + + + + + In-memory cache for pictures not currently on screen + + DeckListHistoryManagerWidget @@ -1989,12 +1528,12 @@ To update your client, go to Help -> Check for Updates. DeckLoader - + Common deck formats (%1) - + All files (*.*) @@ -2216,27 +1755,27 @@ To update your client, go to Help -> Check for Updates. - + Moved to %1 1 × "%2" (%3) - + Removed "%1" (all copies) - + %1 1 × "%2" (%3) - + Added - + Removed @@ -2258,74 +1797,74 @@ To update your client, go to Help -> Check for Updates. DeckViewContainer - + Load deck... Ladda lek... - + Load remote deck... Ladda remote lek... - + Load from clipboard... - + Load from website... - + Unload deck - + Ready to start - + Force start - + Sideboard unlocked - + Sideboard locked - - + + Error Fel - + The selected file could not be loaded. Den valda filen kunde ej laddas. - + Deck is greater than maximum file size. - + Are you sure you want to force start? This will kick all non-ready players from the game. - + Cockatrice @@ -2424,7 +1963,7 @@ This will kick all non-ready players from the game. - + Webpage Webbsida @@ -2464,37 +2003,37 @@ This will kick all non-ready players from the game. Anslut till servern - + Server URL Server webbadress - + Communication Port - + Unique Server Name Unikt servernamn - + Connection Warning Anslutningsvarning - + You need to name your new connection profile. Du måste ange din nya anslutningsprofil. - + Connect Warning Anslutningsvarning - + The player name can't be empty. Fältet för spelarnamn kan inte lämnas tomt. @@ -2607,17 +2146,17 @@ This will kick all non-ready players from the game. Skapa spel - + Game information Spelinformation - + Error Fel - + Server error. Serverfel. @@ -2625,97 +2164,97 @@ This will kick all non-ready players from the game. DlgCreateToken - + &Name: &Namn: - + Token Jetong - + C&olor: &Färg: - + white vit - + blue blå - + black svart - + red röd - + green grön - + multicolor multifärgad - + colorless färglös - + &P/T: &P/T: - + &Annotation: &Annotering: - + &Destroy token when it leaves the table &Förstör jetong när den lämnar bordet - + Create face-down (Only hides name) - + Token data Jetongdata - + Show &all tokens Visa alla &jetonger - + Show tokens from this &deck Visa jetonger från denna &lek - + Choose token from list Välj jetong från lista - + Create token Skapa jetong @@ -2749,7 +2288,7 @@ This will kick all non-ready players from the game. - + ✖ @@ -2764,12 +2303,12 @@ This will kick all non-ready players from the game. - + Duplicate Tag - + This tag already exists. @@ -2956,12 +2495,12 @@ För att radera din nuvarande avatar, klicka "bekräfta" utan att väl Vänligen ange namnet på jetongen: - + Error Fel - + The chosen name conflicts with an existing card or token. Make sure to enable the 'Token' set in the "Manage sets" dialog to display them correctly. Det valda namnet står i konflikt med ett befintligt kort eller token. @@ -2986,12 +2525,12 @@ Se till att du aktiverar "Token" i dialogrutan "Hantera uppsättn Odefinierat - + Real name: Riktiga namn: - + Edit user profile Justera användarprofil @@ -3029,113 +2568,113 @@ Se till att du aktiverar "Token" i dialogrutan "Hantera uppsättn - + Hide 'buddies only' games - + Hide full games - + Hide games that have started - + Hide password protected games - + Hide 'ignored user' games - + Hide games not created by buddies Hide games not created by buddy - + Hide games with forced open decklists - + &Newer than: - + Game &description: Spel&beskrivning: - + &Creator name: S&kaparens namn: - + General - + &Game types &Speltyper - + at &least: &Minst: - + at &most: M&ax: - + Maximum player count Maximalt antal spelare - + Restrictions begränsningar - + Show games only if &spectators can watch - + Show spectator password p&rotected games - + Show only if spectators can ch&at - + Show only if spectators can see &hands - + Spectators - + Filter games Filtrera spel @@ -3438,37 +2977,37 @@ https://tappedout.net/mtg-decks/your-deck-name/ DlgMoveTopCardsUntil - + Card name (or search expressions): - + Number of hits: - + Auto play hits - + Put top cards on stack until... - + No cards matching the search expression exists in the card database. Proceed anyways? - + Cockatrice - + Invalid filter @@ -3527,40 +3066,40 @@ Your email will be used to verify your account. Odefinierad - + Real name: Riktiga namn: - + Register to server Registrera på server - - - - + + + + Registration Warning Registreringsvarning - + Your password is too short. - + Your passwords do not match, please try again. Dina lösenord matchar inte, var god försök igen. - + Your email addresses do not match, please try again. Dina e-postadresser matchar inte, var god försök igen. - + The player name can't be empty. Fältet för spelarnamn kan inte lämnas tomt. @@ -3568,17 +3107,17 @@ Your email will be used to verify your account. DlgRollDice - + Number of sides: - + Number of dice: - + Roll Dice @@ -3629,12 +3168,12 @@ Your email will be used to verify your account. DlgSettings - + Unknown Error loading card database Ett okänt fel har inträffat vid laddande av kortdatabasen - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -3651,7 +3190,7 @@ Möjligen kan du behöva starta om oracle för att uppdatera din kortdatabas. Vill du ändra dina databaslokaliseringsinställningar? - + Your card database version is too old. This can cause problems loading card information or images @@ -3668,7 +3207,7 @@ Detta kan oftast fixas genom att starta om oracle för att uppdatera din kortdat Vill du ändra dina kortdatabaslokaliseringsinställningar? - + Your card database did not finish loading Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached @@ -3677,7 +3216,7 @@ Would you like to change your database location setting? - + File Error loading your card database. Would you like to change your database location setting? @@ -3686,7 +3225,7 @@ Would you like to change your database location setting? Vill du ändra dina kortdatabaslokaliseringsinställningar? - + Your card database was loaded but contains no cards. Would you like to change your database location setting? @@ -3695,7 +3234,7 @@ Would you like to change your database location setting? Vill du ändra dina kortdatabaslokaliseringsinställningar? - + Unknown card database load status Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues @@ -3704,64 +3243,59 @@ Would you like to change your database location setting? - - - + + + Error Fel - + The path to your deck directory is invalid. Would you like to go back and set the correct path? Sökvägen till din lekkatalog är ogiltig. Vill du gå tillbaka och ange den korrekta sökvägen? - + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? Sökvägen till din kortbildsdatabas är ogiltig. Vill du gå tillbaka och ange den korrekta sökvägen? - + Settings Inställningar - + General Allmänt - + Appearance Utseende - + User Interface Gränssnitt - - Storage - - - - + Card Sources - + Chat Chatt - + Sound Ljud - + Shortcuts Genvägar @@ -3853,9 +3387,9 @@ You can always change this behavior in the 'General' settings tab. - - - + + + Error Fel @@ -3908,31 +3442,31 @@ Besök sidan för nedladdning för att uppdatera manuellt. - + Update Available Uppdatering tillgänglig - + A new version of Cockatrice is available! En ny version av Cockatrice är tillgänglig! - + New version Ny version - + Released Släppte - + Changelog Ändringslogg @@ -3942,50 +3476,50 @@ Besök sidan för nedladdning för att uppdatera manuellt. Vill du uppdatera nu? - + Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. - + Please check the <a href="%1">releases page</a> on our Github and download the build for your system. - - - + + + Update Error Uppdateringsfel - + An error occurred while checking for updates: Ett fel uppstod när du letade efter uppdateringar: - + An error occurred while downloading an update: Ett fel uppstod när du hämtade en uppdatering: - + Installing... Installerar... - + Cockatrice is unable to open the installer. Cockatrice kan inte öppna installatören. - + Try to update manually by closing Cockatrice and running the installer. Försök att uppdatera manuellt genom att stänga Cockatrice och köra installationsprogrammet. - + Download location Hämta plats @@ -4075,67 +3609,67 @@ You may have to manually download the new version. DrawProbabilityWidget - + Draw Probability - + Probability of drawing - + Card Name - + Type - + Subtype - + Mana Value - + At least - + Exactly - + card(s) having drawn at least - + cards - + Category - + Qty - + Odds (%) @@ -4249,7 +3783,7 @@ You may have to manually download the new version. FilterBuilder - + Type your filter here Skriv ditt filter här @@ -4280,22 +3814,22 @@ You may have to manually download the new version. GameEventHandler - + kicked by game host or moderator - + player left the game - + player disconnected from server - + reason unknown @@ -4303,140 +3837,140 @@ You may have to manually download the new version. GameSelector - - - - - - - - - + + + + + + + + + Error Fel - + Please join the appropriate room first. Vänligen anslut till det lämpliga rummet först. - + Wrong password. Fel lösenord. - + Spectators are not allowed in this game. Åskådare är ej tillåtna i detta spelet. - + The game is already full. Spelet är redan fullt. - + The game does not exist any more. Det här spelet finns inte längre. - + This game is only open to registered users. Det här spelet är bara öppet för registrerade användare. - + This game is only open to its creator's buddies. Det här spelet är bara öppet för skaparens vänner. - + You are being ignored by the creator of this game. Spelets skapare ignorerar dig. - + Join Game - + Spectate Game - + Game Information - + Join Game as Judge - + Spectate Game as Judge - + Join game Anslut till spel - + Password: Lösenord: - + Please join the respective room first. Vänligen anslut till respektive rum först. - + &Filter games Specificera speltyp - + C&lear filter Rensa filter - + C&reate Skapa - + &Join Anslut - + Join as judge - + J&oin as spectator Anslut som &åskådare - + Join as judge spectator - + Games shown: %1 / %2 - + Games Spel @@ -4444,32 +3978,32 @@ You may have to manually download the new version. GameSelectorQuickFilterToolBar - + All types - + Filter by game name... - + Filter by game type/format - + Hide games not created by buddies - + Hide full games - + Hide started games @@ -4477,105 +4011,105 @@ You may have to manually download the new version. GamesModel - + >1 day - + %1%2 hr short age in hours - + new - + %1%2 min short age in minutes - + password lösenord - + buddies only endast vänner - + reg. users only endast reg. användare - + open decklists + - can chat kan chatta - + see hands visa händer - + can see hands Tillåts se händer - + not allowed ej tillåtna - + Room Rum - + Age Ålder - + Description Beskrivning - + Creator Skapare - + Type Typ - + Restrictions Begränsningar - + Players Spelare - + Spectators Åskådare @@ -4583,158 +4117,143 @@ You may have to manually download the new version. GeneralSettingsPage - + Reset all paths - + All paths have been reset - - - - - - - + + + + + + + Choose path Välj sökväg - - Language settings - + + Personal settings + Personliga inställningar - + Language: Språk: - - Version settings - - - - - Card database - - - - - Startup settings - - - - + Paths (editing disabled in portable mode) Sökvägar (redigering inaktiverad i bärbart läge) - + Paths Sökvägar - + How to help with translations - + Decks directory: Lekkatalog: - + Filters directory: - + Replays directory: Repriskatalog: - + Pictures directory: Bildkatalog: - + Card database: Kortdatabas: - + Custom database directory: - + Token database: Token-databas: - + Update channel Uppdatera kanal - + Check for client updates on startup - + Check for card database updates on startup - + Don't check - + Prompt for update - + Always update in the background - + Check for card database updates every - + days - + Notify if a feature supported by the server is missing in my client Meddela om en funktion som stöds av servern saknas i min klient - + Automatically run Oracle when running a new version of Cockatrice - + Show tips on startup Visa tips vid uppstart - + Last update check on %1 (%2 days ago) @@ -4742,47 +4261,47 @@ You may have to manually download the new version. GraveyardMenu - + &Graveyard - + &View graveyard - + &Move graveyard to... - + &Top of library - + &Bottom of library - + &All players - + &Hand - + &Exile - + Reveal random card to... @@ -4790,88 +4309,88 @@ You may have to manually download the new version. HandMenu - + &Hand - + &View hand - + Sort hand by... - + Name - + Type - + Mana Value - + Take &mulligan (Choose hand size) - + Take mulligan (Same hand size) - + Take mulligan (Hand size - 1) - + &Move hand to... - + &Top of library - + &Bottom of library - + &Graveyard - + &Exile - + &Reveal hand to... - - + + All players - + Reveal r&andom card to... @@ -4879,52 +4398,52 @@ You may have to manually download the new version. HomeWidget - + Create New Deck - + Browse Decks - + Browse Card Database - + Browse EDHRec - + Browse Archidekt - + View Replays - + Quit - + Connecting... - + Connect - + Play @@ -4932,213 +4451,213 @@ You may have to manually download the new version. LibraryMenu - + &Library - + &View library - + View &top cards of library... - + View bottom cards of library... - + Reveal &library to... - + Lend library to... - + Reveal &top cards to... - + &Top of library... - + &Bottom of library... - + &Always reveal top card - + &Always look at top card - + &Open deck in deck editor - + &Draw card - + D&raw cards... - + &Undo last draw - + Shuffle - + &Play top card - + Play top card &face down - + Put top card on &bottom - + Move top card to grave&yard - + Move top card to e&xile - + Move top cards to &graveyard... - + Move top cards to graveyard face down... - + Move top cards to &exile... - + Move top cards to exile face down... - + Put top cards on stack &until... - + Shuffle top cards... - + &Draw bottom card - + D&raw bottom cards... - + &Play bottom card - + Play bottom card &face down - + Move bottom card to grave&yard - + Move bottom card to e&xile - + Move bottom cards to &graveyard... - + Move bottom cards to graveyard face down... - + Move bottom cards to &exile... - + Move bottom cards to exile face down... - + Put bottom card on &top - + Shuffle bottom cards... - - + + &All players - + Reveal top cards of library - + Number of cards: (max. %1) @@ -5146,453 +4665,844 @@ You may have to manually download the new version. MainWindow - - + + + The server has reached its maximum user capacity, please check back later. + Servern har nått sin maximala kapacitet för användare, var god försök igen vid ett senare tillfälle. + + + + There are too many concurrent connections from your address. + Din adress har för många uppkopplingar samtidigt. + + + + Banned by moderator + Bannlyst av moderator + + + + Expected end time: %1 + Förväntad sluttid: %1 + + + + This ban lasts indefinitely. + Denna bannlysning varar för evigt. + + + + Scheduled server shutdown. + Schemalagd serverstängning. + + + + + Invalid username. + Ogiltigt användarnamn. + + + + You have been logged out due to logging in at another location. + Du loggades ut på grund av att du loggade in via en annan plats. + + + + Connection closed + Uppkoppling avslutad + + + + The server has terminated your connection. +Reason: %1 + Servern har avslutat din uppkoppling. +Anledning: %1 + + + + The server is going to be restarted in %n minute(s). +All running games will be lost. +Reason for shutdown: %1 + Servern kommer att starts om om %n minut. +Alla pågående spel kommer att gå förlorade. +Anledning till nedstängning: %1Servern kommer att starts om om %n minuter. +Alla pågående spel kommer att gå förlorade. +Anledning till nedstängning: %1 + + + + Scheduled server shutdown + Schemalagd serverstängning + + + + + Success + Framgång + + + + Registration accepted. +Will now login. + Registrering lyckad. +Inloggning påbörjad. + + + + Account activation accepted. +Will now login. + Aktivering tillåten. +Inloggning påbörjad. + + + + Player %1 Spelare %1 - + Load replay Ladda repris - + About Cockatrice Om Cockatrice - + Version - + Cockatrice Webpage - + Project Manager: Projektledare: - + Past Project Managers: Tidigare projektledare: - + Developers: utvecklare: - + Our Developers Våra utvecklare - + Help Develop! - + Translators: Översättare: - + Our Translators - + Help Translate! - + Support: - + Report an Issue - + Troubleshooting - + F.A.Q. - - + + + + + + + + + + + + + + + + + + + + Error Fel - + + Server timeout + Server timeout + + + + Failed Login + + + + + Your client seems to be missing features this server requires for connection. + + + + + To update your client, go to 'Help -> Check for Client Updates'. + + + + + Incorrect username or password. Please check your authentication information and try again. + + + + + There is already an active session using this user name. +Please close that session first and re-login. + Det finns redan en aktiv session med det användarnamnet. +Vänligen stäng den sessionen först och försök igen. + + + + + You are banned until %1. + Du är bannlyst till %1. + + + + + You are banned indefinitely. + Du är bannlyst för evigt. + + + + This server requires user registration. Do you want to register now? + + + + + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. + + + + + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. + + + + + Account activation + + + + + Your account has not been activated yet. +You need to provide the activation token received in the activation email. + + + + + Server Full + + + + + Unknown login error: %1 + Okänt inloggningsfel: %1 + + + + + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. + + + + + Your username must respect these rules: + + + + + is %1 - %2 characters long + + + + + can %1 contain lowercase characters + + + + + + + + NOT + + + + + can %1 contain uppercase characters + + + + + can %1 contain numeric characters + + + + + can contain the following punctuation: %1 + + + + + first character can %1 be a punctuation mark + + + + + no unacceptable language as specified by these server rules: + note that the following lines will not be translated + + + + + can not contain any of the following words: %1 + + + + + can not match any of the following expressions: %1 + + + + + You may only use A-Z, a-z, 0-9, _, ., and - in your username. + + + + + + + + + + Registration denied + + + + + Registration is currently disabled on this server + + + + + There is already an existing account with the same user name. + + + + + It's mandatory to specify a valid email address when registering. + + + + + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + + + + + Password too short. + + + + + Registration failed for a technical problem on the server. + + + + + The connection to the server has been lost. + + + + + Unknown registration error: %1 + + + + + Account activation failed + + + + + Socket error: %1 + Socketfel: %1 + + + + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + Du försöker koppla upp dig till en föråldrad server. Vänligen nergradera din version av Cockatrice eller koppla upp dig till en lämplig server. +Lokal version är %1, avlägsen version är %2. + + + + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + Din version av Cockatrice är föråldrad. Vänligen uppdatera din version av Cockatrice. +Lokal version är %1, avlägsen version är %2. + + + + Connecting to %1... + Ansluter till %1... + + + + Registering to %1 as %2... + + + + + Disconnected + Frånkopplad + + + + Connected, logging in at %1 + Uppkopplad, loggar in hos %1 + + + + + + Requesting forgotten password to %1 as %2... + Begär att få glömt lösenord skickat till %1 som %2 + + + &Connect... &Anslut... - + &Disconnect &Frånkoppla - + Start &local game... Starta &lokalt spel... - + &Watch replay... &Titta på repris... - + &Full screen &Fullskärmsläge - + &Register to server... - + &Restore password... - + &Settings... &Inställningar... - + &Exit A&vsluta - + A&ctions - + &Cockatrice &Cockatrice - + C&ard Database - + &Manage sets... &Hantera utgåvor... - + Edit custom &tokens... Redigera egna &tokens... - + Open custom image folder - + Open custom sets folder - + Add custom sets/cards - + Reload card database - + Tabs - + &Help &Hjälp - + &About Cockatrice &Om Cockatrice - + &Tip of the Day - + Check for Client Updates - + Check for Card Updates... - + Check for Card Updates (Automatic) - + Show Status Bar - + View &Debug Log - + Open Settings Folder - + Show/Hide - + New Version - + Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. - + Cockatrice installed - + Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. - + Card database - + Cockatrice is unable to load the card database. Do you want to update your card database now? If unsure or first time user, choose "Yes" - - + + Yes - - + + No - + Open settings - + New sets found - + %n new set(s) found in the card database Set code(s): %1 Do you want to enable it/them? - - Yes, always enable - - - - + View sets - + Welcome - + Hi! It seems like you're running this version of Cockatrice for the first time. All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. - + + Information - + A card database update is already running. - + Unable to run the card database updater: - + Card database update running. - + Failed to start. The file might be missing, or permissions might be incorrect. - + The process crashed some time after starting successfully. - + Timed out. The process took too long to respond. The last waitFor...() function timed out. - + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. - + An error occurred when attempting to read from the process. For example, the process may not be running. - + Unknown error occurred. - + The card database updater exited with an error: %1 - - - - - + + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + Den här servern stöder funktioner din version av Cockatrice inte har. +Det behöver inte innebära problem men det kan vara ett tecken på att det finns en ny version av Cockatrice tillgänglig eller att servern kör en anpassad eller förhandsutgiven version. + +För att uppdatera din klient, gå till Hjälp -> Leta efter uppdateringar. + + + + + + + Load sets/cards Ladda utgåvor/kort - + Selected file cannot be found. Den valda filen kunde inte laddas. - + You can only import XML databases at this time. För tillfället går det bara att importera XML-databaser. - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. - + Sets/cards failed to import. Det gick inte att importera utgåvor/kort. + + + + + Reset Password + + + + + Your password has been reset successfully, you can now log in using the new credentials. + + + + + Failed to reset user account password, please contact the server operator to reset your password. + Det gick inte att återställa kontots lösenord. Kontakta serveroperatören för att få hjälp att återställa lösenordet. + + + + Activation request received, please check your email for an activation token. + + ManaBaseConfigDialog - + Mana Base Configuration - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): - + OK - + Cancel @@ -5664,27 +5574,27 @@ Cockatrice will now reload the card database. ManaDevotionConfigDialog - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): @@ -5754,615 +5664,610 @@ Cockatrice will now reload the card database. MessageLogWidget - + from play - + from their graveyard - + from exile från exil - + from their hand - + the top card of %1's library det översta kortet av %1's lek - + the top card of their library - + from the top of %1's library från toppen av %1's lek - + from the top of their library - + the bottom card of %1's library det sista kortet i %1's lek - + the bottom card of their library - + from the bottom of %1's library från botten av %1's lek - + from the bottom of their library - + from %1's library från %1'a lek - + from their library - + from sideboard från sidbrädan - + from the stack från stapeln - + from custom zone '%1' - + %1 is now keeping the top card %2 revealed. %1 håller nu det översta kortet %2 avslöjat. - + %1 is not revealing the top card %2 any longer. %1 håller inte längre det översta kortet %2 avslöjat. - + %1 can now look at top card %2 at any time. - + %1 no longer can look at top card %2 at any time. - + %1 attaches %2 to %3's %4. %1 fäster %2 på %3s %4. - + %1 has conceded the game. - + %1 has unconceded the game. %1 har ångrat att ge upp spelet. - + %1 has restored connection to the game. - + %1 has lost connection to the game. - + %1 points from their %2 to themselves. - + %1 points from their %2 to %3. - + %1 points from %2's %3 to themselves. - + %1 points from %2's %3 to %4. - + %1 points from their %2 to their %3. - + %1 points from their %2 to %3's %4. - + %1 points from %2's %3 to their own %4. - + %1 points from %2's %3 to %4's %5. - + %1 creates a face down token. - + %1 creates token: %2%3. - + %1 has loaded a deck (%2). - + %1 has loaded a deck with %2 sideboard cards (%3). - + %1 destroys %2. - + a card ett kort - + %1 gives %2 control over %3. %1 ger kontroll över %3 till %2. - + %1 puts %2 into play%3 face down. - + %1 puts %2 into play%3. %1 sätter %2 i spel%3. - + %1 puts %2%3 into their graveyard face down. - + %1 puts %2%3 into their graveyard. - + %1 exiles %2%3 face down. - + %1 exiles %2%3. %1 sätter %2%3 i exil. - + %1 moves %2%3 to their hand. - + %1 puts %2%3 into their library. - + %1 puts %2%3 onto the bottom of their library. - + %1 puts %2%3 on top of their library. - + %1 puts %2%3 into their library %4 cards from the top. %1 lägger %2%3 i sitt bibliotek %4 kort från toppen. - + %1 moves %2%3 to sideboard. %1 flyttar %2%3 till sidbrädan. - + %1 plays %2%3 face down. - + %1 plays %2%3. %1 spelar %2%3. - + %1 moves %2%3 to custom zone '%4' face down. - + %1 moves %2%3 to custom zone '%4'. - + %1 tries to draw from an empty library - + %1 draws %2 card(s). - + %1 is looking at %2. - + %1 is looking at the %4 %3 card(s) %2. top card for singular, top %3 cards for plural - + bottom - + top - + %1 turns %2 face-down. %1 vänder %2 nedåt. - + %1 turns %2 face-up. %1 vänder %2 uppåt. - + The game has been closed. Spelet har stängts. - + The game has started. Spelet har börjat. - + You are flooding the game. Please wait a couple of seconds. - + %1 has joined the game. - + %1 is now watching the game. %1 kollar nu på spelet. - + You have been kicked out of the game. Du har blivit utsparkad från spelet. - + %1 has left the game (%2). %1 har lämnat spelet (%2) - + %1 is not watching the game any more (%2). %1 tittar inte längre på spelet (%2). - + %1 is not ready to start the game any more. - + %1 shuffles their deck and draws a new hand of %2 card(s). - + %1 shuffles their deck and draws a new hand. %1 blandar sin lek och drar en ny hand. - + You are watching a replay of game #%1. - + %1 is ready to start the game. - + cards an unknown amount of cards kort - + %1 card(s) a card for singular, %1 cards for plural - + %1 lends %2 to %3. - + %1 reveals %2 to %3. - + %1 reveals %2. - + %1 randomly reveals %2%3 to %4. - + %1 randomly reveals %2%3. - + %1 peeks at face down card #%2. - + %1 peeks at face down card #%2: %3. - + %1 reveals %2%3 to %4. - + %1 reveals %2%3. - + %1 reversed turn order, now it's %2. - + reversed - + normal - + Heads - + Tails - + %1 flipped a coin. It landed as %2. - + %1 rolls a %2 with a %3-sided die. - + %1 flips %2 coins. There are %3 heads and %4 tails. - + %1 rolls a %2-sided dice %3 times: %4. - + %1's turn. %1's tur - + %1 sets annotation of %2 to %3. - - %1 places %2 %3%4 counter(s) on %5 (now %6). + + %1 places %2 "%3" counter(s) on %4 (now %5). - - %1 removes %2 %3%4 counter(s) from %5 (now %6). + + %1 removes %2 "%3" counter(s) from %4 (now %5). - - %1 failed to undo their last draw. - - - - + %1 sets counter %2 to %3 (%4%5). - + %1 sets %2 to not untap normally. - + %1 sets %2 to untap normally. - + %1 removes the PT of %2. - + %1 changes the PT of %2 from nothing to %4. - + %1 changes the PT of %2 from %3 to %4. - + %1 has locked their sideboard. - + %1 has unlocked their sideboard. - + %1 taps their permanents. - + %1 untaps their permanents. - + %1 taps %2. - + %1 untaps %2. - + %1 shuffles %2. - + %1 shuffles the bottom %3 cards of %2. - + %1 shuffles the top %3 cards of %2. - + %1 shuffles cards %3 - %4 of %2. - + %1 unattaches %2. - + %1 undoes their last draw. - + %1 undoes their last draw (%2). @@ -6370,115 +6275,110 @@ Cockatrice will now reload the card database. MessagesSettingsPage - + Word1 Word2 Word3 - + Add New Message - + Edit Message - + Remove Message - + Add message Lägg till meddelande - - + + Message: Meddelande: - + Edit message - + Chat settings - + Custom alert words - + Enable chat mentions - + Enable mention completer - + In-game message macros - + How to use in-game message macros - + Ignore chat room messages sent by unregistered users - + Ignore private messages sent by unregistered users - - Ignore private messages sent by non-buddy users - - - - - + + Invert text color - + Enable desktop notifications for private messages - + Enable desktop notification for mentions - + Enable room message history on join - - + + (Color is hexadecimal) - + Separate words with a space, alphanumeric characters only @@ -6486,42 +6386,42 @@ Cockatrice will now reload the card database. MoveMenu - + Move to - + &Top of library in random order - + X cards from the top of library... - + &Bottom of library in random order - + T&able - + &Hand - + &Graveyard - + &Exile @@ -6534,47 +6434,47 @@ Cockatrice will now reload the card database. - + Mana Value - + Color(s) - + Loyalty - + Main Card Type - + Mana Cost - + P/T - + Side - + Layout - + Color Identity @@ -6597,152 +6497,6 @@ Cockatrice will now reload the card database. - - PaletteEditorDialog - - - - Reset - - - - - - Apply - - - - - - Save && Apply - - - - - ▼ Edit Palette - - - - - - ▶ Edit Palette - - - - - Palette Editor — %1 - - - - - <b>Palette Editor</b> &nbsp;·&nbsp; %1 - - - - - This theme ships no default palette files - - - - - Replace current colours with the theme author's defaults - - - - - Switch between the light and dark palette files - - - - - Editing: - - - - - Show or hide the per-role colour grid for manual tweaks - - - - - ↺ Revert to theme default - - - - - Discard unsaved edits and restore the last saved palette - - - - - Preview this palette without saving to disk - - - - - Write palette-%1.toml and reload the theme - - - - - Cannot save: this theme has no directory on disk - - - - - Save failed - - - - - Could not write %1 to: -%2 - - - - - No default found - - - - - No default palette file found for the "%1" scheme. - - - - - PaletteGridWidget - - - Active - - - - - Disabled - - - - - Inactive - - - - - Normal interactive state - - - - - Widget is disabled / not interactive - - - - - Window is in background / unfocused - - - Phase @@ -6809,57 +6563,57 @@ Cockatrice will now reload the card database. PhasesToolbar - + Untap step Uptappningssteget - + Upkeep step Underhållssteget - + Draw step Dragsteget - + First main phase Första huvudfasen - + Beginning of combat step Början av stridssteget - + Declare attackers step Attacksteget - + Declare blockers step Blockeringssteget - + Combat damage step Skadesteget - + End of combat step Slutet av stridssteget - + Second main phase Andra huvudfasen - + End of turn step Slutsteget @@ -6867,7 +6621,7 @@ Cockatrice will now reload the card database. PictureLoader - + en code for scryfall's language property, not available for all languages @@ -6876,142 +6630,151 @@ Cockatrice will now reload the card database. PlayerActions - - - - - grave - - - - - - - - exile - - - - - PlayerDialogs - - + View top cards of library - - - - - - - - - + + + + + + + + + Number of cards: (max. %1) - + View bottom cards of library - + Shuffle top cards of library - + Shuffle bottom cards of library - + Draw hand - + 0 and lower are in comparison to current hand size - + Draw cards - + + + + + grave + + + + + + + + exile + + + + Move top cards to %1 - + Move bottom cards to %1 - + Draw bottom cards - + + + C&reate another %1 token + + + + Create tokens - + + Number: - + Place card X cards from top of library - + Which position should this card be placed: - + (max. %1) - + Change power/toughness - + Change stats to: - + Set annotation - + Please enter the new annotation: + + + Set counters + + PlayerMenu - + Player "%1" - + &Counters @@ -7041,7 +6804,7 @@ This setting means you'll only see the default printing for each card, instead o - + Printing Selector @@ -7049,22 +6812,22 @@ This setting means you'll only see the default printing for each card, instead o PrintingSelectorCardOverlayWidget - + Preference - + Pin Printing - + Unpin Printing - + Show Related cards @@ -7135,57 +6898,57 @@ This setting means you'll only see the default printing for each card, instead o PtMenu - + Power / toughness - + &Increase power - + &Decrease power - + I&ncrease toughness - + D&ecrease toughness - + In&crease power and toughness - + Dec&rease power and toughness - + Increase power and decrease toughness - + Decrease power and increase toughness - + Set &power and toughness... - + Reset p&ower and toughness @@ -7193,37 +6956,37 @@ This setting means you'll only see the default printing for each card, instead o QMenuBar - + Services - + Hide %1 - + Hide Others - + Show All - + Preferences... - + Quit %1 - + About %1 @@ -7231,17 +6994,17 @@ This setting means you'll only see the default printing for each card, instead o QObject - + Cockatrice card database (*.xml) - + All files (*.*) Alla filer (*.*) - + Cockatrice replays (*.cor) Cockatricerepriser (*.cor) @@ -7301,177 +7064,110 @@ Are you sure you would like to disable this feature? QPlatformTheme - + OK - + Save - + Save All - + Open - + &Yes - + Yes to &All - + &No - + N&o to All - + Abort - + Retry - + Ignore - + Close - + Cancel - + Discard - + Help - + Apply - + Reset - + Restore Defaults - - QuickSetupPanel - - - %1% - - - - - <b>Quick Setup</b> - - - - - Generate all palette roles automatically from a single accent colour - - - - - Accent: - - - - - Primary hue. Used directly for highlights and links. -At high intensity it also tints buttons and backgrounds. - - - - - Intensity: - - - - - Subtle - - - - - Full colour - - - - - 0–30 Subtle tint — only highlights and links change hue -30–70 Accented — buttons, tooltips, and borders join in -70–100 Full colour — backgrounds, everything - - - - - 70% - - - - - Generate ↓ - - - - - Derive all palette roles from the accent colour above. -Fine-tune individual colours in the grid afterwards. - - - RemoteDeckList_TreeModel - + Name Namn - + ID ID - + Upload time Uppladdningstidpunkt @@ -7479,32 +7175,32 @@ Fine-tune individual colours in the grid afterwards. RemoteReplayList_TreeModel - + ID ID - + Name Namn - + Players Spelare - + Keep Behåll - + Time started Tid startad - + Duration (sec) Varaktighet (sek) @@ -7512,37 +7208,37 @@ Fine-tune individual colours in the grid afterwards. RfgMenu - + &Exile - + &View exile - + &Move exile to... - + &Top of library - + &Bottom of library - + &Hand - + &Graveyard @@ -7588,7 +7284,7 @@ Fine-tune individual colours in the grid afterwards. SayMenu - + S&ay @@ -7629,27 +7325,27 @@ Fine-tune individual colours in the grid afterwards. SetsModel - + Enabled - + Set type - + Set code - + Long name Långt namna - + Release date @@ -7657,53 +7353,53 @@ Fine-tune individual colours in the grid afterwards. ShortcutSettingsPage - - + + Restore all default shortcuts - + Do you really want to restore all default shortcuts? - + Clear all default shortcuts - + Do you really want to clear all shortcuts? - + Section: - + Action: - + Shortcut: - + How to set custom shortcuts - + Clear all shortcuts - + Search by shortcut name @@ -7757,12 +7453,12 @@ Please check your shortcut settings! SideboardMenu - + &Sideboard - + &View sideboard @@ -7770,27 +7466,27 @@ Please check your shortcut settings! SoundSettingsPage - + Enable &sounds - + Current sounds theme: - + Test system sound engine - + Sound settings - + Master volume @@ -7862,146 +7558,16 @@ Please check your shortcut settings! - + No reply received from the tag update server. - + Invalid reply received from the tag update server. - - StorageSettingsPage - - - - - Success - - - - - Cached card pictures have been reset. - - - - - Downloaded card pictures have been reset. - - - - - Error - - - - - One or more downloaded card pictures could not be cleared. - - - - - In-memory (currently loaded) card pictures have been reset. - - - - - Card Picture Loader Caching Method: - - - - - The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size. - - - - - Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while. - - - - - This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk. - - - - - Delete Cached Images - - - - - Delete Saved Images - - - - - Clear In-Memory Images - - - - - Card Picture Loader Cache Method - - - - - Network Cache - - - - - Filesystem - - - - - In-Memory Picture Cache - - - - - Network Cache Size: - - - - - On-disk cache for downloaded pictures - - - - - Redirect Cache TTL: - - - - - How long cached redirects for urls are valid for. - - - - - Picture Cache Size: - - - - - In-memory cache for pictures not currently on screen - - - - - Naming scheme: - - - - - Day(s) - - - TabAccount @@ -8137,117 +7703,117 @@ Please check your shortcut settings! TabArchidekt - - + + Desc. - - + + AND - - + + Require ALL selected colors - - + + Deck name... - - + + Owner... - - + + Packages - - + + Advanced Filters - + Bracket: - - + + Any - - + + Contains card... - - + + Commander... - - + + Tag... - - + + Deck Size - + Cards: - - + + Asc. - + Sort by: - + Filter by: - + Display Settings - - + + Search - - + + Formats @@ -8257,54 +7823,6 @@ Please check your shortcut settings! - - TabCardArtRules - - - Card: - - - - - ProviderId: - - - - - Mode: - - - - - Reason: - - - - - Type a card name... - - - - - Add rule - - - - - Remove rule - - - - - Refresh - - - - - Card Art Rules - - - TabDeckEditor @@ -8353,7 +7871,7 @@ Please check your shortcut settings! - + Deck: %1 Lek: %1 @@ -8361,49 +7879,55 @@ Please check your shortcut settings! TabDeckEditorVisual - + Visual Deck: %1 - + &Visual Deck Editor - - + + Card Info - - + + Deck - + + + Filters + + + + &View - + Printing - + Visible - + Floating - + Reset layout @@ -8411,22 +7935,22 @@ Please check your shortcut settings! TabDeckEditorVisualTabWidget - + Visual Deck View - + Visual Database Display - + Deck Analytics - + Sample Hand @@ -8434,133 +7958,133 @@ Please check your shortcut settings! TabDeckStorage - + Local file system Lokalt filsystem - + Server deck storage Serverns leklagring - - + + Open in deck editor Öppna i lekredigeraren - + Rename deck or folder - + Upload deck Ladda upp lek - + Download deck Ladda ner lek + - - - + + New folder Ny mapp + - Delete Radera - + Open decks folder - + Rename local folder - + Rename local file - + New name: - - - - + + + + Error - + Rename failed - - + + Invalid deck file - + Enter deck name Ange leknamn - + This decklist does not have a name. Please enter a name: Denna leklista har inget namn. Vänligen ange ett namn: - + Unnamed deck Namnlös lek - + Failed to upload deck to server - + Delete local file Radera lokal fil - + Are you sure you want to delete the selected files? - + Delete remote decks - + Are you sure you want to delete the selected decks? - - + + Name of new folder: Namn på den nya mappen: @@ -8632,191 +8156,191 @@ Please enter a name: TabGame - - - + + + Replay - - + + Game - - + + Player List - - + + Card Info - - + + Messages - - + + Replay Timeline - + &Phases &Faser - + &Game &Spel - + Next &phase Nästa &fas - + Next phase with &action - + Next &turn Nästa &tur - + Reverse turn order - + &Remove all local arrows Ta &bort alla lokala pilar - + Rotate View Cl&ockwise - + Rotate View Co&unterclockwise - + Game &information Spel&information - + Un&concede - - - + + + &Concede &Ge upp - + &Leave game &Lämna spel - + C&lose replay S&täng repris - + &Focus Chat - + &Say: S&äg: - + Selected cards - + &View - + Visible - + Floating - + Reset layout - + Concede Ge upp - + Are you sure you want to concede this game? Är du säker på att du vill ge upp detta spel? - + Unconcede - + You have already conceded. Do you want to return to this game? - + Leave game Lämna spel - + Are you sure you want to leave this game? Är du säker på att du vill lämna detta spel? - + A player has joined game #%1 - + %1 has joined the game - + You have been kicked out of the game. @@ -8875,114 +8399,114 @@ Please enter a name: - + Username: - + IP Address: - + Game Name: - + GameID: - + Message: - + Main Room - + Game Room - + Private Chat - + Past X Days: - + Today - + Last Hour - + Maximum Results: - + At least one filter is required. The more information you put in, the more specific your results will be. - + Get User Logs - + Clear Filters - + Filters - + Log Locations - + Date Range - + Maximum Results - - + + Message History - + Failed to collect message history information. - + There are no messages for the selected filters. @@ -9000,27 +8524,27 @@ The more information you put in, the more specific your results will be.&Lämna - + %1 - Private chat - + This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. - + Private message from - + %1 has left the server. %1 har lämnat servern. - + %1 has joined the server. %1 har anslutit sig till servern. @@ -9028,180 +8552,180 @@ The more information you put in, the more specific your results will be. TabReplays - + Local file system Lokalt filsystem - + Server replay storage Serverns reprislagring - - + + Watch replay Titta på repris - + Rename - - + + New folder - - + + Delete Radera - + Open replays folder - + Download replay Ladda ner repris - + Toggle expiration lock Växla utgångslås - + Get replay share code - - + + Look up replay by share code - + Rename local folder - + Rename local file - + New name: - + Error - + Rename failed - + Name of new folder: - + Delete local file Radera lokal fil - + Are you sure you want to delete the selected files? - + Are you sure you want to delete the selected replays? - + Failed to get code - - + + Either this server does not support replay sharing, or does not permit replay sharing for you. - - - + + + Failed - + Could not get replay code - + Replay Share Code - + Others can use this code to add the replay to their list of remote replays: %1 - + Copy to clipboard - + Replay share code - + Replay code found - + Replay was added, or you already had access to it. - + Replay code not found - + Failed to submit code - + Unexpected error - + Delete remote replay Radera avlägsen repris @@ -9214,62 +8738,47 @@ The more information you put in, the more specific your results will be. TabRoom - - Friends - - - - - Online - - - - - Ignored - - - - + &Say: &Säg: - + Chat Chatt - + &Room &Rum - + &Leave room &Lämna rum - + &Clear chat - + Chat Settings... - + mentioned you. - + Click to view - + You are flooding the chat. Please wait a couple of seconds. Du översvämmar chatten. Var vänlig vänta ett par sekunder. @@ -9282,30 +8791,30 @@ The more information you put in, the more specific your results will be. - - - - + + + + Error - + Failed to join the server room: it doesn't exist on the server. - + The server thinks you are in the server room but your client is unable to display it. Try restarting your client. - + You do not have the required permission to join this server room. - + Failed to join the server room due to an unknown error: %1. @@ -9313,97 +8822,97 @@ The more information you put in, the more specific your results will be. TabSupervisor - + Deck Editor - + Visual Deck Editor - + EDHRec - + Archidekt - + Home - + &Visual Deck Storage - + Visual Database Display - + Server - + Account - + Deck Storage - + Game Replays - + Administration - + Logs - + Are you sure? - + There are still open games. Are you sure you want to quit? - + Click to view - + Your buddy %1 has signed on! - + Unknown Event - + The server has sent you a message that your client does not understand. This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. @@ -9411,38 +8920,38 @@ To update your client, go to Help -> Check for Updates. Servern har skickat dig ett meddelande som din klient inte förstår. Det här meddelandet kan betyda att det finns en ny version av Cockatrice tillgänglig eller så kör den här servern en användarinställd eller förhandsutgiven version. För att uppdatera din klient, gå till Hjälp -> Leta efter uppdateringar. - + Idle Timeout - + You are about to be logged out due to inactivity. Du kommer snart loggas ut på grund av inaktivitet. - + Promotion - + You have been promoted. Please log out and back in for changes to take effect. - + Warned Varnad - + You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. - + You have received the following message from the server. (custom messages like these could be untranslated) @@ -9451,12 +8960,12 @@ Please refrain from engaging in this activity or further actions may be taken ag TabVisualDatabaseDisplay - + Database Display - + Visual Database Display @@ -9493,42 +9002,42 @@ Please refrain from engaging in this activity or further actions may be taken ag TranslateCounterName - + Life - + White - + Blue - + Black - + Red - + Green - + Colorless - + Other @@ -9536,69 +9045,11 @@ Please refrain from engaging in this activity or further actions may be taken ag UpdateDownloader - + Could not open the file for reading. - - UserCardArtSettingsDialog - - - Card Art Settings - - - - - Type a card name... - - - - - Card name: - - - - - Card ProviderId: - - - - - Left margin (%): - - - - - Right margin (%): - - - - - Vertical offset: - - - - - Zoom: - - - - - Parameters - - - - - Preview - - - - - Remove Banner Card - - - UserContextMenu @@ -9716,7 +9167,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Ban History @@ -9731,87 +9182,77 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Failed to collect ban information. - - - + + + Warning History - + Warning Time;Moderator;User Name;Reason - + User has never been warned. - + Failed to collect warning information. - + Failed to get admin notes. - - + + Success - + Successfully promoted user. - + Successfully demoted user. - - Kick Player - - - - - Are you sure you want to kick this player from the game? - - - - - - + + + Failed - + Failed to promote user. - + Failed to demote user. - + Copy hash to clipboard - + Remove this user's messages @@ -9819,554 +9260,326 @@ Please refrain from engaging in this activity or further actions may be taken ag UserInfoBox - + Location: Plats: - + Account Age: - + Edit - + Change password - + Change avatar - + Administrator Administratör - + Moderator Moderator - + Registered user Registrerad användare - - + + Unregistered user Oregistrerad användare - + Judge - + Unknown - + The entered password does not match your account. - - - - + + + Information - + User information updated. - - - - - - - - - - - + + + + + + + + + + Error - + User Information - + Real Name: - + User Level: - - - Edit Banner Card - - - + %n Year(s), amount of years (only shown if more than 0) - + %10%n Day(s) %20 amount of years (if more than 0), amount of days, date in local short format - + Enter Password - + Password verification is required in order to change your email address - - - + + + An error occurred while trying to update your user information. - - The selected card is blacklisted on this server or another error occurred. - - - - - Banner card removed. - - - - - Banner card updated. - - - - + This server does not permit you to update your user informations. - + Password changed. - + This server does not permit you to change your password. - + The new password is too short. - + The old password is incorrect. - + Avatar updated. - + This server does not permit you to update your avatar. - - - An error occured while trying to update your avatar. - - - This server does not permit you to update your user informations. - An error occured while trying to updater your avatar. - - - - - UserInfoPopup - - - - Games - - - - - Chat - - - - - Open private chat - - - - - Profile - - - - - View user profile - - - - - Show this user's games - - - - - − Buddy - - - - - Remove from buddy list - - - - - + Buddy - - - - - Add to buddy list - - - - - − Ignore - - - - - Remove from ignore list - - - - - + Ignore - - - - - Add to ignore list - - - - - Ban - - - - - Ban from server - - - - - Warn - - - - - Warn user - - - - - Ban log - - - - - View ban history - - - - - Warn log - - - - - View warning history - - - - - Notes - - - - - View admin notes - - - - - − Mod - - - - - Demote from moderator - - - - - + Mod - - - - - Promote to moderator - - - - - − Judge - - - - - Demote from judge - - - - - + Judge - - - - - Promote to judge - - - - - Join game - - - - - Spectate - - - - - - Loading games… - - - - - Could not load games. - - - - - No active games. + An error occured while trying to updater your avatar. UserInterfaceSettingsPage - + General interface settings Allmänna gränssnittsinställningar - + &Double-click cards to play them (instead of single-click) &Dubbelklicka på kort för att spela dem (istället för enkelklick) - + &Clicking plays all selected cards (instead of just the clicked card) - + &Play all nonlands onto the stack (not the battlefield) by default - + Do not delete &arrows inside of subphases - + Close card view window when last card is removed - + Auto focus search bar when card view window is opened - + Annotate card text on tokens - - Show selection count during drag selection + + Show selection counter during drag selection - - Show total selection count + + Show total selection counter - - Show subtype breakdown in selection tally - - - - + Use tear-off menus, allowing right click menus to persist on screen - - Keep game chat focused when clicking in game (Note: disables card view search bar) - - - - + Notifications settings - + Enable notifications in taskbar - + Notify in the taskbar for game events while you are spectating - + Notify in the taskbar when users in your buddy list connect - + Animation settings Animationsinställningar - + &Tap/untap animation &Tappnings/Upptappningsanimation - + Deck editor/storage settings - + Open deck in new tab by default - + Use visual deck storage in game lobby - + Use selection animation for Visual Deck Storage - + When adding a tag in the visual deck storage to a .txt deck: - + do nothing - + ask to convert to .cod - + always convert to .cod - + Default deck editor type - + Classic Deck Editor - + Visual Deck Editor - + Replay settings - + Buffer time for backwards skip via shortcut: @@ -10374,22 +9587,22 @@ Please refrain from engaging in this activity or further actions may be taken ag UserListWidget - + Users connected to server: %1 - + Users in this room: %1 - + Buddies online: %1 / %2 - + Ignored users online: %1 / %2 @@ -10397,45 +9610,35 @@ Please refrain from engaging in this activity or further actions may be taken ag UtilityMenu - + Increment all card counters - + &Untap all permanents - + R&oll die... - - Flip coin - - - - + &Create token... - + C&reate another token - + Cr&eate predefined token - - - C&reate another %1 token - - VisualDatabaseDisplayColorFilterWidget @@ -10487,72 +9690,72 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFilterToolbarWidget - + Sort by - + Filter by - + Save and load filters - + Filter by exact card name - + Filter by card main-type - + Filter by card sub-type - + Filter by set - + Filter by format legality - + Save/Load - + Name - + Main Type - + Sub Type - + Sets - + Formats @@ -10560,22 +9763,22 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFormatLegalityFilterWidget - + Show formats with at least: - + cards - + Do not display formats with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) @@ -10593,32 +9796,32 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayMainTypeFilterWidget - + Show main types with at least: - + cards - + Do not display card main-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10626,27 +9829,27 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayNameFilterWidget - + Filter by name... (Exact match) - + Load from Deck - + Apply all card names in currently loaded deck as exact match name filters - + Load from Clipboard - + Apply all card names in clipboard as exact match name filters @@ -10654,7 +9857,7 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayRecentSetFilterSettingsWidget - + Filter to most recent sets @@ -10662,19 +9865,19 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySetFilterWidget - + Search sets... - - + + Mode: Exact Match - - + + Mode: Includes @@ -10682,37 +9885,37 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySubTypeFilterWidget - + Search subtypes... - + Show sub types with at least: - + cards - + Do not display card sub-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10720,23 +9923,23 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayWidget - + Search by card name (or search expressions) - + Visual - + Loading database ... - + Clear all filters @@ -10775,17 +9978,17 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Toggle Layout: Overlap - + Change how cards are displayed within zones (i.e. overlapped or fully visible.) - + Toggle Layout: Flat @@ -10814,17 +10017,17 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDeckEditorWidget - + Type a card name here for suggestions from the database... - + Quick search and add card - + Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter @@ -10942,43 +10145,43 @@ Please refrain from engaging in this activity or further actions may be taken ag WarningDialog - + Which warning would you like to send? - + Redact all messages from this user in all rooms - + &OK - + &Cancel - + Warn user for misconduct - - + + Error - + User name to send a warning to can not be blank, please specify a user to warn. - + Warning to use can not be blank, please select a valid warning to send. @@ -10986,133 +10189,133 @@ Please refrain from engaging in this activity or further actions may be taken ag WndSets - + Move selected set to the top - + Move selected set up - + Move selected set down - + Move selected set to the bottom - + Search by set name, code, or type - + Default order - + Restore original art priority order - + Enable all sets - + Disable all sets - + Enable selected set(s) - + Disable selected set(s) - + Deck Editor - + Use CTRL+A to select all sets in the view. - + Only cards in enabled sets will appear in the card list of the deck editor. - + Image priority is decided in the following order: - + first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) %1 is a link to the wiki - + Include cards rebalanced for Alchemy [requires restart] - + Card Art - + How to use custom card art - + Hints - + Note - + Sorting by column allows you to find a set while not changing set priority. - + To enable ordering again, click the column header until this message disappears. - + Use the current sorting as the set priority instead - + Sorts the set priority using the same column - + Manage sets @@ -11120,72 +10323,72 @@ Please refrain from engaging in this activity or further actions may be taken ag ZoneViewWidget - + Search by card name (or search expressions) - + Ungrouped - + Group by Type - + Group by Mana Value - + Group by Color - + Unsorted - + Sort by Name - + Sort by Type - + Sort by Mana Cost - + Sort by Colors - + Sort by P/T - + Sort by Set - + shuffle when closing blanda när du stänger - + pile view @@ -11193,7 +10396,7 @@ Please refrain from engaging in this activity or further actions may be taken ag i18n - + English Svenska (Swedish) @@ -11201,12 +10404,12 @@ Please refrain from engaging in this activity or further actions may be taken ag main - + Connect on startup - + Debug to file @@ -11220,7 +10423,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Deck Editor @@ -11301,7 +10504,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Replays @@ -11416,129 +10619,129 @@ Please refrain from engaging in this activity or further actions may be taken ag - - + + Load Deck from Clipboard... - + Edit Deck in Clipboard, Annotated - + Edit Deck in Clipboard - + New Deck - + Open Custom Pictures Folder - + Print Deck... - + Delete Card - - + + Reset Layout - + Save Deck - + Save Deck as... - + Save Deck to Clipboard, Annotated - + Save Deck to Clipboard, Annotated (No Set Info) - + Save Deck to Clipboard - + Save Deck to Clipboard (No Set Info) - + Load Local Deck... - + Load Remote Deck... - + Set Ready to Start - + Toggle Sideboard Lock - + Add Green Counter - + Remove Green Counter - + Set Green Counters... - + Add Red Counter - + Remove Red Counter - + Set Red Counters... - + Add Life Counter @@ -11548,744 +10751,724 @@ Please refrain from engaging in this activity or further actions may be taken ag - - Load deck from online service... - - - - - Load from website... - - - - + Unload Deck - + Force Start - + Add Card Counter (F) - + Remove Card Counter (F) - + Set Card Counters (F)... - + Add Card Counter (E) - + Remove Card Counter (E) - + Set Card Counters (E)... - + Add Card Counter(D) - + Remove Card Counter (D) - + Set Card Counters (D)... - + Add Card Counter (C) - + Remove Card Counter (C) - + Set Card Counters (C)... - + Add Card Counter (B) - + Remove Card Counter (B) - + Set Card Counters (B)... - + Add Card Counter (A) - + Remove Card Counter (A) - + Set Card Counters (A)... - + Remove Life Counter - + Set Life Counters... - + Add White Counter - + Remove White Counter - + Set White Counters... - + Add Blue Counter - + Remove Blue Counter - + Set Blue Counters... - + Add Black Counter - + Remove Black Counter - + Set Black Counters... - + Add Colorless Counter - + Remove Colorless Counter - + Set Colorless Counters... - + Add Other Counter - + Remove Other Counter - + Set Other Counters... - + Increment all card counters - + Add Power (+1/+0) - + Remove Power (-1/-0) - + Move Toughness to Power (+1/-1) - + Add Toughness (+0/+1) - + Remove Toughness (-0/-1) - + Move Power to Toughness (-1/+1) - + Add Power and Toughness (+1/+1) - + Remove Power and Toughness (-1/-1) - + Set Power and Toughness... - + Reset Power and Toughness - + Untap - + Upkeep - + Draw - + First Main Phase - + Start Combat - + Attack - + Block - + Damage - + End Combat - + Second Main Phase - + End - + Next Phase - + Next Phase Action - + Next Turn - + Hide Card in Reveal Window - + Tap / Untap Card - + Untap All - + Toggle Skip Untapping Toggle Untap - + Turn Card Over - + Peek Card - + Play Card - + Play Card, Face Down - + Attach Card... - + Unattach Card - + Clone Card - + Create Token... - + Create All Related Tokens - + Create Another Token - + Set Annotation... - - Reduce Life by Power - - - - + Select All Cards in Zone - + Select All Cards in Row - + Select All Cards in Column - + Reveal Selected Cards to All Players - - + + Bottom of Library - - - - + + + + Exile Exil - - - - + + + + Graveyard Kyrkogård - - + + Hand - - + + Top of Library - - + + Battlefield, Face Down - + Battlefield - + Library Bibliotek - + Sideboard Skänk - + Top Cards of Library - + Bottom Cards of Library - + Close Recent View - - + + Stack - - + + Graveyard (Multiple) - - + + Graveyard (Multiple), Face Down - - + + Exile (Multiple) - - + + Exile (Multiple), Face Down - + Stack Until Found - + Draw Bottom Card - + Draw Multiple Cards from Bottom... - + Draw Arrow... - + Remove Local Arrows - + Leave Game Lämna spelet - + Concede Medge - + Roll Dice... Kasta tärning - - Flip Coin - - - - + Shuffle Library - + Shuffle Top Cards of Library - + Shuffle Bottom Cards of Library - + Mulligan - + Mulligan (Same hand size) - + Mulligan (Hand size - 1) - + Draw a Card Dra ett kort - + Draw Multiple Cards... - + Undo Draw - + Always Reveal Top Card - + Always Look At Top Card - + Sort Hand by Name - + Sort Hand by Type - + Sort Hand by Mana Value - + Reveal Hand to All Players - + Reveal Random Card to All Players - + Rotate View Clockwise - + Rotate View Counterclockwise - + Unfocus Text Box - + Focus Chat - + Clear Chat - + Refresh - + Skip Forward - + Skip Backward - + Skip Forward by a lot - + Skip Backward by a lot - + Play/Pause - + Toggle Fast Forward - + Home - + Visual Deck Storage Visuell Leklagring - + Deck Storage Leklagring - + Server Server - + Account Konto - + Administration Administratör - + Logs Loggar diff --git a/cockatrice/translations/cockatrice_yue.ts b/cockatrice/translations/cockatrice_yue.ts index f20b9ea1d..1f206c1eb 100644 --- a/cockatrice/translations/cockatrice_yue.ts +++ b/cockatrice/translations/cockatrice_yue.ts @@ -2,7 +2,7 @@ AbstractCounter - + &Set counter... &設置指示物 @@ -10,12 +10,12 @@ AbstractCounterDialog - + Set counter 設置指示物 - + New value for counter '%1': 數值物新價值為 '%1' @@ -25,71 +25,71 @@ &Refresh - &刷新 + Parse Set Name and Number (if available) - 解析組名及編號(如果有) + AbstractTabDeckEditor - + Open in new tab - + Are you sure? - 你確定嗎？ + - + The decklist has been modified. Do you want to save the changes? - - - - - - + + + + + + Error - 出錯 + - + Could not open deck at %1 - + Could not save remote deck - - + + The deck could not be saved. Please check that the directory is writable and try again. - + Save deck - + The deck could not be saved. - + There are no cards in your deck to be exported @@ -105,12 +105,12 @@ Please check that the directory is writable and try again. AdminNotesDialog - + Update Notes 更新後筆記 - + Admin Notes for %1 %1 的管理筆記 @@ -127,227 +127,172 @@ Please check that the directory is writable and try again. Sideboard 副牌庫 - - - Tokens - - AppearanceSettingsPage - + seconds - + Error 出現錯誤 - + Could not create themes directory at '%1'. 不能在'%1'創造主題目錄 - + Theme settings 主題設定 - + Current theme: 現在主題 - + Open themes folder 打開主題文件夾 - + Home tab background source: - + Home tab background shuffle frequency: - + Disabled - + + Display card name of background in bottom right: + + + + Menu settings 選單設定 - + Show keyboard shortcuts in right-click menus 在右擊選單中顯示鍵盤快速鍵 - + Show game filter toolbar above list in room tab - + Card rendering 卡面算繪 - + Display card names on cards having a picture 最有圖片的牌上顯示牌名 - + Auto-Rotate cards with sideways layout 將打橫佈局卡片自動向上旋轉 - + Override all card art with personal set preference (Pre-ProviderID change behavior) - - Light - - - - - Dark - - - - - System - - - - - Active theme palette: - - - - - Edit theme palette - - - - - Home tab settings - - - - - Display card name of background in bottom right - - - - - Styling settings - - - - - Style user list - - - - - Card printings - - - - + Bump sets that the deck contains cards from to the top in the printing selector 將牌庫中包含的牌組推到藝術選擇視窗之頂 - + Scale cards on mouse over 卡牌隨遊標縮放 - + Use rounded card corners - - Card layout - - - - + Minimum overlap percentage of cards on the stack and in vertical hand 在疊區中和直行手牌中,盡量減少交重疊百分點 - + Maximum initial height for card view window: 卡望框最高開頭高度 - - + + rows 橫列 - + Maximum expanded height for card view window: - + Card counters - 牌指示物 + - + Counter %1 - 指示物 %1 + - + Hand layout 手牌佈局 - + Display hand horizontally (wastes space) 打棟顯示手牌(浪費空間) - + Enable left justification 啟用向左對齊 - + Table grid layout 表格布局 - + Invert vertical coordinate 反轉垂直坐標 - + Minimum player count for multi-column layout: 界面佈局之內能夠容納的最少玩家數量： - + Maximum font size for information displayed on cards: 卡牌上顯示的最大字體大小 @@ -355,14 +300,14 @@ Please check that the directory is writable and try again. ArchidektApiResponseDeckDisplayWidget - + Back to results - 返去結果 + - + Open Deck in Deck Editor - 在套牌編輯&打開牌庫檔案 + @@ -370,7 +315,7 @@ Please check that the directory is writable and try again. Theme - 卡牌主题 + @@ -386,112 +331,112 @@ Please check that the directory is writable and try again. BanDialog - + ban &user name 禁用 &用家名字 - + ban &IP address 禁用&IP地址 - + ban client I&D 禁用客户ID - + Ban type 禁用類型 - + &permanent ban &永久禁用 - + &temporary ban &暫時禁用 - + &Days: &日 - + &Hours: &小時 - + &Minutes: &分鐘 - + Duration of the ban 禁用時間 - + Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. 請記載禁用原因 這項只保留為版主, 被禁用戶不能看到. - + Please enter the reason for the ban that will be visible to the banned person. 請記載被禁用戶能看到的被禁原因. - + Redact all messages from this user in all rooms 將這用戶所有室中打出的訊息完全移除 - + &OK &OK - + &Cancel &取消 - + Ban user from server 把用戶從本伺服器禁用 - - - - + + + + Error 出現錯誤 - + You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. 若要對用戶實施禁用,請你選擇以下三種的拼合:名字,IP,或用戶id. - + You must have a value in the name ban when selecting the name ban checkbox. 若用用戶名字施行禁用,必須要填寫姓名. - + You must have a value in the ip ban when selecting the ip ban checkbox. 若用ip地址施行禁用,必須要寫下IP地址. - + You must have a value in the clientid ban when selecting the clientid ban checkbox. 若用用戶ID施行禁用,必須要寫下用戶ID. @@ -499,123 +444,59 @@ This is only saved for moderators and cannot be seen by the banned person. BetaReleaseChannel - + Beta 測試版 - + No reply received from the release update server. 從發佈更新伺服器收不到回覆. - + Invalid reply received from the release update server. 從發佈更新伺服器收不到有效的回覆. - + No reply received from the file update server. 從檔案更新伺服器收不到有效的回覆. - - CardArtPreviewWidget - - - No card selected - - - - - CardArtRulesModel - - - Card - - - - - ProviderId - - - - - Mode - - - - - Reason - - - CardDatabaseModel - + Name 名字 - + Sets 牌組 - + Mana cost 法力費用 - + Card type 卡牌類別 - + P/T 力量/防御力 - + Color(s) 顏色 - - CardDatabaseView - - - Add to Deck - - - - - Add to Sideboard - - - - - Select Printing - - - - - Show on EDHRec (Commander) - - - - - Show on EDHRec (Card) - - - - - Show Related cards - - - CardFilter @@ -650,7 +531,7 @@ This is only saved for moderators and cannot be seen by the banned person. Name (Exact) - 名稱(確切） + @@ -710,12 +591,12 @@ This is only saved for moderators and cannot be seen by the banned person. Main Type - 主要類型 + Sub Type - 副類型 + @@ -738,30 +619,30 @@ This is only saved for moderators and cannot be seen by the banned person. View transformation - 查看轉化 + CardInfoPictureWidget - + View related cards 查看關聯卡牌 - + Add card to deck - 添加卡牌到牌庫 + - + Mainboard - 主牌庫 + - + Sideboard - 副牌庫 + @@ -774,20 +655,20 @@ This is only saved for moderators and cannot be seen by the banned person. Set: - 牌組: + Collector Number: - 收藏號碼: + - + Related cards: 有關牌名: - + Unknown card: 不知名的牌 @@ -795,146 +676,128 @@ This is only saved for moderators and cannot be seen by the banned person. CardMenu - + Re&veal to... - &展示给... + - + &All players - &所有玩家 + - + View related cards - 查看關聯卡牌 + - + Token: - 令牌: + - + All tokens - 所有令牌 + - + &Select All - &全選 + - + S&elect Row - &選擇橫行 + - + S&elect Column - &選擇直行 + - + &Play - &使出 + - + &Hide - &隱藏 + - + Play &Face Down - &面朝下使出 + - + &Tap / Untap Turn sideways or back again - &横置/重置 + - + Skip &untapping - + T&urn Over Turn face up/face down - + &Peek at card face - + &Clone - + Attac&h to card... - + Unattac&h - + &Draw arrow... - + &Set annotation... - - Reduce life by power - - - - + Ca&rd counters - + &Add counter (%1) - + &Remove counter (%1) - + &Set counters (%1)... - - CardPictureLoaderCacheMethod - - - Network Cache - - - - - Filesystem - - - CardSizeWidget @@ -946,136 +809,136 @@ This is only saved for moderators and cannot be seen by the banned person. CardZoneLogic - + their hand nominative - 它們的手牌 + - + %1's hand nominative - %1的手牌 + - + their library look at zone - 它們的牌庫 + - + %1's library look at zone - %1的牌庫 + - + of their library top cards of zone, - 它們的牌庫中 + - + of %1's library top cards of zone - %1的牌庫中 + - + their library reveal zone - 它們的牌庫 + - + %1's library reveal zone - %1的牌庫 + - + their library shuffle - 它們的牌庫 + - + %1's library shuffle - %1的牌庫 + - + their library nominative - 它們的牌庫 + - + %1's library nominative - %1的牌庫 + - + their graveyard nominative - 它們的墳場 + - + %1's graveyard nominative - %1的的墳場 + - + their exile nominative - 它們的放逐區 + - + %1's exile nominative - %1的放逐區 + - + their sideboard look at zone - 它們的備牌 + - + %1's sideboard look at zone - %1的備牌 + - + their sideboard nominative - 它們的備牌 + - + %1's sideboard nominative - %1的備牌 + - + their custom zone '%1' nominative - 它們的自定區域 '%1' + - + %1's custom zone '%2' nominative - %1的自定區域'%2' + @@ -1094,421 +957,16 @@ This is only saved for moderators and cannot be seen by the banned person. - - ColorButton - - - Click to pick a color - - - - - Pick colour - - - - - ConnectionController - - - - The server has reached its maximum user capacity, please check back later. - - - - - There are too many concurrent connections from your address. - - - - - Banned by moderator - - - - - Expected end time: %1 - - - - - This ban lasts indefinitely. - - - - - Scheduled server shutdown. - - - - - - Invalid username. - - - - - You have been logged out due to logging in at another location. - - - - - Connection closed - - - - - The server has terminated your connection. -Reason: %1 - - - - - The server is going to be restarted in %n minute(s). -All running games will be lost. -Reason for shutdown: %1 - - - - - Scheduled server shutdown - - - - - Failed Login - - - - - Your client seems to be missing features this server requires for connection. - - - - - To update your client, go to 'Help -> Check for Client Updates'. - - - - - - - - - - - - - - - - - - - - - - Error - - - - - Incorrect username or password. Please check your authentication information and try again. - - - - - There is already an active session using this user name. -Please close that session first and re-login. - - - - - - You are banned until %1. - - - - - - You are banned indefinitely. - - - - - This server requires user registration. Do you want to register now? - - - - - This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. -Please close and reopen your client to try again. - - - - - An internal error has occurred, please close and reopen Cockatrice before trying again. -If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - - - - Account activation - - - - - Your account has not been activated yet. -You need to provide the activation token received in the activation email. - - - - - Server Full - - - - - Unknown login error: %1 - - - - - - -This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - - - - - - - - - Registration denied - - - - - Registration is currently disabled on this server - - - - - There is already an existing account with the same user name. - - - - - It's mandatory to specify a valid email address when registering. - - - - - It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. - - - - - Password too short. - - - - - Registration failed for a technical problem on the server. - - - - - The connection to the server has been lost. - - - - - Unknown registration error: %1 - - - - - Account activation failed - - - - - Socket error: %1 - - - - - Server timeout - - - - - You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. -Local version is %1, remote version is %2. - - - - - Your Cockatrice client is obsolete. Please update your Cockatrice version. -Local version is %1, remote version is %2. - - - - - - Success - - - - - Registration accepted. -Will now login. - - - - - Account activation accepted. -Will now login. - - - - - Information - - - - - This server supports additional features that your client doesn't have. -This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. - -To update your client, go to Help -> Check for Updates. - - - - - - - Reset Password - - - - - Your password has been reset successfully, you can now log in using the new credentials. - - - - - Failed to reset user account password, please contact the server operator to reset your password. - - - - - Activation request received, please check your email for an activation token. - - - - - Connecting to %1... - - - - - Registering to %1 as %2... - - - - - Disconnected - - - - - Connected, logging in at %1 - - - - - Requesting forgotten password to %1 as %2... - - - - - Your username must respect these rules: - - - - - is %1 - %2 characters long - - - - - can %1 contain lowercase characters - - - - - - - - NOT - - - - - can %1 contain uppercase characters - - - - - can %1 contain numeric characters - - - - - can contain the following punctuation: %1 - - - - - first character can %1 be a punctuation mark - - - - - no unacceptable language as specified by these server rules: - note that the following lines will not be translated - - - - - can not contain any of the following words: %1 - - - - - can not match any of the following expressions: %1 - - - - - You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - - CustomZoneMenu - + C&ustom Zones - - + + View custom zone '%1' @@ -1516,35 +974,30 @@ To update your client, go to Help -> Check for Updates. DeckAnalyticsWidget - + Add Panel - + Remove Panel - + Save Layout - + Load Layout - - - Include Sideboard - - DeckEditorCardDatabaseDockWidget - + Card Database @@ -1560,17 +1013,47 @@ To update your client, go to Help -> Check for Updates. DeckEditorDatabaseDisplayWidget - + Search by card name (or search expressions) - + + Add to Deck + + + + + Add to Sideboard + + + + + Select Printing + + + + + Show on EDHRec (Commander) + + + + + Show on EDHRec (Card) + + + + + Show Related cards + + + + Add card to &maindeck - + Add card to &sideboard @@ -1603,72 +1086,72 @@ To update your client, go to Help -> Check for Updates. - + Select Printing - + Deck - + Deck &name: - + Banner Card/Tags Visibility Settings - + Show banner card selection menu - + Show tags selection menu - + &Comments: - + Group by: - + Format: - + Hash: - + &Increment number - + &Decrement number - + &Remove row - + Swap card to/from sideboard @@ -1676,17 +1159,17 @@ To update your client, go to Help -> Check for Updates. DeckEditorFilterDockWidget - + Filters - + &Clear all filters - + Delete selected @@ -1817,113 +1300,169 @@ To update your client, go to Help -> Check for Updates. DeckEditorSettingsPage - - + + Update Spoilers 更新預覽卡牌 - + + Success 成功 - + Download URLs have been reset. 下載URL已重置。 - + + Downloaded card pictures have been reset. + 下載的卡牌圖片已被重置。 + + + + Error + 出現錯誤 + + + + One or more downloaded card pictures could not be cleared. + 一幅或以上的卡牌圖片未能被清除。 + + + Add URL 添加URL - - + + URL: URL: - - + + Edit URL 更改URL - + + Network Cache Size: + 圖片網路緩存大小： + + + + Redirect Cache TTL: + 網路緩處再定向生存時間 + + + + How long cached redirects for urls are valid for. + 再定向緩處有效時間 + + + + Picture Cache Size: + 圖片緩存大小： + + + Add New URL 添置新 URL - + Remove URL 移除 URL. - + + Day(s) + 日 + + + Updating... 更新中... - + Choose path 選擇路徑 - + URL Download Priority URL下載優先次序 - + Spoilers 預覽 - + Download Spoilers Automatically 自動下載預覽 - + Spoiler Location: 預覽位置: - + Last Change 最後變更 - + Spoilers download automatically on launch 開啟時自動下載預覽 - + Press the button to manually update without relaunching 免重新啟動人手按制更新 - + Do not close settings until manual update is complete 人手更新完成前,不能關掉设置 - + Download card pictures on the fly 即時下載卡牌圖片 - + How to add a custom URL 如何添加自定URL - + + Delete Downloaded Images + 刪除已下載的圖片 + + + Reset Download URLs 重置下載URL + + + On-disk cache for downloaded pictures + 下載圖片專用硬盤緩儲 + + + + In-memory cache for pictures not currently on screen + 現不在螢光幕上記憶中圖片緩儲 + DeckListHistoryManagerWidget @@ -1989,12 +1528,12 @@ To update your client, go to Help -> Check for Updates. DeckLoader - + Common deck formats (%1) - + All files (*.*) @@ -2216,27 +1755,27 @@ To update your client, go to Help -> Check for Updates. - + Moved to %1 1 × "%2" (%3) - + Removed "%1" (all copies) - + %1 1 × "%2" (%3) - + Added - + Removed @@ -2258,74 +1797,74 @@ To update your client, go to Help -> Check for Updates. DeckViewContainer - + Load deck... 載入牌庫... - + Load remote deck... 載入伺服器上的牌庫... - + Load from clipboard... - + Load from website... - + Unload deck - + Ready to start 準備好 - + Force start 強迫開始 - + Sideboard unlocked 備牌解鎖 - + Sideboard locked 解鎖鎖上 - - + + Error 出現錯誤 - + The selected file could not be loaded. 選擇的檔案不能再入 - + Deck is greater than maximum file size. - + Are you sure you want to force start? This will kick all non-ready players from the game. - + Cockatrice @@ -2424,7 +1963,7 @@ This will kick all non-ready players from the game. - + Webpage 網頁 @@ -2464,37 +2003,37 @@ This will kick all non-ready players from the game. 連接伺服器 - + Server URL 伺服器URL - + Communication Port 通信端口 - + Unique Server Name 獨特伺服器名字 - + Connection Warning 連接警告 - + You need to name your new connection profile. 你必須將你的連接簡介命名 - + Connect Warning 連接警告 - + The player name can't be empty. 玩家名稱不能空置 @@ -2607,17 +2146,17 @@ This will kick all non-ready players from the game. 創建遊戲 - + Game information 遊戲資訊 - + Error 出現錯誤 - + Server error. 伺服器出現錯誤. @@ -2625,97 +2164,97 @@ This will kick all non-ready players from the game. DlgCreateToken - + &Name: &名稱： - + Token 令牌 - + C&olor: &顏色： - + white 白色 - + blue 藍色 - + black 黑色 - + red 紅色 - + green 綠色 - + multicolor 多色 - + colorless 無色 - + &P/T: &力量/防御力: - + &Annotation: &註釋： - + &Destroy token when it leaves the table &此令牌離場時會被摧毀 - + Create face-down (Only hides name) - + Token data 令牌資料 - + Show &all tokens 顯示&所有令牌 - + Show tokens from this &deck 顯示本牌庫所有令牌 - + Choose token from list 從清單中選擇令牌 - + Create token 派出令牌 @@ -2749,7 +2288,7 @@ This will kick all non-ready players from the game. - + ✖ @@ -2764,12 +2303,12 @@ This will kick all non-ready players from the game. - + Duplicate Tag - + This tag already exists. @@ -2956,12 +2495,12 @@ To remove your current avatar, confirm without choosing a new image. 請輸入令牌名稱: - + Error 出現錯誤 - + The chosen name conflicts with an existing card or token. Make sure to enable the 'Token' set in the "Manage sets" dialog to display them correctly. 現時選擇的名字跟現有的卡牌或令牌出現衝突.請從"牌組管理"中啟動'令牌牌組',保持正確顯示. @@ -2985,12 +2524,12 @@ Make sure to enable the 'Token' set in the "Manage sets" dia 未定義 - + Real name: 實名: - + Edit user profile 更改用戶資料 @@ -3028,113 +2567,113 @@ Make sure to enable the 'Token' set in the "Manage sets" dia 2小時 - + Hide 'buddies only' games - + Hide full games - + Hide games that have started - + Hide password protected games - + Hide 'ignored user' games - + Hide games not created by buddies Hide games not created by buddy - + Hide games with forced open decklists - + &Newer than: &新過: - + Game &description: 遊戲 &描述: - + &Creator name: &創建者名稱: - + General 一般 - + &Game types &遊戲類型 - + at &least: &至少: - + at &most: &最多： - + Maximum player count 可容納玩家最高數量 - + Restrictions 限制 - + Show games only if &spectators can watch 只顯示容許&觀看者 觀看的遊戲 - + Show spectator password p&rotected games 顯示有觀看者&密碼保護的遊戲 - + Show only if spectators can ch&at 只顯示容許觀看者&聊天的遊戲 - + Show only if spectators can see &hands 只顯示容許觀看者看&手牌 的遊戲 - + Spectators 觀看者 - + Filter games 篩選遊戲 @@ -3437,37 +2976,37 @@ https://tappedout.net/mtg-decks/your-deck-name/ DlgMoveTopCardsUntil - + Card name (or search expressions): 卡牌名稱(或搜尋表達式) - + Number of hits: 因為cockatrice原生沒有ssl支援, 所以你不能自動下載更新. 請瀏覽到我們的下載網頁,進行人手更新. - + Auto play hits 開關副牌上鎖 - + Put top cards on stack until... 把頂牌放在重疊區, 直到... - + No cards matching the search expression exists in the card database. Proceed anyways? 在卡牌資料庫中找不到符合搜尋表達式的卡牌.你想繼續嗎? - + Cockatrice Cockatrice - + Invalid filter 篩選無效 @@ -3528,40 +3067,40 @@ Your email will be used to verify your account. 未定義 - + Real name: 實名： - + Register to server 註冊加入伺服器 - - - - + + + + Registration Warning 注册警告 - + Your password is too short. 你的密碼太短。 - + Your passwords do not match, please try again. 兩次輸入的密碼不一致，請重新輸入， - + Your email addresses do not match, please try again. 兩次輸入的電子郵箱不一致，請重新輸入。 - + The player name can't be empty. 玩家名稱不能空置 @@ -3569,17 +3108,17 @@ Your email will be used to verify your account. DlgRollDice - + Number of sides: 骰子面數: - + Number of dice: 骰子數目: - + Roll Dice 擲骰 @@ -3630,12 +3169,12 @@ Your email will be used to verify your account. DlgSettings - + Unknown Error loading card database 讀取卡牌資料庫時出現不知名錯誤 - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -3652,7 +3191,7 @@ Would you like to change your database location setting? 你想要重新設置卡牌資料庫路徑嗎？ - + Your card database version is too old. This can cause problems loading card information or images @@ -3669,7 +3208,7 @@ Would you like to change your database location setting? 你想要重新設置卡牌資料庫路徑嗎？ - + Your card database did not finish loading Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached @@ -3682,7 +3221,7 @@ Would you like to change your database location setting? 你想要重新設置卡牌資料庫路徑嗎？ - + File Error loading your card database. Would you like to change your database location setting? @@ -3690,7 +3229,7 @@ Would you like to change your database location setting? 你想要重新設置卡牌資料庫路徑嗎？ - + Your card database was loaded but contains no cards. Would you like to change your database location setting? @@ -3699,7 +3238,7 @@ Would you like to change your database location setting? 你想要重新設置卡牌資料庫路徑嗎？ - + Unknown card database load status Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues @@ -3715,64 +3254,59 @@ https://github.com/Cockatrice/Cockatrice/issues 你想不想更改你的資料庫位置設定? - - - + + + Error 出現錯誤 - + The path to your deck directory is invalid. Would you like to go back and set the correct path? 你的牌庫目錄路徑現在無效. 你想要重新設置套牌路徑嗎？ - + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? 你的卡牌圖片目錄路徑現在無效. 你想要重新設置卡牌圖片資料庫路徑嗎？ - + Settings 設定 - + General 一般 - + Appearance 外觀 - + User Interface 用戶界面 - - Storage - - - - + Card Sources 卡牌來源 - + Chat 聊天 - + Sound 聲音 - + Shortcuts 快捷键 @@ -3864,9 +3398,9 @@ You can always change this behavior in the 'General' settings tab. - - - + + + Error 出現錯誤 @@ -3919,31 +3453,31 @@ Please visit the download page to update manually. - + Update Available 現有更新版本 - + A new version of Cockatrice is available! Cockatrice有新版本可用！ - + New version 新版本 - + Released 已發行 - + Changelog 變更記載 @@ -3953,50 +3487,50 @@ Please visit the download page to update manually. 你打算現在更新嗎？ - + Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. - + Please check the <a href="%1">releases page</a> on our Github and download the build for your system. - - - + + + Update Error 更新出現錯誤 - + An error occurred while checking for updates: 檢測更新時出現錯誤: - + An error occurred while downloading an update: 下載更新時出現錯誤 - + Installing... 安裝中 - + Cockatrice is unable to open the installer. Cockatrice 不能啟動安裝程式 - + Try to update manually by closing Cockatrice and running the installer. 請你嘗試人手更新, 關掉cockatrice, 然後重開安裝程式. - + Download location 下載位置 @@ -4086,67 +3620,67 @@ You may have to manually download the new version. DrawProbabilityWidget - + Draw Probability - + Probability of drawing - + Card Name - + Type - + Subtype - + Mana Value - + At least - + Exactly - + card(s) having drawn at least - + cards - + Category - + Qty - + Odds (%) @@ -4260,7 +3794,7 @@ You may have to manually download the new version. FilterBuilder - + Type your filter here 輸入你的篩選類型 @@ -4291,22 +3825,22 @@ You may have to manually download the new version. GameEventHandler - + kicked by game host or moderator - + player left the game - + player disconnected from server - + reason unknown @@ -4314,140 +3848,140 @@ You may have to manually download the new version. GameSelector - - - - - - - - - + + + + + + + + + Error 出現錯誤 - + Please join the appropriate room first. 請先參加合適房間 - + Wrong password. 密碼錯誤. - + Spectators are not allowed in this game. 這個遊戲不允許觀眾加入. - + The game is already full. 這個遊戲已經滿了. - + The game does not exist any more. 這個遊戲已經不存在了。 - + This game is only open to registered users. 這個遊戲只開放給註冊用戶. - + This game is only open to its creator's buddies. 這個遊戲只開放給房間主辦的好友。 - + You are being ignored by the creator of this game. 你被這個房間的主辦屏蔽了. - + Join Game - + Spectate Game - + Game Information - + Join Game as Judge - + Spectate Game as Judge - + Join game 加入遊戲 - + Password: 密碼: - + Please join the respective room first. 請先參加相關的房間. - + &Filter games &篩選遊戲 - + C&lear filter &清除篩選項目 - + C&reate &創建 - + &Join &加入 - + Join as judge - + J&oin as spectator &作為觀看者加入 - + Join as judge spectator - + Games shown: %1 / %2 顯示遊戲：%1/%2 - + Games 遊戲 @@ -4455,32 +3989,32 @@ You may have to manually download the new version. GameSelectorQuickFilterToolBar - + All types - + Filter by game name... - + Filter by game type/format - + Hide games not created by buddies - + Hide full games - + Hide started games @@ -4488,105 +4022,105 @@ You may have to manually download the new version. GamesModel - + >1 day ＞1日 - + %1%2 hr short age in hours %1%2 小時 - + new 新建 - + %1%2 min short age in minutes %1%2 分鐘 - + password 密碼 - + buddies only 僅限好友 - + reg. users only 僅限註冊用户 - + open decklists + - can chat 允許聊天 - + see hands 查看手牌 - + can see hands 允許查看手牌 - + not allowed 不允許 - + Room 房間 - + Age 時長 - + Description 描述: - + Creator 創建者 - + Type 類型 - + Restrictions 限制 - + Players 玩家 - + Spectators 觀看者 @@ -4594,158 +4128,143 @@ You may have to manually download the new version. GeneralSettingsPage - + Reset all paths 重置所有路徑 - + All paths have been reset 重置所有路徑 - - - - - - - + + + + + + + Choose path 選擇路徑 - - Language settings - + + Personal settings + 個人設定 - + Language: 語言: - - Version settings - - - - - Card database - - - - - Startup settings - - - - + Paths (editing disabled in portable mode) 路徑(在便攜模式下不能編輯) - + Paths 路徑 - + How to help with translations - + Decks directory: 牌庫路徑: - + Filters directory: - + Replays directory: 遊戲錄像目錄: - + Pictures directory: 圖片目錄: - + Card database: 卡牌資料庫： - + Custom database directory: 自主資料庫目錄 - + Token database: 令牌資料庫: - + Update channel 更新渠道 - + Check for client updates on startup 啟動時檢查客戶更新 - + Check for card database updates on startup - + Don't check - + Prompt for update - + Always update in the background - + Check for card database updates every - + days - + Notify if a feature supported by the server is missing in my client 如果客戶端缺少伺服器支持的更功能時,請提示我 - + Automatically run Oracle when running a new version of Cockatrice 啟動新版本Cockatrice時,自動運行Oracle. - + Show tips on startup 顯示啓動時提示 - + Last update check on %1 (%2 days ago) @@ -4753,47 +4272,47 @@ You may have to manually download the new version. GraveyardMenu - + &Graveyard - + &View graveyard - + &Move graveyard to... - + &Top of library - + &Bottom of library - + &All players - + &Hand - + &Exile - + Reveal random card to... @@ -4801,88 +4320,88 @@ You may have to manually download the new version. HandMenu - + &Hand - + &View hand - + Sort hand by... - + Name - + Type - + Mana Value - + Take &mulligan (Choose hand size) - + Take mulligan (Same hand size) - + Take mulligan (Hand size - 1) - + &Move hand to... - + &Top of library - + &Bottom of library - + &Graveyard - + &Exile - + &Reveal hand to... - - + + All players - + Reveal r&andom card to... @@ -4890,52 +4409,52 @@ You may have to manually download the new version. HomeWidget - + Create New Deck - + Browse Decks - + Browse Card Database - + Browse EDHRec - + Browse Archidekt - + View Replays - + Quit - + Connecting... - + Connect - + Play @@ -4943,213 +4462,213 @@ You may have to manually download the new version. LibraryMenu - + &Library - + &View library - + View &top cards of library... - + View bottom cards of library... - + Reveal &library to... - + Lend library to... - + Reveal &top cards to... - + &Top of library... - + &Bottom of library... - + &Always reveal top card - + &Always look at top card - + &Open deck in deck editor - + &Draw card - + D&raw cards... - + &Undo last draw - + Shuffle - + &Play top card - + Play top card &face down - + Put top card on &bottom - + Move top card to grave&yard - + Move top card to e&xile - + Move top cards to &graveyard... - + Move top cards to graveyard face down... - + Move top cards to &exile... - + Move top cards to exile face down... - + Put top cards on stack &until... - + Shuffle top cards... - + &Draw bottom card - + D&raw bottom cards... - + &Play bottom card - + Play bottom card &face down - + Move bottom card to grave&yard - + Move bottom card to e&xile - + Move bottom cards to &graveyard... - + Move bottom cards to graveyard face down... - + Move bottom cards to &exile... - + Move bottom cards to exile face down... - + Put bottom card on &top - + Shuffle bottom cards... - - + + &All players - + Reveal top cards of library - + Number of cards: (max. %1) @@ -5157,273 +4676,633 @@ You may have to manually download the new version. MainWindow - - + + + The server has reached its maximum user capacity, please check back later. + 伺服器已達到最最高用戶限額，請另外選擇吉時再試. + + + + There are too many concurrent connections from your address. + 你的網路地址擁有太多同時連繫. + + + + Banned by moderator + 你已被版主禁用 + + + + Expected end time: %1 + 預計結束時間: %1 + + + + This ban lasts indefinitely. + 這是無限期禁用 + + + + Scheduled server shutdown. + 排期伺服器關機 + + + + + Invalid username. + 不可用的用戶名。 + + + + You have been logged out due to logging in at another location. + 因為你已在另外的位置登入, 所以你現有的聯繫已被登出. + + + + Connection closed + 連繫已被關閉 + + + + The server has terminated your connection. +Reason: %1 + 伺服器已經中斷你的聯繫/ +原因: %1 + + + + The server is going to be restarted in %n minute(s). +All running games will be lost. +Reason for shutdown: %1 + 伺服器將會在 %n 分鐘內重新啟動. 所有進行中的遊戲都會報銷.伺服器關閉原因: %1 + + + + Scheduled server shutdown + 排期伺服器關機 + + + + + Success + 成功 + + + + Registration accepted. +Will now login. + 註冊已成功。 +現在登入。 + + + + Account activation accepted. +Will now login. + 戶口啟動已經成功 +現在登入. + + + + Player %1 玩家 %1 - + Load replay 載入遊戲錄像 - + About Cockatrice 關於Cockatrice - + Version 版本 - + Cockatrice Webpage Cockatrice 網頁 - + Project Manager: 項目經理： - + Past Project Managers: 前項目經理： - + Developers: 開發者： - + Our Developers 我們的開發者： - + Help Develop! 協助開發！ - + Translators: 翻譯者： - + Our Translators 翻譯者名單 - + Help Translate! 協助翻譯! - + Support: 支援: - + Report an Issue 報告問題 - + Troubleshooting 排除故障 - + F.A.Q. 問答 - - + + + + + + + + + + + + + + + + + + + + Error 出現錯誤 - + + Server timeout + 伺服器超時 + + + + Failed Login + 登入失敗 + + + + Your client seems to be missing features this server requires for connection. + 你的客戶端似乎脫小本伺服器需要用來達成連繫的功能. + + + + To update your client, go to 'Help -> Check for Client Updates'. + 請去"求助->檢查客戶端更新" 內更新你的客戶. + + + + Incorrect username or password. Please check your authentication information and try again. + 用户名或密碼錯誤。請檢查賬號信息,然後重試。 + + + + There is already an active session using this user name. +Please close that session first and re-login. + 已經有在線用户正在使用這用户名.請先關閉連線,然後重新登入. + + + + + You are banned until %1. + 你被禁止直到: %1. + + + + + You are banned indefinitely. + 你已被永久封禁. + + + + This server requires user registration. Do you want to register now? + 本伺服器要求用戶註冊. 你想不想現在登記? + + + + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. + 本伺服器要求用戶擁有客戶id. 你的客戶端現在不能造成客戶id,或是你正在使用修改過的客戶端. +請你關掉現有的客戶端,然後重新啟動, 擇吉日再試。 + + + + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. + 因為內部出現故障, 請關閉,重開Cockatrice 然後再次嘗試. +如果故障繼續出現,請將客戶端軟件升級為最新版本, 有需要時請聯絡軟件開發人士. + + + + Account activation + 戶口啟動 + + + + Your account has not been activated yet. +You need to provide the activation token received in the activation email. + 你的戶口還未嘗啟動. +你需要提供從啟動電郵得來的驗證碼. + + + + Server Full + 伺服器載滿 + + + + Unknown login error: %1 + 不知名登入錯誤: %1 + + + + + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. + +這通常意味住你的客戶端版本已經過期,引起你的客戶端不能明曉伺服器的回覆. + + + + Your username must respect these rules: + 您的用戶名字必須遵守以下規則： + + + + is %1 - %2 characters long + 在%1 - %2个字符之间。 + + + + can %1 contain lowercase characters + 可以 $1 包含細楷/小寫字母 + + + + + + + NOT + 並否 + + + + can %1 contain uppercase characters + 可以 $1 包含大楷/大寫字母 + + + + can %1 contain numeric characters + 可以 $1 包含數字 + + + + can contain the following punctuation: %1 + 可以包含以下符號：%1 + + + + first character can %1 be a punctuation mark + 第一個字符可以 %1 是標點符號 + + + + no unacceptable language as specified by these server rules: + note that the following lines will not be translated + 在以下伺服器規矩中,道明不能接受的語言: + + + + can not contain any of the following words: %1 + 不能含有以下字眼: %1 + + + + can not match any of the following expressions: %1 + 不能含有以下語句: %1 + + + + You may only use A-Z, a-z, 0-9, _, ., and - in your username. + 你的用戶名字只可以用以下的字符: A-Z, a-z, 0-9, _, ., 和 - . + + + + + + + + + Registration denied + 註冊被拒絕 + + + + Registration is currently disabled on this server + 這伺服器暫時謝絕登記 + + + + There is already an existing account with the same user name. + 這個用戶名字已經被使用. + + + + It's mandatory to specify a valid email address when registering. + 登記時必要指明合能用的電郵地址. + + + + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + 你看來好像在本伺服器嘗試申請新戶口, 但是你已經有跟你電郵掛鉤的戶口名字.我們的伺服器限制每用戶在每個地址可以有多少個戶口. 如果需要更多援助或是得取你的登入資料,請聯絡伺服器辦事人. + + + + Password too short. + 密碼太短。 + + + + Registration failed for a technical problem on the server. + 由於伺服器出現技術問題, 你的登記暫時失敗. + + + + The connection to the server has been lost. + + + + + Unknown registration error: %1 + 不知名登記錯誤: %1 + + + + Account activation failed + 戶口啟動失敗 + + + + Socket error: %1 + 接口錯誤: %1 + + + + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + 你正在嘗試跟過時的伺服器連繫. 請把你的 Cockatrice 版本降級,或是連繫於合適的伺服器. 當地/離線版本維 %1, 遙距/上線版本維 %2. + + + + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + 你的 Cockatrice 版本現已過時.請把你的版本更新. +當地/離線版本維 %1, 遙距/上線版本維 %2. + + + + Connecting to %1... + 向 %1 連接中... + + + + Registering to %1 as %2... + 正在用%2的身份登記到%1伺服器... + + + + Disconnected + 已經斷線了 + + + + Connected, logging in at %1 + 連線成功, 在%1登入 + + + + + + Requesting forgotten password to %1 as %2... + 正在用%2的身份對%1要求遺忘密碼. + + + &Connect... &連線... - + &Disconnect &斷線 - + Start &local game... 開始&離線遊戲 - + &Watch replay... &觀看遊戲錄像 - + &Full screen &全屏 - + &Register to server... &註冊加入伺服器 - + &Restore password... &弄回密碼 - + &Settings... 設置⋯ - + &Exit &退出 - + A&ctions &動作 - + &Cockatrice &Cockatrice - + C&ard Database &卡牌資料庫 - + &Manage sets... &管理牌組 - + Edit custom &tokens... 編輯自定 &令牌... - + Open custom image folder 打開自定圖片文件夾 - + Open custom sets folder 打開自定牌组文件夾 - + Add custom sets/cards 添加自定卡组/卡牌 - + Reload card database 刷新卡牌資料庫 - + Tabs - + &Help &求助 - + &About Cockatrice &關於Cockatrice - + &Tip of the Day &每日提示 - + Check for Client Updates 檢查客戶端更新 - + Check for Card Updates... 檢查卡牌更新 - + Check for Card Updates (Automatic) - + Show Status Bar - + View &Debug Log 查看&偵錯紀錄 - + Open Settings Folder 打開設置文件夾 - + Show/Hide 顯示/隱藏 - + New Version 新版本 - + Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. 恭喜你將Cockatrice升級為%1. 現在會幫你啟動oracle, 更新你的卡牌資料庫. - + Cockatrice installed Cockatrice 已被安裝 - + Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. 恭喜你成功安裝Cockatrice%1. 現在會幫你啟動oracle, 安裝你的卡牌資料庫. - + Card database 卡牌資料庫 - + Cockatrice is unable to load the card database. Do you want to update your card database now? If unsure or first time user, choose "Yes" @@ -5432,29 +5311,29 @@ If unsure or first time user, choose "Yes" 如果不確定, 或者是第一次使用，請選擇“是/Yes” - - + + Yes 是/Yes - - + + No 否/No - + Open settings 打開設置 - + New sets found 發現新卡组 - + %n new set(s) found in the card database Set code(s): %1 Do you want to enable it/them? @@ -5463,22 +5342,17 @@ Do you want to enable it/them? 要啟用它們嗎？ - - Yes, always enable - - - - + View sets 查看卡组 - + Welcome 歡迎 - + Hi! It seems like you're running this version of Cockatrice for the first time. All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. @@ -5487,131 +5361,166 @@ Read more about changing the set order or disabling specific sets and consequent 請閱讀,了解更多在“卡组设置”對話框裡.更改卡组顺序或者禁用某些卡组的功能. - + + Information 資訊 - + A card database update is already running. 資料庫更新現已進行. - + Unable to run the card database updater: 不能運行卡牌資料附更新程式: - + Card database update running. - + Failed to start. The file might be missing, or permissions might be incorrect. - + The process crashed some time after starting successfully. - + Timed out. The process took too long to respond. The last waitFor...() function timed out. - + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. - + An error occurred when attempting to read from the process. For example, the process may not be running. - + Unknown error occurred. - + The card database updater exited with an error: %1 - - - - - + + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + 本伺服器支持你現在客戶端軟件欠缺的額外功能. + +這信息不是大問題, 但此信息可能意會現在已有新版本的 Cockatrice, 或是本伺服器運用自設或預先釋放版本. + +請到"援助->檢查更新"去更新你的客戶端. + + + + + + + Load sets/cards 载入卡组/卡牌 - + Selected file cannot be found. 找不到選擇的文件。 - + You can only import XML databases at this time. 你暫時只能導入xml資料庫. - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. 已經成功添加新的卡組/卡牌. Cockatrice會重新載入卡牌資料庫. - + Sets/cards failed to import. 卡組/卡牌導入失敗. + + + + + Reset Password + 重設密碼 + + + + Your password has been reset successfully, you can now log in using the new credentials. + 你的密碼已經成功重置, 你可以用新密碼重新登入。 + + + + Failed to reset user account password, please contact the server operator to reset your password. + 重置用戶密碼失敗, 請聯絡伺服器管責人重置密碼. + + + + Activation request received, please check your email for an activation token. + 已經收到啟動要求, 請從你的電郵獲取啟動驗證碼. + ManaBaseConfigDialog - + Mana Base Configuration - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): - + OK - + Cancel @@ -5683,27 +5592,27 @@ Cockatrice will now reload the card database. ManaDevotionConfigDialog - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): @@ -5773,615 +5682,610 @@ Cockatrice will now reload the card database. MessageLogWidget - + from play 從戰場上 - + from their graveyard 從它們的墳場 - + from exile 從放逐區 - + from their hand 從它們的手牌 - + the top card of %1's library %1牌庫的頂牌 - + the top card of their library 它們的頂牌 - + from the top of %1's library 從%1牌庫的頂 - + from the top of their library 從它們1牌庫頂 - + the bottom card of %1's library %1牌庫的底牌 - + the bottom card of their library 它們牌庫的底牌 - + from the bottom of %1's library 從%1的牌庫底 - + from the bottom of their library 從它們的牌庫底 - + from %1's library 從%1的牌庫 - + from their library 從它們的牌庫 - + from sideboard 從備牌中 - + from the stack 從疊區中 - + from custom zone '%1' - + %1 is now keeping the top card %2 revealed. %1現在保持%2頂牌顯現. - + %1 is not revealing the top card %2 any longer. %1不再展示牌庫頂牌%2。 - + %1 can now look at top card %2 at any time. %1可以隨時查看牌庫頂牌 %2. - + %1 no longer can look at top card %2 at any time. %1再不可以隨時查看牌庫頂牌 %2. - + %1 attaches %2 to %3's %4. %1 結附 %2 指向 %3的 %4. - + %1 has conceded the game. %1 在此遊戲宣佈降服. - + %1 has unconceded the game. %1 收回在此遊戲降服. - + %1 has restored connection to the game. %1已恢復連接。 - + %1 has lost connection to the game. %1 已失去連接。 - + %1 points from their %2 to themselves. %1 從它們的%2 指向自己。 - + %1 points from their %2 to %3. %1 從它們的%2指向%3。 - + %1 points from %2's %3 to themselves. %1 從%2的%3 指向自己。 - + %1 points from %2's %3 to %4. %1 從%2的%3 指向%4。 - + %1 points from their %2 to their %3. %1 從它們的%2指向它們的%3。 - + %1 points from their %2 to %3's %4. %1 從它們的%2指向%3的%4。 - + %1 points from %2's %3 to their own %4. %1 從%2的%3指向自己的%4。 - + %1 points from %2's %3 to %4's %5. %1 從%2的%3指向%4的%5。 - + %1 creates a face down token. - + %1 creates token: %2%3. %1 派出令牌: %2%3 - + %1 has loaded a deck (%2). %1 已载入牌庫(%2) - + %1 has loaded a deck with %2 sideboard cards (%3). %1已載入含有 %2張備牌的牌庫(%3). - + %1 destroys %2. %1销毁了%2。 - + a card 一張牌 - + %1 gives %2 control over %3. %1將%3的控制轉移給%2. - + %1 puts %2 into play%3 face down. %1將%2%3牌面朝下地放進戰場。 - + %1 puts %2 into play%3. %1將%2放進戰場%3。 - + %1 puts %2%3 into their graveyard face down. - + %1 puts %2%3 into their graveyard. %1將%2%3置入它們的的墳場。 - + %1 exiles %2%3 face down. - + %1 exiles %2%3. %1 放逐%2%3. - + %1 moves %2%3 to their hand. %1將%2%3移到它們的的手牌中。 - + %1 puts %2%3 into their library. %1將%2%3放入它們的牌庫。 - + %1 puts %2%3 onto the bottom of their library. %1將%2%3放在它們的牌庫底部。 - + %1 puts %2%3 on top of their library. %1將%2%3放在它們的牌庫頂部。 - + %1 puts %2%3 into their library %4 cards from the top. %1將%2%3放在它們的牌庫頂部%4張牌以下。 - + %1 moves %2%3 to sideboard. %1 將%2%3移到副牌庫. - + %1 plays %2%3 face down. - + %1 plays %2%3. %1使出 %2%3。 - + %1 moves %2%3 to custom zone '%4' face down. - + %1 moves %2%3 to custom zone '%4'. - + %1 tries to draw from an empty library %1嘗試從空牌庫抽牌 - + %1 draws %2 card(s). %1抽%2張牌。 - + %1 is looking at %2. %1 正在查看%2。 - + %1 is looking at the %4 %3 card(s) %2. top card for singular, top %3 cards for plural %1 正在查看%2的 %4 %3張卡牌. - + bottom 底部 - + top 頂部 - + %1 turns %2 face-down. %1把%2翻為面朝下。 - + %1 turns %2 face-up. %1把%2翻為面朝上。 - + The game has been closed. 遊戲已經關閉。 - + The game has started. 遊戲已開始。 - + You are flooding the game. Please wait a couple of seconds. - + %1 has joined the game. %1 已經加入遊戲。 - + %1 is now watching the game. %1 正在旁觀遊戲。 - + You have been kicked out of the game. 你已被踢出遊戲。 - + %1 has left the game (%2). %1 已經離開遊戲(%2)。 - + %1 is not watching the game any more (%2). %1 已經不再旁觀遊戲(%2)。 - + %1 is not ready to start the game any more. %1 還未準備好開始遊戲。 - + %1 shuffles their deck and draws a new hand of %2 card(s). %1將其牌庫洗牌，然後抽%2張牌作為新的起手。 - + %1 shuffles their deck and draws a new hand. %1將其牌庫洗牌，然後抽起新的手牌。 - + You are watching a replay of game #%1. 你正在觀看遊戲#%1的錄像。 - + %1 is ready to start the game. %1已準備好開始遊戲。 - + cards an unknown amount of cards 卡牌(眾)  - + %1 card(s) a card for singular, %1 cards for plural %1 卡牌(眾)  - + %1 lends %2 to %3. %1把&2借給%3. - + %1 reveals %2 to %3. %1把%2展示給%3. - + %1 reveals %2. %1 展示 %2。 - + %1 randomly reveals %2%3 to %4. %1隨機展示%2%3給%4。 - + %1 randomly reveals %2%3. %1隨機展示%2%3。 - + %1 peeks at face down card #%2. %1查看面朝下的卡牌#%2。 - + %1 peeks at face down card #%2: %3. %1查看面朝下的卡牌#%2:%3。 - + %1 reveals %2%3 to %4. %1展示%2%3給%4。 - + %1 reveals %2%3. %1展示%2%3。 - + %1 reversed turn order, now it's %2. %1 逆轉回合次序，現在輪到%2。 - + reversed 逆轉 - + normal 正常 - + Heads 正面 - + Tails 翻面 - + %1 flipped a coin. It landed as %2. %1擲了硬幣。結果為%2。 - + %1 rolls a %2 with a %3-sided die. %1擲%3面骰子，結果為%2。 - + %1 flips %2 coins. There are %3 heads and %4 tails. %1擲了%2個硬幣。結果為%3個正面和%4個反面。 - + %1 rolls a %2-sided dice %3 times: %4. %1把%2面骰子擲了%3次:%4 - + %1's turn. 輪到 %1. - + %1 sets annotation of %2 to %3. %1給%2添加了註釋成%3。 - - %1 places %2 %3%4 counter(s) on %5 (now %6). + + %1 places %2 "%3" counter(s) on %4 (now %5). - - %1 removes %2 %3%4 counter(s) from %5 (now %6). + + %1 removes %2 "%3" counter(s) from %4 (now %5). - - %1 failed to undo their last draw. - - - - + %1 sets counter %2 to %3 (%4%5). %1 將%2指示物設置為 %3 (%4%5)。 - + %1 sets %2 to not untap normally. %1 將 %2 設置為不被重置。 - + %1 sets %2 to untap normally. %1 將 %2 設置為照常重置。 - + %1 removes the PT of %2. %1 移除%2的力量/防禦. - + %1 changes the PT of %2 from nothing to %4. %1把%2的力量/防禦從無數值轉為%4. - + %1 changes the PT of %2 from %3 to %4. %1把%2的力量/防禦從%3轉為%4. - + %1 has locked their sideboard. %1已經鎖定它們的的副牌庫。 - + %1 has unlocked their sideboard. %1已經把它們的的副牌庫解鎖。 - + %1 taps their permanents. %1横置它們的永久卡牌 - + %1 untaps their permanents. %1重置它們的永久卡牌. - + %1 taps %2. %1 横置 %2. - + %1 untaps %2. %1 重置 %2。 - + %1 shuffles %2. % 1 對 %2 洗牌 - + %1 shuffles the bottom %3 cards of %2. %1 洗 %2 底的 %3 張卡牌. - + %1 shuffles the top %3 cards of %2. %1 洗 %2 頂的 %3 張卡牌. - + %1 shuffles cards %3 - %4 of %2. %1到%2.洗%3 - %4 - + %1 unattaches %2. %1 取消了%2的結附。 - + %1 undoes their last draw. %1 放回它們最後一張抽到的卡牌. - + %1 undoes their last draw (%2). %1 放回它們最後一張抽到的卡牌(%2). @@ -6389,115 +6293,110 @@ Cockatrice will now reload the card database. MessagesSettingsPage - + Word1 Word2 Word3 詞1 詞2 詞3 - + Add New Message 添加新信息 - + Edit Message 更改信息 - + Remove Message 移除信息 - + Add message 添加信息 - - + + Message: 信息: - + Edit message 更改信息 - + Chat settings 聊天設定 - + Custom alert words 自定通知觸發詞語 - + Enable chat mentions 允許聊天中提到某人 - + Enable mention completer 允許自動完成提名 - + In-game message macros 遊戲內短信速鍵 - + How to use in-game message macros 如何使用遊戲內短信速鍵 - + Ignore chat room messages sent by unregistered users 不要顯示未註冊用户的聊天消息。 - + Ignore private messages sent by unregistered users 不要顯示未註冊用户的私人消息. - - Ignore private messages sent by non-buddy users - - - - - + + Invert text color 反轉文本顏色 - + Enable desktop notifications for private messages 容許桌面提醒提及私人消息 - + Enable desktop notification for mentions 容許桌面提醒提及聊天提名 - + Enable room message history on join 加入聊天室時開啓消息歷史 - - + + (Color is hexadecimal) （顏色為16進制） - + Separate words with a space, alphanumeric characters only 將單詞以空格區分，僅支持字母. @@ -6505,42 +6404,42 @@ Cockatrice will now reload the card database. MoveMenu - + Move to - + &Top of library in random order - + X cards from the top of library... - + &Bottom of library in random order - + T&able - + &Hand - + &Graveyard - + &Exile @@ -6553,47 +6452,47 @@ Cockatrice will now reload the card database. 卡牌類型 - + Mana Value 法力數值 - + Color(s) 颜色(眾)  - + Loyalty 忠誠值 - + Main Card Type 卡牌主類型 - + Mana Cost 法力費用 - + P/T 力量/防御力 - + Side 正面/底面 - + Layout 佈局 - + Color Identity 顏色身份 @@ -6616,152 +6515,6 @@ Cockatrice will now reload the card database. 重疊方向 - - PaletteEditorDialog - - - - Reset - - - - - - Apply - - - - - - Save && Apply - - - - - ▼ Edit Palette - - - - - - ▶ Edit Palette - - - - - Palette Editor — %1 - - - - - <b>Palette Editor</b> &nbsp;·&nbsp; %1 - - - - - This theme ships no default palette files - - - - - Replace current colours with the theme author's defaults - - - - - Switch between the light and dark palette files - - - - - Editing: - - - - - Show or hide the per-role colour grid for manual tweaks - - - - - ↺ Revert to theme default - - - - - Discard unsaved edits and restore the last saved palette - - - - - Preview this palette without saving to disk - - - - - Write palette-%1.toml and reload the theme - - - - - Cannot save: this theme has no directory on disk - - - - - Save failed - - - - - Could not write %1 to: -%2 - - - - - No default found - - - - - No default palette file found for the "%1" scheme. - - - - - PaletteGridWidget - - - Active - - - - - Disabled - - - - - Inactive - - - - - Normal interactive state - - - - - Widget is disabled / not interactive - - - - - Window is in background / unfocused - - - Phase @@ -6828,57 +6581,57 @@ Cockatrice will now reload the card database. PhasesToolbar - + Untap step 重置步 - + Upkeep step 維持步 - + Draw step 抓牌步 - + First main phase 第一主階段 - + Beginning of combat step 戰鬥開始步 - + Declare attackers step 宣告阻擋步 - + Declare blockers step 宣告阻擋步 - + Combat damage step 戰鬥損害步 - + End of combat step 戰鬥結束步 - + Second main phase 第二主階段 - + End of turn step 回合完結部 @@ -6886,7 +6639,7 @@ Cockatrice will now reload the card database. PictureLoader - + en code for scryfall's language property, not available for all languages @@ -6895,142 +6648,151 @@ Cockatrice will now reload the card database. PlayerActions - - - - - grave - - - - - - - - exile - - - - - PlayerDialogs - - + View top cards of library - - - - - - - - - + + + + + + + + + Number of cards: (max. %1) - + View bottom cards of library - + Shuffle top cards of library - + Shuffle bottom cards of library - + Draw hand - + 0 and lower are in comparison to current hand size - + Draw cards - + + + + + grave + + + + + + + + exile + + + + Move top cards to %1 - + Move bottom cards to %1 - + Draw bottom cards - + + + C&reate another %1 token + + + + Create tokens - + + Number: - + Place card X cards from top of library - + Which position should this card be placed: - + (max. %1) - + Change power/toughness - + Change stats to: - + Set annotation - + Please enter the new annotation: + + + Set counters + + PlayerMenu - + Player "%1" - + &Counters @@ -7060,7 +6822,7 @@ This setting means you'll only see the default printing for each card, instead o - + Printing Selector @@ -7068,22 +6830,22 @@ This setting means you'll only see the default printing for each card, instead o PrintingSelectorCardOverlayWidget - + Preference 喜好 - + Pin Printing 版本上別針 - + Unpin Printing 版本脫別針 - + Show Related cards 顯示關聯卡牌 @@ -7154,57 +6916,57 @@ This setting means you'll only see the default printing for each card, instead o PtMenu - + Power / toughness - + &Increase power - + &Decrease power - + I&ncrease toughness - + D&ecrease toughness - + In&crease power and toughness - + Dec&rease power and toughness - + Increase power and decrease toughness - + Decrease power and increase toughness - + Set &power and toughness... - + Reset p&ower and toughness @@ -7212,37 +6974,37 @@ This setting means you'll only see the default printing for each card, instead o QMenuBar - + Services 服務 - + Hide %1 隐藏 %1 - + Hide Others 隱藏其他 - + Show All 全部展示 - + Preferences... 喜好... - + Quit %1 退出%1 - + About %1 關於 %1 @@ -7250,17 +7012,17 @@ This setting means you'll only see the default printing for each card, instead o QObject - + Cockatrice card database (*.xml) Cockatrice卡牌資料庫 (*.xml) - + All files (*.*) 所有檔案格式 (*.*) - + Cockatrice replays (*.cor) Cockatrice錄像文件 (*.cor) @@ -7320,177 +7082,110 @@ Are you sure you would like to disable this feature? QPlatformTheme - + OK OK/確認 - + Save 保存 - + Save All 全部保存 - + Open 打開 - + &Yes &是/Yes - + Yes to &All &全選是/Yes - + &No &否/No - + N&o to All &全選否/No - + Abort 退出 - + Retry 重試 - + Ignore 不理 - + Close 關閉 - + Cancel 取消 - + Discard 棄牌 - + Help 協助 - + Apply 應用 - + Reset 重設 - + Restore Defaults 恢復常用認值 - - QuickSetupPanel - - - %1% - - - - - <b>Quick Setup</b> - - - - - Generate all palette roles automatically from a single accent colour - - - - - Accent: - - - - - Primary hue. Used directly for highlights and links. -At high intensity it also tints buttons and backgrounds. - - - - - Intensity: - - - - - Subtle - - - - - Full colour - - - - - 0–30 Subtle tint — only highlights and links change hue -30–70 Accented — buttons, tooltips, and borders join in -70–100 Full colour — backgrounds, everything - - - - - 70% - - - - - Generate ↓ - - - - - Derive all palette roles from the accent colour above. -Fine-tune individual colours in the grid afterwards. - - - RemoteDeckList_TreeModel - + Name 名字 - + ID ID - + Upload time 上載時間 @@ -7498,32 +7193,32 @@ Fine-tune individual colours in the grid afterwards. RemoteReplayList_TreeModel - + ID ID - + Name 名字 - + Players 玩家(眾) - + Keep 選用 - + Time started 開始時間 - + Duration (sec) 維持(秒) @@ -7531,37 +7226,37 @@ Fine-tune individual colours in the grid afterwards. RfgMenu - + &Exile - + &View exile - + &Move exile to... - + &Top of library - + &Bottom of library - + &Hand - + &Graveyard @@ -7607,7 +7302,7 @@ Fine-tune individual colours in the grid afterwards. SayMenu - + S&ay @@ -7648,27 +7343,27 @@ Fine-tune individual colours in the grid afterwards. SetsModel - + Enabled 已啓用 - + Set type 設置類型 - + Set code 設置代碼 - + Long name 長名 - + Release date 發行日期 @@ -7676,53 +7371,53 @@ Fine-tune individual colours in the grid afterwards. ShortcutSettingsPage - - + + Restore all default shortcuts 恢復所有常用快鍵 - + Do you really want to restore all default shortcuts? 確定要恢復所有常用快鍵嗎? - + Clear all default shortcuts 清除所有常用快鍵 - + Do you really want to clear all shortcuts? 確認清除所有快鍵嗎? - + Section: 部分： - + Action: 行動: - + Shortcut: 快鍵: - + How to set custom shortcuts 如何設置自定快鍵 - + Clear all shortcuts 清除所有快键 - + Search by shortcut name 按快鍵名稱搜尋 @@ -7778,12 +7473,12 @@ Please check your shortcut settings! SideboardMenu - + &Sideboard - + &View sideboard @@ -7791,27 +7486,27 @@ Please check your shortcut settings! SoundSettingsPage - + Enable &sounds 啓用&聲效 - + Current sounds theme: 現前聲效主題： - + Test system sound engine 測試系統聲效引擎 - + Sound settings 聲效設置 - + Master volume 主音量 @@ -7883,146 +7578,16 @@ Please check your shortcut settings! 從發佈更新伺服器收不到有效的回覆. - + No reply received from the tag update server. 未收到標籤更新伺服器的回應. - + Invalid reply received from the tag update server. 從標籤更新伺服器收不到有效的回覆. - - StorageSettingsPage - - - - - Success - - - - - Cached card pictures have been reset. - - - - - Downloaded card pictures have been reset. - - - - - Error - - - - - One or more downloaded card pictures could not be cleared. - - - - - In-memory (currently loaded) card pictures have been reset. - - - - - Card Picture Loader Caching Method: - - - - - The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size. - - - - - Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while. - - - - - This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk. - - - - - Delete Cached Images - - - - - Delete Saved Images - - - - - Clear In-Memory Images - - - - - Card Picture Loader Cache Method - - - - - Network Cache - - - - - Filesystem - - - - - In-Memory Picture Cache - - - - - Network Cache Size: - - - - - On-disk cache for downloaded pictures - - - - - Redirect Cache TTL: - - - - - How long cached redirects for urls are valid for. - - - - - Picture Cache Size: - - - - - In-memory cache for pictures not currently on screen - - - - - Naming scheme: - - - - - Day(s) - - - TabAccount @@ -8158,117 +7723,117 @@ Please check your shortcut settings! TabArchidekt - - + + Desc. - - + + AND - - + + Require ALL selected colors - - + + Deck name... - - + + Owner... - - + + Packages - - + + Advanced Filters - + Bracket: - - + + Any - - + + Contains card... - - + + Commander... - - + + Tag... - - + + Deck Size - + Cards: - - + + Asc. - + Sort by: - + Filter by: - + Display Settings - - + + Search - - + + Formats @@ -8278,54 +7843,6 @@ Please check your shortcut settings! - - TabCardArtRules - - - Card: - - - - - ProviderId: - - - - - Mode: - - - - - Reason: - - - - - Type a card name... - - - - - Add rule - - - - - Remove rule - - - - - Refresh - - - - - Card Art Rules - - - TabDeckEditor @@ -8374,7 +7891,7 @@ Please check your shortcut settings! 重置布局 - + Deck: %1 牌庫:%1 @@ -8382,49 +7899,55 @@ Please check your shortcut settings! TabDeckEditorVisual - + Visual Deck: %1 - + &Visual Deck Editor - - + + Card Info - - + + Deck - + + + Filters + + + + &View - + Printing - + Visible - + Floating - + Reset layout @@ -8432,22 +7955,22 @@ Please check your shortcut settings! TabDeckEditorVisualTabWidget - + Visual Deck View - + Visual Database Display - + Deck Analytics - + Sample Hand @@ -8455,133 +7978,133 @@ Please check your shortcut settings! TabDeckStorage - + Local file system 本地檔案系統 - + Server deck storage 伺服器牌庫儲藏 - - + + Open in deck editor 在套牌編輯打開 - + Rename deck or folder - + Upload deck 上載牌庫 - + Download deck 下载套牌 + - - - + + New folder 新文件夾 + - Delete 删除 - + Open decks folder 打開牌庫文件夾 - + Rename local folder - + Rename local file - + New name: - - - - + + + + Error 出現錯誤 - + Rename failed - - + + Invalid deck file 無效牌庫檔案 - + Enter deck name 輸入牌庫名稱 - + This decklist does not have a name. Please enter a name: 本牌庫列表未有名稱.請輸入名稱: - + Unnamed deck 未命名牌庫 - + Failed to upload deck to server 牌庫上載於伺服器時失敗 - + Delete local file 删除本地檔案 - + Are you sure you want to delete the selected files? 你確定要刪除被選檔案(眾)嗎 ？ - + Delete remote decks 刪除伺服器上的牌庫 - + Are you sure you want to delete the selected decks? 你確定要剷除所有被選的牌庫嗎? - - + + Name of new folder: 新建文件夾名稱: @@ -8653,191 +8176,191 @@ Please enter a name: TabGame - - - + + + Replay 遊戲錄像重溫 - - + + Game 遊戲 - - + + Player List 玩家列表 - - + + Card Info 卡牌資訊 - - + + Messages 信息 - - + + Replay Timeline 錄像時間線 - + &Phases 階段 - + &Game 遊戲 - + Next &phase 下個&階段 - + Next phase with &action 下個階段&行動 - + Next &turn 下個&回合 - + Reverse turn order 逆轉回合次序 - + &Remove all local arrows &移除所有自設箭頭 - + Rotate View Cl&ockwise &順時針旋轉視角 - + Rotate View Co&unterclockwise &逆時針旋轉視角 - + Game &information 遊戲&資訊 - + Un&concede 撤銷&投降 - - - + + + &Concede &投降 - + &Leave game &離開遊戲 - + C&lose replay &關閉遊戲錄像 - + &Focus Chat &聚焦聊天 - + &Say: &説： - + Selected cards - + &View &視圖 - + Visible 可見 - + Floating 浮動 - + Reset layout 重置布局 - + Concede 投降 - + Are you sure you want to concede this game? 你確定要宣佈投降嗎？ - + Unconcede 撤銷投降 - + You have already conceded. Do you want to return to this game? 你已經宣佈投降,你想回到這場遊戲嗎？ - + Leave game 離開遊戲 - + Are you sure you want to leave this game? 你確定要離開這個遊戲嗎？ - + A player has joined game #%1 有玩家加入遊戲 #%1 - + %1 has joined the game %1 已經加入遊戲。 - + You have been kicked out of the game. 你已被踢出遊戲。 @@ -8896,115 +8419,115 @@ Please enter a name: 您必須選擇一個可用的日數來作為定位. - + Username: 用戶名稱: - + IP Address: IP地址 - + Game Name: 遊戲名稱： - + GameID: 遊戲ID： - + Message: 信息: - + Main Room 主房 - + Game Room 遊戲房間 - + Private Chat 私人聊天 - + Past X Days: 過去 X 天： - + Today 今天 - + Last Hour 1小時前 - + Maximum Results: 最多結果: - + At least one filter is required. The more information you put in, the more specific your results will be. 至少需要1個篩選項。 您輸入的信息越多，找到結果越準確。 - + Get User Logs 獲取用戶記錄 - + Clear Filters 清除篩選項目 - + Filters 篩選項目 - + Log Locations 記錄位置 - + Date Range 日期範圍 - + Maximum Results 最多結果 - - + + Message History 信息歷史 - + Failed to collect message history information. 不能獲取信息歷史消息 - + There are no messages for the selected filters. 沒有符合篩選條件的信息。 @@ -9022,27 +8545,27 @@ The more information you put in, the more specific your results will be.&離開 - + %1 - Private chat %1 - 私人聊天 - + This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. 你已被這用戶屏蔽, 它們不能再主聊天室看見你的信息,你亦不能參加它們的遊戲. - + Private message from 私人信息信到, 来自 - + %1 has left the server. %1 已離開伺服器. - + %1 has joined the server. %1 已加入伺服器. @@ -9050,180 +8573,180 @@ The more information you put in, the more specific your results will be. TabReplays - + Local file system 本地檔案系統 - + Server replay storage 伺服器錄像倉庫 - - + + Watch replay 觀看遊戲錄像 - + Rename 改名 - - + + New folder 新文件夾 - - + + Delete 刪除 - + Open replays folder 打開錄像文件夾 - + Download replay 下載遊戲錄像 - + Toggle expiration lock 過期鎖定 - + Get replay share code - - + + Look up replay by share code - + Rename local folder 本地檔案夾改名 - + Rename local file 本地檔案改名 - + New name: 新名稱 - + Error 出錯 - + Rename failed 改名不成功 - + Name of new folder: 新建文件夾名稱: - + Delete local file 刪除本地檔案 - + Are you sure you want to delete the selected files? 你確定要剷除所有被選的檔案嗎? - + Are you sure you want to delete the selected replays? 你確定要刪除被選錄像檔案嗎 ？ - + Failed to get code - - + + Either this server does not support replay sharing, or does not permit replay sharing for you. - - - + + + Failed - + Could not get replay code - + Replay Share Code - + Others can use this code to add the replay to their list of remote replays: %1 - + Copy to clipboard - + Replay share code - + Replay code found - + Replay was added, or you already had access to it. - + Replay code not found - + Failed to submit code - + Unexpected error - + Delete remote replay 刪除伺服器錄像 @@ -9236,62 +8759,47 @@ The more information you put in, the more specific your results will be. TabRoom - - Friends - - - - - Online - - - - - Ignored - - - - + &Say: &説： - + Chat 聊天 - + &Room &房間 - + &Leave room &離開房間 - + &Clear chat &清除聊天記錄 - + Chat Settings... 聊天設置... - + mentioned you. 提到了你。 - + Click to view 點擊查看 - + You are flooding the chat. Please wait a couple of seconds. 你正在刷屏。請稍等幾秒鐘。 @@ -9304,30 +8812,30 @@ The more information you put in, the more specific your results will be.伺服器 - - - - + + + + Error 出現錯誤 - + Failed to join the server room: it doesn't exist on the server. 加入伺服器房間失敗：在本伺服器上這房間並不存在。 - + The server thinks you are in the server room but your client is unable to display it. Try restarting your client. 伺服器認為你在房間內, 但Cockatrice無法顯示。請重新啓動Cockatrice。 - + You do not have the required permission to join this server room. 你未被允許進入該房間。 - + Failed to join the server room due to an unknown error: %1. 因為以下不知名的錯誤,所以不能參入伺服器房間: %1. @@ -9335,97 +8843,97 @@ The more information you put in, the more specific your results will be. TabSupervisor - + Deck Editor - + Visual Deck Editor - + EDHRec - + Archidekt - + Home - + &Visual Deck Storage - + Visual Database Display - + Server - + Account - + Deck Storage - + Game Replays - + Administration - + Logs - + Are you sure? 你確定嗎？ - + There are still open games. Are you sure you want to quit? 遊戲還在繼續, 你確定要退出嗎？ - + Click to view 點擊查看 - + Your buddy %1 has signed on! 你的好友%1已登錄! - + Unknown Event 不知名事件 - + The server has sent you a message that your client does not understand. This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. @@ -9436,38 +8944,38 @@ To update your client, go to Help -> Check for Updates. 要升級你的客户端，請點擊“幫助”->“檢查更新” - + Idle Timeout 閒置超時 - + You are about to be logged out due to inactivity. 你即將因為長時間沒有活動而被退出。 - + Promotion 升級 - + You have been promoted. Please log out and back in for changes to take effect. 你已被升級.請登出然後再登入讓本更改生效. - + Warned 被警告 - + You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. 你由於$1 原因,現在接受警告. 請避免繼續本行為, 否則你將有可能會接受進一步的警誡或懲罰. 若有任何疑問, 請私信我們門下的版主. - + You have received the following message from the server. (custom messages like these could be untranslated) 你收到松本伺服器發出的以下訊息(類似本信息的自定訊息可能未經翻譯) @@ -9476,12 +8984,12 @@ Please refrain from engaging in this activity or further actions may be taken ag TabVisualDatabaseDisplay - + Database Display - + Visual Database Display @@ -9520,42 +9028,42 @@ Please refrain from engaging in this activity or further actions may be taken ag TranslateCounterName - + Life 生命值 - + White 白色 - + Blue 藍色 - + Black 黑色 - + Red 紅色 - + Green 綠色 - + Colorless 無色 - + Other 其他 @@ -9563,69 +9071,11 @@ Please refrain from engaging in this activity or further actions may be taken ag UpdateDownloader - + Could not open the file for reading. 無法打開文件。 - - UserCardArtSettingsDialog - - - Card Art Settings - - - - - Type a card name... - - - - - Card name: - - - - - Card ProviderId: - - - - - Left margin (%): - - - - - Right margin (%): - - - - - Vertical offset: - - - - - Zoom: - - - - - Parameters - - - - - Preview - - - - - Remove Banner Card - - - UserContextMenu @@ -9743,7 +9193,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Ban History 禁用歷史 @@ -9758,87 +9208,77 @@ Please refrain from engaging in this activity or further actions may be taken ag 用戶從未被禁 - + Failed to collect ban information. 不能獲取禁用訊息 - - - + + + Warning History 警告歷史 - + Warning Time;Moderator;User Name;Reason 警告時間；版主；用戶名稱；理由 - + User has never been warned. 用戶從未接收警告 - + Failed to collect warning information. 不能獲取警告信息 - + Failed to get admin notes. 不能獲取管理筆記 - - + + Success 成功 - + Successfully promoted user. 用戶升級成功 - + Successfully demoted user. 用戶降級成功 - - Kick Player - - - - - Are you sure you want to kick this player from the game? - - - - - - + + + Failed 失敗 - + Failed to promote user. 用戶升級失敗 - + Failed to demote user. 用戶降級失敗 - + Copy hash to clipboard 把哈希覆印到用戶剪貼 - + Remove this user's messages 移除這用戶訊息 @@ -9846,554 +9286,326 @@ Please refrain from engaging in this activity or further actions may be taken ag UserInfoBox - + Location: 位置： - + Account Age: 帳戶年齡 - + Edit 更改 - + Change password 更改密碼 - + Change avatar 更改頭像 - + Administrator 管理員 - + Moderator 版主 - + Registered user 登記用戶 - - + + Unregistered user 未登記用戶 - + Judge 裁判 - + Unknown 不知名 - + The entered password does not match your account. 輸入密碼跟你戶口不匹配 - - - - + + + Information 資訊 - + User information updated. 用戶資訊已更新。 - - - - - - - - - - - + + + + + + + + + + Error 出現錯誤 - + User Information 用戶資訊 - + Real Name: 實名： - + User Level: 用戶等級: - - - Edit Banner Card - - - + %n Year(s), amount of years (only shown if more than 0) %n年(眾) ， - + %10%n Day(s) %20 amount of years (if more than 0), amount of days, date in local short format %10%n日(眾) %20 - + Enter Password 輸入密碼 - + Password verification is required in order to change your email address 要核實密碼才能更改你的電郵地址 - - - + + + An error occurred while trying to update your user information. 在嘗試更新你的用戶信息時出現錯誤. - - The selected card is blacklisted on this server or another error occurred. - - - - - Banner card removed. - - - - - Banner card updated. - - - - + This server does not permit you to update your user informations. 本伺服器不容許你更新你的用戶資訊. - + Password changed. 密碼已更改 - + This server does not permit you to change your password. 本伺服器不容許你更改密碼 - + The new password is too short. 新的密碼太短 - + The old password is incorrect. 舊的密碼不正確 - + Avatar updated. 頭像已更新。 - + This server does not permit you to update your avatar. 本伺服器不容許你更新你的頭像. - - - An error occured while trying to update your avatar. - - - This server does not permit you to update your user informations. - An error occured while trying to updater your avatar. - 本伺服器不容許你更新你的用戶資訊. - - - - UserInfoPopup - - - - Games - - - - - Chat - - - - - Open private chat - - - - - Profile - - - - - View user profile - - - - - Show this user's games - - - - - − Buddy - - - - - Remove from buddy list - - - - - + Buddy - - - - - Add to buddy list - - - - - − Ignore - - - - - Remove from ignore list - - - - - + Ignore - - - - - Add to ignore list - - - - - Ban - - - - - Ban from server - - - - - Warn - - - - - Warn user - - - - - Ban log - - - - - View ban history - - - - - Warn log - - - - - View warning history - - - - - Notes - - - - - View admin notes - - - - - − Mod - - - - - Demote from moderator - - - - - + Mod - - - - - Promote to moderator - - - - - − Judge - - - - - Demote from judge - - - - - + Judge - - - - - Promote to judge - - - - - Join game - - - - - Spectate - - - - - - Loading games… - - - - - Could not load games. - - - - - No active games. - + An error occured while trying to updater your avatar. + 在更新你頭像時出現錯誤 UserInterfaceSettingsPage - + General interface settings 一般通用接口設置 - + &Double-click cards to play them (instead of single-click) 雙點擊使出卡牌 (而不是單點擊使出) - + &Clicking plays all selected cards (instead of just the clicked card) &單一點擊把所有選擇的卡牌使出(不只是被點擊的單張卡牌) - + &Play all nonlands onto the stack (not the battlefield) by default &把所有使出的非地牌放入堆疊區(不是戰場) 作為常用設置 - + Do not delete &arrows inside of subphases - + Close card view window when last card is removed - + Auto focus search bar when card view window is opened - + Annotate card text on tokens 在令牌上標註牌中文字 - - Show selection count during drag selection + + Show selection counter during drag selection - - Show total selection count + + Show total selection counter - - Show subtype breakdown in selection tally - - - - + Use tear-off menus, allowing right click menus to persist on screen 使用浮動菜單，允許右鍵單擊, 把菜單保留在屏幕上 - - Keep game chat focused when clicking in game (Note: disables card view search bar) - - - - + Notifications settings 通告設置 - + Enable notifications in taskbar 開啓任務欄通告 - + Notify in the taskbar for game events while you are spectating 觀看時在任務欄提示遊戲信息 - + Notify in the taskbar when users in your buddy list connect 在任務欄中提示好友連到伺服器 - + Animation settings 動畫設定 - + &Tap/untap animation &橫置/重置 動畫 - + Deck editor/storage settings - + Open deck in new tab by default 把用新頁開啟牌庫作為常用設置 - + Use visual deck storage in game lobby - + Use selection animation for Visual Deck Storage - + When adding a tag in the visual deck storage to a .txt deck: - + do nothing - + ask to convert to .cod - + always convert to .cod - + Default deck editor type - + Classic Deck Editor - + Visual Deck Editor - + Replay settings 重播設置 - + Buffer time for backwards skip via shortcut: 用速鍵啟動向後跳的緩衝時間: @@ -10401,22 +9613,22 @@ Please refrain from engaging in this activity or further actions may be taken ag UserListWidget - + Users connected to server: %1 - + Users in this room: %1 - + Buddies online: %1 / %2 - + Ignored users online: %1 / %2 @@ -10424,45 +9636,35 @@ Please refrain from engaging in this activity or further actions may be taken ag UtilityMenu - + Increment all card counters - + &Untap all permanents - + R&oll die... - - Flip coin - - - - + &Create token... - + C&reate another token - + Cr&eate predefined token - - - C&reate another %1 token - - VisualDatabaseDisplayColorFilterWidget @@ -10514,72 +9716,72 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFilterToolbarWidget - + Sort by - + Filter by - + Save and load filters - + Filter by exact card name - + Filter by card main-type - + Filter by card sub-type - + Filter by set - + Filter by format legality - + Save/Load - + Name - + Main Type - + Sub Type - + Sets - + Formats @@ -10587,22 +9789,22 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFormatLegalityFilterWidget - + Show formats with at least: - + cards - + Do not display formats with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) @@ -10620,32 +9822,32 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayMainTypeFilterWidget - + Show main types with at least: - + cards - + Do not display card main-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10653,27 +9855,27 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayNameFilterWidget - + Filter by name... (Exact match) - + Load from Deck - + Apply all card names in currently loaded deck as exact match name filters - + Load from Clipboard - + Apply all card names in clipboard as exact match name filters @@ -10681,7 +9883,7 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayRecentSetFilterSettingsWidget - + Filter to most recent sets @@ -10689,19 +9891,19 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySetFilterWidget - + Search sets... - - + + Mode: Exact Match - - + + Mode: Includes @@ -10709,37 +9911,37 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySubTypeFilterWidget - + Search subtypes... - + Show sub types with at least: - + cards - + Do not display card sub-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10747,23 +9949,23 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayWidget - + Search by card name (or search expressions) - + Visual - + Loading database ... - + Clear all filters @@ -10802,17 +10004,17 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Toggle Layout: Overlap - + Change how cards are displayed within zones (i.e. overlapped or fully visible.) - + Toggle Layout: Flat @@ -10841,17 +10043,17 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDeckEditorWidget - + Type a card name here for suggestions from the database... - + Quick search and add card - + Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter @@ -10969,43 +10171,43 @@ Please refrain from engaging in this activity or further actions may be taken ag WarningDialog - + Which warning would you like to send? 你想發出那種警告？ - + Redact all messages from this user in all rooms 把這用戶在所有房間留下的訊息刪除 - + &OK &確認 - + &Cancel &取消 - + Warn user for misconduct 對行為不當的用戶發出警告 - - + + Error 出現錯誤 - + User name to send a warning to can not be blank, please specify a user to warn. 接收警告的用戶名稱不能空白.請定好要接收警告的用戶名字. - + Warning to use can not be blank, please select a valid warning to send. 警告名稱不能留空. 請選擇有效的警告. @@ -11013,133 +10215,133 @@ Please refrain from engaging in this activity or further actions may be taken ag WndSets - + Move selected set to the top 將選擇的牌組送到最頂 - + Move selected set up 將選擇的牌組往上一格 - + Move selected set down 將選擇的牌組往下一格 - + Move selected set to the bottom 將選擇的牌組送到最底 - + Search by set name, code, or type 用排組名稱,代碼,或類型進行搜尋 - + Default order 常用次序 - + Restore original art priority order 恢復常用藝術先後次序 - + Enable all sets 啟用所有牌組 - + Disable all sets 禁用所有卡组 - + Enable selected set(s) 啟用選擇的牌組(眾)  - + Disable selected set(s) 停用選擇的牌組(眾) - + Deck Editor 牌庫編輯 - + Use CTRL+A to select all sets in the view. 請按 CTRL + A, 以此選擇所有看到的牌組 - + Only cards in enabled sets will appear in the card list of the deck editor. 只有已經被啟用的卡牌組中的卡牌,才會在牌庫編輯中的卡牌清單出現 - + Image priority is decided in the following order: 卡牌圖片先後次序由以下次序決定: - + first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) %1 is a link to the wiki 自訂檔案夾(%`1)優先, 此對話窗中已被啟用的牌組為後(由頂到底) - + Include cards rebalanced for Alchemy [requires restart] - + Card Art 卡牌藝術 - + How to use custom card art 如何使用自定卡牌圖片 - + Hints 提示 - + Note 筆記 - + Sorting by column allows you to find a set while not changing set priority. 按列排序允許您在不更改系列優先級別的情況下查找牌組。 - + To enable ordering again, click the column header until this message disappears. 要再次啓用排序，請單擊列標題，直到此消息消失。 - + Use the current sorting as the set priority instead 用現在排序代替牌組先後 - + Sorts the set priority using the same column 用同一列分牌組先後 - + Manage sets 管理牌組 @@ -11147,72 +10349,72 @@ Please refrain from engaging in this activity or further actions may be taken ag ZoneViewWidget - + Search by card name (or search expressions) - + Ungrouped 未分組 - + Group by Type 按類型分組 - + Group by Mana Value 按法力數值分組 - + Group by Color 按顏色排序 - + Unsorted 未排序 - + Sort by Name 按名稱排次序 - + Sort by Type 按類型排序 - + Sort by Mana Cost 按法力費用排序 - + Sort by Colors 按顏色(眾) 排序 - + Sort by P/T 按力量/防禦力排序 - + Sort by Set 按排組排序 - + shuffle when closing 關閉界面時洗牌 - + pile view 棟疊觀看 @@ -11220,7 +10422,7 @@ Please refrain from engaging in this activity or further actions may be taken ag i18n - + English @@ -11228,12 +10430,12 @@ Please refrain from engaging in this activity or further actions may be taken ag main - + Connect on startup 啟動時自動連接 - + Debug to file 偵錯紀錄寫進檔案 @@ -11247,7 +10449,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Deck Editor 牌庫編輯 @@ -11328,7 +10530,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Replays 遊戲錄像 @@ -11443,129 +10645,129 @@ Please refrain from engaging in this activity or further actions may be taken ag 載入牌庫... - - + + Load Deck from Clipboard... 從剪貼板載入牌庫 - + Edit Deck in Clipboard, Annotated - + Edit Deck in Clipboard - + New Deck 創建新牌庫 - + Open Custom Pictures Folder 打開自定圖片文件夾 - + Print Deck... 印刷牌庫 - + Delete Card 刪除卡牌 - - + + Reset Layout 重置佈局 - + Save Deck 保存牌庫 - + Save Deck as... 牌庫另存為 - + Save Deck to Clipboard, Annotated 從剪貼板儲藏牌庫, 帶注釋 - + Save Deck to Clipboard, Annotated (No Set Info) - + Save Deck to Clipboard 從剪貼板儲藏牌庫 - + Save Deck to Clipboard (No Set Info) - + Load Local Deck... 從自身檔案載入牌庫 - + Load Remote Deck... 載入伺服器上的牌庫... - + Set Ready to Start 設定準備開始 - + Toggle Sideboard Lock 切換副牌庫鎖 - + Add Green Counter 增加綠色指示物 - + Remove Green Counter 移除綠色指示物 - + Set Green Counters... 設定綠色指示物 - + Add Red Counter 增加红色指示物 - + Remove Red Counter 移除紅色指示物 - + Set Red Counters... 設定紅色指示物 - + Add Life Counter 增加生命指示物 @@ -11575,744 +10777,724 @@ Please refrain from engaging in this activity or further actions may be taken ag - - Load deck from online service... - - - - - Load from website... - - - - + Unload Deck - + Force Start - + Add Card Counter (F) - + Remove Card Counter (F) - + Set Card Counters (F)... - + Add Card Counter (E) - + Remove Card Counter (E) - + Set Card Counters (E)... - + Add Card Counter(D) - + Remove Card Counter (D) - + Set Card Counters (D)... - + Add Card Counter (C) - + Remove Card Counter (C) - + Set Card Counters (C)... - + Add Card Counter (B) - + Remove Card Counter (B) - + Set Card Counters (B)... - + Add Card Counter (A) - + Remove Card Counter (A) - + Set Card Counters (A)... - + Remove Life Counter 移除生命指示物 - + Set Life Counters... 設定生命指示物 - + Add White Counter 增加白色指示物 - + Remove White Counter 移除白色指示物 - + Set White Counters... 設定白色指示物 - + Add Blue Counter 增加藍色指示物 - + Remove Blue Counter 移除藍色指示物 - + Set Blue Counters... 設定藍色指示物 - + Add Black Counter 增加黑色指示物 - + Remove Black Counter 移除黑色指示物 - + Set Black Counters... 設定黑色指示物 - + Add Colorless Counter 增加無色指示物 - + Remove Colorless Counter 移除無色指示物 - + Set Colorless Counters... 設定無色指示物 - + Add Other Counter 增加其他指示物 - + Remove Other Counter 移除其他指示物 - + Set Other Counters... 設定其他指示物 - + Increment all card counters - + Add Power (+1/+0) 增加力量(+1/+0) - + Remove Power (-1/-0) 削減力量(-1/-0) - + Move Toughness to Power (+1/-1) 防禦移到力量（+1/-1） - + Add Toughness (+0/+1) 增加防御(+0/+1) - + Remove Toughness (-0/-1) 削減防御(-0/-1) - + Move Power to Toughness (-1/+1) 力量移到防禦（-1/+1） - + Add Power and Toughness (+1/+1) 增加力量和防御(+1/+1) - + Remove Power and Toughness (-1/-1) 削減力量和防御(-1/-1) - + Set Power and Toughness... 設置力量和防禦 - + Reset Power and Toughness 重置力量和防御 - + Untap 重置 - + Upkeep 維持 - + Draw 抽牌 - + First Main Phase 第一主階段 - + Start Combat 開始戰鬥 - + Attack 攻擊 - + Block 擋格 - + Damage 計算損害 - + End Combat 戰鬥结束 - + Second Main Phase 第二主階段 - + End 完結 - + Next Phase 下個階段 - + Next Phase Action 下個行動階段 - + Next Turn 下一回合 - + Hide Card in Reveal Window 從揭露視窗中隱藏這牌 - + Tap / Untap Card 横置/重置這牌 - + Untap All 重置全牌 - + Toggle Skip Untapping Toggle Untap - + Turn Card Over 反轉本牌 - + Peek Card 查看卡牌 - + Play Card 使出本牌 - + Play Card, Face Down - + Attach Card... 结附牌 - + Unattach Card 解除牌结附 - + Clone Card 複製卡牌 - + Create Token... 派出令牌 - + Create All Related Tokens 派出所有相關令牌 - + Create Another Token 再做另外令牌 - + Set Annotation... 記下註解 - - Reduce Life by Power - - - - + Select All Cards in Zone 選擇所有在區域的牌 - + Select All Cards in Row 選擇所有橫行牌 - + Select All Cards in Column 選擇所有直行牌 - + Reveal Selected Cards to All Players - - + + Bottom of Library 牌庫底 - - - - + + + + Exile 放逐 - - - - + + + + Graveyard 墳場 - - + + Hand 手牌 - - + + Top of Library 牌庫頂 - - + + Battlefield, Face Down 戰場，面朝下 - + Battlefield 戰場 - + Library 牌庫 - + Sideboard 副牌庫 - + Top Cards of Library 排副多張頂牌 - + Bottom Cards of Library 排副多張底牌 - + Close Recent View 關閉最近查看 - - + + Stack 疊區 - - + + Graveyard (Multiple) 多張送墳場 - - + + Graveyard (Multiple), Face Down - - + + Exile (Multiple) 多張放逐 - - + + Exile (Multiple), Face Down - + Stack Until Found 找到以下牌前全送疊區 - + Draw Bottom Card 從牌庫底抽一張牌 - + Draw Multiple Cards from Bottom... 從牌庫底抽超過一張牌 - + Draw Arrow... 畫箭咀 - + Remove Local Arrows 清除自設箭咀 - + Leave Game 離開遊戲 - + Concede 投降 - + Roll Dice... 擲骰 - - Flip Coin - - - - + Shuffle Library 洗牌 - + Shuffle Top Cards of Library - + Shuffle Bottom Cards of Library - + Mulligan 再調度 - + Mulligan (Same hand size) - + Mulligan (Hand size - 1) - + Draw a Card 抽一張牌 - + Draw Multiple Cards... 抽超過一張牌 - + Undo Draw 撤銷抽牌 - + Always Reveal Top Card 永遠顯示頂牌 - + Always Look At Top Card 永遠看到頂牌 - + Sort Hand by Name - + Sort Hand by Type - + Sort Hand by Mana Value - + Reveal Hand to All Players - + Reveal Random Card to All Players - + Rotate View Clockwise 視角順時針轉 - + Rotate View Counterclockwise 視角逆時針轉 - + Unfocus Text Box 取消聚焦文本框 - + Focus Chat 聚焦聊天 - + Clear Chat 掃清聊天 - + Refresh 刷新 - + Skip Forward 跳前 - + Skip Backward 跳後 - + Skip Forward by a lot 向前大跳 - + Skip Backward by a lot 向後大跳 - + Play/Pause 播放/暫停 - + Toggle Fast Forward 切換快進 - + Home - + Visual Deck Storage - + Deck Storage - + Server - + Account - + Administration - + Logs diff --git a/cockatrice/translations/cockatrice_zh-Hans.ts b/cockatrice/translations/cockatrice_zh-Hans.ts index a2df2035e..3e219b572 100644 --- a/cockatrice/translations/cockatrice_zh-Hans.ts +++ b/cockatrice/translations/cockatrice_zh-Hans.ts @@ -2,7 +2,7 @@ AbstractCounter - + &Set counter... &设置指示物 @@ -10,12 +10,12 @@ AbstractCounterDialog - + Set counter 设置指示物 - + New value for counter '%1': 数值物新价值为 '%1' @@ -36,60 +36,60 @@ AbstractTabDeckEditor - + Open in new tab - + Are you sure? - + The decklist has been modified. Do you want to save the changes? - - - - - - + + + + + + Error - + Could not open deck at %1 - + Could not save remote deck - - + + The deck could not be saved. Please check that the directory is writable and try again. - + Save deck - + The deck could not be saved. - + There are no cards in your deck to be exported @@ -105,12 +105,12 @@ Please check that the directory is writable and try again. AdminNotesDialog - + Update Notes 更新后笔记 - + Admin Notes for %1 %1 的管理笔记 @@ -127,227 +127,172 @@ Please check that the directory is writable and try again. Sideboard 副牌库 - - - Tokens - - AppearanceSettingsPage - + seconds 秒 - + Error 出现错误 - + Could not create themes directory at '%1'. 不能在'%1'创造主题目录 - + Theme settings 主题设定 - + Current theme: 现在主题 - + Open themes folder 打开主题文件夹 - + Home tab background source: - + Home tab background shuffle frequency: - + Disabled - + + Display card name of background in bottom right: + + + + Menu settings 选单设定 - + Show keyboard shortcuts in right-click menus 在右击选单中显示键盘快速键 - + Show game filter toolbar above list in room tab - + Card rendering 卡面算绘 - + Display card names on cards having a picture 最有图片的牌上显示牌名 - + Auto-Rotate cards with sideways layout 将打横佈局卡片自动向上旋转 - + Override all card art with personal set preference (Pre-ProviderID change behavior) - - Light - - - - - Dark - - - - - System - - - - - Active theme palette: - - - - - Edit theme palette - - - - - Home tab settings - - - - - Display card name of background in bottom right - - - - - Styling settings - - - - - Style user list - - - - - Card printings - - - - + Bump sets that the deck contains cards from to the top in the printing selector 将牌库中包含的牌组推到艺术选择视窗之顶 - + Scale cards on mouse over 卡牌随游标缩放 - + Use rounded card corners - - Card layout - - - - + Minimum overlap percentage of cards on the stack and in vertical hand 在迭区中和直行手牌中,尽量减少交重迭百分点 - + Maximum initial height for card view window: 卡望框最高开头高度 - - + + rows 横列 - + Maximum expanded height for card view window: - + Card counters - + Counter %1 - + Hand layout 手牌佈局 - + Display hand horizontally (wastes space) 打栋显示手牌(浪费空间) - + Enable left justification 啟用向左对齐 - + Table grid layout 表格布局 - + Invert vertical coordinate 反转垂直坐标 - + Minimum player count for multi-column layout: 界面佈局之内能够容纳的最少玩家数量： - + Maximum font size for information displayed on cards: 卡牌上显示的最大字体大小 @@ -355,12 +300,12 @@ Please check that the directory is writable and try again. ArchidektApiResponseDeckDisplayWidget - + Back to results - + Open Deck in Deck Editor @@ -386,112 +331,112 @@ Please check that the directory is writable and try again. BanDialog - + ban &user name 禁用 &用家名字 - + ban &IP address 禁用&IP地址 - + ban client I&D 禁用客户ID - + Ban type 禁用类型 - + &permanent ban &永久禁用 - + &temporary ban &暂时禁用 - + &Days: &日 - + &Hours: &小时 - + &Minutes: &分鐘 - + Duration of the ban 禁用时间 - + Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. 请记载禁用原因 这项只保留为版主, 被禁用户不能看到. - + Please enter the reason for the ban that will be visible to the banned person. 请记载被禁用户能看到的被禁原因. - + Redact all messages from this user in all rooms 将这用户所有室中打出的讯息完全移除 - + &OK &OK - + &Cancel &取消 - + Ban user from server 把用户从本伺服器禁用 - - - - + + + + Error 出现错误 - + You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. 若要对用户实施禁用,请你选择以下叁种的拼合:名字,IP,或用户id. - + You must have a value in the name ban when selecting the name ban checkbox. 若用用户名字施行禁用,必须要填写姓名. - + You must have a value in the ip ban when selecting the ip ban checkbox. 若用ip地址施行禁用,必须要写下IP地址. - + You must have a value in the clientid ban when selecting the clientid ban checkbox. 若用用户ID施行禁用,必须要写下用户ID. @@ -499,123 +444,59 @@ This is only saved for moderators and cannot be seen by the banned person. BetaReleaseChannel - + Beta 测试版 - + No reply received from the release update server. 从发佈更新伺服器收不到回覆. - + Invalid reply received from the release update server. 从发佈更新伺服器收不到有效的回覆. - + No reply received from the file update server. 从档案更新伺服器收不到有效的回覆. - - CardArtPreviewWidget - - - No card selected - - - - - CardArtRulesModel - - - Card - - - - - ProviderId - - - - - Mode - - - - - Reason - - - CardDatabaseModel - + Name 名字 - + Sets 牌组 - + Mana cost 法力费用 - + Card type 卡牌类别 - + P/T 力量/防御力 - + Color(s) 顏色 - - CardDatabaseView - - - Add to Deck - - - - - Add to Sideboard - - - - - Select Printing - - - - - Show on EDHRec (Commander) - - - - - Show on EDHRec (Card) - - - - - Show Related cards - - - CardFilter @@ -744,22 +625,22 @@ This is only saved for moderators and cannot be seen by the banned person. CardInfoPictureWidget - + View related cards 查看关联卡牌 - + Add card to deck - + Mainboard - + Sideboard @@ -782,12 +663,12 @@ This is only saved for moderators and cannot be seen by the banned person. - + Related cards: 有关牌名: - + Unknown card: 不知名的牌 @@ -795,146 +676,128 @@ This is only saved for moderators and cannot be seen by the banned person. CardMenu - + Re&veal to... - + &All players - + View related cards - + Token: - + All tokens - + &Select All - + S&elect Row - + S&elect Column - + &Play - + &Hide - + Play &Face Down - + &Tap / Untap Turn sideways or back again - + Skip &untapping - + T&urn Over Turn face up/face down - + &Peek at card face - + &Clone - + Attac&h to card... - + Unattac&h - + &Draw arrow... - + &Set annotation... - - Reduce life by power - - - - + Ca&rd counters - + &Add counter (%1) - + &Remove counter (%1) - + &Set counters (%1)... - - CardPictureLoaderCacheMethod - - - Network Cache - - - - - Filesystem - - - CardSizeWidget @@ -946,133 +809,133 @@ This is only saved for moderators and cannot be seen by the banned person. CardZoneLogic - + their hand nominative - + %1's hand nominative - + their library look at zone - + %1's library look at zone - + of their library top cards of zone, - + of %1's library top cards of zone - + their library reveal zone - + %1's library reveal zone - + their library shuffle - + %1's library shuffle - + their library nominative - + %1's library nominative - + their graveyard nominative - + %1's graveyard nominative - + their exile nominative - + %1's exile nominative - + their sideboard look at zone - + %1's sideboard look at zone - + their sideboard nominative - + %1's sideboard nominative - + their custom zone '%1' nominative - + %1's custom zone '%2' nominative @@ -1094,421 +957,16 @@ This is only saved for moderators and cannot be seen by the banned person. - - ColorButton - - - Click to pick a color - - - - - Pick colour - - - - - ConnectionController - - - - The server has reached its maximum user capacity, please check back later. - - - - - There are too many concurrent connections from your address. - - - - - Banned by moderator - - - - - Expected end time: %1 - - - - - This ban lasts indefinitely. - - - - - Scheduled server shutdown. - - - - - - Invalid username. - - - - - You have been logged out due to logging in at another location. - - - - - Connection closed - - - - - The server has terminated your connection. -Reason: %1 - - - - - The server is going to be restarted in %n minute(s). -All running games will be lost. -Reason for shutdown: %1 - - - - - Scheduled server shutdown - - - - - Failed Login - - - - - Your client seems to be missing features this server requires for connection. - - - - - To update your client, go to 'Help -> Check for Client Updates'. - - - - - - - - - - - - - - - - - - - - - - Error - - - - - Incorrect username or password. Please check your authentication information and try again. - - - - - There is already an active session using this user name. -Please close that session first and re-login. - - - - - - You are banned until %1. - - - - - - You are banned indefinitely. - - - - - This server requires user registration. Do you want to register now? - - - - - This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. -Please close and reopen your client to try again. - - - - - An internal error has occurred, please close and reopen Cockatrice before trying again. -If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - - - - Account activation - - - - - Your account has not been activated yet. -You need to provide the activation token received in the activation email. - - - - - Server Full - - - - - Unknown login error: %1 - - - - - - -This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - - - - - - - - - Registration denied - - - - - Registration is currently disabled on this server - - - - - There is already an existing account with the same user name. - - - - - It's mandatory to specify a valid email address when registering. - - - - - It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. - - - - - Password too short. - - - - - Registration failed for a technical problem on the server. - - - - - The connection to the server has been lost. - - - - - Unknown registration error: %1 - - - - - Account activation failed - - - - - Socket error: %1 - - - - - Server timeout - - - - - You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. -Local version is %1, remote version is %2. - - - - - Your Cockatrice client is obsolete. Please update your Cockatrice version. -Local version is %1, remote version is %2. - - - - - - Success - - - - - Registration accepted. -Will now login. - - - - - Account activation accepted. -Will now login. - - - - - Information - - - - - This server supports additional features that your client doesn't have. -This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. - -To update your client, go to Help -> Check for Updates. - - - - - - - Reset Password - - - - - Your password has been reset successfully, you can now log in using the new credentials. - - - - - Failed to reset user account password, please contact the server operator to reset your password. - - - - - Activation request received, please check your email for an activation token. - - - - - Connecting to %1... - - - - - Registering to %1 as %2... - - - - - Disconnected - - - - - Connected, logging in at %1 - - - - - Requesting forgotten password to %1 as %2... - - - - - Your username must respect these rules: - - - - - is %1 - %2 characters long - - - - - can %1 contain lowercase characters - - - - - - - - NOT - - - - - can %1 contain uppercase characters - - - - - can %1 contain numeric characters - - - - - can contain the following punctuation: %1 - - - - - first character can %1 be a punctuation mark - - - - - no unacceptable language as specified by these server rules: - note that the following lines will not be translated - - - - - can not contain any of the following words: %1 - - - - - can not match any of the following expressions: %1 - - - - - You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - - CustomZoneMenu - + C&ustom Zones - - + + View custom zone '%1' @@ -1516,35 +974,30 @@ To update your client, go to Help -> Check for Updates. DeckAnalyticsWidget - + Add Panel - + Remove Panel - + Save Layout - + Load Layout - - - Include Sideboard - - DeckEditorCardDatabaseDockWidget - + Card Database @@ -1560,17 +1013,47 @@ To update your client, go to Help -> Check for Updates. DeckEditorDatabaseDisplayWidget - + Search by card name (or search expressions) - + + Add to Deck + + + + + Add to Sideboard + + + + + Select Printing + + + + + Show on EDHRec (Commander) + + + + + Show on EDHRec (Card) + + + + + Show Related cards + + + + Add card to &maindeck - + Add card to &sideboard @@ -1603,72 +1086,72 @@ To update your client, go to Help -> Check for Updates. - + Select Printing - + Deck - + Deck &name: - + Banner Card/Tags Visibility Settings - + Show banner card selection menu - + Show tags selection menu - + &Comments: - + Group by: - + Format: - + Hash: - + &Increment number - + &Decrement number - + &Remove row - + Swap card to/from sideboard @@ -1676,17 +1159,17 @@ To update your client, go to Help -> Check for Updates. DeckEditorFilterDockWidget - + Filters - + &Clear all filters - + Delete selected @@ -1817,113 +1300,169 @@ To update your client, go to Help -> Check for Updates. DeckEditorSettingsPage - - + + Update Spoilers 更新预览卡牌 - + + Success 成功 - + Download URLs have been reset. 下载URL已重置。 - + + Downloaded card pictures have been reset. + 下载的卡牌图片已被重置。 + + + + Error + 出现错误 + + + + One or more downloaded card pictures could not be cleared. + 一幅或以上的卡牌图片未能被清除。 + + + Add URL 添加URL - - + + URL: URL: - - + + Edit URL 更改URL - + + Network Cache Size: + 图片网路缓存大小： + + + + Redirect Cache TTL: + 网路缓处再定向生存时间 + + + + How long cached redirects for urls are valid for. + 再定向缓处有效时间 + + + + Picture Cache Size: + 图片缓存大小： + + + Add New URL 添置新 URL - + Remove URL 移除 URL. - + + Day(s) + 日 + + + Updating... 更新中... - + Choose path 选择路径 - + URL Download Priority URL下载优先次序 - + Spoilers 预览 - + Download Spoilers Automatically 自动下载预览 - + Spoiler Location: 预览位置: - + Last Change 最后变更 - + Spoilers download automatically on launch 开啟时自动下载预览 - + Press the button to manually update without relaunching 免重新啟动人手按制更新 - + Do not close settings until manual update is complete 人手更新完成前,不能关掉设置 - + Download card pictures on the fly 即时下载卡牌图片 - + How to add a custom URL 如何添加自定URL - + + Delete Downloaded Images + 删除已下载的图片 + + + Reset Download URLs 重置下载URL + + + On-disk cache for downloaded pictures + 下载图片专用硬盘缓储 + + + + In-memory cache for pictures not currently on screen + 现不在萤光幕上记忆中图片缓储 + DeckListHistoryManagerWidget @@ -1989,12 +1528,12 @@ To update your client, go to Help -> Check for Updates. DeckLoader - + Common deck formats (%1) - + All files (*.*) @@ -2216,27 +1755,27 @@ To update your client, go to Help -> Check for Updates. - + Moved to %1 1 × "%2" (%3) - + Removed "%1" (all copies) - + %1 1 × "%2" (%3) - + Added - + Removed @@ -2258,74 +1797,74 @@ To update your client, go to Help -> Check for Updates. DeckViewContainer - + Load deck... 载入牌库... - + Load remote deck... 载入伺服器上的牌库... - + Load from clipboard... - + Load from website... - + Unload deck - + Ready to start 準备好 - + Force start 强迫开始 - + Sideboard unlocked 备牌解锁 - + Sideboard locked 解锁锁上 - - + + Error 出现错误 - + The selected file could not be loaded. 选择的档案不能再入 - + Deck is greater than maximum file size. - + Are you sure you want to force start? This will kick all non-ready players from the game. - + Cockatrice @@ -2424,7 +1963,7 @@ This will kick all non-ready players from the game. - + Webpage 网页 @@ -2464,37 +2003,37 @@ This will kick all non-ready players from the game. 连接伺服器 - + Server URL 伺服器URL - + Communication Port 通信端口 - + Unique Server Name 独特伺服器名字 - + Connection Warning 连接警告 - + You need to name your new connection profile. 你必须将你的连接简介命名 - + Connect Warning 连接警告 - + The player name can't be empty. 玩家名称不能空置 @@ -2607,17 +2146,17 @@ This will kick all non-ready players from the game. 创建游戏 - + Game information 游戏资讯 - + Error 出现错误 - + Server error. 伺服器出现错误. @@ -2625,97 +2164,97 @@ This will kick all non-ready players from the game. DlgCreateToken - + &Name: &名称： - + Token 令牌 - + C&olor: &顏色： - + white 白色 - + blue 蓝色 - + black 黑色 - + red 红色 - + green 绿色 - + multicolor 多色 - + colorless 无色 - + &P/T: &力量/防御力: - + &Annotation: &註释： - + &Destroy token when it leaves the table &此令牌离场时会被摧毁 - + Create face-down (Only hides name) - + Token data 令牌资料 - + Show &all tokens 显示&所有令牌 - + Show tokens from this &deck 显示本牌库所有令牌 - + Choose token from list 从清单中选择令牌 - + Create token 派出令牌 @@ -2749,7 +2288,7 @@ This will kick all non-ready players from the game. - + ✖ @@ -2764,12 +2303,12 @@ This will kick all non-ready players from the game. - + Duplicate Tag - + This tag already exists. @@ -2956,12 +2495,12 @@ To remove your current avatar, confirm without choosing a new image. 请输入令牌名称: - + Error 出现错误 - + The chosen name conflicts with an existing card or token. Make sure to enable the 'Token' set in the "Manage sets" dialog to display them correctly. 现时选择的名字跟现有的卡牌或令牌出现衝突.请从"牌组管理"中啟动'令牌牌组',保持正确显示. @@ -2985,12 +2524,12 @@ Make sure to enable the 'Token' set in the "Manage sets" dia 未定义 - + Real name: 实名: - + Edit user profile 更改用户资料 @@ -3028,113 +2567,113 @@ Make sure to enable the 'Token' set in the "Manage sets" dia 2小时 - + Hide 'buddies only' games - + Hide full games - + Hide games that have started - + Hide password protected games - + Hide 'ignored user' games - + Hide games not created by buddies Hide games not created by buddy - + Hide games with forced open decklists - + &Newer than: &新过: - + Game &description: 游戏 &描述: - + &Creator name: &创建者名称: - + General 一般 - + &Game types &游戏类型 - + at &least: &至少: - + at &most: &最多： - + Maximum player count 可容纳玩家最高数量 - + Restrictions 限制 - + Show games only if &spectators can watch 只显示容许&观看者 观看的游戏 - + Show spectator password p&rotected games 显示有观看者&密码保护的游戏 - + Show only if spectators can ch&at 只显示容许观看者&聊天的游戏 - + Show only if spectators can see &hands 只显示容许观看者看&手牌 的游戏 - + Spectators 观看者 - + Filter games 筛选游戏 @@ -3437,37 +2976,37 @@ https://tappedout.net/mtg-decks/your-deck-name/ DlgMoveTopCardsUntil - + Card name (or search expressions): 卡牌名称(或搜寻表达式) - + Number of hits: 因为cockatrice原生没有ssl支援, 所以你不能自动下载更新. 请瀏览到我们的下载网页,进行人手更新. - + Auto play hits 开关副牌上锁 - + Put top cards on stack until... 把顶牌放在重迭区, 直到... - + No cards matching the search expression exists in the card database. Proceed anyways? 在卡牌资料库中找不到符合搜寻表达式的卡牌.你想继续吗? - + Cockatrice Cockatrice - + Invalid filter 筛选无效 @@ -3528,40 +3067,40 @@ Your email will be used to verify your account. 未定义 - + Real name: 实名： - + Register to server 註册加入伺服器 - - - - + + + + Registration Warning 注册警告 - + Your password is too short. 你的密码太短。 - + Your passwords do not match, please try again. 两次输入的密码不一致，请重新输入， - + Your email addresses do not match, please try again. 两次输入的电子邮箱不一致，请重新输入。 - + The player name can't be empty. 玩家名称不能空置 @@ -3569,17 +3108,17 @@ Your email will be used to verify your account. DlgRollDice - + Number of sides: 骰子面数: - + Number of dice: 骰子数目: - + Roll Dice 掷骰 @@ -3630,12 +3169,12 @@ Your email will be used to verify your account. DlgSettings - + Unknown Error loading card database 读取卡牌资料库时出现不知名错误 - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -3652,7 +3191,7 @@ Would you like to change your database location setting? 你想要重新设置卡牌资料库路径吗？ - + Your card database version is too old. This can cause problems loading card information or images @@ -3669,7 +3208,7 @@ Would you like to change your database location setting? 你想要重新设置卡牌资料库路径吗？ - + Your card database did not finish loading Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached @@ -3682,7 +3221,7 @@ Would you like to change your database location setting? 你想要重新设置卡牌资料库路径吗？ - + File Error loading your card database. Would you like to change your database location setting? @@ -3690,7 +3229,7 @@ Would you like to change your database location setting? 你想要重新设置卡牌资料库路径吗？ - + Your card database was loaded but contains no cards. Would you like to change your database location setting? @@ -3699,7 +3238,7 @@ Would you like to change your database location setting? 你想要重新设置卡牌资料库路径吗？ - + Unknown card database load status Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues @@ -3715,64 +3254,59 @@ https://github.com/Cockatrice/Cockatrice/issues 你想不想更改你的资料库位置设定? - - - + + + Error 出现错误 - + The path to your deck directory is invalid. Would you like to go back and set the correct path? 你的牌库目录路径现在无效. 你想要重新设置套牌路径吗？ - + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? 你的卡牌图片目录路径现在无效. 你想要重新设置卡牌图片资料库路径吗？ - + Settings 设定 - + General 一般 - + Appearance 外观 - + User Interface 用户界面 - - Storage - - - - + Card Sources 卡牌来源 - + Chat 聊天 - + Sound 声音 - + Shortcuts 快捷键 @@ -3864,9 +3398,9 @@ You can always change this behavior in the 'General' settings tab. - - - + + + Error 出现错误 @@ -3919,31 +3453,31 @@ Please visit the download page to update manually. - + Update Available 现有更新版本 - + A new version of Cockatrice is available! Cockatrice有新版本可用！ - + New version 新版本 - + Released 已发行 - + Changelog 变更记载 @@ -3953,50 +3487,50 @@ Please visit the download page to update manually. 你打算现在更新吗？ - + Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. - + Please check the <a href="%1">releases page</a> on our Github and download the build for your system. - - - + + + Update Error 更新出现错误 - + An error occurred while checking for updates: 检测更新时出现错误: - + An error occurred while downloading an update: 下载更新时出现错误 - + Installing... 安装中 - + Cockatrice is unable to open the installer. Cockatrice 不能啟动安装程式 - + Try to update manually by closing Cockatrice and running the installer. 请你尝试人手更新, 关掉cockatrice, 然后重开安装程式. - + Download location 下载位置 @@ -4086,67 +3620,67 @@ You may have to manually download the new version. DrawProbabilityWidget - + Draw Probability - + Probability of drawing - + Card Name - + Type - + Subtype - + Mana Value - + At least - + Exactly - + card(s) having drawn at least - + cards - + Category - + Qty - + Odds (%) @@ -4260,7 +3794,7 @@ You may have to manually download the new version. FilterBuilder - + Type your filter here 输入你的筛选类型 @@ -4291,22 +3825,22 @@ You may have to manually download the new version. GameEventHandler - + kicked by game host or moderator - + player left the game - + player disconnected from server - + reason unknown @@ -4314,140 +3848,140 @@ You may have to manually download the new version. GameSelector - - - - - - - - - + + + + + + + + + Error 出现错误 - + Please join the appropriate room first. 请先参加合适房间 - + Wrong password. 密码错误. - + Spectators are not allowed in this game. 这个游戏不允许观眾加入. - + The game is already full. 这个游戏已经满了. - + The game does not exist any more. 这个游戏已经不存在了。 - + This game is only open to registered users. 这个游戏只开放给註册用户. - + This game is only open to its creator's buddies. 这个游戏只开放给房间主办的好友。 - + You are being ignored by the creator of this game. 你被这个房间的主办屏蔽了. - + Join Game - + Spectate Game - + Game Information - + Join Game as Judge - + Spectate Game as Judge - + Join game 加入游戏 - + Password: 密码: - + Please join the respective room first. 请先参加相关的房间. - + &Filter games &筛选游戏 - + C&lear filter &清除筛选项目 - + C&reate &创建 - + &Join &加入 - + Join as judge - + J&oin as spectator &作为观看者加入 - + Join as judge spectator - + Games shown: %1 / %2 显示游戏：%1/%2 - + Games 游戏 @@ -4455,32 +3989,32 @@ You may have to manually download the new version. GameSelectorQuickFilterToolBar - + All types - + Filter by game name... - + Filter by game type/format - + Hide games not created by buddies - + Hide full games - + Hide started games @@ -4488,105 +4022,105 @@ You may have to manually download the new version. GamesModel - + >1 day ＞1日 - + %1%2 hr short age in hours %1%2 小时 - + new 新建 - + %1%2 min short age in minutes %1%2 分鐘 - + password 密码 - + buddies only 仅限好友 - + reg. users only 仅限註册用户 - + open decklists + - can chat 允许聊天 - + see hands 查看手牌 - + can see hands 允许查看手牌 - + not allowed 不允许 - + Room 房间 - + Age 时长 - + Description 描述: - + Creator 创建者 - + Type 类型 - + Restrictions 限制 - + Players 玩家 - + Spectators 观看者 @@ -4594,158 +4128,143 @@ You may have to manually download the new version. GeneralSettingsPage - + Reset all paths 重置所有路径 - + All paths have been reset 重置所有路径 - - - - - - - + + + + + + + Choose path 选择路径 - - Language settings - + + Personal settings + 个人设定 - + Language: 语言: - - Version settings - - - - - Card database - - - - - Startup settings - - - - + Paths (editing disabled in portable mode) 路径(在便携模式下不能编辑) - + Paths 路径 - + How to help with translations - + Decks directory: 牌库路径: - + Filters directory: - + Replays directory: 游戏录像目录: - + Pictures directory: 图片目录: - + Card database: 卡牌资料库： - + Custom database directory: 自主资料库目录 - + Token database: 令牌资料库: - + Update channel 更新渠道 - + Check for client updates on startup 啟动时检查客户更新 - + Check for card database updates on startup - + Don't check - + Prompt for update - + Always update in the background - + Check for card database updates every - + days - + Notify if a feature supported by the server is missing in my client 如果客户端缺少伺服器支持的更功能时,请提示我 - + Automatically run Oracle when running a new version of Cockatrice 啟动新版本Cockatrice时,自动运行Oracle. - + Show tips on startup 显示启动时提示 - + Last update check on %1 (%2 days ago) @@ -4753,47 +4272,47 @@ You may have to manually download the new version. GraveyardMenu - + &Graveyard - + &View graveyard - + &Move graveyard to... - + &Top of library - + &Bottom of library - + &All players - + &Hand - + &Exile - + Reveal random card to... @@ -4801,88 +4320,88 @@ You may have to manually download the new version. HandMenu - + &Hand - + &View hand - + Sort hand by... - + Name - + Type - + Mana Value - + Take &mulligan (Choose hand size) - + Take mulligan (Same hand size) - + Take mulligan (Hand size - 1) - + &Move hand to... - + &Top of library - + &Bottom of library - + &Graveyard - + &Exile - + &Reveal hand to... - - + + All players - + Reveal r&andom card to... @@ -4890,52 +4409,52 @@ You may have to manually download the new version. HomeWidget - + Create New Deck - + Browse Decks - + Browse Card Database - + Browse EDHRec - + Browse Archidekt - + View Replays - + Quit - + Connecting... - + Connect - + Play @@ -4943,213 +4462,213 @@ You may have to manually download the new version. LibraryMenu - + &Library - + &View library - + View &top cards of library... - + View bottom cards of library... - + Reveal &library to... - + Lend library to... - + Reveal &top cards to... - + &Top of library... - + &Bottom of library... - + &Always reveal top card - + &Always look at top card - + &Open deck in deck editor - + &Draw card - + D&raw cards... - + &Undo last draw - + Shuffle - + &Play top card - + Play top card &face down - + Put top card on &bottom - + Move top card to grave&yard - + Move top card to e&xile - + Move top cards to &graveyard... - + Move top cards to graveyard face down... - + Move top cards to &exile... - + Move top cards to exile face down... - + Put top cards on stack &until... - + Shuffle top cards... - + &Draw bottom card - + D&raw bottom cards... - + &Play bottom card - + Play bottom card &face down - + Move bottom card to grave&yard - + Move bottom card to e&xile - + Move bottom cards to &graveyard... - + Move bottom cards to graveyard face down... - + Move bottom cards to &exile... - + Move bottom cards to exile face down... - + Put bottom card on &top - + Shuffle bottom cards... - - + + &All players - + Reveal top cards of library - + Number of cards: (max. %1) @@ -5157,273 +4676,633 @@ You may have to manually download the new version. MainWindow - - + + + The server has reached its maximum user capacity, please check back later. + 伺服器已达到最最高用户限额，请另外选择吉时再试. + + + + There are too many concurrent connections from your address. + 你的网路地址拥有太多同时连繫. + + + + Banned by moderator + 你已被版主禁用 + + + + Expected end time: %1 + 预计结束时间: %1 + + + + This ban lasts indefinitely. + 这是无限期禁用 + + + + Scheduled server shutdown. + 排期伺服器关机 + + + + + Invalid username. + 不可用的用户名。 + + + + You have been logged out due to logging in at another location. + 因为你已在另外的位置登入, 所以你现有的联繫已被登出. + + + + Connection closed + 连繫已被关闭 + + + + The server has terminated your connection. +Reason: %1 + 伺服器已经中断你的联繫/ +原因: %1 + + + + The server is going to be restarted in %n minute(s). +All running games will be lost. +Reason for shutdown: %1 + 伺服器将会在 %n 分鐘内重新啟动. 所有进行中的游戏都会报销.伺服器关闭原因: %1 + + + + Scheduled server shutdown + 排期伺服器关机 + + + + + Success + 成功 + + + + Registration accepted. +Will now login. + 註册已成功。 +现在登入。 + + + + Account activation accepted. +Will now login. + 户口啟动已经成功 +现在登入. + + + + Player %1 玩家 %1 - + Load replay 载入游戏录像 - + About Cockatrice 关於Cockatrice - + Version 版本 - + Cockatrice Webpage Cockatrice 网页 - + Project Manager: 项目经理： - + Past Project Managers: 前项目经理： - + Developers: 开发者： - + Our Developers 我们的开发者： - + Help Develop! 协助开发！ - + Translators: 翻译者： - + Our Translators 翻译者名单 - + Help Translate! 协助翻译! - + Support: 支援: - + Report an Issue 报告问题 - + Troubleshooting 排除故障 - + F.A.Q. 问答 - - + + + + + + + + + + + + + + + + + + + + Error 出现错误 - + + Server timeout + 伺服器超时 + + + + Failed Login + 登入失败 + + + + Your client seems to be missing features this server requires for connection. + 你的客户端似乎脱小本伺服器需要用来达成连繫的功能. + + + + To update your client, go to 'Help -> Check for Client Updates'. + 请去"求助->检查客户端更新" 内更新你的客户. + + + + Incorrect username or password. Please check your authentication information and try again. + 用户名或密码错误。请检查账号信息,然后重试。 + + + + There is already an active session using this user name. +Please close that session first and re-login. + 已经有在线用户正在使用这用户名.请先关闭连线,然后重新登入. + + + + + You are banned until %1. + 你被禁止直到: %1. + + + + + You are banned indefinitely. + 你已被永久封禁. + + + + This server requires user registration. Do you want to register now? + 本伺服器要求用户註册. 你想不想现在登记? + + + + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. + 本伺服器要求用户拥有客户id. 你的客户端现在不能造成客户id,或是你正在使用修改过的客户端. +请你关掉现有的客户端,然后重新啟动, 择吉日再试。 + + + + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. + 因为内部出现故障, 请关闭,重开Cockatrice 然后再次尝试. +如果故障继续出现,请将客户端软件升级为最新版本, 有需要时请联络软件开发人士. + + + + Account activation + 户口啟动 + + + + Your account has not been activated yet. +You need to provide the activation token received in the activation email. + 你的户口还未尝啟动. +你需要提供从啟动电邮得来的验证码. + + + + Server Full + 伺服器载满 + + + + Unknown login error: %1 + 不知名登入错误: %1 + + + + + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. + +这通常意味住你的客户端版本已经过期,引起你的客户端不能明晓伺服器的回覆. + + + + Your username must respect these rules: + 您的用户名字必须遵守以下规则： + + + + is %1 - %2 characters long + 在%1 - %2个字符之间。 + + + + can %1 contain lowercase characters + 可以 $1 包含细楷/小写字母 + + + + + + + NOT + 并否 + + + + can %1 contain uppercase characters + 可以 $1 包含大楷/大写字母 + + + + can %1 contain numeric characters + 可以 $1 包含数字 + + + + can contain the following punctuation: %1 + 可以包含以下符号：%1 + + + + first character can %1 be a punctuation mark + 第一个字符可以 %1 是标点符号 + + + + no unacceptable language as specified by these server rules: + note that the following lines will not be translated + 在以下伺服器规矩中,道明不能接受的语言: + + + + can not contain any of the following words: %1 + 不能含有以下字眼: %1 + + + + can not match any of the following expressions: %1 + 不能含有以下语句: %1 + + + + You may only use A-Z, a-z, 0-9, _, ., and - in your username. + 你的用户名字只可以用以下的字符: A-Z, a-z, 0-9, _, ., 和 - . + + + + + + + + + Registration denied + 註册被拒绝 + + + + Registration is currently disabled on this server + 这伺服器暂时谢绝登记 + + + + There is already an existing account with the same user name. + 这个用户名字已经被使用. + + + + It's mandatory to specify a valid email address when registering. + 登记时必要指明合能用的电邮地址. + + + + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + 你看来好像在本伺服器尝试申请新户口, 但是你已经有跟你电邮掛鉤的户口名字.我们的伺服器限制每用户在每个地址可以有多少个户口. 如果需要更多援助或是得取你的登入资料,请联络伺服器办事人. + + + + Password too short. + 密码太短。 + + + + Registration failed for a technical problem on the server. + 由於伺服器出现技术问题, 你的登记暂时失败. + + + + The connection to the server has been lost. + + + + + Unknown registration error: %1 + 不知名登记错误: %1 + + + + Account activation failed + 户口啟动失败 + + + + Socket error: %1 + 接口错误: %1 + + + + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + 你正在尝试跟过时的伺服器连繫. 请把你的 Cockatrice 版本降级,或是连繫於合适的伺服器. 当地/离线版本维 %1, 遥距/上线版本维 %2. + + + + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + 你的 Cockatrice 版本现已过时.请把你的版本更新. +当地/离线版本维 %1, 遥距/上线版本维 %2. + + + + Connecting to %1... + 向 %1 连接中... + + + + Registering to %1 as %2... + 正在用%2的身份登记到%1伺服器... + + + + Disconnected + 已经断线了 + + + + Connected, logging in at %1 + 连线成功, 在%1登入 + + + + + + Requesting forgotten password to %1 as %2... + 正在用%2的身份对%1要求遗忘密码. + + + &Connect... &连线... - + &Disconnect &断线 - + Start &local game... 开始&离线游戏 - + &Watch replay... &观看游戏录像 - + &Full screen &全屏 - + &Register to server... &註册加入伺服器 - + &Restore password... &弄回密码 - + &Settings... 设置⋯ - + &Exit &退出 - + A&ctions &动作 - + &Cockatrice &Cockatrice - + C&ard Database &卡牌资料库 - + &Manage sets... &管理牌组 - + Edit custom &tokens... 编辑自定 &令牌... - + Open custom image folder 打开自定图片文件夹 - + Open custom sets folder 打开自定牌组文件夹 - + Add custom sets/cards 添加自定卡组/卡牌 - + Reload card database 刷新卡牌资料库 - + Tabs - + &Help &求助 - + &About Cockatrice &关於Cockatrice - + &Tip of the Day &每日提示 - + Check for Client Updates 检查客户端更新 - + Check for Card Updates... 检查卡牌更新 - + Check for Card Updates (Automatic) - + Show Status Bar - + View &Debug Log 查看&侦错纪录 - + Open Settings Folder 打开设置文件夹 - + Show/Hide 显示/隐藏 - + New Version 新版本 - + Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. 恭喜你将Cockatrice升级为%1. 现在会帮你啟动oracle, 更新你的卡牌资料库. - + Cockatrice installed Cockatrice 已被安装 - + Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. 恭喜你成功安装Cockatrice%1. 现在会帮你啟动oracle, 安装你的卡牌资料库. - + Card database 卡牌资料库 - + Cockatrice is unable to load the card database. Do you want to update your card database now? If unsure or first time user, choose "Yes" @@ -5432,29 +5311,29 @@ If unsure or first time user, choose "Yes" 如果不确定, 或者是第一次使用，请选择“是/Yes” - - + + Yes 是/Yes - - + + No 否/No - + Open settings 打开设置 - + New sets found 发现新卡组 - + %n new set(s) found in the card database Set code(s): %1 Do you want to enable it/them? @@ -5463,22 +5342,17 @@ Do you want to enable it/them? 要啟用它们吗？ - - Yes, always enable - - - - + View sets 查看卡组 - + Welcome 欢迎 - + Hi! It seems like you're running this version of Cockatrice for the first time. All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. @@ -5487,131 +5361,166 @@ Read more about changing the set order or disabling specific sets and consequent 请阅读,了解更多在“卡组设置”对话框裡.更改卡组顺序或者禁用某些卡组的功能. - + + Information 资讯 - + A card database update is already running. 资料库更新现已进行. - + Unable to run the card database updater: 不能运行卡牌资料附更新程式: - + Card database update running. - + Failed to start. The file might be missing, or permissions might be incorrect. - + The process crashed some time after starting successfully. - + Timed out. The process took too long to respond. The last waitFor...() function timed out. - + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. - + An error occurred when attempting to read from the process. For example, the process may not be running. - + Unknown error occurred. - + The card database updater exited with an error: %1 - - - - - + + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + 本伺服器支持你现在客户端软件欠缺的额外功能. + +这信息不是大问题, 但此信息可能意会现在已有新版本的 Cockatrice, 或是本伺服器运用自设或预先释放版本. + +请到"援助->检查更新"去更新你的客户端. + + + + + + + Load sets/cards 载入卡组/卡牌 - + Selected file cannot be found. 找不到选择的文件。 - + You can only import XML databases at this time. 你暂时只能导入xml资料库. - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. 已经成功添加新的卡组/卡牌. Cockatrice会重新载入卡牌资料库. - + Sets/cards failed to import. 卡组/卡牌导入失败. + + + + + Reset Password + 重设密码 + + + + Your password has been reset successfully, you can now log in using the new credentials. + 你的密码已经成功重置, 你可以用新密码重新登入。 + + + + Failed to reset user account password, please contact the server operator to reset your password. + 重置用户密码失败, 请联络伺服器管责人重置密码. + + + + Activation request received, please check your email for an activation token. + 已经收到啟动要求, 请从你的电邮获取啟动验证码. + ManaBaseConfigDialog - + Mana Base Configuration - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): - + OK - + Cancel @@ -5683,27 +5592,27 @@ Cockatrice will now reload the card database. ManaDevotionConfigDialog - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): @@ -5773,615 +5682,610 @@ Cockatrice will now reload the card database. MessageLogWidget - + from play 从战场上 - + from their graveyard 从它们的坟场 - + from exile 从放逐区 - + from their hand 从它们的手牌 - + the top card of %1's library %1牌库的顶牌 - + the top card of their library 它们的顶牌 - + from the top of %1's library 从%1牌库的顶 - + from the top of their library 从它们1牌库顶 - + the bottom card of %1's library %1牌库的底牌 - + the bottom card of their library 它们牌库的底牌 - + from the bottom of %1's library 从%1的牌库底 - + from the bottom of their library 从它们的牌库底 - + from %1's library 从%1的牌库 - + from their library 从它们的牌库 - + from sideboard 从备牌中 - + from the stack 从迭区中 - + from custom zone '%1' - + %1 is now keeping the top card %2 revealed. %1现在保持%2顶牌显现. - + %1 is not revealing the top card %2 any longer. %1不再展示牌库顶牌%2。 - + %1 can now look at top card %2 at any time. %1可以随时查看牌库顶牌 %2. - + %1 no longer can look at top card %2 at any time. %1再不可以随时查看牌库顶牌 %2. - + %1 attaches %2 to %3's %4. %1 结附 %2 指向 %3的 %4. - + %1 has conceded the game. %1 在此游戏宣佈降服. - + %1 has unconceded the game. %1 收回在此游戏降服. - + %1 has restored connection to the game. %1已恢復连接。 - + %1 has lost connection to the game. %1 已失去连接。 - + %1 points from their %2 to themselves. %1 从它们的%2 指向自己。 - + %1 points from their %2 to %3. %1 从它们的%2指向%3。 - + %1 points from %2's %3 to themselves. %1 从%2的%3 指向自己。 - + %1 points from %2's %3 to %4. %1 从%2的%3 指向%4。 - + %1 points from their %2 to their %3. %1 从它们的%2指向它们的%3。 - + %1 points from their %2 to %3's %4. %1 从它们的%2指向%3的%4。 - + %1 points from %2's %3 to their own %4. %1 从%2的%3指向自己的%4。 - + %1 points from %2's %3 to %4's %5. %1 从%2的%3指向%4的%5。 - + %1 creates a face down token. - + %1 creates token: %2%3. %1 派出令牌: %2%3 - + %1 has loaded a deck (%2). %1 已载入牌库(%2) - + %1 has loaded a deck with %2 sideboard cards (%3). %1已载入含有 %2张备牌的牌库(%3). - + %1 destroys %2. %1销毁了%2。 - + a card 一张牌 - + %1 gives %2 control over %3. %1将%3的控制转移给%2. - + %1 puts %2 into play%3 face down. %1将%2%3牌面朝下地放进战场。 - + %1 puts %2 into play%3. %1将%2放进战场%3。 - + %1 puts %2%3 into their graveyard face down. - + %1 puts %2%3 into their graveyard. %1将%2%3置入它们的的坟场。 - + %1 exiles %2%3 face down. - + %1 exiles %2%3. %1 放逐%2%3. - + %1 moves %2%3 to their hand. %1将%2%3移到它们的的手牌中。 - + %1 puts %2%3 into their library. %1将%2%3放入它们的牌库。 - + %1 puts %2%3 onto the bottom of their library. %1将%2%3放在它们的牌库底部。 - + %1 puts %2%3 on top of their library. %1将%2%3放在它们的牌库顶部。 - + %1 puts %2%3 into their library %4 cards from the top. %1将%2%3放在它们的牌库顶部%4张牌以下。 - + %1 moves %2%3 to sideboard. %1 将%2%3移到副牌库. - + %1 plays %2%3 face down. - + %1 plays %2%3. %1使出 %2%3。 - + %1 moves %2%3 to custom zone '%4' face down. - + %1 moves %2%3 to custom zone '%4'. - + %1 tries to draw from an empty library %1尝试从空牌库抽牌 - + %1 draws %2 card(s). %1抽%2张牌。 - + %1 is looking at %2. %1 正在查看%2。 - + %1 is looking at the %4 %3 card(s) %2. top card for singular, top %3 cards for plural %1 正在查看%2的 %4 %3张卡牌. - + bottom 底部 - + top 顶部 - + %1 turns %2 face-down. %1把%2翻为面朝下。 - + %1 turns %2 face-up. %1把%2翻为面朝上。 - + The game has been closed. 游戏已经关闭。 - + The game has started. 游戏已开始。 - + You are flooding the game. Please wait a couple of seconds. - + %1 has joined the game. %1 已经加入游戏。 - + %1 is now watching the game. %1 正在旁观游戏。 - + You have been kicked out of the game. 你已被踢出游戏。 - + %1 has left the game (%2). %1 已经离开游戏(%2)。 - + %1 is not watching the game any more (%2). %1 已经不再旁观游戏(%2)。 - + %1 is not ready to start the game any more. %1 还未準备好开始游戏。 - + %1 shuffles their deck and draws a new hand of %2 card(s). %1将其牌库洗牌，然后抽%2张牌作为新的起手。 - + %1 shuffles their deck and draws a new hand. %1将其牌库洗牌，然后抽起新的手牌。 - + You are watching a replay of game #%1. 你正在观看游戏#%1的录像。 - + %1 is ready to start the game. %1已準备好开始游戏。 - + cards an unknown amount of cards 卡牌(眾)  - + %1 card(s) a card for singular, %1 cards for plural %1 卡牌(眾)  - + %1 lends %2 to %3. %1把&2借给%3. - + %1 reveals %2 to %3. %1把%2展示给%3. - + %1 reveals %2. %1 展示 %2。 - + %1 randomly reveals %2%3 to %4. %1随机展示%2%3给%4。 - + %1 randomly reveals %2%3. %1随机展示%2%3。 - + %1 peeks at face down card #%2. %1查看面朝下的卡牌#%2。 - + %1 peeks at face down card #%2: %3. %1查看面朝下的卡牌#%2:%3。 - + %1 reveals %2%3 to %4. %1展示%2%3给%4。 - + %1 reveals %2%3. %1展示%2%3。 - + %1 reversed turn order, now it's %2. %1 逆转回合次序，现在轮到%2。 - + reversed 逆转 - + normal 正常 - + Heads 正面 - + Tails 翻面 - + %1 flipped a coin. It landed as %2. %1掷了硬币。结果为%2。 - + %1 rolls a %2 with a %3-sided die. %1掷%3面骰子，结果为%2。 - + %1 flips %2 coins. There are %3 heads and %4 tails. %1掷了%2个硬币。结果为%3个正面和%4个反面。 - + %1 rolls a %2-sided dice %3 times: %4. %1把%2面骰子掷了%3次:%4 - + %1's turn. 轮到 %1. - + %1 sets annotation of %2 to %3. %1给%2添加了註释成%3。 - - %1 places %2 %3%4 counter(s) on %5 (now %6). + + %1 places %2 "%3" counter(s) on %4 (now %5). - - %1 removes %2 %3%4 counter(s) from %5 (now %6). + + %1 removes %2 "%3" counter(s) from %4 (now %5). - - %1 failed to undo their last draw. - - - - + %1 sets counter %2 to %3 (%4%5). %1 将%2指示物设置为 %3 (%4%5)。 - + %1 sets %2 to not untap normally. %1 将 %2 设置为不被重置。 - + %1 sets %2 to untap normally. %1 将 %2 设置为照常重置。 - + %1 removes the PT of %2. %1 移除%2的力量/防御. - + %1 changes the PT of %2 from nothing to %4. %1把%2的力量/防御从无数值转为%4. - + %1 changes the PT of %2 from %3 to %4. %1把%2的力量/防御从%3转为%4. - + %1 has locked their sideboard. %1已经锁定它们的的副牌库。 - + %1 has unlocked their sideboard. %1已经把它们的的副牌库解锁。 - + %1 taps their permanents. %1横置它们的永久卡牌 - + %1 untaps their permanents. %1重置它们的永久卡牌. - + %1 taps %2. %1 横置 %2. - + %1 untaps %2. %1 重置 %2。 - + %1 shuffles %2. % 1 对 %2 洗牌 - + %1 shuffles the bottom %3 cards of %2. %1 洗 %2 底的 %3 张卡牌. - + %1 shuffles the top %3 cards of %2. %1 洗 %2 顶的 %3 张卡牌. - + %1 shuffles cards %3 - %4 of %2. %1到%2.洗%3 - %4 - + %1 unattaches %2. %1 取消了%2的结附。 - + %1 undoes their last draw. %1 放回它们最后一张抽到的卡牌. - + %1 undoes their last draw (%2). %1 放回它们最后一张抽到的卡牌(%2). @@ -6389,115 +6293,110 @@ Cockatrice will now reload the card database. MessagesSettingsPage - + Word1 Word2 Word3 词1 词2 词3 - + Add New Message 添加新信息 - + Edit Message 更改信息 - + Remove Message 移除信息 - + Add message 添加信息 - - + + Message: 信息: - + Edit message 更改信息 - + Chat settings 聊天设定 - + Custom alert words 自定通知触发词语 - + Enable chat mentions 允许聊天中提到某人 - + Enable mention completer 允许自动完成提名 - + In-game message macros 游戏内短信速键 - + How to use in-game message macros 如何使用游戏内短信速键 - + Ignore chat room messages sent by unregistered users 不要显示未註册用户的聊天消息。 - + Ignore private messages sent by unregistered users 不要显示未註册用户的私人消息. - - Ignore private messages sent by non-buddy users - - - - - + + Invert text color 反转文本顏色 - + Enable desktop notifications for private messages 容许桌面提醒提及私人消息 - + Enable desktop notification for mentions 容许桌面提醒提及聊天提名 - + Enable room message history on join 加入聊天室时开启消息历史 - - + + (Color is hexadecimal) （顏色为16进制） - + Separate words with a space, alphanumeric characters only 将单词以空格区分，仅支持字母. @@ -6505,42 +6404,42 @@ Cockatrice will now reload the card database. MoveMenu - + Move to - + &Top of library in random order - + X cards from the top of library... - + &Bottom of library in random order - + T&able - + &Hand - + &Graveyard - + &Exile @@ -6553,47 +6452,47 @@ Cockatrice will now reload the card database. 卡牌类型 - + Mana Value 法力数值 - + Color(s) 颜色(眾)  - + Loyalty 忠诚值 - + Main Card Type 卡牌主类型 - + Mana Cost 法力费用 - + P/T 力量/防御力 - + Side 正面/底面 - + Layout 佈局 - + Color Identity 顏色身份 @@ -6616,152 +6515,6 @@ Cockatrice will now reload the card database. 重迭方向 - - PaletteEditorDialog - - - - Reset - - - - - - Apply - - - - - - Save && Apply - - - - - ▼ Edit Palette - - - - - - ▶ Edit Palette - - - - - Palette Editor — %1 - - - - - <b>Palette Editor</b> &nbsp;·&nbsp; %1 - - - - - This theme ships no default palette files - - - - - Replace current colours with the theme author's defaults - - - - - Switch between the light and dark palette files - - - - - Editing: - - - - - Show or hide the per-role colour grid for manual tweaks - - - - - ↺ Revert to theme default - - - - - Discard unsaved edits and restore the last saved palette - - - - - Preview this palette without saving to disk - - - - - Write palette-%1.toml and reload the theme - - - - - Cannot save: this theme has no directory on disk - - - - - Save failed - - - - - Could not write %1 to: -%2 - - - - - No default found - - - - - No default palette file found for the "%1" scheme. - - - - - PaletteGridWidget - - - Active - - - - - Disabled - - - - - Inactive - - - - - Normal interactive state - - - - - Widget is disabled / not interactive - - - - - Window is in background / unfocused - - - Phase @@ -6828,57 +6581,57 @@ Cockatrice will now reload the card database. PhasesToolbar - + Untap step 重置步 - + Upkeep step 维持步 - + Draw step 抓牌步 - + First main phase 第一主阶段 - + Beginning of combat step 战斗开始步 - + Declare attackers step 宣告阻挡步 - + Declare blockers step 宣告阻挡步 - + Combat damage step 战斗损害步 - + End of combat step 战斗结束步 - + Second main phase 第二主阶段 - + End of turn step 回合完结部 @@ -6886,7 +6639,7 @@ Cockatrice will now reload the card database. PictureLoader - + en code for scryfall's language property, not available for all languages zhs @@ -6895,142 +6648,151 @@ Cockatrice will now reload the card database. PlayerActions - - - - - grave - - - - - - - - exile - - - - - PlayerDialogs - - + View top cards of library - - - - - - - - - + + + + + + + + + Number of cards: (max. %1) - + View bottom cards of library - + Shuffle top cards of library - + Shuffle bottom cards of library - + Draw hand - + 0 and lower are in comparison to current hand size - + Draw cards - + + + + + grave + + + + + + + + exile + + + + Move top cards to %1 - + Move bottom cards to %1 - + Draw bottom cards - + + + C&reate another %1 token + + + + Create tokens - + + Number: - + Place card X cards from top of library - + Which position should this card be placed: - + (max. %1) - + Change power/toughness - + Change stats to: - + Set annotation - + Please enter the new annotation: + + + Set counters + + PlayerMenu - + Player "%1" - + &Counters @@ -7060,7 +6822,7 @@ This setting means you'll only see the default printing for each card, instead o - + Printing Selector @@ -7068,22 +6830,22 @@ This setting means you'll only see the default printing for each card, instead o PrintingSelectorCardOverlayWidget - + Preference 喜好 - + Pin Printing 版本上别针 - + Unpin Printing 版本脱别针 - + Show Related cards 显示关联卡牌 @@ -7154,57 +6916,57 @@ This setting means you'll only see the default printing for each card, instead o PtMenu - + Power / toughness - + &Increase power - + &Decrease power - + I&ncrease toughness - + D&ecrease toughness - + In&crease power and toughness - + Dec&rease power and toughness - + Increase power and decrease toughness - + Decrease power and increase toughness - + Set &power and toughness... - + Reset p&ower and toughness @@ -7212,37 +6974,37 @@ This setting means you'll only see the default printing for each card, instead o QMenuBar - + Services 服务 - + Hide %1 隐藏 %1 - + Hide Others 隐藏其他 - + Show All 全部展示 - + Preferences... 喜好... - + Quit %1 退出%1 - + About %1 关於 %1 @@ -7250,17 +7012,17 @@ This setting means you'll only see the default printing for each card, instead o QObject - + Cockatrice card database (*.xml) Cockatrice卡牌资料库 (*.xml) - + All files (*.*) 所有档案格式 (*.*) - + Cockatrice replays (*.cor) Cockatrice录像文件 (*.cor) @@ -7320,177 +7082,110 @@ Are you sure you would like to disable this feature? QPlatformTheme - + OK OK/确认 - + Save 保存 - + Save All 全部保存 - + Open 打开 - + &Yes &是/Yes - + Yes to &All &全选是/Yes - + &No &否/No - + N&o to All &全选否/No - + Abort 退出 - + Retry 重试 - + Ignore 不理 - + Close 关闭 - + Cancel 取消 - + Discard 弃牌 - + Help 协助 - + Apply 应用 - + Reset 重设 - + Restore Defaults 恢復常用认值 - - QuickSetupPanel - - - %1% - - - - - <b>Quick Setup</b> - - - - - Generate all palette roles automatically from a single accent colour - - - - - Accent: - - - - - Primary hue. Used directly for highlights and links. -At high intensity it also tints buttons and backgrounds. - - - - - Intensity: - - - - - Subtle - - - - - Full colour - - - - - 0–30 Subtle tint — only highlights and links change hue -30–70 Accented — buttons, tooltips, and borders join in -70–100 Full colour — backgrounds, everything - - - - - 70% - - - - - Generate ↓ - - - - - Derive all palette roles from the accent colour above. -Fine-tune individual colours in the grid afterwards. - - - RemoteDeckList_TreeModel - + Name 名字 - + ID ID - + Upload time 上载时间 @@ -7498,32 +7193,32 @@ Fine-tune individual colours in the grid afterwards. RemoteReplayList_TreeModel - + ID ID - + Name 名字 - + Players 玩家(眾) - + Keep 选用 - + Time started 开始时间 - + Duration (sec) 维持(秒) @@ -7531,37 +7226,37 @@ Fine-tune individual colours in the grid afterwards. RfgMenu - + &Exile - + &View exile - + &Move exile to... - + &Top of library - + &Bottom of library - + &Hand - + &Graveyard @@ -7607,7 +7302,7 @@ Fine-tune individual colours in the grid afterwards. SayMenu - + S&ay @@ -7648,27 +7343,27 @@ Fine-tune individual colours in the grid afterwards. SetsModel - + Enabled 已启用 - + Set type 设置类型 - + Set code 设置代码 - + Long name 长名 - + Release date 发行日期 @@ -7676,53 +7371,53 @@ Fine-tune individual colours in the grid afterwards. ShortcutSettingsPage - - + + Restore all default shortcuts 恢復所有常用快键 - + Do you really want to restore all default shortcuts? 确定要恢復所有常用快键吗? - + Clear all default shortcuts 清除所有常用快键 - + Do you really want to clear all shortcuts? 确认清除所有快键吗? - + Section: 部分： - + Action: 行动: - + Shortcut: 快键: - + How to set custom shortcuts 如何设置自定快键 - + Clear all shortcuts 清除所有快键 - + Search by shortcut name 按快键名称搜寻 @@ -7778,12 +7473,12 @@ Please check your shortcut settings! SideboardMenu - + &Sideboard - + &View sideboard @@ -7791,27 +7486,27 @@ Please check your shortcut settings! SoundSettingsPage - + Enable &sounds 启用&声效 - + Current sounds theme: 现前声效主题： - + Test system sound engine 测试系统声效引擎 - + Sound settings 声效设置 - + Master volume 主音量 @@ -7883,146 +7578,16 @@ Please check your shortcut settings! 从发佈更新伺服器收不到有效的回覆. - + No reply received from the tag update server. 未收到标籤更新伺服器的回应. - + Invalid reply received from the tag update server. 从标籤更新伺服器收不到有效的回覆. - - StorageSettingsPage - - - - - Success - - - - - Cached card pictures have been reset. - - - - - Downloaded card pictures have been reset. - - - - - Error - - - - - One or more downloaded card pictures could not be cleared. - - - - - In-memory (currently loaded) card pictures have been reset. - - - - - Card Picture Loader Caching Method: - - - - - The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size. - - - - - Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while. - - - - - This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk. - - - - - Delete Cached Images - - - - - Delete Saved Images - - - - - Clear In-Memory Images - - - - - Card Picture Loader Cache Method - - - - - Network Cache - - - - - Filesystem - - - - - In-Memory Picture Cache - - - - - Network Cache Size: - - - - - On-disk cache for downloaded pictures - - - - - Redirect Cache TTL: - - - - - How long cached redirects for urls are valid for. - - - - - Picture Cache Size: - - - - - In-memory cache for pictures not currently on screen - - - - - Naming scheme: - - - - - Day(s) - - - TabAccount @@ -8158,117 +7723,117 @@ Please check your shortcut settings! TabArchidekt - - + + Desc. - - + + AND - - + + Require ALL selected colors - - + + Deck name... - - + + Owner... - - + + Packages - - + + Advanced Filters - + Bracket: - - + + Any - - + + Contains card... - - + + Commander... - - + + Tag... - - + + Deck Size - + Cards: - - + + Asc. - + Sort by: - + Filter by: - + Display Settings - - + + Search - - + + Formats @@ -8278,54 +7843,6 @@ Please check your shortcut settings! - - TabCardArtRules - - - Card: - - - - - ProviderId: - - - - - Mode: - - - - - Reason: - - - - - Type a card name... - - - - - Add rule - - - - - Remove rule - - - - - Refresh - - - - - Card Art Rules - - - TabDeckEditor @@ -8374,7 +7891,7 @@ Please check your shortcut settings! 重置布局 - + Deck: %1 牌库:%1 @@ -8382,49 +7899,55 @@ Please check your shortcut settings! TabDeckEditorVisual - + Visual Deck: %1 - + &Visual Deck Editor - - + + Card Info - - + + Deck - + + + Filters + + + + &View - + Printing - + Visible - + Floating - + Reset layout @@ -8432,22 +7955,22 @@ Please check your shortcut settings! TabDeckEditorVisualTabWidget - + Visual Deck View - + Visual Database Display - + Deck Analytics - + Sample Hand @@ -8455,133 +7978,133 @@ Please check your shortcut settings! TabDeckStorage - + Local file system 本地档案系统 - + Server deck storage 伺服器牌库储藏 - - + + Open in deck editor 在套牌编辑打开 - + Rename deck or folder - + Upload deck 上载牌库 - + Download deck 下载套牌 + - - - + + New folder 新文件夹 + - Delete 删除 - + Open decks folder 打开牌库文件夹 - + Rename local folder - + Rename local file - + New name: - - - - + + + + Error 出现错误 - + Rename failed - - + + Invalid deck file 无效牌库档案 - + Enter deck name 输入牌库名称 - + This decklist does not have a name. Please enter a name: 本牌库列表未有名称.请输入名称: - + Unnamed deck 未命名牌库 - + Failed to upload deck to server 牌库上载於伺服器时失败 - + Delete local file 删除本地档案 - + Are you sure you want to delete the selected files? 你确定要删除被选档案(眾)吗 ？ - + Delete remote decks 删除伺服器上的牌库 - + Are you sure you want to delete the selected decks? 你确定要剷除所有被选的牌库吗? - - + + Name of new folder: 新建文件夹名称: @@ -8653,191 +8176,191 @@ Please enter a name: TabGame - - - + + + Replay 游戏录像重温 - - + + Game 游戏 - - + + Player List 玩家列表 - - + + Card Info 卡牌资讯 - - + + Messages 信息 - - + + Replay Timeline 录像时间线 - + &Phases 阶段 - + &Game 游戏 - + Next &phase 下个&阶段 - + Next phase with &action 下个阶段&行动 - + Next &turn 下个&回合 - + Reverse turn order 逆转回合次序 - + &Remove all local arrows &移除所有自设箭头 - + Rotate View Cl&ockwise &顺时针旋转视角 - + Rotate View Co&unterclockwise &逆时针旋转视角 - + Game &information 游戏&资讯 - + Un&concede 撤销&投降 - - - + + + &Concede &投降 - + &Leave game &离开游戏 - + C&lose replay &关闭游戏录像 - + &Focus Chat &聚焦聊天 - + &Say: &説： - + Selected cards - + &View &视图 - + Visible 可见 - + Floating 浮动 - + Reset layout 重置布局 - + Concede 投降 - + Are you sure you want to concede this game? 你确定要宣佈投降吗？ - + Unconcede 撤销投降 - + You have already conceded. Do you want to return to this game? 你已经宣佈投降,你想回到这场游戏吗？ - + Leave game 离开游戏 - + Are you sure you want to leave this game? 你确定要离开这个游戏吗？ - + A player has joined game #%1 有玩家加入游戏 #%1 - + %1 has joined the game %1 已经加入游戏。 - + You have been kicked out of the game. 你已被踢出游戏。 @@ -8896,115 +8419,115 @@ Please enter a name: 您必须选择一个可用的日数来作为定位. - + Username: 用户名称: - + IP Address: IP地址 - + Game Name: 游戏名称： - + GameID: 游戏ID： - + Message: 信息: - + Main Room 主房 - + Game Room 游戏房间 - + Private Chat 私人聊天 - + Past X Days: 过去 X 天： - + Today 今天 - + Last Hour 1小时前 - + Maximum Results: 最多结果: - + At least one filter is required. The more information you put in, the more specific your results will be. 至少需要1个筛选项。 您输入的信息越多，找到结果越準确。 - + Get User Logs 获取用户记录 - + Clear Filters 清除筛选项目 - + Filters 筛选项目 - + Log Locations 记录位置 - + Date Range 日期范围 - + Maximum Results 最多结果 - - + + Message History 信息历史 - + Failed to collect message history information. 不能获取信息历史消息 - + There are no messages for the selected filters. 没有符合筛选条件的信息。 @@ -9022,27 +8545,27 @@ The more information you put in, the more specific your results will be.&离开 - + %1 - Private chat %1 - 私人聊天 - + This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. 你已被这用户屏蔽, 它们不能再主聊天室看见你的信息,你亦不能参加它们的游戏. - + Private message from 私人信息信到, 来自 - + %1 has left the server. %1 已离开伺服器. - + %1 has joined the server. %1 已加入伺服器. @@ -9050,180 +8573,180 @@ The more information you put in, the more specific your results will be. TabReplays - + Local file system 本地档案系统 - + Server replay storage 伺服器录像仓库 - - + + Watch replay 观看游戏录像 - + Rename 改名 - - + + New folder 新文件夹 - - + + Delete 删除 - + Open replays folder 打开录像文件夹 - + Download replay 下载游戏录像 - + Toggle expiration lock 过期锁定 - + Get replay share code - - + + Look up replay by share code - + Rename local folder 本地档案夹改名 - + Rename local file 本地档案改名 - + New name: 新名称 - + Error 出错 - + Rename failed 改名不成功 - + Name of new folder: 新建文件夹名称: - + Delete local file 删除本地档案 - + Are you sure you want to delete the selected files? 你确定要剷除所有被选的档案吗? - + Are you sure you want to delete the selected replays? 你确定要删除被选录像档案吗 ？ - + Failed to get code - - + + Either this server does not support replay sharing, or does not permit replay sharing for you. - - - + + + Failed - + Could not get replay code - + Replay Share Code - + Others can use this code to add the replay to their list of remote replays: %1 - + Copy to clipboard - + Replay share code - + Replay code found - + Replay was added, or you already had access to it. - + Replay code not found - + Failed to submit code - + Unexpected error - + Delete remote replay 删除伺服器录像 @@ -9236,62 +8759,47 @@ The more information you put in, the more specific your results will be. TabRoom - - Friends - - - - - Online - - - - - Ignored - - - - + &Say: &説： - + Chat 聊天 - + &Room &房间 - + &Leave room &离开房间 - + &Clear chat &清除聊天记录 - + Chat Settings... 聊天设置... - + mentioned you. 提到了你。 - + Click to view 点击查看 - + You are flooding the chat. Please wait a couple of seconds. 你正在刷屏。请稍等几秒鐘。 @@ -9304,30 +8812,30 @@ The more information you put in, the more specific your results will be.伺服器 - - - - + + + + Error 出现错误 - + Failed to join the server room: it doesn't exist on the server. 加入伺服器房间失败：在本伺服器上这房间并不存在。 - + The server thinks you are in the server room but your client is unable to display it. Try restarting your client. 伺服器认为你在房间内, 但Cockatrice无法显示。请重新启动Cockatrice。 - + You do not have the required permission to join this server room. 你未被允许进入该房间。 - + Failed to join the server room due to an unknown error: %1. 因为以下不知名的错误,所以不能参入伺服器房间: %1. @@ -9335,97 +8843,97 @@ The more information you put in, the more specific your results will be. TabSupervisor - + Deck Editor - + Visual Deck Editor - + EDHRec - + Archidekt - + Home - + &Visual Deck Storage - + Visual Database Display - + Server - + Account - + Deck Storage - + Game Replays - + Administration - + Logs - + Are you sure? 你确定吗？ - + There are still open games. Are you sure you want to quit? 游戏还在继续, 你确定要退出吗？ - + Click to view 点击查看 - + Your buddy %1 has signed on! 你的好友%1已登录! - + Unknown Event 不知名事件 - + The server has sent you a message that your client does not understand. This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. @@ -9436,38 +8944,38 @@ To update your client, go to Help -> Check for Updates. 要升级你的客户端，请点击“帮助”->“检查更新” - + Idle Timeout 閒置超时 - + You are about to be logged out due to inactivity. 你即将因为长时间没有活动而被退出。 - + Promotion 升级 - + You have been promoted. Please log out and back in for changes to take effect. 你已被升级.请登出然后再登入让本更改生效. - + Warned 被警告 - + You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. 你由於$1 原因,现在接受警告. 请避免继续本行为, 否则你将有可能会接受进一步的警诫或惩罚. 若有任何疑问, 请私信我们门下的版主. - + You have received the following message from the server. (custom messages like these could be untranslated) 你收到松本伺服器发出的以下讯息(类似本信息的自定讯息可能未经翻译) @@ -9476,12 +8984,12 @@ Please refrain from engaging in this activity or further actions may be taken ag TabVisualDatabaseDisplay - + Database Display - + Visual Database Display @@ -9520,42 +9028,42 @@ Please refrain from engaging in this activity or further actions may be taken ag TranslateCounterName - + Life 生命值 - + White 白色 - + Blue 蓝色 - + Black 黑色 - + Red 红色 - + Green 绿色 - + Colorless 无色 - + Other 其他 @@ -9563,69 +9071,11 @@ Please refrain from engaging in this activity or further actions may be taken ag UpdateDownloader - + Could not open the file for reading. 无法打开文件。 - - UserCardArtSettingsDialog - - - Card Art Settings - - - - - Type a card name... - - - - - Card name: - - - - - Card ProviderId: - - - - - Left margin (%): - - - - - Right margin (%): - - - - - Vertical offset: - - - - - Zoom: - - - - - Parameters - - - - - Preview - - - - - Remove Banner Card - - - UserContextMenu @@ -9743,7 +9193,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Ban History 禁用历史 @@ -9758,87 +9208,77 @@ Please refrain from engaging in this activity or further actions may be taken ag 用户从未被禁 - + Failed to collect ban information. 不能获取禁用讯息 - - - + + + Warning History 警告历史 - + Warning Time;Moderator;User Name;Reason 警告时间；版主；用户名称；理由 - + User has never been warned. 用户从未接收警告 - + Failed to collect warning information. 不能获取警告信息 - + Failed to get admin notes. 不能获取管理笔记 - - + + Success 成功 - + Successfully promoted user. 用户升级成功 - + Successfully demoted user. 用户降级成功 - - Kick Player - - - - - Are you sure you want to kick this player from the game? - - - - - - + + + Failed 失败 - + Failed to promote user. 用户升级失败 - + Failed to demote user. 用户降级失败 - + Copy hash to clipboard 把哈希覆印到用户剪贴 - + Remove this user's messages 移除这用户讯息 @@ -9846,554 +9286,326 @@ Please refrain from engaging in this activity or further actions may be taken ag UserInfoBox - + Location: 位置： - + Account Age: 帐户年龄 - + Edit 更改 - + Change password 更改密码 - + Change avatar 更改头像 - + Administrator 管理员 - + Moderator 版主 - + Registered user 登记用户 - - + + Unregistered user 未登记用户 - + Judge 裁判 - + Unknown 不知名 - + The entered password does not match your account. 输入密码跟你户口不匹配 - - - - + + + Information 资讯 - + User information updated. 用户资讯已更新。 - - - - - - - - - - - + + + + + + + + + + Error 出现错误 - + User Information 用户资讯 - + Real Name: 实名： - + User Level: 用户等级: - - - Edit Banner Card - - - + %n Year(s), amount of years (only shown if more than 0) %n年(眾) ， - + %10%n Day(s) %20 amount of years (if more than 0), amount of days, date in local short format %10%n日(眾) %20 - + Enter Password 输入密码 - + Password verification is required in order to change your email address 要核实密码才能更改你的电邮地址 - - - + + + An error occurred while trying to update your user information. 在尝试更新你的用户信息时出现错误. - - The selected card is blacklisted on this server or another error occurred. - - - - - Banner card removed. - - - - - Banner card updated. - - - - + This server does not permit you to update your user informations. 本伺服器不容许你更新你的用户资讯. - + Password changed. 密码已更改 - + This server does not permit you to change your password. 本伺服器不容许你更改密码 - + The new password is too short. 新的密码太短 - + The old password is incorrect. 旧的密码不正确 - + Avatar updated. 头像已更新。 - + This server does not permit you to update your avatar. 本伺服器不容许你更新你的头像. - - - An error occured while trying to update your avatar. - - - This server does not permit you to update your user informations. - An error occured while trying to updater your avatar. - 本伺服器不容许你更新你的用户资讯. - - - - UserInfoPopup - - - - Games - - - - - Chat - - - - - Open private chat - - - - - Profile - - - - - View user profile - - - - - Show this user's games - - - - - − Buddy - - - - - Remove from buddy list - - - - - + Buddy - - - - - Add to buddy list - - - - - − Ignore - - - - - Remove from ignore list - - - - - + Ignore - - - - - Add to ignore list - - - - - Ban - - - - - Ban from server - - - - - Warn - - - - - Warn user - - - - - Ban log - - - - - View ban history - - - - - Warn log - - - - - View warning history - - - - - Notes - - - - - View admin notes - - - - - − Mod - - - - - Demote from moderator - - - - - + Mod - - - - - Promote to moderator - - - - - − Judge - - - - - Demote from judge - - - - - + Judge - - - - - Promote to judge - - - - - Join game - - - - - Spectate - - - - - - Loading games… - - - - - Could not load games. - - - - - No active games. - + An error occured while trying to updater your avatar. + 在更新你头像时出现错误 UserInterfaceSettingsPage - + General interface settings 一般通用接口设置 - + &Double-click cards to play them (instead of single-click) 双点击使出卡牌 (而不是单点击使出) - + &Clicking plays all selected cards (instead of just the clicked card) &单一点击把所有选择的卡牌使出(不只是被点击的单张卡牌) - + &Play all nonlands onto the stack (not the battlefield) by default &把所有使出的非地牌放入堆迭区(不是战场) 作为常用设置 - + Do not delete &arrows inside of subphases - + Close card view window when last card is removed - + Auto focus search bar when card view window is opened - + Annotate card text on tokens 在令牌上标註牌中文字 - - Show selection count during drag selection + + Show selection counter during drag selection - - Show total selection count + + Show total selection counter - - Show subtype breakdown in selection tally - - - - + Use tear-off menus, allowing right click menus to persist on screen 使用浮动菜单，允许右键单击, 把菜单保留在屏幕上 - - Keep game chat focused when clicking in game (Note: disables card view search bar) - - - - + Notifications settings 通告设置 - + Enable notifications in taskbar 开启任务栏通告 - + Notify in the taskbar for game events while you are spectating 观看时在任务栏提示游戏信息 - + Notify in the taskbar when users in your buddy list connect 在任务栏中提示好友连到伺服器 - + Animation settings 动画设定 - + &Tap/untap animation &横置/重置 动画 - + Deck editor/storage settings - + Open deck in new tab by default 把用新页开啟牌库作为常用设置 - + Use visual deck storage in game lobby - + Use selection animation for Visual Deck Storage - + When adding a tag in the visual deck storage to a .txt deck: - + do nothing - + ask to convert to .cod - + always convert to .cod - + Default deck editor type - + Classic Deck Editor - + Visual Deck Editor - + Replay settings 重播设置 - + Buffer time for backwards skip via shortcut: 用速键啟动向后跳的缓衝时间: @@ -10401,22 +9613,22 @@ Please refrain from engaging in this activity or further actions may be taken ag UserListWidget - + Users connected to server: %1 - + Users in this room: %1 - + Buddies online: %1 / %2 - + Ignored users online: %1 / %2 @@ -10424,45 +9636,35 @@ Please refrain from engaging in this activity or further actions may be taken ag UtilityMenu - + Increment all card counters - + &Untap all permanents - + R&oll die... - - Flip coin - - - - + &Create token... - + C&reate another token - + Cr&eate predefined token - - - C&reate another %1 token - - VisualDatabaseDisplayColorFilterWidget @@ -10514,72 +9716,72 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFilterToolbarWidget - + Sort by - + Filter by - + Save and load filters - + Filter by exact card name - + Filter by card main-type - + Filter by card sub-type - + Filter by set - + Filter by format legality - + Save/Load - + Name - + Main Type - + Sub Type - + Sets - + Formats @@ -10587,22 +9789,22 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFormatLegalityFilterWidget - + Show formats with at least: - + cards - + Do not display formats with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) @@ -10620,32 +9822,32 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayMainTypeFilterWidget - + Show main types with at least: - + cards - + Do not display card main-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10653,27 +9855,27 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayNameFilterWidget - + Filter by name... (Exact match) - + Load from Deck - + Apply all card names in currently loaded deck as exact match name filters - + Load from Clipboard - + Apply all card names in clipboard as exact match name filters @@ -10681,7 +9883,7 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayRecentSetFilterSettingsWidget - + Filter to most recent sets @@ -10689,19 +9891,19 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySetFilterWidget - + Search sets... - - + + Mode: Exact Match - - + + Mode: Includes @@ -10709,37 +9911,37 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySubTypeFilterWidget - + Search subtypes... - + Show sub types with at least: - + cards - + Do not display card sub-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10747,23 +9949,23 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayWidget - + Search by card name (or search expressions) - + Visual - + Loading database ... - + Clear all filters @@ -10802,17 +10004,17 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Toggle Layout: Overlap - + Change how cards are displayed within zones (i.e. overlapped or fully visible.) - + Toggle Layout: Flat @@ -10841,17 +10043,17 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDeckEditorWidget - + Type a card name here for suggestions from the database... - + Quick search and add card - + Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter @@ -10969,43 +10171,43 @@ Please refrain from engaging in this activity or further actions may be taken ag WarningDialog - + Which warning would you like to send? 你想发出那种警告？ - + Redact all messages from this user in all rooms 把这用户在所有房间留下的讯息删除 - + &OK &确认 - + &Cancel &取消 - + Warn user for misconduct 对行为不当的用户发出警告 - - + + Error 出现错误 - + User name to send a warning to can not be blank, please specify a user to warn. 接收警告的用户名称不能空白.请定好要接收警告的用户名字. - + Warning to use can not be blank, please select a valid warning to send. 警告名称不能留空. 请选择有效的警告. @@ -11013,133 +10215,133 @@ Please refrain from engaging in this activity or further actions may be taken ag WndSets - + Move selected set to the top 将选择的牌组送到最顶 - + Move selected set up 将选择的牌组往上一格 - + Move selected set down 将选择的牌组往下一格 - + Move selected set to the bottom 将选择的牌组送到最底 - + Search by set name, code, or type 用排组名称,代码,或类型进行搜寻 - + Default order 常用次序 - + Restore original art priority order 恢復常用艺术先后次序 - + Enable all sets 啟用所有牌组 - + Disable all sets 禁用所有卡组 - + Enable selected set(s) 啟用选择的牌组(眾)  - + Disable selected set(s) 停用选择的牌组(眾) - + Deck Editor 牌库编辑 - + Use CTRL+A to select all sets in the view. 请按 CTRL + A, 以此选择所有看到的牌组 - + Only cards in enabled sets will appear in the card list of the deck editor. 只有已经被啟用的卡牌组中的卡牌,才会在牌库编辑中的卡牌清单出现 - + Image priority is decided in the following order: 卡牌图片先后次序由以下次序决定: - + first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) %1 is a link to the wiki 自订档案夹(%`1)优先, 此对话窗中已被啟用的牌组为后(由顶到底) - + Include cards rebalanced for Alchemy [requires restart] - + Card Art 卡牌艺术 - + How to use custom card art 如何使用自定卡牌图片 - + Hints 提示 - + Note 笔记 - + Sorting by column allows you to find a set while not changing set priority. 按列排序允许您在不更改系列优先级别的情况下查找牌组。 - + To enable ordering again, click the column header until this message disappears. 要再次启用排序，请单击列标题，直到此消息消失。 - + Use the current sorting as the set priority instead 用现在排序代替牌组先后 - + Sorts the set priority using the same column 用同一列分牌组先后 - + Manage sets 管理牌组 @@ -11147,72 +10349,72 @@ Please refrain from engaging in this activity or further actions may be taken ag ZoneViewWidget - + Search by card name (or search expressions) - + Ungrouped 未分组 - + Group by Type 按类型分组 - + Group by Mana Value 按法力数值分组 - + Group by Color 按顏色排序 - + Unsorted 未排序 - + Sort by Name 按名称排次序 - + Sort by Type 按类型排序 - + Sort by Mana Cost 按法力费用排序 - + Sort by Colors 按顏色(眾) 排序 - + Sort by P/T 按力量/防御力排序 - + Sort by Set 按排组排序 - + shuffle when closing 关闭界面时洗牌 - + pile view 栋迭观看 @@ -11220,7 +10422,7 @@ Please refrain from engaging in this activity or further actions may be taken ag i18n - + English 简体中文 (Chinese Simplified) @@ -11228,12 +10430,12 @@ Please refrain from engaging in this activity or further actions may be taken ag main - + Connect on startup 啟动时自动连接 - + Debug to file 侦错纪录写进档案 @@ -11247,7 +10449,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Deck Editor 牌库编辑 @@ -11328,7 +10530,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Replays 游戏录像 @@ -11443,129 +10645,129 @@ Please refrain from engaging in this activity or further actions may be taken ag 载入牌库... - - + + Load Deck from Clipboard... 从剪贴板载入牌库 - + Edit Deck in Clipboard, Annotated - + Edit Deck in Clipboard - + New Deck 创建新牌库 - + Open Custom Pictures Folder 打开自定图片文件夹 - + Print Deck... 印刷牌库 - + Delete Card 删除卡牌 - - + + Reset Layout 重置佈局 - + Save Deck 保存牌库 - + Save Deck as... 牌库另存为 - + Save Deck to Clipboard, Annotated 从剪贴板储藏牌库, 带注释 - + Save Deck to Clipboard, Annotated (No Set Info) - + Save Deck to Clipboard 从剪贴板储藏牌库 - + Save Deck to Clipboard (No Set Info) - + Load Local Deck... 从自身档案载入牌库 - + Load Remote Deck... 载入伺服器上的牌库... - + Set Ready to Start 设定準备开始 - + Toggle Sideboard Lock 切换副牌库锁 - + Add Green Counter 增加绿色指示物 - + Remove Green Counter 移除绿色指示物 - + Set Green Counters... 设定绿色指示物 - + Add Red Counter 增加红色指示物 - + Remove Red Counter 移除红色指示物 - + Set Red Counters... 设定红色指示物 - + Add Life Counter 增加生命指示物 @@ -11575,744 +10777,724 @@ Please refrain from engaging in this activity or further actions may be taken ag - - Load deck from online service... - - - - - Load from website... - - - - + Unload Deck - + Force Start - + Add Card Counter (F) - + Remove Card Counter (F) - + Set Card Counters (F)... - + Add Card Counter (E) - + Remove Card Counter (E) - + Set Card Counters (E)... - + Add Card Counter(D) - + Remove Card Counter (D) - + Set Card Counters (D)... - + Add Card Counter (C) - + Remove Card Counter (C) - + Set Card Counters (C)... - + Add Card Counter (B) - + Remove Card Counter (B) - + Set Card Counters (B)... - + Add Card Counter (A) - + Remove Card Counter (A) - + Set Card Counters (A)... - + Remove Life Counter 移除生命指示物 - + Set Life Counters... 设定生命指示物 - + Add White Counter 增加白色指示物 - + Remove White Counter 移除白色指示物 - + Set White Counters... 设定白色指示物 - + Add Blue Counter 增加蓝色指示物 - + Remove Blue Counter 移除蓝色指示物 - + Set Blue Counters... 设定蓝色指示物 - + Add Black Counter 增加黑色指示物 - + Remove Black Counter 移除黑色指示物 - + Set Black Counters... 设定黑色指示物 - + Add Colorless Counter 增加无色指示物 - + Remove Colorless Counter 移除无色指示物 - + Set Colorless Counters... 设定无色指示物 - + Add Other Counter 增加其他指示物 - + Remove Other Counter 移除其他指示物 - + Set Other Counters... 设定其他指示物 - + Increment all card counters - + Add Power (+1/+0) 增加力量(+1/+0) - + Remove Power (-1/-0) 削减力量(-1/-0) - + Move Toughness to Power (+1/-1) 防御移到力量（+1/-1） - + Add Toughness (+0/+1) 增加防御(+0/+1) - + Remove Toughness (-0/-1) 削减防御(-0/-1) - + Move Power to Toughness (-1/+1) 力量移到防御（-1/+1） - + Add Power and Toughness (+1/+1) 增加力量和防御(+1/+1) - + Remove Power and Toughness (-1/-1) 削减力量和防御(-1/-1) - + Set Power and Toughness... 设置力量和防御 - + Reset Power and Toughness 重置力量和防御 - + Untap 重置 - + Upkeep 维持 - + Draw 抽牌 - + First Main Phase 第一主阶段 - + Start Combat 开始战斗 - + Attack 攻击 - + Block 挡格 - + Damage 计算损害 - + End Combat 战斗结束 - + Second Main Phase 第二主阶段 - + End 完结 - + Next Phase 下个阶段 - + Next Phase Action 下个行动阶段 - + Next Turn 下一回合 - + Hide Card in Reveal Window 从揭露视窗中隐藏这牌 - + Tap / Untap Card 横置/重置这牌 - + Untap All 重置全牌 - + Toggle Skip Untapping Toggle Untap - + Turn Card Over 反转本牌 - + Peek Card 查看卡牌 - + Play Card 使出本牌 - + Play Card, Face Down - + Attach Card... 结附牌 - + Unattach Card 解除牌结附 - + Clone Card 复製卡牌 - + Create Token... 派出令牌 - + Create All Related Tokens 派出所有相关令牌 - + Create Another Token 再做另外令牌 - + Set Annotation... 记下註解 - - Reduce Life by Power - - - - + Select All Cards in Zone 选择所有在区域的牌 - + Select All Cards in Row 选择所有横行牌 - + Select All Cards in Column 选择所有直行牌 - + Reveal Selected Cards to All Players - - + + Bottom of Library 牌库底 - - - - + + + + Exile 放逐 - - - - + + + + Graveyard 坟场 - - + + Hand 手牌 - - + + Top of Library 牌库顶 - - + + Battlefield, Face Down 战场，面朝下 - + Battlefield 战场 - + Library 牌库 - + Sideboard 副牌库 - + Top Cards of Library 排副多张顶牌 - + Bottom Cards of Library 排副多张底牌 - + Close Recent View 关闭最近查看 - - + + Stack 迭区 - - + + Graveyard (Multiple) 多张送坟场 - - + + Graveyard (Multiple), Face Down - - + + Exile (Multiple) 多张放逐 - - + + Exile (Multiple), Face Down - + Stack Until Found 找到以下牌前全送迭区 - + Draw Bottom Card 从牌库底抽一张牌 - + Draw Multiple Cards from Bottom... 从牌库底抽超过一张牌 - + Draw Arrow... 画箭咀 - + Remove Local Arrows 清除自设箭咀 - + Leave Game 离开游戏 - + Concede 投降 - + Roll Dice... 掷骰 - - Flip Coin - - - - + Shuffle Library 洗牌 - + Shuffle Top Cards of Library - + Shuffle Bottom Cards of Library - + Mulligan 再调度 - + Mulligan (Same hand size) - + Mulligan (Hand size - 1) - + Draw a Card 抽一张牌 - + Draw Multiple Cards... 抽超过一张牌 - + Undo Draw 撤销抽牌 - + Always Reveal Top Card 永远显示顶牌 - + Always Look At Top Card 永远看到顶牌 - + Sort Hand by Name - + Sort Hand by Type - + Sort Hand by Mana Value - + Reveal Hand to All Players - + Reveal Random Card to All Players - + Rotate View Clockwise 视角顺时针转 - + Rotate View Counterclockwise 视角逆时针转 - + Unfocus Text Box 取消聚焦文本框 - + Focus Chat 聚焦聊天 - + Clear Chat 扫清聊天 - + Refresh 刷新 - + Skip Forward 跳前 - + Skip Backward 跳后 - + Skip Forward by a lot 向前大跳 - + Skip Backward by a lot 向后大跳 - + Play/Pause 播放/暂停 - + Toggle Fast Forward 切换快进 - + Home - + Visual Deck Storage - + Deck Storage - + Server - + Account - + Administration - + Logs diff --git a/cockatrice/translations/cockatrice_zh-Hant.ts b/cockatrice/translations/cockatrice_zh-Hant.ts index 2ce4cbd53..1980960a9 100644 --- a/cockatrice/translations/cockatrice_zh-Hant.ts +++ b/cockatrice/translations/cockatrice_zh-Hant.ts @@ -2,7 +2,7 @@ AbstractCounter - + &Set counter... 設置指示物為... @@ -10,12 +10,12 @@ AbstractCounterDialog - + Set counter 設置指示物 - + New value for counter '%1': 新的指示物數值'%1'： @@ -36,60 +36,60 @@ AbstractTabDeckEditor - + Open in new tab - + Are you sure? - + The decklist has been modified. Do you want to save the changes? - - - - - - + + + + + + Error - + Could not open deck at %1 - + Could not save remote deck - - + + The deck could not be saved. Please check that the directory is writable and try again. - + Save deck - + The deck could not be saved. - + There are no cards in your deck to be exported @@ -105,12 +105,12 @@ Please check that the directory is writable and try again. AdminNotesDialog - + Update Notes - + Admin Notes for %1 @@ -127,227 +127,172 @@ Please check that the directory is writable and try again. Sideboard - - - Tokens - - AppearanceSettingsPage - + seconds - + Error 錯誤 - + Could not create themes directory at '%1'. - + Theme settings 主題設定 - + Current theme: 當前主題 - + Open themes folder 打開主題文件夾 - + Home tab background source: - + Home tab background shuffle frequency: - + Disabled - + + Display card name of background in bottom right: + + + + Menu settings - + Show keyboard shortcuts in right-click menus - + Show game filter toolbar above list in room tab - + Card rendering 牌面 - + Display card names on cards having a picture 顯示有圖卡牌的名稱 - + Auto-Rotate cards with sideways layout - + Override all card art with personal set preference (Pre-ProviderID change behavior) - - Light - - - - - Dark - - - - - System - - - - - Active theme palette: - - - - - Edit theme palette - - - - - Home tab settings - - - - - Display card name of background in bottom right - - - - - Styling settings - - - - - Style user list - - - - - Card printings - - - - + Bump sets that the deck contains cards from to the top in the printing selector - + Scale cards on mouse over 卡牌隨指針縮放 - + Use rounded card corners - - Card layout - - - - + Minimum overlap percentage of cards on the stack and in vertical hand - + Maximum initial height for card view window: - - + + rows - + Maximum expanded height for card view window: - + Card counters - + Counter %1 - + Hand layout 手牌區域佈局 - + Display hand horizontally (wastes space) 水平顯示手牌區域 (浪費空間) - + Enable left justification 開啓左對齊 - + Table grid layout 表格佈局 - + Invert vertical coordinate 反轉垂直坐標 - + Minimum player count for multi-column layout: 界面佈局之內能夠容納的玩家欄數量： - + Maximum font size for information displayed on cards: 卡牌上顯示的最大字號 @@ -355,12 +300,12 @@ Please check that the directory is writable and try again. ArchidektApiResponseDeckDisplayWidget - + Back to results - + Open Deck in Deck Editor @@ -386,112 +331,112 @@ Please check that the directory is writable and try again. BanDialog - + ban &user name 禁止該用戶 - + ban &IP address 禁止該IP地址 - + ban client I&D 禁止該客户端 - + Ban type 禁止類型 - + &permanent ban 永久禁止 - + &temporary ban 暫時禁止 - + &Days: 天： - + &Hours: 小時： - + &Minutes: 分鐘： - + Duration of the ban 持續時長 - + Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. 請輸入禁止原因. 此項為管理緣由而保存並且對於這位被禁止的用戶不可見. - + Please enter the reason for the ban that will be visible to the banned person. 請輸入對於被禁止用戶可見的禁止原因 - + Redact all messages from this user in all rooms 修改該用戶在所有房間中的所有消息 - + &OK 確認 - + &Cancel 取消 - + Ban user from server 禁止此用戶 - - - - + + + + Error 錯誤 - + You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban. 你必須選擇姓名、IP、客户端或任意多選組合來執行禁止操作。 - + You must have a value in the name ban when selecting the name ban checkbox. 在禁用姓名時必須填寫一個姓名。 - + You must have a value in the ip ban when selecting the ip ban checkbox. 在禁用IP時必須填寫一個IP。 - + You must have a value in the clientid ban when selecting the clientid ban checkbox. 在禁用客戶端ID時必須填寫一個客戶端ID。 @@ -499,123 +444,59 @@ This is only saved for moderators and cannot be seen by the banned person. BetaReleaseChannel - + Beta - + No reply received from the release update server. 未收到更新伺服器的回應。 - + Invalid reply received from the release update server. 收到更新伺服器的無效回應 - + No reply received from the file update server. 未收到文件更新伺服器的回應 - - CardArtPreviewWidget - - - No card selected - - - - - CardArtRulesModel - - - Card - - - - - ProviderId - - - - - Mode - - - - - Reason - - - CardDatabaseModel - + Name 名稱 - + Sets 系列 - + Mana cost 魔法力費用 - + Card type 卡牌類別 - + P/T 力量/防禦力 - + Color(s) 顏色 - - CardDatabaseView - - - Add to Deck - - - - - Add to Sideboard - - - - - Select Printing - - - - - Show on EDHRec (Commander) - - - - - Show on EDHRec (Card) - - - - - Show Related cards - - - CardFilter @@ -744,22 +625,22 @@ This is only saved for moderators and cannot be seen by the banned person. CardInfoPictureWidget - + View related cards - + Add card to deck - + Mainboard - + Sideboard @@ -782,12 +663,12 @@ This is only saved for moderators and cannot be seen by the banned person. - + Related cards: - + Unknown card: @@ -795,146 +676,128 @@ This is only saved for moderators and cannot be seen by the banned person. CardMenu - + Re&veal to... - + &All players - + View related cards - + Token: - + All tokens - + &Select All - + S&elect Row - + S&elect Column - + &Play - + &Hide - + Play &Face Down - + &Tap / Untap Turn sideways or back again - + Skip &untapping - + T&urn Over Turn face up/face down - + &Peek at card face - + &Clone - + Attac&h to card... - + Unattac&h - + &Draw arrow... - + &Set annotation... - - Reduce life by power - - - - + Ca&rd counters - + &Add counter (%1) - + &Remove counter (%1) - + &Set counters (%1)... - - CardPictureLoaderCacheMethod - - - Network Cache - - - - - Filesystem - - - CardSizeWidget @@ -946,133 +809,133 @@ This is only saved for moderators and cannot be seen by the banned person. CardZoneLogic - + their hand nominative - + %1's hand nominative - + their library look at zone - + %1's library look at zone - + of their library top cards of zone, - + of %1's library top cards of zone - + their library reveal zone - + %1's library reveal zone - + their library shuffle - + %1's library shuffle - + their library nominative - + %1's library nominative - + their graveyard nominative - + %1's graveyard nominative - + their exile nominative - + %1's exile nominative - + their sideboard look at zone - + %1's sideboard look at zone - + their sideboard nominative - + %1's sideboard nominative - + their custom zone '%1' nominative - + %1's custom zone '%2' nominative @@ -1094,421 +957,16 @@ This is only saved for moderators and cannot be seen by the banned person. - - ColorButton - - - Click to pick a color - - - - - Pick colour - - - - - ConnectionController - - - - The server has reached its maximum user capacity, please check back later. - - - - - There are too many concurrent connections from your address. - - - - - Banned by moderator - - - - - Expected end time: %1 - - - - - This ban lasts indefinitely. - - - - - Scheduled server shutdown. - - - - - - Invalid username. - - - - - You have been logged out due to logging in at another location. - - - - - Connection closed - - - - - The server has terminated your connection. -Reason: %1 - - - - - The server is going to be restarted in %n minute(s). -All running games will be lost. -Reason for shutdown: %1 - - - - - Scheduled server shutdown - - - - - Failed Login - - - - - Your client seems to be missing features this server requires for connection. - - - - - To update your client, go to 'Help -> Check for Client Updates'. - - - - - - - - - - - - - - - - - - - - - - Error - - - - - Incorrect username or password. Please check your authentication information and try again. - - - - - There is already an active session using this user name. -Please close that session first and re-login. - - - - - - You are banned until %1. - - - - - - You are banned indefinitely. - - - - - This server requires user registration. Do you want to register now? - - - - - This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. -Please close and reopen your client to try again. - - - - - An internal error has occurred, please close and reopen Cockatrice before trying again. -If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. - - - - - Account activation - - - - - Your account has not been activated yet. -You need to provide the activation token received in the activation email. - - - - - Server Full - - - - - Unknown login error: %1 - - - - - - -This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. - - - - - - - - - - Registration denied - - - - - Registration is currently disabled on this server - - - - - There is already an existing account with the same user name. - - - - - It's mandatory to specify a valid email address when registering. - - - - - It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. - - - - - Password too short. - - - - - Registration failed for a technical problem on the server. - - - - - The connection to the server has been lost. - - - - - Unknown registration error: %1 - - - - - Account activation failed - - - - - Socket error: %1 - - - - - Server timeout - - - - - You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. -Local version is %1, remote version is %2. - - - - - Your Cockatrice client is obsolete. Please update your Cockatrice version. -Local version is %1, remote version is %2. - - - - - - Success - - - - - Registration accepted. -Will now login. - - - - - Account activation accepted. -Will now login. - - - - - Information - - - - - This server supports additional features that your client doesn't have. -This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. - -To update your client, go to Help -> Check for Updates. - - - - - - - Reset Password - - - - - Your password has been reset successfully, you can now log in using the new credentials. - - - - - Failed to reset user account password, please contact the server operator to reset your password. - - - - - Activation request received, please check your email for an activation token. - - - - - Connecting to %1... - - - - - Registering to %1 as %2... - - - - - Disconnected - - - - - Connected, logging in at %1 - - - - - Requesting forgotten password to %1 as %2... - - - - - Your username must respect these rules: - - - - - is %1 - %2 characters long - - - - - can %1 contain lowercase characters - - - - - - - - NOT - - - - - can %1 contain uppercase characters - - - - - can %1 contain numeric characters - - - - - can contain the following punctuation: %1 - - - - - first character can %1 be a punctuation mark - - - - - no unacceptable language as specified by these server rules: - note that the following lines will not be translated - - - - - can not contain any of the following words: %1 - - - - - can not match any of the following expressions: %1 - - - - - You may only use A-Z, a-z, 0-9, _, ., and - in your username. - - - CustomZoneMenu - + C&ustom Zones - - + + View custom zone '%1' @@ -1516,35 +974,30 @@ To update your client, go to Help -> Check for Updates. DeckAnalyticsWidget - + Add Panel - + Remove Panel - + Save Layout - + Load Layout - - - Include Sideboard - - DeckEditorCardDatabaseDockWidget - + Card Database @@ -1560,17 +1013,47 @@ To update your client, go to Help -> Check for Updates. DeckEditorDatabaseDisplayWidget - + Search by card name (or search expressions) - + + Add to Deck + + + + + Add to Sideboard + + + + + Select Printing + + + + + Show on EDHRec (Commander) + + + + + Show on EDHRec (Card) + + + + + Show Related cards + + + + Add card to &maindeck - + Add card to &sideboard @@ -1603,72 +1086,72 @@ To update your client, go to Help -> Check for Updates. - + Select Printing - + Deck - + Deck &name: - + Banner Card/Tags Visibility Settings - + Show banner card selection menu - + Show tags selection menu - + &Comments: - + Group by: - + Format: - + Hash: - + &Increment number - + &Decrement number - + &Remove row - + Swap card to/from sideboard @@ -1676,17 +1159,17 @@ To update your client, go to Help -> Check for Updates. DeckEditorFilterDockWidget - + Filters - + &Clear all filters - + Delete selected @@ -1817,113 +1300,169 @@ To update your client, go to Help -> Check for Updates. DeckEditorSettingsPage - - + + Update Spoilers 更新預覽 - + + Success 成功 - + Download URLs have been reset. 下載URL已重置。 - + + Downloaded card pictures have been reset. + 下載的卡牌圖片已被重置。 + + + + Error + 錯誤 + + + + One or more downloaded card pictures could not be cleared. + 1個或多個卡牌圖片未能被清除。 + + + Add URL 添加URL - - + + URL: URL: - - + + Edit URL 編輯URL - + + Network Cache Size: + + + + + Redirect Cache TTL: + + + + + How long cached redirects for urls are valid for. + + + + + Picture Cache Size: + + + + Add New URL 添加新的URL - + Remove URL 移除URL - + + Day(s) + + + + Updating... 更新中... - + Choose path 選擇路徑 - + URL Download Priority URL下載優先級 - + Spoilers 預覽 - + Download Spoilers Automatically 自動下載預覽 - + Spoiler Location: 預覽位置: - + Last Change 最近的變更 - + Spoilers download automatically on launch 自動下載預覽運行 - + Press the button to manually update without relaunching 按下按鈕手動更新而不重新啓動 - + Do not close settings until manual update is complete 手動更新完成之前，請勿關閉設置 - + Download card pictures on the fly 即時下載卡牌圖片 - + How to add a custom URL 如何添加自定義URL - + + Delete Downloaded Images + 刪除已下載的圖片 + + + Reset Download URLs 重置用於下載的URL + + + On-disk cache for downloaded pictures + + + + + In-memory cache for pictures not currently on screen + + DeckListHistoryManagerWidget @@ -1989,12 +1528,12 @@ To update your client, go to Help -> Check for Updates. DeckLoader - + Common deck formats (%1) - + All files (*.*) @@ -2216,27 +1755,27 @@ To update your client, go to Help -> Check for Updates. - + Moved to %1 1 × "%2" (%3) - + Removed "%1" (all copies) - + %1 1 × "%2" (%3) - + Added - + Removed @@ -2258,74 +1797,74 @@ To update your client, go to Help -> Check for Updates. DeckViewContainer - + Load deck... 讀取套牌... - + Load remote deck... 載入伺服器上的套牌... - + Load from clipboard... - + Load from website... - + Unload deck - + Ready to start 準備好開始 - + Force start - + Sideboard unlocked 解鎖備牌 - + Sideboard locked 鎖定備牌 - - + + Error 錯誤 - + The selected file could not be loaded. 此文件無法被載入 - + Deck is greater than maximum file size. - + Are you sure you want to force start? This will kick all non-ready players from the game. - + Cockatrice @@ -2424,7 +1963,7 @@ This will kick all non-ready players from the game. - + Webpage 網頁 @@ -2464,37 +2003,37 @@ This will kick all non-ready players from the game. 連接伺服器 - + Server URL 伺服器URL - + Communication Port 通信端口 - + Unique Server Name 唯一的伺服器名稱 - + Connection Warning 連接警告 - + You need to name your new connection profile. 你需要給連接配置文件命名。 - + Connect Warning 連接警告 - + The player name can't be empty. 玩家名稱不能為空白 @@ -2607,17 +2146,17 @@ This will kick all non-ready players from the game. 創建一個房間 - + Game information 房間信息 - + Error 錯誤 - + Server error. 伺服器錯誤. @@ -2625,97 +2164,97 @@ This will kick all non-ready players from the game. DlgCreateToken - + &Name: 名稱： - + Token 衍生物 - + C&olor: 顏色： - + white 白 - + blue 藍 - + black 黑 - + red 紅 - + green 綠 - + multicolor 多色 - + colorless 無色 - + &P/T: 力量/防禦力： - + &Annotation: 註釋： - + &Destroy token when it leaves the table 此衍生物離場時會被摧毀 - + Create face-down (Only hides name) - + Token data 衍生物數據資料 - + Show &all tokens 顯示所有衍生物 - + Show tokens from this &deck 顯示此套牌所使用的衍生物 - + Choose token from list 從列表中選擇衍生物 - + Create token 派出一個衍生物 @@ -2749,7 +2288,7 @@ This will kick all non-ready players from the game. - + ✖ @@ -2764,12 +2303,12 @@ This will kick all non-ready players from the game. - + Duplicate Tag - + This tag already exists. @@ -2956,12 +2495,12 @@ To remove your current avatar, confirm without choosing a new image. 請輸入衍生物名稱: - + Error 錯誤 - + The chosen name conflicts with an existing card or token. Make sure to enable the 'Token' set in the "Manage sets" dialog to display them correctly. 所選擇的名字與現有的卡牌或衍生物有衝突。 @@ -2986,12 +2525,12 @@ Make sure to enable the 'Token' set in the "Manage sets" dia 未定義 - + Real name: 真實姓名： - + Edit user profile 編輯用戶資料 @@ -3029,113 +2568,113 @@ Make sure to enable the 'Token' set in the "Manage sets" dia 2小時 - + Hide 'buddies only' games - + Hide full games - + Hide games that have started - + Hide password protected games - + Hide 'ignored user' games - + Hide games not created by buddies Hide games not created by buddy - + Hide games with forced open decklists - + &Newer than: - + Game &description: 房間描述： - + &Creator name: 創建者名字: - + General 綜合 - + &Game types 房間類型 - + at &least: 至少： - + at &most: 最多： - + Maximum player count 可容納玩家數量 - + Restrictions 限制 - + Show games only if &spectators can watch - + Show spectator password p&rotected games - + Show only if spectators can ch&at - + Show only if spectators can see &hands - + Spectators 觀看者 - + Filter games 過濾房間 @@ -3438,37 +2977,37 @@ https://tappedout.net/mtg-decks/your-deck-name/ DlgMoveTopCardsUntil - + Card name (or search expressions): - + Number of hits: - + Auto play hits - + Put top cards on stack until... - + No cards matching the search expression exists in the card database. Proceed anyways? - + Cockatrice - + Invalid filter @@ -3527,40 +3066,40 @@ Your email will be used to verify your account. 未定義 - + Real name: 真實姓名: - + Register to server 註冊到伺服器 - - - - + + + + Registration Warning 註冊警告 - + Your password is too short. 你的密碼太短。 - + Your passwords do not match, please try again. 兩次輸入的密碼不一致，請重新輸入， - + Your email addresses do not match, please try again. 兩次輸入的電子郵箱不一致，請重新輸入。 - + The player name can't be empty. 玩家名稱不能為空白 @@ -3568,17 +3107,17 @@ Your email will be used to verify your account. DlgRollDice - + Number of sides: - + Number of dice: - + Roll Dice @@ -3629,12 +3168,12 @@ Your email will be used to verify your account. DlgSettings - + Unknown Error loading card database 讀取卡牌數據庫時出現未知錯誤 - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -3651,7 +3190,7 @@ Would you like to change your database location setting? 你想要重新設置卡牌資料庫路徑嗎？ - + Your card database version is too old. This can cause problems loading card information or images @@ -3668,7 +3207,7 @@ Would you like to change your database location setting? 你想要重新設置卡牌資料庫路徑嗎？ - + Your card database did not finish loading Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached @@ -3677,7 +3216,7 @@ Would you like to change your database location setting? - + File Error loading your card database. Would you like to change your database location setting? @@ -3686,7 +3225,7 @@ Would you like to change your database location setting? 你想要重新設置卡牌數據庫路徑嗎？ - + Your card database was loaded but contains no cards. Would you like to change your database location setting? @@ -3695,7 +3234,7 @@ Would you like to change your database location setting? 你想要重新設置卡牌資料庫路徑嗎？ - + Unknown card database load status Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues @@ -3704,64 +3243,59 @@ Would you like to change your database location setting? - - - + + + Error 錯誤 - + The path to your deck directory is invalid. Would you like to go back and set the correct path? 你的套牌路徑無效。你想要重新設置正確的路徑嗎？ - + The path to your card pictures directory is invalid. Would you like to go back and set the correct path? 你想要重新設置卡牌數據庫路徑嗎？ - + Settings 設定 - + General 常規 - + Appearance 外觀 - + User Interface 用戶界面 - - Storage - - - - + Card Sources 卡牌的來源 - + Chat 聊天 - + Sound 聲音 - + Shortcuts 快捷鍵 @@ -3853,9 +3387,9 @@ You can always change this behavior in the 'General' settings tab. - - - + + + Error 錯誤 @@ -3908,31 +3442,31 @@ Please visit the download page to update manually. - + Update Available 更新可用 - + A new version of Cockatrice is available! 雞蛇有新版本可用！ - + New version 新版本 - + Released 發佈 - + Changelog 更新日誌 @@ -3942,50 +3476,50 @@ Please visit the download page to update manually. 你打算現在就更新嗎？ - + Unfortunately, the automatic updater failed to find a compatible download. You may have to manually download the new version. - + Please check the <a href="%1">releases page</a> on our Github and download the build for your system. - - - + + + Update Error 更新錯誤 - + An error occurred while checking for updates: 檢查更新時發生錯誤： - + An error occurred while downloading an update: 下載更新時發生錯誤： - + Installing... 正在安裝... - + Cockatrice is unable to open the installer. 雞蛇無法打開安裝程序。 - + Try to update manually by closing Cockatrice and running the installer. 嘗試關閉雞蛇運行安裝程序手動更新。 - + Download location 下載區域信息 @@ -4075,67 +3609,67 @@ You may have to manually download the new version. DrawProbabilityWidget - + Draw Probability - + Probability of drawing - + Card Name - + Type - + Subtype - + Mana Value - + At least - + Exactly - + card(s) having drawn at least - + cards - + Category - + Qty - + Odds (%) @@ -4249,7 +3783,7 @@ You may have to manually download the new version. FilterBuilder - + Type your filter here 輸入你打算篩選的類型 @@ -4280,22 +3814,22 @@ You may have to manually download the new version. GameEventHandler - + kicked by game host or moderator - + player left the game - + player disconnected from server - + reason unknown @@ -4303,140 +3837,140 @@ You may have to manually download the new version. GameSelector - - - - - - - - - + + + + + + + + + Error 錯誤 - + Please join the appropriate room first. 首先請加入一個房間. - + Wrong password. 密碼錯誤. - + Spectators are not allowed in this game. 這個遊戲不允許觀眾加入. - + The game is already full. 這個遊戲已經滿了. - + The game does not exist any more. 這個遊戲不能裝下啊更多了. - + This game is only open to registered users. 這個遊戲只開放給註冊用戶. - + This game is only open to its creator's buddies. 這個遊戲只開放給好友。 - + You are being ignored by the creator of this game. 你屏蔽了這個與遊戲的創造者. - + Join Game - + Spectate Game - + Game Information - + Join Game as Judge - + Spectate Game as Judge - + Join game 加入遊戲 - + Password: 密碼: - + Please join the respective room first. 請各自加入一個房間. - + &Filter games 過濾房間 - + C&lear filter 清除篩選項目 - + C&reate 創建 - + &Join 加入 - + Join as judge - + J&oin as spectator 觀看 - + Join as judge spectator - + Games shown: %1 / %2 顯示遊戲：%1/%2 - + Games 遊戲 @@ -4444,32 +3978,32 @@ You may have to manually download the new version. GameSelectorQuickFilterToolBar - + All types - + Filter by game name... - + Filter by game type/format - + Hide games not created by buddies - + Hide full games - + Hide started games @@ -4477,105 +4011,105 @@ You may have to manually download the new version. GamesModel - + >1 day - + %1%2 hr short age in hours - + new 新建 - + %1%2 min short age in minutes - + password 密碼 - + buddies only 僅限好友 - + reg. users only 僅限註冊用户 - + open decklists + - can chat 允許聊天 - + see hands 查看手牌 - + can see hands 允許查看手牌 - + not allowed 不允許 - + Room 房間 - + Age 時長 - + Description 描述 - + Creator 創建者 - + Type 類型 - + Restrictions 限制 - + Players 玩家 - + Spectators 觀看者 @@ -4583,158 +4117,143 @@ You may have to manually download the new version. GeneralSettingsPage - + Reset all paths - + All paths have been reset - - - - - - - + + + + + + + Choose path 選擇路徑 - - Language settings - + + Personal settings + 個人設定 - + Language: 語言: - - Version settings - - - - - Card database - - - - - Startup settings - - - - + Paths (editing disabled in portable mode) 路徑(在便攜模式下禁止編輯) - + Paths 路徑 - + How to help with translations - + Decks directory: 套牌路徑: - + Filters directory: - + Replays directory: 遊戲錄像目錄: - + Pictures directory: 圖片目錄: - + Card database: 卡牌數據庫: - + Custom database directory: - + Token database: 衍生物數據庫： - + Update channel 更新通道 - + Check for client updates on startup - + Check for card database updates on startup - + Don't check - + Prompt for update - + Always update in the background - + Check for card database updates every - + days - + Notify if a feature supported by the server is missing in my client 當客戶端缺少伺服器支持的特性時提示我 - + Automatically run Oracle when running a new version of Cockatrice 運行新版本雞蛇時自動運行Oracle - + Show tips on startup 顯示啓動時提示 - + Last update check on %1 (%2 days ago) @@ -4742,47 +4261,47 @@ You may have to manually download the new version. GraveyardMenu - + &Graveyard - + &View graveyard - + &Move graveyard to... - + &Top of library - + &Bottom of library - + &All players - + &Hand - + &Exile - + Reveal random card to... @@ -4790,88 +4309,88 @@ You may have to manually download the new version. HandMenu - + &Hand - + &View hand - + Sort hand by... - + Name - + Type - + Mana Value - + Take &mulligan (Choose hand size) - + Take mulligan (Same hand size) - + Take mulligan (Hand size - 1) - + &Move hand to... - + &Top of library - + &Bottom of library - + &Graveyard - + &Exile - + &Reveal hand to... - - + + All players - + Reveal r&andom card to... @@ -4879,52 +4398,52 @@ You may have to manually download the new version. HomeWidget - + Create New Deck - + Browse Decks - + Browse Card Database - + Browse EDHRec - + Browse Archidekt - + View Replays - + Quit - + Connecting... - + Connect - + Play @@ -4932,213 +4451,213 @@ You may have to manually download the new version. LibraryMenu - + &Library - + &View library - + View &top cards of library... - + View bottom cards of library... - + Reveal &library to... - + Lend library to... - + Reveal &top cards to... - + &Top of library... - + &Bottom of library... - + &Always reveal top card - + &Always look at top card - + &Open deck in deck editor - + &Draw card - + D&raw cards... - + &Undo last draw - + Shuffle - + &Play top card - + Play top card &face down - + Put top card on &bottom - + Move top card to grave&yard - + Move top card to e&xile - + Move top cards to &graveyard... - + Move top cards to graveyard face down... - + Move top cards to &exile... - + Move top cards to exile face down... - + Put top cards on stack &until... - + Shuffle top cards... - + &Draw bottom card - + D&raw bottom cards... - + &Play bottom card - + Play bottom card &face down - + Move bottom card to grave&yard - + Move bottom card to e&xile - + Move bottom cards to &graveyard... - + Move bottom cards to graveyard face down... - + Move bottom cards to &exile... - + Move bottom cards to exile face down... - + Put bottom card on &top - + Shuffle bottom cards... - - + + &All players - + Reveal top cards of library - + Number of cards: (max. %1) @@ -5146,273 +4665,634 @@ You may have to manually download the new version. MainWindow - - + + + The server has reached its maximum user capacity, please check back later. + 伺服器已達到最大用戶數，請稍微再試。 + + + + There are too many concurrent connections from your address. + 你的地址有太多連接. + + + + Banned by moderator + 已被版主禁止 + + + + Expected end time: %1 + 預計結束時間: %1 + + + + This ban lasts indefinitely. + 這個封禁是永久的. + + + + Scheduled server shutdown. + 預定伺服器關閉. + + + + + Invalid username. + 不可用的用戶名。 + + + + You have been logged out due to logging in at another location. + 由於在其他地點登陸，您已被登出。 + + + + Connection closed + 連接關閉 + + + + The server has terminated your connection. +Reason: %1 + 伺服器中斷連接. +原因: %1 + + + + The server is going to be restarted in %n minute(s). +All running games will be lost. +Reason for shutdown: %1 + + + + + Scheduled server shutdown + 預定伺服器關閉 + + + + + Success + 成功 + + + + Registration accepted. +Will now login. + 註冊已成功。 +現在登陸。 + + + + Account activation accepted. +Will now login. + 賬號已激活。 +現在登陸 + + + + Player %1 玩家 %1 - + Load replay 載入遊戲錄像 - + About Cockatrice 關於Cockatrice雞蛇 - + Version 版本 - + Cockatrice Webpage Cockatrice雞蛇網站 - + Project Manager: 項目經理： - + Past Project Managers: 前項目經理： - + Developers: 開發者： - + Our Developers 我們的開發者： - + Help Develop! 協助開發！ - + Translators: 翻譯者： - + Our Translators 翻譯者名單 - + Help Translate! 協助翻譯! - + Support: 支持： - + Report an Issue 報告錯誤 - + Troubleshooting 排除故障 - + F.A.Q. 問答 - - + + + + + + + + + + + + + + + + + + + + Error 錯誤 - + + Server timeout + 伺服器超時 + + + + Failed Login + 登錄失敗 + + + + Your client seems to be missing features this server requires for connection. + 你的客戶端缺少連接這個伺服器所需要的要素 + + + + To update your client, go to 'Help -> Check for Client Updates'. + 轉到幫助->檢查客户端更新，更新你的客户端。 + + + + Incorrect username or password. Please check your authentication information and try again. + 用户名或密碼錯誤。請檢查賬號信息並重試。 + + + + There is already an active session using this user name. +Please close that session first and re-login. + 已經有一個在線用户正在使用這個用户名. +首先請關閉這個對話框然後重新登陸. + + + + + You are banned until %1. + 你被禁止直到: %1. + + + + + You are banned indefinitely. + 你被永久封禁. + + + + This server requires user registration. Do you want to register now? + 伺服器需要註冊。現在註冊嗎？ + + + + This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client. +Please close and reopen your client to try again. + 伺服器需要客户端ID。你的客户端未能生成ID或你正在運行修改過的客户端。 +請關閉並重新打開客户端。 + + + + An internal error has occurred, please close and reopen Cockatrice before trying again. +If the error persists, ensure you are running the latest version of the software and if needed contact the software developers. + 出現內部錯誤，請關閉並重啓客戶端再嘗試。如果錯誤仍然出現請將您的客戶端升級到最新版本，如有需要請聯繫您的軟件提供商。 + + + + Account activation + 賬號激活 + + + + Your account has not been activated yet. +You need to provide the activation token received in the activation email. + 你的賬號還未激活。 +請提供激活郵件中的驗證碼。 + + + + Server Full + 伺服器已滿 + + + + Unknown login error: %1 + 未知的登陸錯誤: %1 + + + + + +This usually means that your client version is out of date, and the server sent a reply your client doesn't understand. + +這通常表示你的客户端已經過於陳舊，未能響應伺服器提出的請求。 + + + + Your username must respect these rules: + 您的用戶名須遵守以下規則： + + + + is %1 - %2 characters long + 在%1 - %2個字符之間。 + + + + can %1 contain lowercase characters + 能包含 %1 個小寫字母 + + + + + + + NOT + 否 + + + + can %1 contain uppercase characters + 能包含%1個小寫字母 + + + + can %1 contain numeric characters + 能包含%1個數字 + + + + can contain the following punctuation: %1 + 能包含以下符號：%1 + + + + first character can %1 be a punctuation mark + 第一個字符不能為%1 標點符號 + + + + no unacceptable language as specified by these server rules: + note that the following lines will not be translated + + + + + can not contain any of the following words: %1 + 不能包含以下詞：%1 + + + + can not match any of the following expressions: %1 + 不能包含以下語句：%1 + + + + You may only use A-Z, a-z, 0-9, _, ., and - in your username. + 你可以使用A-Z，a-z，0-9，_，.以及-作為用户名。 + + + + + + + + + Registration denied + 註冊失敗 + + + + Registration is currently disabled on this server + 當前伺服器無法註冊 + + + + There is already an existing account with the same user name. + 當前用戶名已經被使用。 + + + + It's mandatory to specify a valid email address when registering. + 註冊時必須提供一個有效的電郵。 + + + + It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information. + 看起來你正試圖在這個伺服器上註冊一個新賬户，但是你已經有了一個用提供的郵箱註冊的賬户。 此伺服器限制每個郵箱地址可以註冊用户帳户的數量。請聯繫伺服器運營商以獲得進一步幫助或獲取你的憑據信息。 + + + + Password too short. + 密碼太短。 + + + + Registration failed for a technical problem on the server. + 由於伺服器出現技術問題，註冊失敗。 + + + + The connection to the server has been lost. + + + + + Unknown registration error: %1 + 未知的註冊錯誤：%1 + + + + Account activation failed + 賬號激活失敗 + + + + Socket error: %1 + 接口錯誤: %1 + + + + You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server. +Local version is %1, remote version is %2. + 你正在連接到一個過時的伺服器，請下調你的版本或者連接到一個匹配的伺服器. +你當前的版本 %1, 伺服器版本 %2. + + + + Your Cockatrice client is obsolete. Please update your Cockatrice version. +Local version is %1, remote version is %2. + 你使用的客户端意見過時，請使用更新你版本. +你當前的版本 %1, 伺服器版本 %2. + + + + Connecting to %1... + 連接到 %1⋯ + + + + Registering to %1 as %2... + 正在將 %2 註冊到 %1 + + + + Disconnected + 斷開連接 + + + + Connected, logging in at %1 + 連接登陸到 %1 + + + + + + Requesting forgotten password to %1 as %2... + 正在將%2向%1申請忘記密碼流程。 + + + &Connect... 連接⋯ - + &Disconnect 斷開連接 - + Start &local game... 開始本地遊戲... - + &Watch replay... 觀看錄像... - + &Full screen 全屏 - + &Register to server... 註冊到伺服器 - + &Restore password... - + &Settings... 設置⋯ - + &Exit 退出 - + A&ctions 動作 - + &Cockatrice CockatriceCockatrice - + C&ard Database 卡牌資料庫 - + &Manage sets... 系列管理 - + Edit custom &tokens... 編輯自定義&tokens - + Open custom image folder 打開自定義圖片文件夾 - + Open custom sets folder 打開自定義系列文件夾 - + Add custom sets/cards 添加自定義系列/卡牌 - + Reload card database - + Tabs - + &Help 幫助 - + &About Cockatrice 關於Cockatrice雞蛇 - + &Tip of the Day & 每日提示 - + Check for Client Updates 檢查客戶端更新 - + Check for Card Updates... - + Check for Card Updates (Automatic) - + Show Status Bar - + View &Debug Log - + Open Settings Folder - + Show/Hide - + New Version 新版本 - + Congratulations on updating to Cockatrice %1! Oracle will now launch to update your card database. 恭喜Cockatrice更新到%1！ 現在啓動Oracle更新你的卡牌資料庫。 - + Cockatrice installed 雞蛇已安裝 - + Congratulations on installing Cockatrice %1! Oracle will now launch to install the initial card database. 恭喜Cockatrice更新到%1！ 現在啓動Oracle更新你的卡牌資料庫。 - + Card database 卡牌數據庫 - + Cockatrice is unable to load the card database. Do you want to update your card database now? If unsure or first time user, choose "Yes" @@ -5421,51 +5301,46 @@ If unsure or first time user, choose "Yes" 如果不確定或者你是第一次使用，請選擇“是” - - + + Yes 是 - - + + No 否 - + Open settings 打開設定 - + New sets found 發現新系列 - + %n new set(s) found in the card database Set code(s): %1 Do you want to enable it/them? - - Yes, always enable - - - - + View sets 查看系列 - + Welcome 歡迎 - + Hi! It seems like you're running this version of Cockatrice for the first time. All the sets in the card database have been enabled. Read more about changing the set order or disabling specific sets and consequent effects in the "Manage Sets" dialog. @@ -5474,132 +5349,165 @@ Read more about changing the set order or disabling specific sets and consequent 瞭解更多用“系列管理”窗口更改系列順序或者禁用某系列的信息。 - + + Information 信息 - + A card database update is already running. 數據庫更新已經在運行中。 - + Unable to run the card database updater: 無法運行卡組數據庫更新器： - + Card database update running. - + Failed to start. The file might be missing, or permissions might be incorrect. - + The process crashed some time after starting successfully. - + Timed out. The process took too long to respond. The last waitFor...() function timed out. - + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. - + An error occurred when attempting to read from the process. For example, the process may not be running. - + Unknown error occurred. - + The card database updater exited with an error: %1 - - - - - + + This server supports additional features that your client doesn't have. +This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. + +To update your client, go to Help -> Check for Updates. + 你當前的客户端缺少該伺服器所需要的特性。 +通常不會有問題，但這代表有新版本的Cockatrice可供使用，或有預覽版本。 +要升級客户端，請點擊 幫助->檢查更新 + + + + + + + Load sets/cards 載入系列/卡牌 - + Selected file cannot be found. 找不到選擇的文件。 - + You can only import XML databases at this time. 當前只能導入XML格式數據庫。 - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. 新的系列/卡牌已添加成功。 CockatriceCockatrice現在會重新載入卡組數據庫。 - + Sets/cards failed to import. 系列/卡牌導入失敗。 + + + + + Reset Password + + + + + Your password has been reset successfully, you can now log in using the new credentials. + 你的密碼已重置，現在你可以使用新密碼登錄了。 + + + + Failed to reset user account password, please contact the server operator to reset your password. + 重置密碼失敗，請聯繫伺服器管理員重置密碼。 + + + + Activation request received, please check your email for an activation token. + 激活請求已收到，請查看你的電子郵箱獲取激活驗證碼。 + ManaBaseConfigDialog - + Mana Base Configuration - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): - + OK - + Cancel @@ -5671,27 +5579,27 @@ CockatriceCockatrice現在會重新載入卡組數據庫。 ManaDevotionConfigDialog - + Display type: - + pie - + bar - + combinedBar - + Filter Colors (optional): @@ -5761,615 +5669,610 @@ CockatriceCockatrice現在會重新載入卡組數據庫。 MessageLogWidget - + from play 從戰場上 - + from their graveyard 從他的墳墓場 - + from exile 從放逐區 - + from their hand 從他的手牌 - + the top card of %1's library %1牌庫頂的牌 - + the top card of their library 他牌庫頂的卡牌 - + from the top of %1's library 從%1的牌庫頂 - + from the top of their library 從他的牌庫頂 - + the bottom card of %1's library %1的牌庫底牌 - + the bottom card of their library 他牌庫底部的牌 - + from the bottom of %1's library 從%1的牌庫底 - + from the bottom of their library 從他的牌庫底 - + from %1's library 從%1的牌庫中 - + from their library 從他的牌庫 - + from sideboard 從備牌中 - + from the stack 從堆疊中 - + from custom zone '%1' - + %1 is now keeping the top card %2 revealed. %1已持續展示牌庫頂牌%2 - + %1 is not revealing the top card %2 any longer. %1不再%2展示牌庫頂牌。 - + %1 can now look at top card %2 at any time. - + %1 no longer can look at top card %2 at any time. - + %1 attaches %2 to %3's %4. %1 結附 %2 指向 %3的 %4. - + %1 has conceded the game. %1 已放棄遊戲。 - + %1 has unconceded the game. %1 已放棄遊戲。 - + %1 has restored connection to the game. %1已恢復連接。 - + %1 has lost connection to the game. %1 已失去連接。 - + %1 points from their %2 to themselves. %1 將%2 指向自己。 - + %1 points from their %2 to %3. %1 將%2指向%3。 - + %1 points from %2's %3 to themselves. %1將%2的%3 - + %1 points from %2's %3 to %4. %1 將%2的%3指向%4。 - + %1 points from their %2 to their %3. %1將他的%2指向他的%3。 - + %1 points from their %2 to %3's %4. %1將他的%2指向%3的%4。 - + %1 points from %2's %3 to their own %4. %1將%2的%3指向他自己的%4。 - + %1 points from %2's %3 to %4's %5. %1 將%2的%3指向%4的%5。 - + %1 creates a face down token. - + %1 creates token: %2%3. %1創建衍生物：%2%3。 - + %1 has loaded a deck (%2). %1 已載入套牌(%2) - + %1 has loaded a deck with %2 sideboard cards (%3). %1已載入含有 %2張備牌的套牌(%3) - + %1 destroys %2. %1銷燬了%2。 - + a card 一張牌 - + %1 gives %2 control over %3. %1讓%2控制%3。 - + %1 puts %2 into play%3 face down. - + %1 puts %2 into play%3. %1將%2%3放進戰場。 - + %1 puts %2%3 into their graveyard face down. - + %1 puts %2%3 into their graveyard. %1將%2%3置入他的墳墓場。 - + %1 exiles %2%3 face down. - + %1 exiles %2%3. %1 %3放逐了 %2 - + %1 moves %2%3 to their hand. %1將%2%3放回他的手牌中。 - + %1 puts %2%3 into their library. %1將%2%3放入他的牌庫。 - + %1 puts %2%3 onto the bottom of their library. - + %1 puts %2%3 on top of their library. %1將%2%3置於其牌庫頂。 - + %1 puts %2%3 into their library %4 cards from the top. %1將%2%3放入牌庫%4張牌放在牌庫頂 - + %1 moves %2%3 to sideboard. %1 將%2%3移動到備牌 - + %1 plays %2%3 face down. - + %1 plays %2%3. %1使用 %2%3。 - + %1 moves %2%3 to custom zone '%4' face down. - + %1 moves %2%3 to custom zone '%4'. - + %1 tries to draw from an empty library - + %1 draws %2 card(s). - + %1 is looking at %2. %1 正在查看%2。 - + %1 is looking at the %4 %3 card(s) %2. top card for singular, top %3 cards for plural - + bottom - + top - + %1 turns %2 face-down. %1回合%2翻為面朝下。 - + %1 turns %2 face-up. %1回合%2翻為面朝上。 - + The game has been closed. 遊戲已經關閉。 - + The game has started. 遊戲已開始。 - + You are flooding the game. Please wait a couple of seconds. - + %1 has joined the game. %1 已經加入遊戲。 - + %1 is now watching the game. %1 正在旁觀遊戲。 - + You have been kicked out of the game. 你已被踢出遊戲。 - + %1 has left the game (%2). %1 已經離開了遊戲(%2)。 - + %1 is not watching the game any more (%2). %1 不再旁觀遊戲(%2)。 - + %1 is not ready to start the game any more. %1 還未準備好開始遊戲。 - + %1 shuffles their deck and draws a new hand of %2 card(s). - + %1 shuffles their deck and draws a new hand. %1洗牌並抓了新的起手 - + You are watching a replay of game #%1. 你正在觀看遊戲#%1的錄像。 - + %1 is ready to start the game. %1已準備好開始遊戲。 - + cards an unknown amount of cards 牌 - + %1 card(s) a card for singular, %1 cards for plural - + %1 lends %2 to %3. - + %1 reveals %2 to %3. %1將%2展示給%3。 - + %1 reveals %2. %1 展示 %2。 - + %1 randomly reveals %2%3 to %4. %1隨機展示%2%3給%4。 - + %1 randomly reveals %2%3. %1隨機展示%2%3。 - + %1 peeks at face down card #%2. %1查看面朝下的卡牌#%2。 - + %1 peeks at face down card #%2: %3. %1查看面朝下的卡牌#%2:%3。 - + %1 reveals %2%3 to %4. %1展示%2%3給%4。 - + %1 reveals %2%3. %1展示%2%3。 - + %1 reversed turn order, now it's %2. %1 反轉回合順序，現在是%2的回合。 - + reversed 反轉 - + normal 正常 - + Heads 正面 - + Tails 反面 - + %1 flipped a coin. It landed as %2. %1擲硬幣。結果為%2。 - + %1 rolls a %2 with a %3-sided die. %1擲%3面骰子，結果為%2。 - + %1 flips %2 coins. There are %3 heads and %4 tails. - + %1 rolls a %2-sided dice %3 times: %4. - + %1's turn. 現在是%1的回合。 - + %1 sets annotation of %2 to %3. %1給%2添加了註釋%3。 - - %1 places %2 %3%4 counter(s) on %5 (now %6). + + %1 places %2 "%3" counter(s) on %4 (now %5). - - %1 removes %2 %3%4 counter(s) from %5 (now %6). + + %1 removes %2 "%3" counter(s) from %4 (now %5). - - %1 failed to undo their last draw. - - - - + %1 sets counter %2 to %3 (%4%5). %1 將%2指示物設置為 %3 (%4%5)。 - + %1 sets %2 to not untap normally. %1 將 %2 設置為不會被通常重置。 - + %1 sets %2 to untap normally. %1 將 %2 設置為可通常重置。 - + %1 removes the PT of %2. %1 移除%2力量/防禦 - + %1 changes the PT of %2 from nothing to %4. %1改變%2的力量/防禦至%4 - + %1 changes the PT of %2 from %3 to %4. %1將%2的力量/防禦從%3改變至%4 - + %1 has locked their sideboard. %1已鎖定他的備牌。 - + %1 has unlocked their sideboard. %1 解除鎖定他的備牌。 - + %1 taps their permanents. %1 橫置了永久物。 - + %1 untaps their permanents. %1 重置了永久物。 - + %1 taps %2. %1 橫置了 %2。 - + %1 untaps %2. %1 重置了 %2。 - + %1 shuffles %2. %1 切洗了%2。 - + %1 shuffles the bottom %3 cards of %2. %1 洗 %2 底的 %3 張卡 - + %1 shuffles the top %3 cards of %2. %1 洗 %2 頂的 %3 張卡 - + %1 shuffles cards %3 - %4 of %2. %1洗%3 - %4 到%2. - + %1 unattaches %2. %1 取消了%2的結附。 - + %1 undoes their last draw. %1撤銷了最後的抓牌。 - + %1 undoes their last draw (%2). %1撤銷了最後的抓牌(%2)。 @@ -6377,115 +6280,110 @@ CockatriceCockatrice現在會重新載入卡組數據庫。 MessagesSettingsPage - + Word1 Word2 Word3 詞1 詞2 詞3 - + Add New Message 添加新信息 - + Edit Message 編輯信息 - + Remove Message - + Add message 添加信息 - - + + Message: 信息: - + Edit message 編輯消息 - + Chat settings 聊天設定 - + Custom alert words 自定義警告語 - + Enable chat mentions 允許聊天中提到某人 - + Enable mention completer 允許自動完成提名 - + In-game message macros 遊戲內消息宏 - + How to use in-game message macros - + Ignore chat room messages sent by unregistered users 忽略未註冊用戶的聊天室消息。 - + Ignore private messages sent by unregistered users 忽略未註冊用戶發出的私人消息 - - Ignore private messages sent by non-buddy users - - - - - + + Invert text color 反轉文本顏色 - + Enable desktop notifications for private messages 開啓私人消息桌面提醒 - + Enable desktop notification for mentions 開啓聊天提名桌面提醒 - + Enable room message history on join 開啓加入聊天室時的歷史消息 - - + + (Color is hexadecimal) （顏色為16進制） - + Separate words with a space, alphanumeric characters only 將單詞以空格區分，僅支持字母 @@ -6493,42 +6391,42 @@ CockatriceCockatrice現在會重新載入卡組數據庫。 MoveMenu - + Move to - + &Top of library in random order - + X cards from the top of library... - + &Bottom of library in random order - + T&able - + &Hand - + &Graveyard - + &Exile @@ -6541,47 +6439,47 @@ CockatriceCockatrice現在會重新載入卡組數據庫。 牌類型 - + Mana Value 魔法力值 - + Color(s) 顏色 - + Loyalty 忠誠 - + Main Card Type 牌的主類型 - + Mana Cost 魔法力費用 - + P/T 力量/防禦力 - + Side 旁邊 - + Layout 佈局 - + Color Identity 標識色 @@ -6604,152 +6502,6 @@ CockatriceCockatrice現在會重新載入卡組數據庫。 - - PaletteEditorDialog - - - - Reset - - - - - - Apply - - - - - - Save && Apply - - - - - ▼ Edit Palette - - - - - - ▶ Edit Palette - - - - - Palette Editor — %1 - - - - - <b>Palette Editor</b> &nbsp;·&nbsp; %1 - - - - - This theme ships no default palette files - - - - - Replace current colours with the theme author's defaults - - - - - Switch between the light and dark palette files - - - - - Editing: - - - - - Show or hide the per-role colour grid for manual tweaks - - - - - ↺ Revert to theme default - - - - - Discard unsaved edits and restore the last saved palette - - - - - Preview this palette without saving to disk - - - - - Write palette-%1.toml and reload the theme - - - - - Cannot save: this theme has no directory on disk - - - - - Save failed - - - - - Could not write %1 to: -%2 - - - - - No default found - - - - - No default palette file found for the "%1" scheme. - - - - - PaletteGridWidget - - - Active - - - - - Disabled - - - - - Inactive - - - - - Normal interactive state - - - - - Widget is disabled / not interactive - - - - - Window is in background / unfocused - - - Phase @@ -6816,57 +6568,57 @@ CockatriceCockatrice現在會重新載入卡組數據庫。 PhasesToolbar - + Untap step 重置步驟 - + Upkeep step 維持步驟 - + Draw step 抓牌步驟 - + First main phase 主要步驟1 - + Beginning of combat step 戰鬥開始步驟 - + Declare attackers step 宣告進攻步驟 - + Declare blockers step 宣告阻擋步驟 - + Combat damage step 戰鬥傷害步驟 - + End of combat step 戰鬥結束步驟 - + Second main phase 主要步驟2 - + End of turn step 結束步驟 @@ -6874,7 +6626,7 @@ CockatriceCockatrice現在會重新載入卡組數據庫。 PictureLoader - + en code for scryfall's language property, not available for all languages @@ -6883,142 +6635,151 @@ CockatriceCockatrice現在會重新載入卡組數據庫。 PlayerActions - - - - - grave - - - - - - - - exile - - - - - PlayerDialogs - - + View top cards of library - - - - - - - - - + + + + + + + + + Number of cards: (max. %1) - + View bottom cards of library - + Shuffle top cards of library - + Shuffle bottom cards of library - + Draw hand - + 0 and lower are in comparison to current hand size - + Draw cards - + + + + + grave + + + + + + + + exile + + + + Move top cards to %1 - + Move bottom cards to %1 - + Draw bottom cards - + + + C&reate another %1 token + + + + Create tokens - + + Number: - + Place card X cards from top of library - + Which position should this card be placed: - + (max. %1) - + Change power/toughness - + Change stats to: - + Set annotation - + Please enter the new annotation: + + + Set counters + + PlayerMenu - + Player "%1" - + &Counters @@ -7048,7 +6809,7 @@ This setting means you'll only see the default printing for each card, instead o - + Printing Selector @@ -7056,22 +6817,22 @@ This setting means you'll only see the default printing for each card, instead o PrintingSelectorCardOverlayWidget - + Preference - + Pin Printing - + Unpin Printing - + Show Related cards @@ -7142,57 +6903,57 @@ This setting means you'll only see the default printing for each card, instead o PtMenu - + Power / toughness - + &Increase power - + &Decrease power - + I&ncrease toughness - + D&ecrease toughness - + In&crease power and toughness - + Dec&rease power and toughness - + Increase power and decrease toughness - + Decrease power and increase toughness - + Set &power and toughness... - + Reset p&ower and toughness @@ -7200,37 +6961,37 @@ This setting means you'll only see the default printing for each card, instead o QMenuBar - + Services 服務 - + Hide %1 隱藏 %1 - + Hide Others 隱藏其他 - + Show All 展示所有 - + Preferences... 參數 - + Quit %1 退出%1 - + About %1 關於 %1 @@ -7238,17 +6999,17 @@ This setting means you'll only see the default printing for each card, instead o QObject - + Cockatrice card database (*.xml) CockatriceCockatrice卡牌數據庫 (*.xml) - + All files (*.*) 全部文件 (*.*) - + Cockatrice replays (*.cor) Cockatrice錄像文件 (*.cor) @@ -7308,177 +7069,110 @@ Are you sure you would like to disable this feature? QPlatformTheme - + OK 確定 - + Save 保存 - + Save All 保存全部 - + Open 打開 - + &Yes 是 - + Yes to &All 全選是 - + &No 否 - + N&o to All 全選否 - + Abort 退出 - + Retry 重試 - + Ignore 忽略 - + Close 關閉 - + Cancel 取消 - + Discard 棄牌 - + Help 幫助 - + Apply 應用 - + Reset 重置 - + Restore Defaults 恢復為默認值 - - QuickSetupPanel - - - %1% - - - - - <b>Quick Setup</b> - - - - - Generate all palette roles automatically from a single accent colour - - - - - Accent: - - - - - Primary hue. Used directly for highlights and links. -At high intensity it also tints buttons and backgrounds. - - - - - Intensity: - - - - - Subtle - - - - - Full colour - - - - - 0–30 Subtle tint — only highlights and links change hue -30–70 Accented — buttons, tooltips, and borders join in -70–100 Full colour — backgrounds, everything - - - - - 70% - - - - - Generate ↓ - - - - - Derive all palette roles from the accent colour above. -Fine-tune individual colours in the grid afterwards. - - - RemoteDeckList_TreeModel - + Name 名稱 - + ID ID - + Upload time 上傳時間 @@ -7486,32 +7180,32 @@ Fine-tune individual colours in the grid afterwards. RemoteReplayList_TreeModel - + ID ID - + Name 名稱 - + Players 玩家 - + Keep 維持 - + Time started 遊戲時間 - + Duration (sec) 持續(離開) @@ -7519,37 +7213,37 @@ Fine-tune individual colours in the grid afterwards. RfgMenu - + &Exile - + &View exile - + &Move exile to... - + &Top of library - + &Bottom of library - + &Hand - + &Graveyard @@ -7595,7 +7289,7 @@ Fine-tune individual colours in the grid afterwards. SayMenu - + S&ay @@ -7636,27 +7330,27 @@ Fine-tune individual colours in the grid afterwards. SetsModel - + Enabled 已啓用 - + Set type 設置類型 - + Set code 設置代碼 - + Long name 長的名稱 - + Release date 發佈日期 @@ -7664,53 +7358,53 @@ Fine-tune individual colours in the grid afterwards. ShortcutSettingsPage - - + + Restore all default shortcuts 恢復所有默認快捷鍵 - + Do you really want to restore all default shortcuts? 確定要恢復所有默認快捷鍵嗎？ - + Clear all default shortcuts 清楚所有默認快捷鍵 - + Do you really want to clear all shortcuts? 確定要清楚所有快捷鍵？ - + Section: 部分: - + Action: 行動: - + Shortcut: 快捷鍵: - + How to set custom shortcuts 如何設置自定義快捷鍵 - + Clear all shortcuts - + Search by shortcut name @@ -7766,12 +7460,12 @@ Please check your shortcut settings! SideboardMenu - + &Sideboard - + &View sideboard @@ -7779,27 +7473,27 @@ Please check your shortcut settings! SoundSettingsPage - + Enable &sounds 啓用聲效 - + Current sounds theme: 當前聲效主題： - + Test system sound engine 測試系統聲效 - + Sound settings 聲效設定 - + Master volume 主音量 @@ -7871,146 +7565,16 @@ Please check your shortcut settings! 收到更新伺服器的無效回應。 - + No reply received from the tag update server. 未收到標籤更新伺服器的回應 - + Invalid reply received from the tag update server. 收到標籤更新伺服器的無效回應 - - StorageSettingsPage - - - - - Success - - - - - Cached card pictures have been reset. - - - - - Downloaded card pictures have been reset. - - - - - Error - - - - - One or more downloaded card pictures could not be cleared. - - - - - In-memory (currently loaded) card pictures have been reset. - - - - - Card Picture Loader Caching Method: - - - - - The network cache is the preferred way of storing images. Downloaded images are stored here until the size of the cache exceeds the configured size. Cockatrice automatically monitors this cache and deletes the least recently seen card images to ensure the cache does not exceed the configured size. - - - - - Writing card images directly to a folder on your hard drive is another way of storing images. This does not change how Cockatrice accesses or downloads images. Cockatrice will NOT automatically monitor and clear this folder, so if you enable this option, it is up to you to ensure sufficient available space. It should also be noted that if a provider outage causes you to download the wrong picture (i.e. wrong printing) you will be stuck with it until you manually delete the file, as opposed to using the network cache, which automatically rotates and thus correct errors after a while. - - - - - This is the in-memory picture cache used by the application at runtime. It determines how much memory (RAM) Cockatrice can use before it has to fetch card images from the hard disk again. Increasing this will allow more card images to be displayed at once but shouldn't be necessary. Clearing this will make Cockatrice reload all images from the network cache or the disk. - - - - - Delete Cached Images - - - - - Delete Saved Images - - - - - Clear In-Memory Images - - - - - Card Picture Loader Cache Method - - - - - Network Cache - - - - - Filesystem - - - - - In-Memory Picture Cache - - - - - Network Cache Size: - - - - - On-disk cache for downloaded pictures - - - - - Redirect Cache TTL: - - - - - How long cached redirects for urls are valid for. - - - - - Picture Cache Size: - - - - - In-memory cache for pictures not currently on screen - - - - - Naming scheme: - - - - - Day(s) - - - TabAccount @@ -8146,117 +7710,117 @@ Please check your shortcut settings! TabArchidekt - - + + Desc. - - + + AND - - + + Require ALL selected colors - - + + Deck name... - - + + Owner... - - + + Packages - - + + Advanced Filters - + Bracket: - - + + Any - - + + Contains card... - - + + Commander... - - + + Tag... - - + + Deck Size - + Cards: - - + + Asc. - + Sort by: - + Filter by: - + Display Settings - - + + Search - - + + Formats @@ -8266,54 +7830,6 @@ Please check your shortcut settings! - - TabCardArtRules - - - Card: - - - - - ProviderId: - - - - - Mode: - - - - - Reason: - - - - - Type a card name... - - - - - Add rule - - - - - Remove rule - - - - - Refresh - - - - - Card Art Rules - - - TabDeckEditor @@ -8362,7 +7878,7 @@ Please check your shortcut settings! 重置界面 - + Deck: %1 套牌: %1 @@ -8370,49 +7886,55 @@ Please check your shortcut settings! TabDeckEditorVisual - + Visual Deck: %1 - + &Visual Deck Editor - - + + Card Info - - + + Deck - + + + Filters + + + + &View - + Printing - + Visible - + Floating - + Reset layout @@ -8420,22 +7942,22 @@ Please check your shortcut settings! TabDeckEditorVisualTabWidget - + Visual Deck View - + Visual Database Display - + Deck Analytics - + Sample Hand @@ -8443,134 +7965,134 @@ Please check your shortcut settings! TabDeckStorage - + Local file system 本地文件系統 - + Server deck storage 伺服器上的套牌倉庫 - - + + Open in deck editor 打開套牌編輯 - + Rename deck or folder - + Upload deck 上傳套牌 - + Download deck 下載套牌 + - - - + + New folder 新建文件夾 + - Delete 刪除 - + Open decks folder - + Rename local folder - + Rename local file - + New name: - - - - + + + + Error 錯誤 - + Rename failed - - + + Invalid deck file - + Enter deck name 輸入套牌名稱 - + This decklist does not have a name. Please enter a name: 這個套牌沒有名稱. 請輸入一個名稱: - + Unnamed deck 未命名套牌 - + Failed to upload deck to server - + Delete local file 刪除本地文件 - + Are you sure you want to delete the selected files? - + Delete remote decks - + Are you sure you want to delete the selected decks? - - + + Name of new folder: 新建文件夾的名稱: @@ -8642,191 +8164,191 @@ Please enter a name: TabGame - - - + + + Replay 錄像 - - + + Game 遊戲 - - + + Player List 玩家列表 - - + + Card Info 卡牌信息 - - + + Messages 消息 - - + + Replay Timeline 錄像時間線 - + &Phases 階段 - + &Game 遊戲 - + Next &phase 下個階段 - + Next phase with &action 下個階段&行動 - + Next &turn 下個回合 - + Reverse turn order 反轉回合順序 - + &Remove all local arrows 移除所有箭頭 - + Rotate View Cl&ockwise 順時針旋轉視角 - + Rotate View Co&unterclockwise 逆時針旋轉視角 - + Game &information 遊戲信息 - + Un&concede - - - + + + &Concede 放棄遊戲 - + &Leave game 離開遊戲 - + C&lose replay 關閉遊戲錄像 - + &Focus Chat 聚焦聊天室 - + &Say: 説： - + Selected cards - + &View 視圖 - + Visible 可見 - + Floating 移動窗口 - + Reset layout 重置界面 - + Concede 投降 - + Are you sure you want to concede this game? 你確定放棄這個遊戲？ - + Unconcede 取消投降 - + You have already conceded. Do you want to return to this game? 你已經投降,你想回到這場遊戲嗎？ - + Leave game 離開遊戲 - + Are you sure you want to leave this game? 你確定離開這這個遊戲？ - + A player has joined game #%1 - + %1 has joined the game - + You have been kicked out of the game. 你已被踢出遊戲。 @@ -8885,115 +8407,115 @@ Please enter a name: 您必須選擇一個可用的天數用來定位 - + Username: 用户名： - + IP Address: IP地址： - + Game Name: 遊戲名： - + GameID: 遊戲ID： - + Message: 消息： - + Main Room 主房間 - + Game Room 遊戲房間 - + Private Chat 私人聊天 - + Past X Days: 過去 X 天： - + Today 今天 - + Last Hour 1小時前 - + Maximum Results: 最大結果： - + At least one filter is required. The more information you put in, the more specific your results will be. 至少需要1個篩選項。 您輸入的信息越多，找到結果越準確。 - + Get User Logs 獲取用戶記錄 - + Clear Filters 清楚篩選項目 - + Filters 過濾器 - + Log Locations 記錄位置 - + Date Range 日期範圍 - + Maximum Results 最大結果 - - + + Message History 消息歷史 - + Failed to collect message history information. 獲取消息歷史信息失敗。 - + There are no messages for the selected filters. 沒有符合篩選條件的消息。 @@ -9011,27 +8533,27 @@ The more information you put in, the more specific your results will be.離開 - + %1 - Private chat %1 - 私人聊天 - + This user is ignoring you, they cannot see your messages in main chat and you cannot join their games. 該用戶已屏蔽你，他無法在主聊天中看見你的消息，你也不能加入他的遊戲。 - + Private message from 私人信息來自 - + %1 has left the server. %1 已經離開了伺服器. - + %1 has joined the server. %1 已經加入了伺服器. @@ -9039,180 +8561,180 @@ The more information you put in, the more specific your results will be. TabReplays - + Local file system 本地文件系統 - + Server replay storage 伺服器錄像倉庫 - - + + Watch replay 觀看錄像 - + Rename - - + + New folder - - + + Delete 刪除 - + Open replays folder - + Download replay 下載遊戲錄像 - + Toggle expiration lock 過期鎖定 - + Get replay share code - - + + Look up replay by share code - + Rename local folder - + Rename local file - + New name: - + Error - + Rename failed - + Name of new folder: - + Delete local file 刪除本地文件 - + Are you sure you want to delete the selected files? - + Are you sure you want to delete the selected replays? - + Failed to get code - - + + Either this server does not support replay sharing, or does not permit replay sharing for you. - - - + + + Failed - + Could not get replay code - + Replay Share Code - + Others can use this code to add the replay to their list of remote replays: %1 - + Copy to clipboard - + Replay share code - + Replay code found - + Replay was added, or you already had access to it. - + Replay code not found - + Failed to submit code - + Unexpected error - + Delete remote replay 刪除伺服器上的錄像 @@ -9225,62 +8747,47 @@ The more information you put in, the more specific your results will be. TabRoom - - Friends - - - - - Online - - - - - Ignored - - - - + &Say: 説： - + Chat 聊天 - + &Room 房間 - + &Leave room 離開房間 - + &Clear chat 清除聊天記錄 - + Chat Settings... 聊天設定 - + mentioned you. 提到了你。 - + Click to view 點擊查看 - + You are flooding the chat. Please wait a couple of seconds. 你正在灌水，請等待幾秒再發言. @@ -9293,30 +8800,30 @@ The more information you put in, the more specific your results will be.伺服器 - - - - + + + + Error 錯誤 - + Failed to join the server room: it doesn't exist on the server. - + The server thinks you are in the server room but your client is unable to display it. Try restarting your client. - + You do not have the required permission to join this server room. - + Failed to join the server room due to an unknown error: %1. @@ -9324,97 +8831,97 @@ The more information you put in, the more specific your results will be. TabSupervisor - + Deck Editor - + Visual Deck Editor - + EDHRec - + Archidekt - + Home - + &Visual Deck Storage - + Visual Database Display - + Server - + Account - + Deck Storage - + Game Replays - + Administration - + Logs - + Are you sure? 你確定嗎？ - + There are still open games. Are you sure you want to quit? 遊戲還在繼續, 你確定要退出嗎？ - + Click to view 點擊查看 - + Your buddy %1 has signed on! 你的好友%1已登錄! - + Unknown Event 未知事件 - + The server has sent you a message that your client does not understand. This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version. @@ -9425,39 +8932,39 @@ To update your client, go to Help -> Check for Updates. 要升級你的客户端，請點擊“幫助”->“檢查更新” - + Idle Timeout 閒置超時 - + You are about to be logged out due to inactivity. 你即將因為長時間未操作而被退出。 - + Promotion 晉升 - + You have been promoted. Please log out and back in for changes to take effect. 你已被提升為版主。請退出再登陸以使修改生效。 - + Warned 被警告 - + You have received a warning due to %1. Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator. 你因為%1被警告。 請杜絕此類行為否則會被採取進一步行動。如果有任何疑問，請私信版主。 - + You have received the following message from the server. (custom messages like these could be untranslated) 你收到來自伺服器的如下消息。 @@ -9467,12 +8974,12 @@ Please refrain from engaging in this activity or further actions may be taken ag TabVisualDatabaseDisplay - + Database Display - + Visual Database Display @@ -9511,42 +9018,42 @@ Please refrain from engaging in this activity or further actions may be taken ag TranslateCounterName - + Life 生命值 - + White 白色 - + Blue 藍色 - + Black 黑色 - + Red 紅色 - + Green 綠色 - + Colorless 無色 - + Other 其他 @@ -9554,69 +9061,11 @@ Please refrain from engaging in this activity or further actions may be taken ag UpdateDownloader - + Could not open the file for reading. 無法打開文件。 - - UserCardArtSettingsDialog - - - Card Art Settings - - - - - Type a card name... - - - - - Card name: - - - - - Card ProviderId: - - - - - Left margin (%): - - - - - Right margin (%): - - - - - Vertical offset: - - - - - Zoom: - - - - - Parameters - - - - - Preview - - - - - Remove Banner Card - - - UserContextMenu @@ -9734,7 +9183,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Ban History 禁止歷史 @@ -9749,87 +9198,77 @@ Please refrain from engaging in this activity or further actions may be taken ag 用戶從未被禁止 - + Failed to collect ban information. 獲取禁止信息失敗。 - - - + + + Warning History 警告歷史 - + Warning Time;Moderator;User Name;Reason 警告時間；版主；用户名；理由 - + User has never been warned. 用戶從未被警告 - + Failed to collect warning information. 獲取警告信息失敗。 - + Failed to get admin notes. - - + + Success 成功 - + Successfully promoted user. 提升用戶成功。 - + Successfully demoted user. 撤銷用戶成功。 - - Kick Player - - - - - Are you sure you want to kick this player from the game? - - - - - - + + + Failed 失敗 - + Failed to promote user. 提升用戶失敗。 - + Failed to demote user. 撤銷用戶失敗。 - + Copy hash to clipboard 複製哈希到剪貼板 - + Remove this user's messages @@ -9837,554 +9276,326 @@ Please refrain from engaging in this activity or further actions may be taken ag UserInfoBox - + Location: 位置: - + Account Age: 賬號年齡： - + Edit 編輯 - + Change password 修改密碼 - + Change avatar 修改頭像 - + Administrator 管理員 - + Moderator 版主 - + Registered user 註冊用戶 - - + + Unregistered user 未註冊用戶 - + Judge 裁判 - + Unknown 未知的 - + The entered password does not match your account. - - - - + + + Information 信息 - + User information updated. 用戶信息已更新。 - - - - - - - - - - - + + + + + + + + + + Error 錯誤 - + User Information 用戶信息 - + Real Name: 真實姓名: - + User Level: 用戶等級: - - - Edit Banner Card - - - + %n Year(s), amount of years (only shown if more than 0) - + %10%n Day(s) %20 amount of years (if more than 0), amount of days, date in local short format - + Enter Password 輸入密碼 - + Password verification is required in order to change your email address - - - + + + An error occurred while trying to update your user information. - - The selected card is blacklisted on this server or another error occurred. - - - - - Banner card removed. - - - - - Banner card updated. - - - - + This server does not permit you to update your user informations. 該伺服器不允許你更新你的用戶信息。 - + Password changed. 密碼已修改。 - + This server does not permit you to change your password. 該伺服器不允許你修改你的密碼。 - + The new password is too short. 新密碼太短。 - + The old password is incorrect. 原密碼不正確。 - + Avatar updated. 頭像已更新。 - + This server does not permit you to update your avatar. 該伺服器不允許你更新你的頭像。 - - - An error occured while trying to update your avatar. - - - This server does not permit you to update your user informations. - An error occured while trying to updater your avatar. - 該伺服器不允許你更新你的用戶信息。 - - - - UserInfoPopup - - - - Games - - - - - Chat - - - - - Open private chat - - - - - Profile - - - - - View user profile - - - - - Show this user's games - - - - - − Buddy - - - - - Remove from buddy list - - - - - + Buddy - - - - - Add to buddy list - - - - - − Ignore - - - - - Remove from ignore list - - - - - + Ignore - - - - - Add to ignore list - - - - - Ban - - - - - Ban from server - - - - - Warn - - - - - Warn user - - - - - Ban log - - - - - View ban history - - - - - Warn log - - - - - View warning history - - - - - Notes - - - - - View admin notes - - - - - − Mod - - - - - Demote from moderator - - - - - + Mod - - - - - Promote to moderator - - - - - − Judge - - - - - Demote from judge - - - - - + Judge - - - - - Promote to judge - - - - - Join game - - - - - Spectate - - - - - - Loading games… - - - - - Could not load games. - - - - - No active games. - + An error occured while trying to updater your avatar. + 嘗試更新你的頭像時出錯。 UserInterfaceSettingsPage - + General interface settings 通用接口設定 - + &Double-click cards to play them (instead of single-click) 雙擊卡牌開始 (而不是單擊開始) - + &Clicking plays all selected cards (instead of just the clicked card) - + &Play all nonlands onto the stack (not the battlefield) by default 默認將所有非地牌加入堆疊(不是戰場) - + Do not delete &arrows inside of subphases - + Close card view window when last card is removed - + Auto focus search bar when card view window is opened - + Annotate card text on tokens 用卡牌信息給衍生物標注 - - Show selection count during drag selection + + Show selection counter during drag selection - - Show total selection count + + Show total selection counter - - Show subtype breakdown in selection tally - - - - + Use tear-off menus, allowing right click menus to persist on screen 使用浮動菜單，允許右鍵單擊菜單保留在屏幕上 - - Keep game chat focused when clicking in game (Note: disables card view search bar) - - - - + Notifications settings 通知設定 - + Enable notifications in taskbar 開啓任務欄提醒 - + Notify in the taskbar for game events while you are spectating 觀看時在任務欄提示遊戲信息 - + Notify in the taskbar when users in your buddy list connect 在任務欄中提示好友連接到伺服器 - + Animation settings 動畫設定 - + &Tap/untap animation 橫置/重置 動畫 - + Deck editor/storage settings - + Open deck in new tab by default - + Use visual deck storage in game lobby - + Use selection animation for Visual Deck Storage - + When adding a tag in the visual deck storage to a .txt deck: - + do nothing - + ask to convert to .cod - + always convert to .cod - + Default deck editor type - + Classic Deck Editor - + Visual Deck Editor - + Replay settings - + Buffer time for backwards skip via shortcut: @@ -10392,22 +9603,22 @@ Please refrain from engaging in this activity or further actions may be taken ag UserListWidget - + Users connected to server: %1 - + Users in this room: %1 - + Buddies online: %1 / %2 - + Ignored users online: %1 / %2 @@ -10415,45 +9626,35 @@ Please refrain from engaging in this activity or further actions may be taken ag UtilityMenu - + Increment all card counters - + &Untap all permanents - + R&oll die... - - Flip coin - - - - + &Create token... - + C&reate another token - + Cr&eate predefined token - - - C&reate another %1 token - - VisualDatabaseDisplayColorFilterWidget @@ -10505,72 +9706,72 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFilterToolbarWidget - + Sort by - + Filter by - + Save and load filters - + Filter by exact card name - + Filter by card main-type - + Filter by card sub-type - + Filter by set - + Filter by format legality - + Save/Load - + Name - + Main Type - + Sub Type - + Sets - + Formats @@ -10578,22 +9779,22 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayFormatLegalityFilterWidget - + Show formats with at least: - + cards - + Do not display formats with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) @@ -10611,32 +9812,32 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayMainTypeFilterWidget - + Show main types with at least: - + cards - + Do not display card main-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10644,27 +9845,27 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayNameFilterWidget - + Filter by name... (Exact match) - + Load from Deck - + Apply all card names in currently loaded deck as exact match name filters - + Load from Clipboard - + Apply all card names in clipboard as exact match name filters @@ -10672,7 +9873,7 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayRecentSetFilterSettingsWidget - + Filter to most recent sets @@ -10680,19 +9881,19 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySetFilterWidget - + Search sets... - - + + Mode: Exact Match - - + + Mode: Includes @@ -10700,37 +9901,37 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplaySubTypeFilterWidget - + Search subtypes... - + Show sub types with at least: - + cards - + Do not display card sub-types with less than this amount of cards in the database - + Filter mode (AND/OR/NOT conjunctions of filters) - + Mode: Exact Match - + Mode: Includes @@ -10738,23 +9939,23 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDatabaseDisplayWidget - + Search by card name (or search expressions) - + Visual - + Loading database ... - + Clear all filters @@ -10793,17 +9994,17 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Toggle Layout: Overlap - + Change how cards are displayed within zones (i.e. overlapped or fully visible.) - + Toggle Layout: Flat @@ -10832,17 +10033,17 @@ Please refrain from engaging in this activity or further actions may be taken ag VisualDeckEditorWidget - + Type a card name here for suggestions from the database... - + Quick search and add card - + Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter @@ -10960,43 +10161,43 @@ Please refrain from engaging in this activity or further actions may be taken ag WarningDialog - + Which warning would you like to send? 你想發出那種警告？ - + Redact all messages from this user in all rooms - + &OK 確認 - + &Cancel 取消 - + Warn user for misconduct 警告用戶的不當行為 - - + + Error 錯誤 - + User name to send a warning to can not be blank, please specify a user to warn. 發送警告的用戶名不能為空，請提供用戶名以供警告。 - + Warning to use can not be blank, please select a valid warning to send. 警告不能為空，請選擇警告以供發送。 @@ -11004,133 +10205,133 @@ Please refrain from engaging in this activity or further actions may be taken ag WndSets - + Move selected set to the top 將選擇的系列移到頂端 - + Move selected set up 將選擇的系列上移 - + Move selected set down 將選擇的系列下移 - + Move selected set to the bottom 將選擇的系列移到底部 - + Search by set name, code, or type 通過系列名、代碼或類型搜索 - + Default order 默認順序 - + Restore original art priority order 恢復初始優先順序 - + Enable all sets 啓用所有系列 - + Disable all sets 禁用所有系列 - + Enable selected set(s) 啓用所選系列 - + Disable selected set(s) 禁用所選系列 - + Deck Editor 套牌編輯器 - + Use CTRL+A to select all sets in the view. - + Only cards in enabled sets will appear in the card list of the deck editor. - + Image priority is decided in the following order: - + first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom) %1 is a link to the wiki - + Include cards rebalanced for Alchemy [requires restart] - + Card Art 牌張風格 - + How to use custom card art 如何使用自定義卡牌圖片 - + Hints 提示 - + Note 注 - + Sorting by column allows you to find a set while not changing set priority. 按列排序允許您在不更改系列優先級的情況下查找系列。 - + To enable ordering again, click the column header until this message disappears. 要再次啓用排序，請單擊列標題，直到此消息消失。 - + Use the current sorting as the set priority instead 使用當前系列的優先級排序 - + Sorts the set priority using the same column 使用同一列系列的優先級排序 - + Manage sets 系列管理 @@ -11138,72 +10339,72 @@ Please refrain from engaging in this activity or further actions may be taken ag ZoneViewWidget - + Search by card name (or search expressions) - + Ungrouped - + Group by Type - + Group by Mana Value - + Group by Color - + Unsorted - + Sort by Name - + Sort by Type - + Sort by Mana Cost - + Sort by Colors - + Sort by P/T - + Sort by Set - + shuffle when closing 當關閉界面時洗牌 - + pile view 柱形圖 @@ -11211,7 +10412,7 @@ Please refrain from engaging in this activity or further actions may be taken ag i18n - + English 繁體中文 (Chinese Traditional) @@ -11219,12 +10420,12 @@ Please refrain from engaging in this activity or further actions may be taken ag main - + Connect on startup 啓動連接 - + Debug to file 調試至文件 @@ -11238,7 +10439,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Deck Editor 套牌編輯 @@ -11319,7 +10520,7 @@ Please refrain from engaging in this activity or further actions may be taken ag - + Replays @@ -11434,129 +10635,129 @@ Please refrain from engaging in this activity or further actions may be taken ag 讀取套牌 - - + + Load Deck from Clipboard... 從剪貼板載入套牌 - + Edit Deck in Clipboard, Annotated - + Edit Deck in Clipboard - + New Deck 創建新套牌 - + Open Custom Pictures Folder 打開自定義圖片文件夾 - + Print Deck... 打印套牌 - + Delete Card 刪除卡牌 - - + + Reset Layout 重置佈局 - + Save Deck 保存套牌 - + Save Deck as... 套牌另存為 - + Save Deck to Clipboard, Annotated 保存套牌到剪貼板，帶注釋 - + Save Deck to Clipboard, Annotated (No Set Info) - + Save Deck to Clipboard 保存套牌到剪貼板 - + Save Deck to Clipboard (No Set Info) - + Load Local Deck... 從本地載入套牌 - + Load Remote Deck... 載入遠程套牌 - + Set Ready to Start 系列準備好開始 - + Toggle Sideboard Lock 切換備牌鎖 - + Add Green Counter 增加綠色指示物 - + Remove Green Counter 移除綠色指示物 - + Set Green Counters... 設置綠色指示物 - + Add Red Counter 增加紅色指示物 - + Remove Red Counter 移除紅色指示物 - + Set Red Counters... 設置紅色指示物 - + Add Life Counter 增加生命指示物 @@ -11566,744 +10767,724 @@ Please refrain from engaging in this activity or further actions may be taken ag - - Load deck from online service... - - - - - Load from website... - - - - + Unload Deck - + Force Start - + Add Card Counter (F) - + Remove Card Counter (F) - + Set Card Counters (F)... - + Add Card Counter (E) - + Remove Card Counter (E) - + Set Card Counters (E)... - + Add Card Counter(D) - + Remove Card Counter (D) - + Set Card Counters (D)... - + Add Card Counter (C) - + Remove Card Counter (C) - + Set Card Counters (C)... - + Add Card Counter (B) - + Remove Card Counter (B) - + Set Card Counters (B)... - + Add Card Counter (A) - + Remove Card Counter (A) - + Set Card Counters (A)... - + Remove Life Counter 移除生命指示物 - + Set Life Counters... 設置生命指示物 - + Add White Counter 增加白色指示物 - + Remove White Counter 移除白色指示物 - + Set White Counters... 設置白色指示物 - + Add Blue Counter 增加藍色指示物 - + Remove Blue Counter 移除藍色指示物 - + Set Blue Counters... 設置藍色指示物 - + Add Black Counter 增加黑色指示物 - + Remove Black Counter 移除黑色指示物 - + Set Black Counters... 設置黑色指示物 - + Add Colorless Counter 增加無色指示物 - + Remove Colorless Counter 移除無色指示物 - + Set Colorless Counters... 設置無色指示物 - + Add Other Counter 增加其他指示物 - + Remove Other Counter 移除其他指示物 - + Set Other Counters... 設置其他指示物 - + Increment all card counters - + Add Power (+1/+0) 增加力量(+1/+0) - + Remove Power (-1/-0) 減少力量(-1/-0) - + Move Toughness to Power (+1/-1) 移動防禦到力量（+1/-1） - + Add Toughness (+0/+1) 增加防禦(+0/+1) - + Remove Toughness (-0/-1) 減少防禦(-0/-1) - + Move Power to Toughness (-1/+1) 移動力量到防禦（-1/+1） - + Add Power and Toughness (+1/+1) 增加力量和防禦(+1/+1) - + Remove Power and Toughness (-1/-1) 減少力量和防禦(-1/-1) - + Set Power and Toughness... 設置力量和防禦 - + Reset Power and Toughness 重置力量和防禦 - + Untap 重置 - + Upkeep 維持 - + Draw 抓 - + First Main Phase 主要步驟1 - + Start Combat 開始戰鬥 - + Attack 攻擊 - + Block 阻擋 - + Damage 傷害 - + End Combat 結束戰鬥 - + Second Main Phase 主要步驟2 - + End 回合結束 - + Next Phase 下個步驟 - + Next Phase Action 下個行動步驟 - + Next Turn 下個回合 - + Hide Card in Reveal Window - + Tap / Untap Card 橫置 / 重置卡牌 - + Untap All 重置所有 - + Toggle Skip Untapping Toggle Untap - + Turn Card Over 將卡翻面 - + Peek Card 查看卡牌 - + Play Card 使用卡牌 - + Play Card, Face Down - + Attach Card... 結附卡牌 - + Unattach Card 取消結附 - + Clone Card 複製卡牌 - + Create Token... 派出衍生物 - + Create All Related Tokens 派出所有相關的衍生物 - + Create Another Token 派出另一個衍生物 - + Set Annotation... 設置注釋... - - Reduce Life by Power - - - - + Select All Cards in Zone - + Select All Cards in Row - + Select All Cards in Column - + Reveal Selected Cards to All Players - - + + Bottom of Library 牌庫底 - - - - + + + + Exile 放逐區 - - - - + + + + Graveyard 墳墓場 - - + + Hand 手牌 - - + + Top of Library 牌庫頂 - - + + Battlefield, Face Down 戰場，面朝下 - + Battlefield 戰場 - + Library 牌庫 - + Sideboard 備牌 - + Top Cards of Library 牌庫頂牌 - + Bottom Cards of Library - + Close Recent View 關閉最近的查看 - - + + Stack 堆疊 - - + + Graveyard (Multiple) 墳場(多個) - - + + Graveyard (Multiple), Face Down - - + + Exile (Multiple) 放逐區(多個) - - + + Exile (Multiple), Face Down - + Stack Until Found - + Draw Bottom Card - + Draw Multiple Cards from Bottom... - + Draw Arrow... 畫箭頭... - + Remove Local Arrows 移除本地箭頭 - + Leave Game 離開遊戲 - + Concede 投降 - + Roll Dice... 擲骰子... - - Flip Coin - - - - + Shuffle Library 洗牌 - + Shuffle Top Cards of Library - + Shuffle Bottom Cards of Library - + Mulligan 再調度起手牌 - + Mulligan (Same hand size) - + Mulligan (Hand size - 1) - + Draw a Card 抓一張牌 - + Draw Multiple Cards... 抓多張牌 - + Undo Draw 撤銷抓牌 - + Always Reveal Top Card 一直展示牌庫頂牌 - + Always Look At Top Card 一直檢視牌庫頂牌 - + Sort Hand by Name - + Sort Hand by Type - + Sort Hand by Mana Value - + Reveal Hand to All Players - + Reveal Random Card to All Players - + Rotate View Clockwise 順時針旋轉視角 - + Rotate View Counterclockwise 逆時針旋轉視角 - + Unfocus Text Box 取消聚焦文本框 - + Focus Chat 聚焦聊天室 - + Clear Chat 清除聊天記錄 - + Refresh 刷新 - + Skip Forward - + Skip Backward - + Skip Forward by a lot - + Skip Backward by a lot - + Play/Pause - + Toggle Fast Forward - + Home - + Visual Deck Storage - + Deck Storage - + Server - + Account - + Administration - + Logs diff --git a/doc/carddatabase_v4/cards.xsd b/doc/carddatabase_v4/cards.xsd index 59ca3e560..92d30b94f 100644 --- a/doc/carddatabase_v4/cards.xsd +++ b/doc/carddatabase_v4/cards.xsd @@ -6,7 +6,6 @@ - diff --git a/format.sh b/format.sh index 83dee9e28..f8c183dfc 100755 --- a/format.sh +++ b/format.sh @@ -3,7 +3,7 @@ # This script will run clang-format on all modified, non-3rd-party C++/Header files. # Optionally runs cmake-format on all modified cmake files. # Optionally runs shellcheck on all modified shell files. -# Uses clang-format, cmake-format, git, diff, find and shellcheck +# Uses clang-format cmake-format git diff find shellcheck # Never, ever, should this receive a path with a newline in it. Don't bother proofing it for that. set -o pipefail @@ -14,7 +14,13 @@ cd "${BASH_SOURCE%/*}/" || exit 2 # could not find path, this could happen with # defaults include=("cockatrice/src" \ -libcockatrice_* \ +"libcockatrice_card" \ +"libcockatrice_deck_list" \ +"libcockatrice_network" \ +"libcockatrice_protocol" \ +"libcockatrice_rng" \ +"libcockatrice_settings" \ +"libcockatrice_utility" \ "oracle/src" \ "servatrice/src" \ "tests") @@ -103,11 +109,11 @@ OPTIONS: Do not check any source files for clang-format. --print-version - Print the lint tool version being used before continuing. + Print the version of clang-format being used before continuing. --shell - Use shellcheck to lint shell files. - Not available in the default inline mode. + Use shellcheck to lint shell files. Not available in the default inline + mode. -t, --test Do not edit files in place. Set exit code to 1 if changes are required. diff --git a/libcockatrice_card/libcockatrice/card/card_info_comparator.h b/libcockatrice_card/libcockatrice/card/card_info_comparator.h index b6df8c7a3..b8d9c47e6 100644 --- a/libcockatrice_card/libcockatrice/card/card_info_comparator.h +++ b/libcockatrice_card/libcockatrice/card/card_info_comparator.h @@ -1,8 +1,8 @@ /** * @file card_info_comparator.h * @ingroup Cards + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARD_INFO_COMPARATOR_H #define CARD_INFO_COMPARATOR_H diff --git a/libcockatrice_card/libcockatrice/card/database/card_database.cpp b/libcockatrice_card/libcockatrice/card/database/card_database.cpp index 261b36690..13dece626 100644 --- a/libcockatrice_card/libcockatrice/card/database/card_database.cpp +++ b/libcockatrice_card/libcockatrice/card/database/card_database.cpp @@ -85,15 +85,14 @@ void CardDatabase::refreshCachedReverseRelatedCards() for (auto *rel : card->getReverseRelatedCards()) { if (auto target = cards.value(rel->getName())) { auto *newRel = new CardRelation(card->getName(), rel->getAttachType(), rel->getIsCreateAllExclusion(), - rel->getIsVariable(), rel->getDefaultCount(), rel->getIsPersistent(), - rel->getIsFaceDown()); + rel->getIsVariable(), rel->getDefaultCount(), rel->getIsPersistent()); target->addReverseRelatedCards2Me(newRel); } } } } -void CardDatabase::addCard(const CardInfoPtr &card) +void CardDatabase::addCard(CardInfoPtr card) { if (card == nullptr) { qCWarning(CardDatabaseLog) << "CardDatabase::addCard(nullptr)"; @@ -104,11 +103,9 @@ void CardDatabase::addCard(const CardInfoPtr &card) // If a card already exists, just add the new set property. if (auto existing = cards.value(name)) { - for (const auto &printings : card->getSets()) { - for (const auto &printing : printings) { + for (const auto &printings : card->getSets()) + for (const auto &printing : printings) existing->addToSet(printing.getSet(), printing); - } - } return; } @@ -119,24 +116,21 @@ void CardDatabase::addCard(const CardInfoPtr &card) emit cardAdded(card); } -void CardDatabase::removeCard(const CardInfoPtr &card) +void CardDatabase::removeCard(CardInfoPtr card) { if (card.isNull()) { qCWarning(CardDatabaseLog) << "CardDatabase::removeCard(nullptr)"; return; } - for (auto *cardRelation : card->getRelatedCards()) { + for (auto *cardRelation : card->getRelatedCards()) cardRelation->deleteLater(); - } - for (auto *cardRelation : card->getReverseRelatedCards()) { + for (auto *cardRelation : card->getReverseRelatedCards()) cardRelation->deleteLater(); - } - for (auto *cardRelation : card->getReverseRelatedCards2Me()) { + for (auto *cardRelation : card->getReverseRelatedCards2Me()) cardRelation->deleteLater(); - } QMutexLocker locker(removeCardMutex); cards.remove(card->getName()); @@ -144,7 +138,7 @@ void CardDatabase::removeCard(const CardInfoPtr &card) emit cardRemoved(card); } -void CardDatabase::addSet(const CardSetPtr &set) +void CardDatabase::addSet(CardSetPtr set) { sets.insert(set->getShortName(), set); } @@ -216,7 +210,7 @@ void CardDatabase::notifyEnabledSetsChanged() emit cardDatabaseEnabledSetsChanged(); } -void CardDatabase::addFormat(const FormatRulesPtr &format) +void CardDatabase::addFormat(FormatRulesPtr format) { formats.insert(format->formatName.toLower(), format); -} +} \ No newline at end of file diff --git a/libcockatrice_card/libcockatrice/card/database/card_database.h b/libcockatrice_card/libcockatrice/card/database/card_database.h index 44838962d..b1af3a2c0 100644 --- a/libcockatrice_card/libcockatrice/card/database/card_database.h +++ b/libcockatrice_card/libcockatrice/card/database/card_database.h @@ -30,27 +30,27 @@ class CardDatabase : public QObject Q_OBJECT protected: - /** @brief Controller to determine set priority when choosing preferred printings. */ + /// Controller to determine set priority when choosing preferred printings. ICardSetPriorityController *setPriorityController; - /** @brief Cards indexed by exact name. */ + /// Cards indexed by exact name CardNameMap cards; - /** @brief Cards indexed by simplified name (normalized). */ + /// Cards indexed by simplified name (normalized) CardNameMap simpleNameCards; - /** @brief Sets indexed by short name. */ + /// Sets indexed by short name SetNameMap sets; FormatRulesNameMap formats; - /** @brief Loader responsible for file discovery and parsing. */ + /// Loader responsible for file discovery and parsing CardDatabaseLoader *loader; - /** @brief Current load status of the database. */ + /// Current load status of the database LoadStatus loadStatus; - /** @brief Querier for higher-level card lookups. */ + /// Querier for higher-level card lookups CardDatabaseQuerier *querier; private: @@ -64,7 +64,7 @@ private: */ void refreshCachedReverseRelatedCards(); - /** @brief Mutexes for thread safety. */ + /// Mutexes for thread safety QBasicMutex *clearDatabaseMutex = new QBasicMutex(), *addCardMutex = new QBasicMutex(), *removeCardMutex = new QBasicMutex(); @@ -88,7 +88,7 @@ public: * @brief Removes a card from the database. * @param card Pointer to the card to remove. */ - void removeCard(const CardInfoPtr &card); + void removeCard(CardInfoPtr card); /** @brief Clears all cards, sets, and internal state. */ void clear(); @@ -133,22 +133,22 @@ public: ICardSetPriorityController *getPriorityController() { return setPriorityController; - } + }; public slots: /** * @brief Adds a card to the database. * @param card CardInfoPtr to add. */ - void addCard(const CardInfoPtr &card); + void addCard(CardInfoPtr card); /** * @brief Adds a set to the database. * @param set Pointer to CardSet to add. */ - void addSet(const CardSetPtr &set); + void addSet(CardSetPtr set); - void addFormat(const FormatRulesPtr &format); + void addFormat(FormatRulesPtr format); /** @brief Loads card databases from configured paths. */ void loadCardDatabases(); diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp index 76abf87ce..716477a59 100644 --- a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp +++ b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp @@ -125,9 +125,8 @@ QStringList CardDatabaseLoader::collectCustomDatabasePaths() const QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); QStringList paths; - while (it.hasNext()) { + while (it.hasNext()) paths << it.next(); - } paths.sort(); return paths; } diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_manager.h b/libcockatrice_card/libcockatrice/card/database/card_database_manager.h index c7de66a25..58a744fbb 100644 --- a/libcockatrice_card/libcockatrice/card/database/card_database_manager.h +++ b/libcockatrice_card/libcockatrice/card/database/card_database_manager.h @@ -67,13 +67,13 @@ private: /** @brief Private destructor. */ ~CardDatabaseManager() = default; - /** @brief Static card preference provider pointer (default: Noop). */ + /// Static card preference provider pointer (default: Noop) static ICardPreferenceProvider *cardPreferenceProvider; - /** @brief Static path provider pointer (default: Noop). */ + /// Static path provider pointer (default: Noop) static ICardDatabasePathProvider *pathProvider; - /** @brief Static set priority controller pointer (default: Noop). */ + /// Static set priority controller pointer (default: Noop) static ICardSetPriorityController *setPriorityController; }; diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp index 174943333..021e8d12d 100644 --- a/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp +++ b/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp @@ -36,9 +36,8 @@ QList CardDatabaseQuerier::getCardInfos(const QStringList &cardName QList cardInfos; for (const QString &cardName : cardNames) { CardInfoPtr ptr = db->cards.value(cardName); - if (ptr) { + if (ptr) cardInfos.append(ptr); - } } return cardInfos; @@ -51,12 +50,10 @@ CardInfoPtr CardDatabaseQuerier::getCardBySimpleName(const QString &cardName) co CardInfoPtr CardDatabaseQuerier::lookupCardByName(const QString &name) const { - if (auto info = getCardInfo(name)) { + if (auto info = getCardInfo(name)) return info; - } - if (auto info = getCardBySimpleName(name)) { + if (auto info = getCardBySimpleName(name)) return info; - } return getCardBySimpleName(CardInfo::simplifyName(name)); } @@ -74,9 +71,8 @@ QList CardDatabaseQuerier::getCards(const QList &cardRefs) c QList cards; for (const auto &cardRef : cardRefs) { ExactCard card = getCard(cardRef); - if (card) { + if (card) cards.append(card); - } } return cards; @@ -123,9 +119,8 @@ ExactCard CardDatabaseQuerier::guessCard(const CardRef &cardRef) const ExactCard CardDatabaseQuerier::getRandomCard() const { - if (db->cards.isEmpty()) { + if (db->cards.isEmpty()) return {}; - } const auto keys = db->cards.keys(); int randomIndex = QRandomGenerator::global()->bounded(keys.size()); 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 b6c3afc57..ba27d63c4 100644 --- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp +++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp @@ -217,32 +217,27 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml) // NOTE: attributes must be read before readElementText() QXmlStreamAttributes attrs = xml.attributes(); QString setName = xml.readElementText(QXmlStreamReader::IncludeChildElements); - auto set = internalAddSet(setName); - // Only load printings from sets the user has enabled, matching the v4 loader's - // behaviour. Without this check, disabling a set has no effect on v3 databases. - if (set->getEnabled()) { - PrintingInfo setInfo(set); - if (attrs.hasAttribute("muId")) { - setInfo.setProperty("muid", attrs.value("muId").toString()); - } - - if (attrs.hasAttribute("uuId")) { - setInfo.setProperty("uuid", attrs.value("uuId").toString()); - } - - if (attrs.hasAttribute("picURL")) { - setInfo.setProperty("picurl", attrs.value("picURL").toString()); - } - - if (attrs.hasAttribute("num")) { - setInfo.setProperty("num", attrs.value("num").toString()); - } - - if (attrs.hasAttribute("rarity")) { - setInfo.setProperty("rarity", attrs.value("rarity").toString()); - } - _sets[setName].append(setInfo); + PrintingInfo setInfo(internalAddSet(setName)); + if (attrs.hasAttribute("muId")) { + setInfo.setProperty("muid", attrs.value("muId").toString()); } + + if (attrs.hasAttribute("muId")) { + setInfo.setProperty("uuid", attrs.value("uuId").toString()); + } + + if (attrs.hasAttribute("picURL")) { + setInfo.setProperty("picurl", attrs.value("picURL").toString()); + } + + if (attrs.hasAttribute("num")) { + setInfo.setProperty("num", attrs.value("num").toString()); + } + + if (attrs.hasAttribute("rarity")) { + setInfo.setProperty("rarity", attrs.value("rarity").toString()); + } + _sets[setName].append(setInfo); // related cards } else if (xmlName == "related" || xmlName == "reverse-related") { CardRelationType attach = CardRelationType::DoesNotAttach; 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 c242425ab..cc0220526 100644 --- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp +++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp @@ -306,9 +306,8 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml) PrintingInfo printingInfo(set); for (QXmlStreamAttribute attr : attrs) { QString attrName = attr.name().toString(); - if (attrName == "picURL") { + if (attrName == "picURL") attrName = "picurl"; - } printingInfo.setProperty(attrName, attr.value().toString()); } @@ -329,7 +328,6 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml) bool exclude = false; bool variable = false; bool persistent = false; - bool facedown = false; int count = 1; QXmlStreamAttributes attrs = xml.attributes(); QString cardName = xml.readElementText(QXmlStreamReader::IncludeChildElements); @@ -361,12 +359,7 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml) persistent = true; } - if (attrs.hasAttribute("facedown")) { - facedown = true; - } - - auto *relation = - new CardRelation(cardName, attachType, exclude, variable, count, persistent, facedown); + auto *relation = new CardRelation(cardName, attachType, exclude, variable, count, persistent); if (xmlName == "reverse-related") { reverseRelatedCards << relation; } else { @@ -516,9 +509,6 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in if (i->getIsPersistent()) { xml.writeAttribute("persistent", "persistent"); } - if (i->getIsFaceDown()) { - xml.writeAttribute("facedown", "facedown"); - } if (i->getIsVariable()) { if (1 == i->getDefaultCount()) { xml.writeAttribute("count", "x"); diff --git a/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h b/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h index 8778ab17e..16f2359ab 100644 --- a/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h +++ b/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h @@ -51,21 +51,16 @@ enum class CardMatchType // convert string to enum inline CardMatchType matchTypeFromString(const QString &str) { - if (str == "equals") { + if (str == "equals") return CardMatchType::Equals; - } - if (str == "notEquals") { + if (str == "notEquals") return CardMatchType::NotEquals; - } - if (str == "contains") { + if (str == "contains") return CardMatchType::Contains; - } - if (str == "notContains") { + if (str == "notContains") return CardMatchType::NotContains; - } - if (str == "regex") { + if (str == "regex") return CardMatchType::Regex; - } return CardMatchType::Equals; // fallback default } diff --git a/libcockatrice_card/libcockatrice/card/game_specific_terms.h b/libcockatrice_card/libcockatrice/card/game_specific_terms.h index e9160e514..2931365ad 100644 --- a/libcockatrice_card/libcockatrice/card/game_specific_terms.h +++ b/libcockatrice_card/libcockatrice/card/game_specific_terms.h @@ -1,8 +1,8 @@ /** * @file game_specific_terms.h * @ingroup Cards + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef GAME_SPECIFIC_TERMS_H #define GAME_SPECIFIC_TERMS_H @@ -31,36 +31,26 @@ QString const ColorIdentity("coloridentity"); inline static const QString getNicePropertyName(QString key) { - if (key == CardType) { + if (key == CardType) return QCoreApplication::translate("Mtg", "Card Type"); - } - if (key == ConvertedManaCost) { + if (key == ConvertedManaCost) return QCoreApplication::translate("Mtg", "Mana Value"); - } - if (key == Colors) { + if (key == Colors) return QCoreApplication::translate("Mtg", "Color(s)"); - } - if (key == Loyalty) { + if (key == Loyalty) return QCoreApplication::translate("Mtg", "Loyalty"); - } - if (key == MainCardType) { + if (key == MainCardType) return QCoreApplication::translate("Mtg", "Main Card Type"); - } - if (key == ManaCost) { + if (key == ManaCost) return QCoreApplication::translate("Mtg", "Mana Cost"); - } - if (key == PowTough) { + if (key == PowTough) return QCoreApplication::translate("Mtg", "P/T"); - } - if (key == Side) { + if (key == Side) return QCoreApplication::translate("Mtg", "Side"); - } - if (key == Layout) { + if (key == Layout) return QCoreApplication::translate("Mtg", "Layout"); - } - if (key == ColorIdentity) { + if (key == ColorIdentity) return QCoreApplication::translate("Mtg", "Color Identity"); - } return key; } } // namespace Mtg diff --git a/libcockatrice_card/libcockatrice/card/relation/card_relation.cpp b/libcockatrice_card/libcockatrice/card/relation/card_relation.cpp index 8903c892d..90e59e439 100644 --- a/libcockatrice_card/libcockatrice/card/relation/card_relation.cpp +++ b/libcockatrice_card/libcockatrice/card/relation/card_relation.cpp @@ -7,10 +7,8 @@ CardRelation::CardRelation(const QString &_name, bool _isCreateAllExclusion, bool _isVariableCount, int _defaultCount, - bool _isPersistent, - bool _isFaceDown) + bool _isPersistent) : name(_name), attachType(_attachType), isCreateAllExclusion(_isCreateAllExclusion), - isVariableCount(_isVariableCount), defaultCount(_defaultCount), isPersistent(_isPersistent), - isFaceDown(_isFaceDown) + isVariableCount(_isVariableCount), defaultCount(_defaultCount), isPersistent(_isPersistent) { -} +} \ No newline at end of file diff --git a/libcockatrice_card/libcockatrice/card/relation/card_relation.h b/libcockatrice_card/libcockatrice/card/relation/card_relation.h index a1864f5b2..9ff704097 100644 --- a/libcockatrice_card/libcockatrice/card/relation/card_relation.h +++ b/libcockatrice_card/libcockatrice/card/relation/card_relation.h @@ -31,7 +31,6 @@ private: bool isVariableCount; ///< True if the number of creations is variable. int defaultCount; ///< Default number of cards created or involved. bool isPersistent; ///< True if this relation persists (i.e. is not destroyed) on zone change. - bool isFaceDown; ///< True if this relation creates the tokens facedown public: /** @@ -43,15 +42,13 @@ public: * @param _isVariableCount Whether the count is variable. * @param _defaultCount Default number for creations or transformations. * @param _isPersistent Whether the relation persists across zone changes. - * @param _isFaceDown Whether the relation creates the token face down */ explicit CardRelation(const QString &_name = QString(), CardRelationType _attachType = CardRelationType::DoesNotAttach, bool _isCreateAllExclusion = false, bool _isVariableCount = false, int _defaultCount = 1, - bool _isPersistent = false, - bool _isFaceDown = false); + bool _isPersistent = false); /** * @brief Returns the name of the related card. @@ -154,16 +151,6 @@ public: { return isPersistent; } - - /** - * @brief Returns whether the relation creates the token facedown. - * - * @return True if facedown, false otherwise. - */ - [[nodiscard]] bool getIsFaceDown() const - { - return isFaceDown; - } }; #endif // COCKATRICE_CARD_RELATION_H diff --git a/libcockatrice_card/libcockatrice/card/set/card_set.cpp b/libcockatrice_card/libcockatrice/card/set/card_set.cpp index 6eea220bb..20d0aced8 100644 --- a/libcockatrice_card/libcockatrice/card/set/card_set.cpp +++ b/libcockatrice_card/libcockatrice/card/set/card_set.cpp @@ -33,9 +33,28 @@ QString CardSet::getCorrectedShortName() const { // For Windows machines. QSet invalidFileNames; - invalidFileNames << "CON" << "PRN" << "AUX" << "NUL" << "COM1" << "COM2" << "COM3" << "COM4" << "COM5" << "COM6" - << "COM7" << "COM8" << "COM9" << "LPT1" << "LPT2" << "LPT3" << "LPT4" << "LPT5" << "LPT6" << "LPT7" - << "LPT8" << "LPT9"; + invalidFileNames << "CON" + << "PRN" + << "AUX" + << "NUL" + << "COM1" + << "COM2" + << "COM3" + << "COM4" + << "COM5" + << "COM6" + << "COM7" + << "COM8" + << "COM9" + << "LPT1" + << "LPT2" + << "LPT3" + << "LPT4" + << "LPT5" + << "LPT6" + << "LPT7" + << "LPT8" + << "LPT9"; return invalidFileNames.contains(shortName) ? shortName + "_" : shortName; } diff --git a/libcockatrice_card/libcockatrice/card/set/card_set.h b/libcockatrice_card/libcockatrice/card/set/card_set.h index 8e16e01df..2cedb597e 100644 --- a/libcockatrice_card/libcockatrice/card/set/card_set.h +++ b/libcockatrice_card/libcockatrice/card/set/card_set.h @@ -107,31 +107,31 @@ public: */ [[nodiscard]] QString getCorrectedShortName() const; - /** @return Short identifier of the set. */ + /// @return Short identifier of the set. [[nodiscard]] QString getShortName() const { return shortName; } - /** @return Descriptive name of the set. */ + /// @return Descriptive name of the set. [[nodiscard]] QString getLongName() const { return longName; } - /** @return Type/category string of the set. */ + /// @return Type/category string of the set. [[nodiscard]] QString getSetType() const { return setType; } - /** @return Release date of the set. */ + /// @return Release date of the set. [[nodiscard]] QDate getReleaseDate() const { return releaseDate; } - /** @return Priority level of the set. */ + /// @return Priority level of the set. [[nodiscard]] Priority getPriority() const { return priority; @@ -190,7 +190,7 @@ public: enabled = _enabled; } - /** @return The sort key assigned to this set. */ + /// @return The sort key assigned to this set. [[nodiscard]] int getSortKey() const { return sortKey; @@ -202,7 +202,7 @@ public: */ void setSortKey(unsigned int _sortKey); - /** @return True if the set is enabled. */ + /// @return True if the set is enabled. [[nodiscard]] bool getEnabled() const { return enabled; @@ -214,7 +214,7 @@ public: */ void setEnabled(bool _enabled); - /** @return True if the set is considered known. */ + /// @return True if the set is considered known. [[nodiscard]] bool getIsKnown() const { return isknown; diff --git a/libcockatrice_card/libcockatrice/card/set/card_set_comparator.h b/libcockatrice_card/libcockatrice/card/set/card_set_comparator.h index 0caa9f156..96f1052a9 100644 --- a/libcockatrice_card/libcockatrice/card/set/card_set_comparator.h +++ b/libcockatrice_card/libcockatrice/card/set/card_set_comparator.h @@ -1,8 +1,8 @@ /** * @file card_set_comparator.h * @ingroup CardSets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef SET_PRIORITY_COMPARATOR_H #define SET_PRIORITY_COMPARATOR_H diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp index d41713302..e3e7b41c0 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp @@ -143,14 +143,12 @@ bool DeckList::loadFromXml(QXmlStreamReader *xml) while (!xml->atEnd()) { xml->readNext(); if (xml->isStartElement()) { - if (xml->name().toString() != "cockatrice_deck") { + if (xml->name().toString() != "cockatrice_deck") return false; - } while (!xml->atEnd()) { xml->readNext(); - if (!readElement(xml)) { + if (!readElement(xml)) break; - } } } } @@ -293,9 +291,8 @@ bool DeckList::loadFromStream_Plain(QTextStream &in, for (; index < max_line; ++index) { // check if line is a card match = reCardLine.match(inputs.at(index)); - if (!match.hasMatch()) { + if (!match.hasMatch()) continue; - } QString cardName = match.captured().simplified(); bool sideboard = false; @@ -308,9 +305,8 @@ bool DeckList::loadFromStream_Plain(QTextStream &in, cardName = match.captured(1); } } else { - if (index == sBStart) { + if (index == sBStart) continue; - } sideboard = index > sBStart; } diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h index e792c85dc..a96adeb38 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h @@ -89,7 +89,7 @@ private: mutable QString cachedDeckHash; public: - /** @name Metadata setters */ + /// @name Metadata setters ///@{ void setName(const QString &_name = QString()) { @@ -125,11 +125,11 @@ public: } ///@} - /** @brief Construct an empty deck. */ + /// @brief Construct an empty deck. explicit DeckList(); - /** @brief Construct from a serialized native-format string. */ + /// @brief Construct from a serialized native-format string. explicit DeckList(const QString &nativeString); - /** @brief Construct from components. */ + /// @brief Construct from components DeckList(const Metadata &metadata, const DecklistNodeTree &tree, const QMap &sideboardPlans = {}); @@ -144,10 +144,8 @@ public: return &tree; } - /** - * @name Metadata getters - * The individual metadata getters still exist for backwards compatibility. - */ + /// @name Metadata getters + /// The individual metadata getters still exist for backwards compatibility. ///@{ //! \todo Figure out when we can remove them. const Metadata &getMetadata() const @@ -185,7 +183,7 @@ public: return metadata.isEmpty() && getCardList().isEmpty(); } - /** @name Sideboard plans */ + /// @name Sideboard plans ///@{ QList getCurrentSideboardPlan() const; void setCurrentSideboardPlan(const QList &plan); @@ -195,7 +193,7 @@ public: } ///@} - /** @name Serialization (XML) */ + /// @name Serialization (XML) ///@{ bool readElement(QXmlStreamReader *xml); void write(QXmlStreamWriter *xml) const; @@ -206,7 +204,7 @@ public: bool saveToFile_Native(QIODevice *device) const; ///@} - /** @name Serialization (Plain text) */ + /// @name Serialization (Plain text) ///@{ bool loadFromStream_Plain(QTextStream &stream, bool preserveMetadata, @@ -218,7 +216,7 @@ public: QString writeToString_Plain(bool prefixSideboardCards = true, bool slashTappedOutSplitCards = false) const; ///@} - /** @name Deck manipulation */ + /// @name Deck manipulation ///@{ void cleanList(bool preserveMetadata = false); bool isEmpty() const @@ -240,7 +238,7 @@ public: const bool formatLegal = true); ///@} - /** @name Deck identity */ + /// @name Deck identity ///@{ QString getDeckHash() const; void refreshDeckHash(); diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.cpp index acf4707ab..83c9cc0bb 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.cpp @@ -16,9 +16,8 @@ void DeckListHistoryManager::clear() void DeckListHistoryManager::undo(DeckList *deck) { - if (undoStack.isEmpty()) { + if (undoStack.isEmpty()) return; - } // Peek at the memento we are going to restore const DeckListMemento &mementoToRestore = undoStack.top(); @@ -36,9 +35,8 @@ void DeckListHistoryManager::undo(DeckList *deck) void DeckListHistoryManager::redo(DeckList *deck) { - if (redoStack.isEmpty()) { + if (redoStack.isEmpty()) return; - } // Peek at the memento we are going to restore const DeckListMemento &mementoToRestore = redoStack.top(); diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp index 196416cde..644e0851a 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp @@ -58,9 +58,8 @@ QList DecklistNodeTree::getZoneNodes(const QSet zones; for (auto *node : *root) { InnerDecklistNode *currentZone = dynamic_cast(node); - if (!currentZone) { + if (!currentZone) continue; - } if (!restrictToZones.isEmpty() && !restrictToZones.contains(currentZone->getName())) { continue; } diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h index 8ef0b18a5..6de760634 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h @@ -12,11 +12,11 @@ class DecklistNodeTree InnerDecklistNode *root; ///< Root of the deck tree (zones + cards). public: - /** @brief Constructs an empty DecklistNodeTree. */ + /// @brief Constructs an empty DecklistNodeTree explicit DecklistNodeTree(); - /** @brief Copy constructor. Deep copies the tree. */ + /// @brief Copy constructor. Deep copies the tree explicit DecklistNodeTree(const DecklistNodeTree &other); - /** @brief Copy-assignment operator. Deep copies the tree. */ + /// @brief Copy-assignment operator. Deep copies the tree DecklistNodeTree &operator=(const DecklistNodeTree &other); virtual ~DecklistNodeTree(); diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp index a76fed619..d991ec98e 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp @@ -18,30 +18,28 @@ bool SideboardPlan::readElement(QXmlStreamReader *xml) xml->readNext(); const QString childName = xml->name().toString(); if (xml->isStartElement()) { - if (childName == "name") { + if (childName == "name") name = xml->readElementText(); - } else if (childName == "move_card_to_zone") { + else if (childName == "move_card_to_zone") { MoveCard_ToZone m; while (!xml->atEnd()) { xml->readNext(); const QString childName2 = xml->name().toString(); if (xml->isStartElement()) { - if (childName2 == "card_name") { + if (childName2 == "card_name") m.set_card_name(xml->readElementText().toStdString()); - } else if (childName2 == "start_zone") { + else if (childName2 == "start_zone") m.set_start_zone(xml->readElementText().toStdString()); - } else if (childName2 == "target_zone") { + else if (childName2 == "target_zone") m.set_target_zone(xml->readElementText().toStdString()); - } } else if (xml->isEndElement() && (childName2 == "move_card_to_zone")) { moveList.append(m); break; } } } - } else if (xml->isEndElement() && (childName == "sideboard_plan")) { + } else if (xml->isEndElement() && (childName == "sideboard_plan")) return true; - } } return false; } diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h index fff4ff2f3..524217c2d 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h @@ -51,19 +51,19 @@ public: */ void write(QXmlStreamWriter *xml) const; - /** @return The plan name. */ + /// @return The plan name. [[nodiscard]] QString getName() const { return name; } - /** @return Const reference to the move list. */ + /// @return Const reference to the move list. [[nodiscard]] const QList &getMoveList() const { return moveList; } - /** @brief Replace the move list with a new one. */ + /// @brief Replace the move list with a new one. void setMoveList(const QList &_moveList); }; diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp index 705dfae4c..b8a497c20 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp @@ -38,9 +38,8 @@ bool AbstractDecklistCardNode::readElement(QXmlStreamReader *xml) { while (!xml->atEnd()) { xml->readNext(); - if (xml->isEndElement() && xml->name().toString() == "card") { + if (xml->isEndElement() && xml->name().toString() == "card") return false; - } } return true; } diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h index df903a168..88d8b0930 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h @@ -58,40 +58,40 @@ public: { } - /** @return The number of copies of this card in the deck. */ + /// @return The number of copies of this card in the deck. [[nodiscard]] virtual int getNumber() const = 0; - /** @param _number Set the number of copies of this card. */ + /// @param _number Set the number of copies of this card. virtual void setNumber(int _number) = 0; - /** @return The display name of this card. */ + /// @return The display name of this card. [[nodiscard]] QString getName() const override = 0; - /** @param _name Set the display name of this card. */ + /// @param _name Set the display name of this card. virtual void setName(const QString &_name) = 0; - /** @return The provider identifier for this card (e.g., UUID). */ + /// @return The provider identifier for this card (e.g., UUID). [[nodiscard]] virtual QString getCardProviderId() const override = 0; - /** @param _cardProviderId Set the provider identifier for this card. */ + /// @param _cardProviderId Set the provider identifier for this card. virtual void setCardProviderId(const QString &_cardProviderId) = 0; - /** @return The abbreviated set code (e.g., "NEO"). */ + /// @return The abbreviated set code (e.g., "NEO"). [[nodiscard]] virtual QString getCardSetShortName() const override = 0; - /** @param _cardSetShortName Set the abbreviated set code. */ + /// @param _cardSetShortName Set the abbreviated set code. virtual void setCardSetShortName(const QString &_cardSetShortName) = 0; - /** @return The collector number of the card within its set. */ + /// @return The collector number of the card within its set. [[nodiscard]] virtual QString getCardCollectorNumber() const override = 0; - /** @param _cardSetNumber Set the collector number. */ + /// @param _cardSetNumber Set the collector number. virtual void setCardCollectorNumber(const QString &_cardSetNumber) = 0; - /** @return The format legality of the card. */ + /// @return The format legality of the card virtual bool getFormatLegality() const = 0; - /** @param _formatLegal If the card is considered legal. */ + /// @param _formatLegal If the card is considered legal virtual void setFormatLegality(const bool _formatLegal) = 0; /** diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.h index a39f0e7b2..877705705 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.h @@ -101,7 +101,7 @@ public: */ explicit AbstractDecklistNode(InnerDecklistNode *_parent = nullptr, int position = -1); - /** @brief Virtual destructor. Child classes must clean up their resources. */ + /// Virtual destructor. Child classes must clean up their resources. virtual ~AbstractDecklistNode() = default; /** @@ -136,7 +136,7 @@ public: */ [[nodiscard]] virtual bool isDeckHeader() const = 0; - /** @return The parent node, or nullptr if this is the root. */ + /// @return The parent node, or nullptr if this is the root. [[nodiscard]] InnerDecklistNode *getParent() const { return parent; diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h index 3bab5405a..b3d42b89a 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h @@ -93,79 +93,79 @@ public: */ explicit DecklistCardNode(DecklistCardNode *other, InnerDecklistNode *_parent); - /** @return The quantity of this card. */ + /// @return The quantity of this card. [[nodiscard]] int getNumber() const override { return number; } - /** @param _number Set the quantity of this card. */ + /// @param _number Set the quantity of this card. void setNumber(int _number) override { number = _number; } - /** @return The display name of this card. */ + /// @return The display name of this card. [[nodiscard]] QString getName() const override { return name; } - /** @param _name Set the display name of this card. */ + /// @param _name Set the display name of this card. void setName(const QString &_name) override { name = _name; } - /** @return The provider identifier for this card. */ + /// @return The provider identifier for this card. [[nodiscard]] QString getCardProviderId() const override { return cardProviderId; } - /** @param _providerId Set the provider identifier for this card. */ + /// @param _providerId Set the provider identifier for this card. void setCardProviderId(const QString &_providerId) override { cardProviderId = _providerId; } - /** @return The short set code (e.g., "NEO"). */ + /// @return The short set code (e.g., "NEO"). [[nodiscard]] QString getCardSetShortName() const override { return cardSetShortName; } - /** @param _cardSetShortName Set the short set code. */ + /// @param _cardSetShortName Set the short set code. void setCardSetShortName(const QString &_cardSetShortName) override { cardSetShortName = _cardSetShortName; } - /** @return The collector number of this card within its set. */ + /// @return The collector number of this card within its set. [[nodiscard]] QString getCardCollectorNumber() const override { return cardSetNumber; } - /** @param _cardSetNumber Set the collector number. */ + /// @param _cardSetNumber Set the collector number. void setCardCollectorNumber(const QString &_cardSetNumber) override { cardSetNumber = _cardSetNumber; } - /** @return The format legality of the card. */ + /// @return The format legality of the card [[nodiscard]] bool getFormatLegality() const override { return formatLegal; } - /** @param _formatLegal If the card is considered legal. */ + /// @param _formatLegal If the card is considered legal void setFormatLegality(const bool _formatLegal) override { formatLegal = _formatLegal; } - /** @return Always false; card nodes are not deck headers. */ + /// @return Always false; card nodes are not deck headers. [[nodiscard]] bool isDeckHeader() const override { return false; diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp index 602ea6aec..eca58963a 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp @@ -48,9 +48,8 @@ QString InnerDecklistNode::getVisibleName() const void InnerDecklistNode::clearTree() { - for (int i = 0; i < size(); i++) { + for (int i = 0; i < size(); i++) delete at(i); - } clear(); } @@ -155,9 +154,8 @@ bool InnerDecklistNode::readElement(QXmlStreamReader *xml) xml->attributes().value("collectorNumber").toString(), xml->attributes().value("uuid").toString()); newCard->readElement(xml); } - } else if (xml->isEndElement() && (childName == "zone")) { + } else if (xml->isEndElement() && (childName == "zone")) return false; - } } return true; } @@ -166,9 +164,8 @@ void InnerDecklistNode::writeElement(QXmlStreamWriter *xml) { xml->writeStartElement("zone"); xml->writeAttribute("name", name); - for (int i = 0; i < size(); i++) { + for (int i = 0; i < size(); i++) at(i)->writeElement(xml); - } xml->writeEndElement(); // zone } diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h index 81c37dffa..f4c48afce 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h @@ -18,11 +18,11 @@ #include "abstract_deck_list_node.h" -/** @brief Constant for the "main" deck zone name. */ +/// Constant for the "main" deck zone name. #define DECK_ZONE_MAIN "main" -/** @brief Constant for the "sideboard" zone name. */ +/// Constant for the "sideboard" zone name. #define DECK_ZONE_SIDE "side" -/** @brief Constant for the "tokens" zone name. */ +/// Constant for the "tokens" zone name. #define DECK_ZONE_TOKENS "tokens" /** @@ -93,13 +93,13 @@ public: */ void setSortMethod(DeckSortMethod method) override; - /** @return The internal name of this node. */ + /// @return The internal name of this node. [[nodiscard]] QString getName() const override { return name; } - /** @param _name Set the internal name of this node. */ + /// @param _name Set the internal name of this node. void setName(const QString &_name) { name = _name; @@ -122,25 +122,25 @@ public: */ [[nodiscard]] virtual QString getVisibleName() const; - /** @return Always empty for container nodes. */ + /// @return Always empty for container nodes. [[nodiscard]] QString getCardProviderId() const override { return ""; } - /** @return Always empty for container nodes. */ + /// @return Always empty for container nodes. [[nodiscard]] QString getCardSetShortName() const override { return ""; } - /** @return Always empty for container nodes. */ + /// @return Always empty for container nodes. [[nodiscard]] QString getCardCollectorNumber() const override { return ""; } - /** @return Always true; InnerDecklistNode represents deck structure. */ + /// @return Always true; InnerDecklistNode represents deck structure. [[nodiscard]] bool isDeckHeader() const override { return true; @@ -196,10 +196,10 @@ public: */ bool compare(AbstractDecklistNode *other) const override; - /** @copydoc compare(AbstractDecklistNode*) const */ + /// @copydoc compare(AbstractDecklistNode*) const bool compareNumber(AbstractDecklistNode *other) const; - /** @copydoc compare(AbstractDecklistNode*) const */ + /// @copydoc compare(AbstractDecklistNode*) const bool compareName(AbstractDecklistNode *other) const; /** diff --git a/libcockatrice_filters/libcockatrice/filters/filter_card.h b/libcockatrice_filters/libcockatrice/filters/filter_card.h index bb1e0ef53..732e43a09 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_card.h +++ b/libcockatrice_filters/libcockatrice/filters/filter_card.h @@ -1,8 +1,8 @@ /** * @file filter_card.h * @ingroup CardDatabaseModelFilters + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARDFILTER_H #define CARDFILTER_H diff --git a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp b/libcockatrice_filters/libcockatrice/filters/filter_string.cpp index 25e8e97db..704e8fadb 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp +++ b/libcockatrice_filters/libcockatrice/filters/filter_string.cpp @@ -251,27 +251,20 @@ static void setupParserRules() const auto arg = std::any_cast(sv[1]); const auto op = std::any_cast(sv[0]); - if (op == ">") { + if (op == ">") return [=](const int s) { return s > arg; }; - } - if (op == ">=") { + if (op == ">=") return [=](const int s) { return s >= arg; }; - } - if (op == "<") { + if (op == "<") return [=](const int s) { return s < arg; }; - } - if (op == "<=") { + if (op == "<=") return [=](const int s) { return s <= arg; }; - } - if (op == "=") { + if (op == "=") return [=](const int s) { return s == arg; }; - } - if (op == ":") { + if (op == ":") return [=](const int s) { return s == arg; }; - } - if (op == "!=") { + if (op == "!=") return [=](const int s) { return s != arg; }; - } return [](int) { return false; }; }; @@ -322,9 +315,8 @@ static void setupParserRules() return true; } - if (parts.contains("c") && match.length() == 0) { + if (parts.contains("c") && match.length() == 0) return true; - } auto containsColor = [&parts](const QString &s) { return parts.contains(s); }; return std::any_of(match.begin(), match.end(), containsColor); diff --git a/libcockatrice_filters/libcockatrice/filters/filter_string.h b/libcockatrice_filters/libcockatrice/filters/filter_string.h index 71a99f7b5..8fc41ce68 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_string.h +++ b/libcockatrice_filters/libcockatrice/filters/filter_string.h @@ -1,8 +1,8 @@ /** * @file filter_string.h * @ingroup CardDatabaseModelFilters + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef FILTER_STRING_H #define FILTER_STRING_H diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp index 8502db50b..19e8c2d8d 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp +++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp @@ -205,9 +205,8 @@ bool FilterItem::acceptColor(const CardInfoPtr info) const */ int match_count = 0; for (auto &it : converted_term) { - if (info->getColors().contains(it, Qt::CaseInsensitive)) { + if (info->getColors().contains(it, Qt::CaseInsensitive)) match_count++; - } } return match_count == converted_term.length(); @@ -543,14 +542,12 @@ void FilterTree::removeFilter(const CardFilter *toRemove) { for (int i = childNodes.size() - 1; i >= 0; --i) { auto *logicMap = dynamic_cast(childNodes.at(i)); - if (!logicMap || logicMap->attr != toRemove->attr()) { + if (!logicMap || logicMap->attr != toRemove->attr()) continue; - } FilterItemList *typeList = logicMap->typeList(toRemove->type()); - if (!typeList) { + if (!typeList) continue; - } int termIdx = typeList->termIndex(toRemove->term()); if (termIdx != -1) { diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.h b/libcockatrice_filters/libcockatrice/filters/filter_tree.h index aac1777e0..75d4241a5 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_tree.h +++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.h @@ -1,8 +1,8 @@ /** * @file filter_tree.h * @ingroup CardDatabaseModelFilters + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef FILTERTREE_H #define FILTERTREE_H @@ -70,33 +70,28 @@ public: } virtual void nodeChanged() const { - if (parent() != nullptr) { + if (parent() != nullptr) parent()->nodeChanged(); - } } virtual void preInsertChild(const FilterTreeNode *p, int i) const { - if (parent() != nullptr) { + if (parent() != nullptr) parent()->preInsertChild(p, i); - } } virtual void postInsertChild(const FilterTreeNode *p, int i) const { - if (parent() != nullptr) { + if (parent() != nullptr) parent()->postInsertChild(p, i); - } } virtual void preRemoveChild(const FilterTreeNode *p, int i) const { - if (parent() != nullptr) { + if (parent() != nullptr) parent()->preRemoveChild(p, i); - } } virtual void postRemoveChild(const FilterTreeNode *p, int i) const { - if (parent() != nullptr) { + if (parent() != nullptr) parent()->postRemoveChild(p, i); - } } }; diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_set_priority_controller.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_set_priority_controller.h index 9559967af..333190015 100644 --- a/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_set_priority_controller.h +++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_set_priority_controller.h @@ -6,8 +6,7 @@ class ICardSetPriorityController { public: - struct SetSaveData - { + struct SetSaveData { QString shortName; unsigned int sortKey; bool enabled; diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_set_priority_controller.h b/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_set_priority_controller.h index 188e2ced9..16fc4c19a 100644 --- a/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_set_priority_controller.h +++ b/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_set_priority_controller.h @@ -29,9 +29,8 @@ public: return true; } - void saveSets(const QVector & /* data */) override - { - } + void saveSets(const QVector & /* data */) override { + }; }; #endif // COCKATRICE_NOOP_CARD_SET_PRIORITY_CONTROLLER_H diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h b/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h index 91dc06335..afb6f1fcf 100644 --- a/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h +++ b/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h @@ -1,8 +1,8 @@ /** * @file card_completer_proxy_model.h * @ingroup CardDatabaseModels + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARD_COMPLETER_PROXY_MODEL_H #define CARD_COMPLETER_PROXY_MODEL_H diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp index d1fbbac2f..6a930c1da 100644 --- a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp +++ b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp @@ -19,9 +19,8 @@ int CardSearchModel::rowCount(const QModelIndex &parent) const QVariant CardSearchModel::data(const QModelIndex &index, int role) const { - if (!index.isValid() || index.row() >= searchResults.size()) { + if (!index.isValid() || index.row() >= searchResults.size()) return QVariant(); - } if (role == Qt::DisplayRole) { return searchResults.at(index.row()).card->getName(); @@ -35,9 +34,8 @@ void CardSearchModel::updateSearchResults(const QString &query) beginResetModel(); searchResults.clear(); - if (query.isEmpty() || !sourceModel) { + if (query.isEmpty() || !sourceModel) return; - } // Set the filter for the display model sourceModel->setCardName(query); @@ -48,15 +46,13 @@ void CardSearchModel::updateSearchResults(const QString &query) QModelIndex sourceIndex = sourceModel->mapToSource(modelIndex); CardDatabaseModel *sourceDbModel = qobject_cast(sourceModel->sourceModel()); - if (!sourceDbModel || !sourceIndex.isValid()) { + if (!sourceDbModel || !sourceIndex.isValid()) return; - } CardInfoPtr card = sourceDbModel->getCard(sourceIndex.row()); - if (!card) { + if (!card) continue; - } int distance = levenshteinDistance(query.toLower(), card->getName().toLower()); searchResults.append({card, distance}); @@ -67,9 +63,8 @@ void CardSearchModel::updateSearchResults(const QString &query) [](const SearchResult &a, const SearchResult &b) { return a.distance < b.distance; }); // Keep only the top 5 results - if (searchResults.size() > 10) { + if (searchResults.size() > 10) searchResults = searchResults.mid(0, 10); - } emit dataChanged(index(0, 0), index(rowCount() - 1, 0)); emit layoutChanged(); diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h index bc4be7a0e..18be2c55a 100644 --- a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h +++ b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h @@ -1,8 +1,8 @@ /** * @file card_search_model.h * @ingroup CardDatabaseModels + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARD_SEARCH_MODEL_H #define CARD_SEARCH_MODEL_H 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 724ee61f2..b9c38d3d7 100644 --- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp +++ b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp @@ -75,14 +75,12 @@ bool CardDatabaseDisplayModel::lessThan(const QModelIndex &left, const QModelInd // test for an exact match: isLeftType && leftString.size() == cardName.size() // or an exclusive start match: isLeftType && !isRightType - if (isLeftType && (!isRightType || leftString.size() == cardName.size())) { + if (isLeftType && (!isRightType || leftString.size() == cardName.size())) return true; - } // same checks for the right string - if (isRightType && (!isLeftType || rightString.size() == cardName.size())) { + if (isRightType && (!isLeftType || rightString.size() == cardName.size())) return false; - } } else if (right.column() == CardDatabaseModel::PTColumn && left.column() == CardDatabaseModel::PTColumn) { QStringList leftList = leftString.split("/"); QStringList rightList = rightString.split("/"); @@ -174,9 +172,8 @@ bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex { CardInfoPtr info = static_cast(sourceModel())->getCard(sourceRow); - if (((isToken == ShowTrue) && !info->getIsToken()) || ((isToken == ShowFalse) && info->getIsToken())) { + if (((isToken == ShowTrue) && !info->getIsToken()) || ((isToken == ShowFalse) && info->getIsToken())) return false; - } if (filterString != nullptr) { if (filterTree != nullptr && !filterTree->acceptsCard(info)) { @@ -190,17 +187,14 @@ bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex bool CardDatabaseDisplayModel::rowMatchesCardName(CardInfoPtr info) const { - if (!cardName.isEmpty() && !info->getName().contains(cardName, Qt::CaseInsensitive)) { + if (!cardName.isEmpty() && !info->getName().contains(cardName, Qt::CaseInsensitive)) return false; - } - if (!cardNameSet.isEmpty() && !cardNameSet.contains(info->getName())) { + if (!cardNameSet.isEmpty() && !cardNameSet.contains(info->getName())) return false; - } - if (filterTree != nullptr) { + if (filterTree != nullptr) return filterTree->acceptsCard(info); - } return true; } @@ -214,9 +208,8 @@ void CardDatabaseDisplayModel::clearFilterAll() cardText.clear(); cardTypes.clear(); cardColors.clear(); - if (filterTree != nullptr) { + if (filterTree != nullptr) filterTree->clear(); - } #if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)) endFilterChange(QSortFilterProxyModel::Direction::Rows); #else @@ -226,9 +219,8 @@ void CardDatabaseDisplayModel::clearFilterAll() void CardDatabaseDisplayModel::setFilterTree(FilterTree *_filterTree) { - if (this->filterTree != nullptr) { + if (this->filterTree != nullptr) disconnect(this->filterTree, nullptr, this, nullptr); - } this->filterTree = _filterTree; connect(this->filterTree, &FilterTree::changed, this, &CardDatabaseDisplayModel::filterTreeChanged); diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp index 253dcd134..e33156329 100644 --- a/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp +++ b/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp @@ -31,9 +31,8 @@ int CardDatabaseModel::columnCount(const QModelIndex & /*parent*/) const QVariant CardDatabaseModel::data(const QModelIndex &index, int role) const { if (!index.isValid() || index.row() >= cardList.size() || index.column() >= CARDDBMODEL_COLUMNS || - (role != Qt::DisplayRole && role != SortRole)) { + (role != Qt::DisplayRole && role != SortRole)) return QVariant(); - } CardInfoPtr card = cardList.at(index.row()); switch (index.column()) { @@ -57,12 +56,10 @@ QVariant CardDatabaseModel::data(const QModelIndex &index, int role) const QVariant CardDatabaseModel::headerData(int section, Qt::Orientation orientation, int role) const { - if (role != Qt::DisplayRole) { + if (role != Qt::DisplayRole) return QVariant(); - } - if (orientation != Qt::Horizontal) { + if (orientation != Qt::Horizontal) return QVariant(); - } switch (section) { case NameColumn: return QString(tr("Name")); @@ -81,27 +78,24 @@ QVariant CardDatabaseModel::headerData(int section, Qt::Orientation orientation, } } -void CardDatabaseModel::cardInfoChanged(const CardInfoPtr &card) +void CardDatabaseModel::cardInfoChanged(CardInfoPtr card) { const int row = cardList.indexOf(card); - if (row == -1) { + if (row == -1) return; - } emit dataChanged(index(row, 0), index(row, CARDDBMODEL_COLUMNS - 1)); } -bool CardDatabaseModel::checkCardHasAtLeastOneEnabledSet(const CardInfoPtr &card) const +bool CardDatabaseModel::checkCardHasAtLeastOneEnabledSet(CardInfoPtr card) { - if (!showOnlyCardsFromEnabledSets) { + if (!showOnlyCardsFromEnabledSets) return true; - } for (const auto &printings : card->getSets()) { for (const auto &printing : printings) { - if (printing.getSet()->getEnabled()) { + if (printing.getSet()->getEnabled()) return true; - } } } @@ -125,7 +119,7 @@ void CardDatabaseModel::cardDatabaseEnabledSetsChanged() } } -void CardDatabaseModel::cardAdded(const CardInfoPtr &card) +void CardDatabaseModel::cardAdded(CardInfoPtr card) { if (checkCardHasAtLeastOneEnabledSet(card)) { // add the card if it's present in at least one enabled set diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_model.h b/libcockatrice_models/libcockatrice/models/database/card_database_model.h index 8655389d7..218cfff92 100644 --- a/libcockatrice_models/libcockatrice/models/database/card_database_model.h +++ b/libcockatrice_models/libcockatrice/models/database/card_database_model.h @@ -51,11 +51,11 @@ private: CardDatabase *db; bool showOnlyCardsFromEnabledSets; - inline bool checkCardHasAtLeastOneEnabledSet(const CardInfoPtr &card) const; + inline bool checkCardHasAtLeastOneEnabledSet(CardInfoPtr card); private slots: - void cardAdded(const CardInfoPtr &card); + void cardAdded(CardInfoPtr card); void cardRemoved(CardInfoPtr card); - void cardInfoChanged(const CardInfoPtr &card); + void cardInfoChanged(CardInfoPtr card); void cardDatabaseEnabledSetsChanged(); }; diff --git a/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp index 8fd5311f2..c0164ad75 100644 --- a/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp +++ b/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp @@ -6,9 +6,8 @@ SetsModel::SetsModel(CardDatabase *_db, QObject *parent) : QAbstractTableModel(p { sets.sortByKey(); for (const CardSetPtr &set : sets) { - if (set->getEnabled()) { + if (set->getEnabled()) enabledSets.insert(set); - } } } @@ -16,18 +15,16 @@ SetsModel::~SetsModel() = default; int SetsModel::rowCount(const QModelIndex &parent) const { - if (parent.isValid()) { + if (parent.isValid()) return 0; - } else { + else return sets.size(); - } } QVariant SetsModel::data(const QModelIndex &index, int role) const { - if (!index.isValid() || (index.column() >= NUM_COLS) || (index.row() >= rowCount())) { + if (!index.isValid() || (index.column() >= NUM_COLS) || (index.row() >= rowCount())) return QVariant(); - } CardSetPtr set = sets[index.row()]; @@ -43,9 +40,8 @@ QVariant SetsModel::data(const QModelIndex &index, int role) const } } - if (role != Qt::DisplayRole && role != SortRole) { + if (role != Qt::DisplayRole && role != SortRole) return QVariant(); - } switch (index.column()) { case SortKeyCol: @@ -76,9 +72,8 @@ bool SetsModel::setData(const QModelIndex &index, const QVariant &value, int rol QVariant SetsModel::headerData(int section, Qt::Orientation orientation, int role) const { - if ((role != Qt::DisplayRole) || (orientation != Qt::Horizontal)) { + if ((role != Qt::DisplayRole) || (orientation != Qt::Horizontal)) return QVariant(); - } switch (section) { case SortKeyCol: return QString("Key"); /* no tr() for translations needed, column just used for sorting --> hidden */ @@ -102,15 +97,13 @@ QVariant SetsModel::headerData(int section, Qt::Orientation orientation, int rol Qt::ItemFlags SetsModel::flags(const QModelIndex &index) const { - if (!index.isValid()) { + if (!index.isValid()) return Qt::NoItemFlags; - } Qt::ItemFlags flags = QAbstractTableModel::flags(index) | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled; - if (index.column() == EnabledCol) { + if (index.column() == EnabledCol) flags |= Qt::ItemIsUserCheckable; - } return flags; } @@ -122,9 +115,8 @@ Qt::DropActions SetsModel::supportedDropActions() const QMimeData *SetsModel::mimeData(const QModelIndexList &indexes) const { - if (indexes.isEmpty()) { + if (indexes.isEmpty()) return 0; - } SetsMimeData *result = new SetsMimeData(indexes[0].row()); return qobject_cast(result); @@ -136,19 +128,16 @@ bool SetsModel::dropMimeData(const QMimeData *data, int /*column*/, const QModelIndex &parent) { - if (action != Qt::MoveAction) { + if (action != Qt::MoveAction) return false; - } if (row == -1) { - if (!parent.isValid()) { + if (!parent.isValid()) return false; - } row = parent.row(); } int oldRow = qobject_cast(data)->getOldRow(); - if (oldRow < row) { + if (oldRow < row) row--; - } swapRows(oldRow, row); @@ -159,11 +148,10 @@ void SetsModel::toggleRow(int row, bool enable) { CardSetPtr temp = sets.at(row); - if (enable) { + if (enable) enabledSets.insert(temp); - } else { + else enabledSets.remove(temp); - } emit dataChanged(index(row, EnabledCol), index(row, EnabledCol)); } @@ -172,15 +160,13 @@ void SetsModel::toggleRow(int row) { CardSetPtr tmp = sets.at(row); - if (tmp == nullptr) { + if (tmp == nullptr) return; - } - if (enabledSets.contains(tmp)) { + if (enabledSets.contains(tmp)) enabledSets.remove(tmp); - } else { + else enabledSets.insert(tmp); - } emit dataChanged(index(row, EnabledCol), index(row, EnabledCol)); } @@ -189,11 +175,9 @@ void SetsModel::toggleAll(bool enabled) { enabledSets.clear(); - if (enabled) { - for (CardSetPtr set : sets) { + if (enabled) + for (CardSetPtr set : sets) enabledSets.insert(set); - } - } emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1)); } @@ -224,9 +208,8 @@ void SetsModel::sort(int column, Qt::SortOrder order) int numRows = rowCount(); int row; - for (row = 0; row < numRows; ++row) { + for (row = 0; row < numRows; ++row) setMap.insert(index(row, column).data(SetsModel::SortRole).toString(), sets.at(row)); - } QList tmp = setMap.values(); sets.clear(); @@ -270,9 +253,8 @@ void SetsModel::restore(CardDatabase *db) // enabled sets enabledSets.clear(); for (const CardSetPtr &set : sets) { - if (set->getEnabled()) { + if (set->getEnabled()) enabledSets.insert(set); - } } emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1)); @@ -303,14 +285,12 @@ bool SetsDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex &source auto typeIndex = sourceModel()->index(sourceRow, SetsModel::SetTypeCol, sourceParent); auto nameIndex = sourceModel()->index(sourceRow, SetsModel::LongNameCol, sourceParent); auto shortNameIndex = sourceModel()->index(sourceRow, SetsModel::ShortNameCol, sourceParent); - auto dateIndex = sourceModel()->index(sourceRow, SetsModel::ReleaseDateCol, sourceParent); const auto filter = filterRegularExpression(); return (sourceModel()->data(typeIndex).toString().contains(filter) || sourceModel()->data(nameIndex).toString().contains(filter) || - sourceModel()->data(shortNameIndex).toString().contains(filter) || - sourceModel()->data(dateIndex).toString().contains(filter)); + sourceModel()->data(shortNameIndex).toString().contains(filter)); } bool SetsDisplayModel::lessThan(const QModelIndex &left, const QModelIndex &right) const diff --git a/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h b/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h index 2adf71def..0ffc5a847 100644 --- a/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h +++ b/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h @@ -1,8 +1,8 @@ /** * @file sets_model.h * @ingroup CardDatabaseModels + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef SETSMODEL_H #define SETSMODEL_H diff --git a/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h b/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h index c8f767189..f6b2fdfbb 100644 --- a/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h +++ b/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h @@ -1,8 +1,8 @@ /** * @file token_display_model.h * @ingroup CardDatabaseModels + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_TOKEN_DISPLAY_MODEL_H #define COCKATRICE_TOKEN_DISPLAY_MODEL_H diff --git a/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h b/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h index 92dfaadd7..5e5843761 100644 --- a/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h +++ b/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h @@ -1,8 +1,8 @@ /** * @file token_edit_model.h * @ingroup CardDatabaseModels + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_TOKEN_EDIT_MODEL_H #define COCKATRICE_TOKEN_EDIT_MODEL_H 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 9b43281c1..e43c612f0 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp +++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp @@ -66,7 +66,7 @@ void DeckListModel::rebuildTree() for (int j = 0; j < currentZone->size(); j++) { auto *currentCard = dynamic_cast(currentZone->at(j)); - //! \todo Better sanity checking. + // TODO: better sanity checking if (currentCard == nullptr) { continue; } @@ -257,9 +257,8 @@ Qt::ItemFlags DeckListModel::flags(const QModelIndex &index) const void DeckListModel::emitBackgroundUpdates(const QModelIndex &parent) { int rows = rowCount(parent); - if (rows == 0) { + if (rows == 0) return; - } QModelIndex topLeft = index(0, 0, parent); QModelIndex bottomRight = index(rows - 1, columnCount() - 1, parent); @@ -540,9 +539,8 @@ int DeckListModel::findSortedInsertRow(const InnerDecklistNode *parent, const Ca for (int i = 0; i < parent->size(); ++i) { auto *existingCard = dynamic_cast(parent->at(i)); - if (!existingCard) { + if (!existingCard) continue; - } bool lessThan = false; switch (lastKnownColumn) { @@ -559,9 +557,8 @@ int DeckListModel::findSortedInsertRow(const InnerDecklistNode *parent, const Ca break; } - if (lessThan) { + if (lessThan) return i; - } } return parent->size(); // insert at end if no earlier match diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h index 209ec8c42..86d36b7f9 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h +++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h @@ -89,15 +89,12 @@ static inline QString toString(Type t) static inline Type fromString(const QString &s) { - if (s == "Main Type") { + if (s == "Main Type") return MAIN_TYPE; - } - if (s == "Mana Cost") { + if (s == "Mana Cost") return MANA_COST; - } - if (s == "Colors") { + if (s == "Colors") return COLOR; - } return MAIN_TYPE; // default } } // namespace DeckListModelGroupCriteria @@ -430,9 +427,8 @@ private: template T getNode(const QModelIndex &index) const { - if (!index.isValid()) { + if (!index.isValid()) return dynamic_cast(root); - } return dynamic_cast(static_cast(index.internalPointer())); } diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.cpp b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.cpp index 3d433153a..0ec159737 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.cpp +++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.cpp @@ -29,29 +29,25 @@ bool DeckListSortFilterProxyModel::lessThan(const QModelIndex &left, const QMode QString ln = lNode->getName(); QString rn = rNode->getName(); int cmp = ln.localeAwareCompare(rn); - if (cmp != 0) { + if (cmp != 0) return cmp < 0; - } } else if (crit == "cmc") { int lc = lInfo ? lInfo->getCmc().toInt() : 0; int rc = rInfo ? rInfo->getCmc().toInt() : 0; - if (lc != rc) { + if (lc != rc) return lc < rc; - } } else if (crit == "colors") { QString lr = lInfo ? lInfo->getColors() : QString(); QString rr = rInfo ? rInfo->getColors() : QString(); int cmp = lr.localeAwareCompare(rr); - if (cmp != 0) { + if (cmp != 0) return cmp < 0; - } } else if (crit == "maintype") { QString lr = lInfo ? lInfo->getMainCardType() : QString(); QString rr = rInfo ? rInfo->getMainCardType() : QString(); int cmp = lr.localeAwareCompare(rr); - if (cmp != 0) { + if (cmp != 0) return cmp < 0; - } } } diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h index 1565417f0..94742795d 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h +++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h @@ -1,8 +1,8 @@ /** * @file deck_list_sort_filter_proxy_model.h * @ingroup DeckEditorCardGroupWidgets + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_DECK_LIST_SORT_FILTER_PROXY_MODEL_H #define COCKATRICE_DECK_LIST_SORT_FILTER_PROXY_MODEL_H diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp index 916f4351b..11458768d 100644 --- a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp +++ b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp @@ -66,9 +66,8 @@ void AbstractClient::processProtocolItem(const ServerMessage &item) const int cmdId = response.cmd_id(); PendingCommand *pend = pendingCommands.value(cmdId, 0); - if (!pend) { + if (!pend) return; - } pendingCommands.remove(cmdId); pend->processResponse(response); diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h index 2eb7e3356..dc3be5a94 100644 --- a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h +++ b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h @@ -1,8 +1,8 @@ /** * @file abstract_client.h * @ingroup Client + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef ABSTRACTCLIENT_H #define ABSTRACTCLIENT_H diff --git a/libcockatrice_network/libcockatrice/network/client/local/local_client.h b/libcockatrice_network/libcockatrice/network/client/local/local_client.h index 9e1c89ddd..e8c5330ac 100644 --- a/libcockatrice_network/libcockatrice/network/client/local/local_client.h +++ b/libcockatrice_network/libcockatrice/network/client/local/local_client.h @@ -1,8 +1,8 @@ /** * @file local_client.h * @ingroup Client + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef LOCALCLIENT_H #define LOCALCLIENT_H diff --git a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp index 7e20f2722..3e3ec889d 100644 --- a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp +++ b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp @@ -213,9 +213,8 @@ Command_Login RemoteClient::generateCommandLogin() if (!clientFeatures.isEmpty()) { QMap::iterator i; - for (i = clientFeatures.begin(); i != clientFeatures.end(); ++i) { + for (i = clientFeatures.begin(); i != clientFeatures.end(); ++i) cmdLogin.add_clientfeatures(i.key().toStdString().c_str()); - } } return cmdLogin; @@ -224,14 +223,14 @@ Command_Login RemoteClient::generateCommandLogin() void RemoteClient::doLogin() { if (!password.isEmpty() && serverSupportsPasswordHash) { - //! \todo Store and log in using stored hashed password. + // TODO store and log in using stored hashed password if (hashedPassword.isEmpty()) { doRequestPasswordSalt(); // ask salt to create hashedPassword, then log in } else { doHashedLogin(); // log in using hashed password instead } } else { - //! \todo Add setting for client to reject unhashed logins. + // TODO add setting for client to reject unhashed logins setStatus(StatusLoggingIn); Command_Login cmdLogin = generateCommandLogin(); if (!password.isEmpty()) { @@ -285,9 +284,8 @@ void RemoteClient::loginResponse(const Response &response) QString possibleMissingFeatures; if (resp.missing_features_size() > 0) { - for (int i = 0; i < resp.missing_features_size(); ++i) { + for (int i = 0; i < resp.missing_features_size(); ++i) possibleMissingFeatures.append("," + QString::fromStdString(resp.missing_features(i))); - } } if (response.response_code() == Response::RespOk) { @@ -295,15 +293,13 @@ void RemoteClient::loginResponse(const Response &response) emit userInfoChanged(resp.user_info()); QList buddyList; - for (int i = resp.buddy_list_size() - 1; i >= 0; --i) { + for (int i = resp.buddy_list_size() - 1; i >= 0; --i) buddyList.append(resp.buddy_list(i)); - } emit buddyListReceived(buddyList); QList ignoreList; - for (int i = resp.ignore_list_size() - 1; i >= 0; --i) { + for (int i = resp.ignore_list_size() - 1; i >= 0; --i) ignoreList.append(resp.ignore_list(i)); - } emit ignoreListReceived(ignoreList); if (newMissingFeatureFound(possibleMissingFeatures) && resp.missing_features_size() > 0 && @@ -315,9 +311,8 @@ void RemoteClient::loginResponse(const Response &response) } else if (response.response_code() != Response::RespNotConnected) { QList missingFeatures; if (resp.missing_features_size() > 0) { - for (int i = 0; i < resp.missing_features_size(); ++i) { + for (int i = 0; i < resp.missing_features_size(); ++i) missingFeatures << QString::fromStdString(resp.missing_features(i)); - } } emit loginError(response.response_code(), QString::fromStdString(resp.denied_reason_str()), static_cast(resp.denied_end_time()), missingFeatures); @@ -388,13 +383,11 @@ void RemoteClient::readData() inputBuffer.remove(0, 4); messageInProgress = true; } - } else { + } else return; - } } - if (inputBuffer.size() < messageLength) { + if (inputBuffer.size() < messageLength) return; - } ServerMessage newServerMessage; bool ok = newServerMessage.ParseFromArray(inputBuffer.data(), messageLength); @@ -410,9 +403,8 @@ void RemoteClient::readData() qCDebug(RemoteClientLog) << "parsing error!"; } - if (getStatus() == StatusDisconnecting) { // use thread-safe getter + if (getStatus() == StatusDisconnecting) // use thread-safe getter doDisconnectFromServer(); - } } while (!inputBuffer.isEmpty()); } @@ -545,9 +537,8 @@ void RemoteClient::doDisconnectFromServer() pendingCommands.clear(); setStatus(StatusDisconnected); - if (websocket->isValid()) { + if (websocket->isValid()) websocket->close(); - } socket->close(); } @@ -624,9 +615,8 @@ bool RemoteClient::newMissingFeatureFound(const QString &_serversMissingFeatures QStringList serversMissingFeaturesList = _serversMissingFeatures.split(","); for (const QString &feature : serversMissingFeaturesList) { if (!feature.isEmpty()) { - if (!networkSettingsProvider->getKnownMissingFeatures().contains(feature)) { + if (!networkSettingsProvider->getKnownMissingFeatures().contains(feature)) return true; - } } } return newMissingFeature; @@ -638,9 +628,8 @@ void RemoteClient::clearNewClientFeatures() QStringList existingKnownMissingFeatures = networkSettingsProvider->getKnownMissingFeatures().split(","); for (const QString &existingKnownFeature : existingKnownMissingFeatures) { if (!existingKnownFeature.isEmpty()) { - if (!clientFeatures.contains(existingKnownFeature)) { + if (!clientFeatures.contains(existingKnownFeature)) newKnownMissingFeatures.append("," + existingKnownFeature); - } } } networkSettingsProvider->setKnownMissingFeatures(newKnownMissingFeatures); @@ -678,12 +667,10 @@ void RemoteClient::requestForgotPasswordResponse(const Response &response) if (response.response_code() == Response::RespOk) { if (resp.challenge_email()) { emit sigPromptForForgotPasswordChallenge(); - } else { + } else emit sigPromptForForgotPasswordReset(); - } - } else { + } else emit sigForgotPasswordError(); - } doDisconnectFromServer(); } @@ -711,9 +698,8 @@ void RemoteClient::submitForgotPasswordResetResponse(const Response &response) { if (response.response_code() == Response::RespOk) { emit sigForgotPasswordSuccess(); - } else { + } else emit sigForgotPasswordError(); - } doDisconnectFromServer(); } @@ -746,9 +732,8 @@ void RemoteClient::submitForgotPasswordChallengeResponse(const Response &respons { if (response.response_code() == Response::RespOk) { emit sigPromptForForgotPasswordReset(); - } else { + } else emit sigForgotPasswordError(); - } doDisconnectFromServer(); } diff --git a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h index 289fdc5d0..15e3e8ef5 100644 --- a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h +++ b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h @@ -1,8 +1,8 @@ /** * @file remote_client.h * @ingroup Client + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef REMOTECLIENT_H #define REMOTECLIENT_H diff --git a/libcockatrice_network/libcockatrice/network/server/local/local_server.h b/libcockatrice_network/libcockatrice/network/server/local/local_server.h index 0112afa72..70586f6c1 100644 --- a/libcockatrice_network/libcockatrice/network/server/local/local_server.h +++ b/libcockatrice_network/libcockatrice/network/server/local/local_server.h @@ -1,8 +1,8 @@ /** * @file local_server.h * @ingroup Server + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef LOCALSERVER_H #define LOCALSERVER_H diff --git a/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h b/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h index 44e3b3e53..4410fd65c 100644 --- a/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h +++ b/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h @@ -1,8 +1,8 @@ /** * @file local_server_interface.h * @ingroup Server + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef LOCALSERVERINTERFACE_H #define LOCALSERVERINTERFACE_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 5c0fdf944..493b8e966 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 @@ -48,7 +48,7 @@ #include #include #include -#include +#include Server_AbstractParticipant::Server_AbstractParticipant(Server_Game *_game, int _playerId, 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 44e317bf7..1b1135ead 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 @@ -47,10 +47,8 @@ #include #include #include -#include -#include +#include #include -#include #include Server_AbstractPlayer::Server_AbstractPlayer(Server_Game *_game, @@ -82,6 +80,17 @@ int Server_AbstractPlayer::newCardId() return nextCardId++; } +int Server_AbstractPlayer::newArrowId() const +{ + int id = 0; + for (Server_Arrow *a : arrows) { + if (a->getId() > id) { + id = a->getId(); + } + } + return id + 1; +} + void Server_AbstractPlayer::setupZones() { nextCardId = 0; @@ -382,14 +391,10 @@ void Server_AbstractPlayer::processMoveCard(GameEventStorage &ges, for (auto *player : game->getPlayers().values()) { QList arrowsToDelete; for (Server_Arrow *arrow : player->getArrows()) { - if ((arrow->getStartCard() == card) || (arrow->getTargetItem() == card)) { + if ((arrow->getStartCard() == card) || (arrow->getTargetItem() == card)) arrowsToDelete.append(arrow->getId()); - } } for (int j : arrowsToDelete) { - Event_DeleteArrow event; - event.set_arrow_id(j); - ges.enqueueGameEvent(event, player->getPlayerId()); player->deleteArrow(j); } } @@ -1085,9 +1090,8 @@ Server_AbstractPlayer::cmdCreateToken(const Command_CreateToken &cmd, ResponseCo _event.set_zone_name(card->getZone()->getName().toStdString()); _event.set_card_id(card->getId()); - if (card->setCounter(i.key(), i.value(), &_event)) { - ges.enqueueGameEvent(_event, playerId); - } + card->setCounter(i.key(), i.value(), &_event); + ges.enqueueGameEvent(_event, playerId); } // Copy parent card @@ -1125,18 +1129,12 @@ Server_AbstractPlayer::cmdCreateToken(const Command_CreateToken &cmd, ResponseCo targetItem = card; } if (sendGameEvent) { - const int oldId = arrow->getId(); - changedArrowIds.append(oldId); - - Event_DeleteArrow deleteEvent; - deleteEvent.set_arrow_id(oldId); - ges.enqueueGameEvent(deleteEvent, player->getPlayerId()); - - Event_CreateArrow createEvent; - ServerInfo_Arrow *arrowInfo = createEvent.mutable_arrow_info(); - const int newId = game->generateArrowId(); - arrow->setId(newId); - arrowInfo->set_id(newId); + Event_CreateArrow _event; + ServerInfo_Arrow *arrowInfo = _event.mutable_arrow_info(); + changedArrowIds.append(arrow->getId()); + int id = player->newArrowId(); + arrow->setId(id); + arrowInfo->set_id(id); arrowInfo->set_start_player_id(player->getPlayerId()); arrowInfo->set_start_zone(startCard->getZone()->getName().toStdString()); arrowInfo->set_start_card_id(startCard->getId()); @@ -1150,7 +1148,7 @@ Server_AbstractPlayer::cmdCreateToken(const Command_CreateToken &cmd, ResponseCo arrowInfo->set_target_card_id(arrowTargetCard->getId()); } arrowInfo->mutable_arrow_color()->CopyFrom(arrow->getColor()); - ges.enqueueGameEvent(createEvent, player->getPlayerId()); + ges.enqueueGameEvent(_event, player->getPlayerId()); } } for (int id : changedArrowIds) { @@ -1257,8 +1255,7 @@ Server_AbstractPlayer::cmdCreateArrow(const Command_CreateArrow &cmd, ResponseCo int currentPhase = game->getActivePhase(); int deletionPhase = cmd.has_delete_in_phase() ? cmd.delete_in_phase() : currentPhase; - auto arrow = new Server_Arrow(game->generateArrowId(), startCard, targetItem, cmd.arrow_color(), currentPhase, - deletionPhase); + auto arrow = new Server_Arrow(newArrowId(), startCard, targetItem, cmd.arrow_color(), currentPhase, deletionPhase); addArrow(arrow); Event_CreateArrow event; @@ -1340,9 +1337,8 @@ Response::ResponseCode Server_AbstractPlayer::cmdSetCardCounter(const Command_Se Event_SetCardCounter event; event.set_zone_name(zone->getName().toStdString()); event.set_card_id(card->getId()); - if (card->setCounter(cmd.counter_id(), cmd.counter_value(), &event)) { - ges.enqueueGameEvent(event, playerId); - } + card->setCounter(cmd.counter_id(), cmd.counter_value(), &event); + ges.enqueueGameEvent(event, playerId); return Response::RespOk; } @@ -1371,13 +1367,14 @@ Response::ResponseCode Server_AbstractPlayer::cmdIncCardCounter(const Command_In return Response::RespNameNotFound; } + int newValue = card->getCounter(cmd.counter_id()) + cmd.counter_delta(); + card->setCounter(cmd.counter_id(), newValue); + Event_SetCardCounter event; event.set_zone_name(zone->getName().toStdString()); event.set_card_id(card->getId()); - if (!card->incrementCounter(cmd.counter_id(), cmd.counter_delta(), &event)) { - return Response::RespOk; - } - + event.set_counter_id(cmd.counter_id()); + event.set_counter_value(newValue); ges.enqueueGameEvent(event, playerId); return Response::RespOk; @@ -1475,9 +1472,8 @@ Server_AbstractPlayer::cmdRevealCards(const Command_RevealCards &cmd, ResponseCo if (cmd.has_player_id()) { Server_AbstractPlayer *otherPlayer = game->getPlayer(cmd.player_id()); - if (!otherPlayer) { + if (!otherPlayer) return Response::RespNameNotFound; - } } Server_CardZone *zone = zones.value(nameFromStdString(cmd.zone_name())); if (!zone) { diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h index 85fbc0557..9d9809298 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h @@ -74,6 +74,7 @@ public: } int newCardId(); + int newArrowId() const; void addZone(Server_CardZone *zone); void addArrow(Server_Arrow *arrow); diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp index 2ad38b977..f6787baa2 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp @@ -30,7 +30,6 @@ void Server_Arrow::getInfo(ServerInfo_Arrow *info) info->set_target_player_id(targetCard->getZone()->getPlayer()->getPlayerId()); info->set_target_zone(targetCard->getZone()->getName().toStdString()); info->set_target_card_id(targetCard->getId()); - } else { + } else info->set_target_player_id(static_cast(targetItem)->getPlayerId()); - } } diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp index 8c7feadba..86ff2f008 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp @@ -26,9 +26,6 @@ #include #include #include -#include -#include -#include Server_Card::Server_Card(const CardRef &cardRef, int _id, int _coord_x, int _coord_y, Server_CardZone *_zone) : zone(_zone), id(_id), coord_x(_coord_x), coord_y(_coord_y), cardRef(cardRef), tapped(false), attacking(false), @@ -39,13 +36,11 @@ Server_Card::Server_Card(const CardRef &cardRef, int _id, int _coord_x, int _coo Server_Card::~Server_Card() { // setParentCard(0) leads to the item being removed from our list, so we can't iterate properly - while (!attachedCards.isEmpty()) { + while (!attachedCards.isEmpty()) attachedCards.first()->setParentCard(0); - } - if (parentCard) { + if (parentCard) parentCard->removeAttachedCard(this); - } if (stashedCard) { stashedCard->deleteLater(); @@ -67,18 +62,16 @@ void Server_Card::resetState(bool keepAnnotations) QString Server_Card::setAttribute(CardAttribute attribute, const QString &avalue, bool allCards) { - if (attribute == AttrTapped && avalue != "1" && allCards && doesntUntap) { + if (attribute == AttrTapped && avalue != "1" && allCards && doesntUntap) return QVariant(tapped).toString(); - } return setAttribute(attribute, avalue); } QString Server_Card::setAttribute(CardAttribute attribute, const QString &avalue, Event_SetCardAttr *event) { - if (event) { + if (event) event->set_attribute(attribute); - } switch (attribute) { case AttrTapped: { @@ -96,9 +89,8 @@ QString Server_Card::setAttribute(CardAttribute attribute, const QString &avalue break; case AttrPT: setPT(avalue); - if (event) { + if (event) event->set_attr_value(getPT().toStdString()); - } return getPT(); case AttrAnnotation: setAnnotation(avalue); @@ -107,69 +99,31 @@ QString Server_Card::setAttribute(CardAttribute attribute, const QString &avalue setDoesntUntap(avalue == "1"); break; } - if (event) { + if (event) event->set_attr_value(avalue.toStdString()); - } return avalue; } -bool Server_Card::setCounter(int _id, int value, Event_SetCardCounter *event) +void Server_Card::setCounter(int _id, int value, Event_SetCardCounter *event) { - // Clamp to valid card counter range [0, MAX_COUNTER_VALUE] - value = qBound(0, value, MAX_COUNTER_VALUE); - - const int oldValue = counters.value(_id, 0); - if (value == oldValue) { - return false; - } - - if (value) { + if (value) counters.insert(_id, value); - } else { + else counters.remove(_id); - } if (event) { event->set_counter_id(_id); event->set_counter_value(value); } - - return true; -} - -bool Server_Card::incrementCounter(int counterId, int delta, Event_SetCardCounter *event) -{ - const int oldValue = counters.value(counterId, 0); - // Clamp to [0, MAX_COUNTER_VALUE] for card counters - const int newValue = addClamped(oldValue, delta, 0, MAX_COUNTER_VALUE); - - if (newValue == oldValue) { - return false; - } - - if (newValue) { - counters.insert(counterId, newValue); - } else { - counters.remove(counterId); - } - - if (event) { - event->set_counter_id(counterId); - event->set_counter_value(newValue); - } - - return true; } void Server_Card::setParentCard(Server_Card *_parentCard) { - if (parentCard) { + if (parentCard) parentCard->removeAttachedCard(this); - } parentCard = _parentCard; - if (parentCard) { + if (parentCard) parentCard->addAttachedCard(this); - } } void Server_Card::getInfo(ServerInfo_Card *info) diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h index a2698ad61..bc326bbc4 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h @@ -153,24 +153,7 @@ public: { cardRef = _cardRef; } - /** - * @brief Sets a card counter to an exact value with clamping. - * @param _id The counter ID. - * @param value The desired value (clamped to [0, MAX_COUNTER_VALUE]; 0 removes the counter). - * @param event Optional event to populate with counter state. - * @return true if the value changed, false otherwise. - */ - [[nodiscard]] bool setCounter(int _id, int value, Event_SetCardCounter *event = nullptr); - /** - * @brief Increments a card counter with overflow-safe arithmetic. - * @param counterId The counter ID to modify. - * @param delta The amount to add (may be negative for decrement). - * @param event Optional event to populate with counter state. - * @return true if the value changed, false otherwise. - * @note If counter does not exist, starts from 0. Counter is removed if result is 0. - * @note Clamps result to [0, MAX_COUNTER_VALUE]. - */ - [[nodiscard]] bool incrementCounter(int counterId, int delta, Event_SetCardCounter *event = nullptr); + void setCounter(int _id, int value, Event_SetCardCounter *event = nullptr); void setTapped(bool _tapped) { tapped = _tapped; diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp index 1db4f9c4c..f2a35e548 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp @@ -47,23 +47,19 @@ void Server_CardZone::shuffle(int start, int end) cardsBeingLookedAt = 0; // Size 0 or 1 decks are sorted - if (cards.size() < 2) { + if (cards.size() < 2) return; - } // Negative numbers signify positions starting at the end of the // zone convert these to actual indexes. - if (end < 0) { + if (end < 0) end += cards.size(); - } - if (start < 0) { + if (start < 0) start += cards.size(); - } - if (start < 0 || end < 0 || start >= cards.size() || end >= cards.size()) { + if (start < 0 || end < 0 || start >= cards.size() || end >= cards.size()) return; - } for (int i = end; i > start; i--) { int j = rng->rand(start, i); @@ -74,47 +70,40 @@ void Server_CardZone::shuffle(int start, int end) void Server_CardZone::removeCardFromCoordMap(Server_Card *card, int oldX, int oldY) { - if (oldX < 0) { + if (oldX < 0) return; - } const int baseX = (oldX / 3) * 3; QMap &coordMap = coordinateMap[oldY]; - if (coordMap.contains(baseX) && coordMap.contains(baseX + 1) && coordMap.contains(baseX + 2)) { + if (coordMap.contains(baseX) && coordMap.contains(baseX + 1) && coordMap.contains(baseX + 2)) // If the removal of this card has opened up a previously full pile... freePilesMap[oldY].insert(coordMap.value(baseX)->getName(), baseX); - } coordMap.remove(oldX); if (!(coordMap.contains(baseX) && coordMap.value(baseX)->getName() == card->getName()) && !(coordMap.contains(baseX + 1) && coordMap.value(baseX + 1)->getName() == card->getName()) && - !(coordMap.contains(baseX + 2) && coordMap.value(baseX + 2)->getName() == card->getName())) { + !(coordMap.contains(baseX + 2) && coordMap.value(baseX + 2)->getName() == card->getName())) // If this card was the last one with this name... freePilesMap[oldY].remove(card->getName(), baseX); - } if (!coordMap.contains(baseX) && !coordMap.contains(baseX + 1) && !coordMap.contains(baseX + 2)) { // If the removal of this card has freed a whole pile, i.e. it was the last card in it... - if (baseX < freeSpaceMap[oldY]) { + if (baseX < freeSpaceMap[oldY]) freeSpaceMap[oldY] = baseX; - } } } void Server_CardZone::insertCardIntoCoordMap(Server_Card *card, int x, int y) { - if (x < 0) { + if (x < 0) return; - } coordinateMap[y].insert(x, card); if (!(x % 3)) { - if (!card->getFaceDown() && !freePilesMap[y].contains(card->getName(), x) && - card->getAttachedCards().isEmpty()) { + if (!card->getFaceDown() && !freePilesMap[y].contains(card->getName(), x) && card->getAttachedCards().isEmpty()) freePilesMap[y].insert(card->getName(), x); - } if (freeSpaceMap[y] == x) { int nextFreeX = x; do { @@ -157,9 +146,8 @@ Server_Card *Server_CardZone::getCard(int id, int *position, bool remove) for (int i = 0; i < cards.size(); ++i) { Server_Card *tmp = cards[i]; if (tmp->getId() == id) { - if (position) { + if (position) *position = i; - } if (remove) { cards.removeAt(i); tmp->setZone(nullptr); @@ -169,13 +157,11 @@ Server_Card *Server_CardZone::getCard(int id, int *position, bool remove) } return nullptr; } else { - if ((id >= cards.size()) || (id < 0)) { + if ((id >= cards.size()) || (id < 0)) return nullptr; - } Server_Card *tmp = cards[id]; - if (position) { + if (position) *position = id; - } if (remove) { cards.removeAt(id); tmp->setZone(nullptr); @@ -198,35 +184,32 @@ int Server_CardZone::getFreeGridColumn(int x, int y, const QString &cardName, bo if (coordMap.contains(x) && (coordMap[x]->getFaceDown() || !coordMap[x]->getAttachedCards().isEmpty())) { // don't pile up on: 1. facedown cards 2. cards with attached cards - } else if (!coordMap.contains(x)) { + } else if (!coordMap.contains(x)) return x; - } else if (!coordMap.contains(x + 1)) { + else if (!coordMap.contains(x + 1)) return x + 1; - } else { + else return x + 2; - } } } else if (x >= 0) { int resultX = 0; x = (x / 3) * 3; - if (!coordMap.contains(x)) { + if (!coordMap.contains(x)) resultX = x; - } else if (!coordMap.value(x)->getAttachedCards().isEmpty()) { + else if (!coordMap.value(x)->getAttachedCards().isEmpty()) { resultX = x; x = -1; - } else if (!coordMap.contains(x + 1)) { + } else if (!coordMap.contains(x + 1)) resultX = x + 1; - } else if (!coordMap.contains(x + 2)) { + else if (!coordMap.contains(x + 2)) resultX = x + 2; - } else { + else { resultX = x; x = -1; } - if (x < 0) { - while (coordMap.contains(resultX)) { + if (x < 0) + while (coordMap.contains(resultX)) resultX += 3; - } - } return resultX; } @@ -236,18 +219,16 @@ int Server_CardZone::getFreeGridColumn(int x, int y, const QString &cardName, bo bool Server_CardZone::isColumnStacked(int x, int y) const { - if (!has_coords) { + if (!has_coords) return false; - } return coordinateMap[y].contains((x / 3) * 3 + 1); } bool Server_CardZone::isColumnEmpty(int x, int y) const { - if (!has_coords) { + if (!has_coords) return true; - } return !coordinateMap[y].contains((x / 3) * 3); } @@ -262,14 +243,12 @@ void Server_CardZone::moveCardInRow(GameEventStorage &ges, Server_Card *card, in void Server_CardZone::fixFreeSpaces(GameEventStorage &ges) { - if (!has_coords) { + if (!has_coords) return; - } QSet> placesToLook; - for (auto &card : cards) { + for (auto &card : cards) placesToLook.insert(QPair((card->getX() / 3) * 3, card->getY())); - } QSetIterator> placeIterator(placesToLook); while (placeIterator.hasNext()) { @@ -278,30 +257,26 @@ void Server_CardZone::fixFreeSpaces(GameEventStorage &ges) int y = foo.second; if (!coordinateMap[y].contains(baseX)) { - if (coordinateMap[y].contains(baseX + 1)) { + if (coordinateMap[y].contains(baseX + 1)) moveCardInRow(ges, coordinateMap[y].value(baseX + 1), baseX, y); - } else if (coordinateMap[y].contains(baseX + 2)) { + else if (coordinateMap[y].contains(baseX + 2)) { moveCardInRow(ges, coordinateMap[y].value(baseX + 2), baseX, y); continue; - } else { + } else continue; - } } - if (!coordinateMap[y].contains(baseX + 1) && coordinateMap[y].contains(baseX + 2)) { + if (!coordinateMap[y].contains(baseX + 1) && coordinateMap[y].contains(baseX + 2)) moveCardInRow(ges, coordinateMap[y].value(baseX + 2), baseX + 1, y); - } } } void Server_CardZone::updateCardCoordinates(Server_Card *card, int oldX, int oldY) { - if (!has_coords) { + if (!has_coords) return; - } - if (oldX != -1) { + if (oldX != -1) removeCardFromCoordMap(card, oldX, oldY); - } insertCardIntoCoordMap(card, card->getX(), card->getY()); } @@ -324,9 +299,8 @@ void Server_CardZone::insertCard(Server_Card *card, int x, int y) void Server_CardZone::clear() { - for (auto card : cards) { + for (auto card : cards) delete card; - } cards.clear(); coordinateMap.clear(); freePilesMap.clear(); @@ -355,8 +329,7 @@ void Server_CardZone::getInfo(ServerInfo_Zone *info, Server_AbstractParticipant const bool zonesOthersCanSee = type == ServerInfo_Zone::PublicZone; if ((selfPlayerAsking && zonesSelfCanSee) || (otherPlayerAsking && zonesOthersCanSee)) { QListIterator cardIterator(cards); - while (cardIterator.hasNext()) { + while (cardIterator.hasNext()) cardIterator.next()->getInfo(info->add_card_list()); - } } } diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.h index ca093b7cf..55aad991c 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.h +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.h @@ -22,23 +22,9 @@ #include #include -#include -#include class ServerInfo_Counter; -/** - * @class Server_Counter - * @brief Represents a player counter with overflow-safe increment arithmetic. - * - * All value modifications return whether the value actually changed, - * enabling callers to skip unnecessary network events. - * - * @note Direct assignment via setCount() does not clamp; only - * incrementCount() enforces int boundary saturation. - * @note Unlike card counters, player counters are never auto-removed - * when they reach zero - they persist with value 0. - */ class Server_Counter { protected: @@ -73,38 +59,11 @@ public: { return count; } - - /** - * @brief Sets the counter to an exact value. - * @param _count The new value (assigned directly without clamping). - * @return true if the value changed, false otherwise. - * @warning This performs raw assignment. For overflow-safe incrementing, - * use incrementCount(). - */ - [[nodiscard]] bool setCount(int _count) + void setCount(int _count) { - const int oldCount = count; count = _count; - return count != oldCount; } - /** - * @brief Increments the counter by delta with overflow-safe arithmetic. - * @param delta The amount to add (may be negative for decrement). - * @return true if the value changed, false otherwise. - * @note Clamps result to [INT_MIN, INT_MAX] to prevent overflow. - */ - [[nodiscard]] bool incrementCount(int delta) - { - const int oldCount = count; - count = addClamped(count, delta, std::numeric_limits::min(), std::numeric_limits::max()); - return count != oldCount; - } - - /** - * @brief Populates info with this counter's current state for network serialization. - * @param info The protobuf message to populate. - */ void getInfo(ServerInfo_Counter *info); }; 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 4761199e5..28d06c6be 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp @@ -147,9 +147,8 @@ void Server_Game::storeGameInformation() const QStringList &allGameTypes = room->getGameTypes(); QStringList _gameTypes; - for (int i = gameInfo.game_types_size() - 1; i >= 0; --i) { + for (int i = gameInfo.game_types_size() - 1; i >= 0; --i) _gameTypes.append(allGameTypes[gameInfo.game_types(i)]); - } for (const auto &playerName : allPlayersEver) { replayMatchInfo->add_player_names(playerName.toStdString()); @@ -167,9 +166,8 @@ void Server_Game::storeGameInformation() server->clientsLock.lockForRead(); for (auto userName : allPlayersEver + allSpectatorsEver) { Server_AbstractUserInterface *userHandler = server->findUser(userName); - if (userHandler && server->getStoreReplaysEnabled()) { + if (userHandler && server->getStoreReplaysEnabled()) userHandler->sendProtocolItem(*sessionEvent); - } } server->clientsLock.unlock(); delete sessionEvent; @@ -191,9 +189,8 @@ void Server_Game::pingClockTimeout() bool allPlayersInactive = true; int playerCount = 0; for (auto *participant : participants) { - if (participant == nullptr) { + if (participant == nullptr) continue; - } if (!participant->isSpectator()) { ++playerCount; @@ -256,9 +253,8 @@ int Server_Game::getSpectatorCount() const int result = 0; for (Server_AbstractParticipant *participant : participants.values()) { - if (participant->isSpectator()) { + if (participant->isSpectator()) ++result; - } } return result; } @@ -273,9 +269,8 @@ void Server_Game::createGameStateChangedEvent(Event_GameStateChanged *event, event->set_game_started(true); event->set_active_player_id(0); event->set_active_phase(0); - } else { + } else event->set_game_started(false); - } for (Server_AbstractParticipant *participant : participants.values()) { participant->getInfo(event->add_player_list(), recipient, omniscient, withUserInfo); @@ -334,7 +329,7 @@ void Server_Game::doStartGameIfReady(bool forceStartGame) if (!player->getReadyStart()) { if (forceStartGame) { // Player is not ready to start, so kick them - //! \todo Move them to Spectators instead. + // TODO: Move them to Spectators instead kickParticipant(player->getPlayerId()); } else { return; @@ -372,9 +367,8 @@ void Server_Game::doStartGameIfReady(bool forceStartGame) delete replayCont; startTimeOfThisGame = secondsElapsed; - } else { + } else firstGameStarted = true; - } sendGameStateToPlayers(); @@ -402,13 +396,11 @@ void Server_Game::stopGameIfFinished() int playing = 0; auto players = getPlayers(); for (auto *player : players.values()) { - if (!player->getConceded()) { + if (!player->getConceded()) ++playing; - } } - if (playing > 1) { + if (playing > 1) return; - } gameStarted = false; @@ -436,40 +428,32 @@ Response::ResponseCode Server_Game::checkJoin(ServerInfo_User *user, { Server_DatabaseInterface *databaseInterface = room->getServer()->getDatabaseInterface(); for (auto *participant : participants.values()) { - if (participant->getUserInfo()->name() == user->name()) { + if (participant->getUserInfo()->name() == user->name()) return Response::RespContextError; - } } if (asJudge && !(user->user_level() & ServerInfo_User::IsJudge)) { return Response::RespUserLevelTooLow; } if (!(overrideRestrictions && (user->user_level() & ServerInfo_User::IsModerator))) { - if ((_password != password) && !(spectator && !spectatorsNeedPassword)) { + if ((_password != password) && !(spectator && !spectatorsNeedPassword)) return Response::RespWrongPassword; - } - if (!(user->user_level() & ServerInfo_User::IsRegistered) && onlyRegistered) { + if (!(user->user_level() & ServerInfo_User::IsRegistered) && onlyRegistered) return Response::RespUserLevelTooLow; - } - if (onlyBuddies && (user->name() != creatorInfo->name())) { + if (onlyBuddies && (user->name() != creatorInfo->name())) if (!databaseInterface->isInBuddyList(QString::fromStdString(creatorInfo->name()), - QString::fromStdString(user->name()))) { + QString::fromStdString(user->name()))) return Response::RespOnlyBuddies; - } - } if (databaseInterface->isInIgnoreList(QString::fromStdString(creatorInfo->name()), - QString::fromStdString(user->name()))) { + QString::fromStdString(user->name()))) return Response::RespInIgnoreList; - } if (spectator) { - if (!spectatorsAllowed) { + if (!spectatorsAllowed) return Response::RespSpectatorsNotAllowed; - } } } - if (!spectator && (gameStarted || (getPlayerCount() >= getMaxPlayers()))) { + if (!spectator && (gameStarted || (getPlayerCount() >= getMaxPlayers()))) return Response::RespGameFull; - } return Response::RespOk; } @@ -479,9 +463,8 @@ bool Server_Game::containsUser(const QString &userName) const QMutexLocker locker(&gameMutex); for (auto *participant : participants.values()) { - if (participant->getUserInfo()->name() == userName.toStdString()) { + if (participant->getUserInfo()->name() == userName.toStdString()) return true; - } } return false; } @@ -517,7 +500,7 @@ void Server_Game::addPlayer(Server_AbstractUserInterface *userInterface, allPlayersEver.insert(playerName); // if the original creator of the game joins, give them host status back - //! \todo Transferring host to spectators has side effects. + //! \todo transferring host to spectators has side effects if (newParticipant->getUserInfo()->name() == creatorInfo->name()) { hostId = newParticipant->getPlayerId(); sendGameEventContainer(prepareGameEvent(Event_GameHostChanged(), hostId)); @@ -533,9 +516,8 @@ void Server_Game::addPlayer(Server_AbstractUserInterface *userInterface, emit gameInfoChanged(gameInfo); } - if ((newParticipant->getUserInfo()->user_level() & ServerInfo_User::IsRegistered) && !spectator) { + if ((newParticipant->getUserInfo()->user_level() & ServerInfo_User::IsRegistered) && !spectator) room->getServer()->addPersistentPlayer(playerName, room->getId(), gameId, newParticipant->getPlayerId()); - } userInterface->playerAddedToGame(gameId, room->getId(), newParticipant->getPlayerId()); @@ -582,9 +564,8 @@ void Server_Game::removeParticipant(Server_AbstractParticipant *participant, Eve } if (!spectator) { stopGameIfFinished(); - if (gameStarted && playerActive) { + if (gameStarted && playerActive) nextTurn(); - } } ServerInfo_Game gameInfo; @@ -607,18 +588,15 @@ void Server_Game::removeArrowsRelatedToPlayer(GameEventStorage &ges, Server_Abst for (auto *arrow : anyPlayer->getArrows().values()) { auto *targetCard = qobject_cast(arrow->getTargetItem()); if (targetCard) { - if (targetCard->getZone() != nullptr && targetCard->getZone()->getPlayer() == player) { + if (targetCard->getZone() != nullptr && targetCard->getZone()->getPlayer() == player) toDelete.append(arrow); - } } else if (arrow->getTargetItem() == player) { toDelete.append(arrow); } // Don't use else here! It has to happen regardless of whether targetCard == 0. - if (arrow->getStartCard()->getZone() != nullptr && - arrow->getStartCard()->getZone()->getPlayer() == player) { + if (arrow->getStartCard()->getZone() != nullptr && arrow->getStartCard()->getZone()->getPlayer() == player) toDelete.append(arrow); - } } for (auto *arrow : toDelete) { Event_DeleteArrow event; @@ -657,9 +635,8 @@ bool Server_Game::kickParticipant(int playerId) QMutexLocker locker(&gameMutex); auto *participant = participants.value(playerId); - if (!participant) { + if (!participant) return false; - } GameEventContainer *gec = prepareGameEvent(Event_Kicked(), -1); participant->sendGameEvent(*gec); @@ -697,11 +674,6 @@ void Server_Game::setActivePhase(int newPhase) sendGameEventContainer(prepareGameEvent(event, -1)); } -qint64 Server_Game::generateArrowId() -{ - return nextArrowId++; -} - void Server_Game::removeArrows(int newPhase, bool force) { QMutexLocker locker(&gameMutex); @@ -797,9 +769,8 @@ void Server_Game::sendGameEventContainer(GameEventContainer *cont, const bool playerPrivate = (participant->getPlayerId() == privatePlayerId) || participant->isJudge() || (participant->isSpectator() && spectatorsSeeEverything); if ((recipients.testFlag(GameEventStorageItem::SendToPrivate) && playerPrivate) || - (recipients.testFlag(GameEventStorageItem::SendToOthers) && !playerPrivate)) { + (recipients.testFlag(GameEventStorageItem::SendToOthers) && !playerPrivate)) participant->sendGameEvent(*cont); - } } if (recipients.testFlag(GameEventStorageItem::SendToPrivate)) { cont->set_seconds_elapsed(secondsElapsed - startTimeOfThisGame); @@ -815,13 +786,11 @@ Server_Game::prepareGameEvent(const ::google::protobuf::Message &gameEvent, int { auto *cont = new GameEventContainer; cont->set_game_id(gameId); - if (context) { + if (context) cont->mutable_context()->CopyFrom(*context); - } GameEvent *event = cont->add_event_list(); - if (playerId != -1) { + if (playerId != -1) event->set_player_id(playerId); - } event->GetReflection() ->MutableMessage(event, gameEvent.GetDescriptor()->FindExtensionByName("ext")) ->CopyFrom(gameEvent); 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 e0e7896b7..1c658f2ba 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h @@ -49,7 +49,6 @@ class Server_Game : public QObject private: Server_Room *room; int nextPlayerId; - std::atomic nextArrowId = 1; int hostId; ServerInfo_User *creatorInfo; QMap participants; @@ -197,7 +196,6 @@ public: } void setActivePlayer(int newPlayer); void setActivePhase(int newPhase); - qint64 generateArrowId(); void removeArrows(int newPhase, bool force = false); void nextTurn(); int getSecondsElapsed() const 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 d502fc7d6..1175e4b57 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -47,7 +46,7 @@ #include #include #include -#include +#include #include Server_Player::Server_Player(Server_Game *_game, @@ -410,9 +409,6 @@ Server_Player::cmdUndoDraw(const Command_UndoDraw & /*cmd*/, ResponseContainer & } if (lastDrawList.isEmpty()) { - Event_GameLogNotice event; - event.set_notice_type(Event_GameLogNotice::UNDO_DRAW_FAILED); - ges.enqueueGameEvent(event, playerId); return Response::RespContextError; } @@ -436,19 +432,17 @@ Server_Player::cmdIncCounter(const Command_IncCounter &cmd, ResponseContainer & return Response::RespContextError; } - const int counterId = cmd.counter_id(); - Server_Counter *c = counters.value(counterId, nullptr); + Server_Counter *c = counters.value(cmd.counter_id(), 0); if (!c) { return Response::RespNameNotFound; } - bool didChange = c->incrementCount(cmd.delta()); - if (didChange) { - Event_SetCounter event; - event.set_counter_id(c->getId()); - event.set_value(c->getCount()); - ges.enqueueGameEvent(event, playerId); - } + c->setCount(c->getCount() + cmd.delta()); + + Event_SetCounter event; + event.set_counter_id(c->getId()); + event.set_value(c->getCount()); + ges.enqueueGameEvent(event, playerId); return Response::RespOk; } @@ -489,19 +483,17 @@ Server_Player::cmdSetCounter(const Command_SetCounter &cmd, ResponseContainer & return Response::RespContextError; } - const int counterId = cmd.counter_id(); - Server_Counter *c = counters.value(counterId, nullptr); + Server_Counter *c = counters.value(cmd.counter_id(), 0); if (!c) { return Response::RespNameNotFound; } - bool didChange = c->setCount(cmd.value()); - if (didChange) { - Event_SetCounter event; - event.set_counter_id(c->getId()); - event.set_value(c->getCount()); - ges.enqueueGameEvent(event, playerId); - } + c->setCount(cmd.value()); + + Event_SetCounter event; + event.set_counter_id(c->getId()); + event.set_value(c->getCount()); + ges.enqueueGameEvent(event, playerId); return Response::RespOk; } @@ -516,16 +508,15 @@ Server_Player::cmdDelCounter(const Command_DelCounter &cmd, ResponseContainer & return Response::RespContextError; } - const int counterId = cmd.counter_id(); - Server_Counter *counter = counters.value(counterId, nullptr); + Server_Counter *counter = counters.value(cmd.counter_id(), 0); if (!counter) { return Response::RespNameNotFound; } - counters.remove(counterId); + counters.remove(cmd.counter_id()); delete counter; Event_DelCounter event; - event.set_counter_id(counterId); + event.set_counter_id(cmd.counter_id()); ges.enqueueGameEvent(event, playerId); return Response::RespOk; diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server.cpp index 7abccfca8..a5a74c54c 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/server.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/server.cpp @@ -56,9 +56,8 @@ void Server::prepareDestroy() { roomsLock.lockForWrite(); QMapIterator roomIterator(rooms); - while (roomIterator.hasNext()) { + while (roomIterator.hasNext()) delete roomIterator.next().value(); - } rooms.clear(); roomsLock.unlock(); } @@ -87,25 +86,22 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session, bool hasClientId = false; if (clientid.isEmpty()) { // client id is empty, either out dated client or client has been modified - if (getClientIDRequiredEnabled()) { + if (getClientIDRequiredEnabled()) return ClientIdRequired; - } } else { hasClientId = true; } - if (name.size() > 35) { + if (name.size() > 35) name = name.left(35); - } Server_DatabaseInterface *databaseInterface = getDatabaseInterface(); AuthenticationResult authState = databaseInterface->checkUserPassword(session, name, password, clientid, reasonStr, secondsLeft, passwordNeedsHash); if (authState == NotLoggedIn || authState == UserIsBanned || authState == UsernameInvalid || - authState == UserIsInactive) { + authState == UserIsInactive) return authState; - } ServerInfo_User data = databaseInterface->getUserData(name, true); data.set_address(session->getAddress().toStdString()); @@ -144,9 +140,8 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session, QString tempName = name; int i = 0; while (users.contains(tempName) || databaseInterface->activeUserExists(tempName) || - databaseInterface->userSessionExists(tempName)) { + databaseInterface->userSessionExists(tempName)) tempName = name + "_" + QString::number(++i); - } name = tempName; data.set_name(name.toStdString()); } @@ -168,11 +163,9 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session, Event_UserJoined event; event.mutable_user_info()->CopyFrom(session->copyUserInfo(false)); SessionEvent *se = Server_ProtocolHandler::prepareSessionEvent(event); - for (auto &client : clients) { - if (client->getAcceptsUserListChanges()) { + for (auto &client : clients) + if (client->getAcceptsUserListChanges()) client->sendProtocolItem(*se); - } - } delete se; event.mutable_user_info()->CopyFrom(session->copyUserInfo(true, true, true)); @@ -190,25 +183,6 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session, return authState; } -void Server::broadcastUserInfoUpdate(Server_ProtocolHandler *source) -{ - Event_UserJoined event; - event.mutable_user_info()->CopyFrom(source->copyUserInfo(false)); - - SessionEvent *se = Server_ProtocolHandler::prepareSessionEvent(event); - - clientsLock.lockForRead(); - for (auto &client : clients) { - if (client->getAcceptsUserListChanges()) { - client->sendProtocolItem(*se); - } - } - clientsLock.unlock(); - - sendIsl_SessionEvent(*se); - delete se; -} - void Server::addPersistentPlayer(const QString &userName, int roomId, int gameId, int playerId) { QWriteLocker locker(&persistentPlayersLock); @@ -232,22 +206,19 @@ Server_AbstractUserInterface *Server::findUser(const QString &userName) const // Call this only with clientsLock set. Server_AbstractUserInterface *userHandler = users.value(userName); - if (userHandler) { + if (userHandler) return userHandler; - } else { + else return externalUsers.value(userName); - } } void Server::addClient(Server_ProtocolHandler *client) { - if (client->getConnectionType() == "tcp") { + if (client->getConnectionType() == "tcp") tcpUserCount++; - } - if (client->getConnectionType() == "websocket") { + if (client->getConnectionType() == "websocket") webSocketUserCount++; - } QWriteLocker locker(&clientsLock); clients << client; @@ -261,13 +232,11 @@ void Server::removeClient(Server_ProtocolHandler *client) return; } - if (client->getConnectionType() == "tcp") { + if (client->getConnectionType() == "tcp") tcpUserCount--; - } - if (client->getConnectionType() == "websocket") { + if (client->getConnectionType() == "websocket") webSocketUserCount--; - } QWriteLocker locker(&clientsLock); clients.removeAt(clientIndex); @@ -276,11 +245,9 @@ void Server::removeClient(Server_ProtocolHandler *client) Event_UserLeft event; event.set_name(data->name()); SessionEvent *se = Server_ProtocolHandler::prepareSessionEvent(event); - for (auto &_client : clients) { - if (_client->getAcceptsUserListChanges()) { + for (auto &_client : clients) + if (_client->getAcceptsUserListChanges()) _client->sendProtocolItem(*se); - } - } sendIsl_SessionEvent(*se); delete se; @@ -305,11 +272,10 @@ QList Server::getOnlineModeratorList() const for (auto &client : clients) { ServerInfo_User *data = client->getUserInfo(); - //! \todo This line should be updated in the event there is any type of new user level created. + // TODO: this line should be updated in the event there is any type of new user level created if (data && - (data->user_level() & ServerInfo_User::IsModerator || data->user_level() & ServerInfo_User::IsAdmin)) { + (data->user_level() & ServerInfo_User::IsModerator || data->user_level() & ServerInfo_User::IsAdmin)) results << QString::fromStdString(data->name()).simplified(); - } } return results; } @@ -327,11 +293,9 @@ void Server::externalUserJoined(const ServerInfo_User &userInfo) event.mutable_user_info()->CopyFrom(userInfo); SessionEvent *se = Server_ProtocolHandler::prepareSessionEvent(event); - for (auto &client : clients) { - if (client->getAcceptsUserListChanges()) { + for (auto &client : clients) + if (client->getAcceptsUserListChanges()) client->sendProtocolItem(*se); - } - } delete se; clientsLock.unlock(); @@ -355,21 +319,18 @@ void Server::externalUserLeft(const QString &userName) while (userGamesIterator.hasNext()) { userGamesIterator.next(); Server_Room *room = rooms.value(userGamesIterator.value().first); - if (!room) { + if (!room) continue; - } QReadLocker roomGamesLocker(&room->gamesLock); Server_Game *game = room->getGames().value(userGamesIterator.key()); - if (!game) { + if (!game) continue; - } QMutexLocker gameLocker(&game->gameMutex); auto *participant = game->getParticipants().value(userGamesIterator.value().second); - if (!participant) { + if (!participant) continue; - } participant->disconnectClient(); } @@ -382,11 +343,9 @@ void Server::externalUserLeft(const QString &userName) SessionEvent *se = Server_ProtocolHandler::prepareSessionEvent(event); clientsLock.lockForRead(); - for (auto &client : clients) { - if (client->getAcceptsUserListChanges()) { + for (auto &client : clients) + if (client->getAcceptsUserListChanges()) client->sendProtocolItem(*se); - } - } clientsLock.unlock(); delete se; } @@ -533,9 +492,8 @@ void Server::externalGameCommandContainerReceived(const CommandContainer &cont, Response::ResponseCode resp = participant->processGameCommand(sc, responseContainer, ges); - if (resp != Response::RespOk) { + if (resp != Response::RespOk) finalResponseCode = resp; - } } ges.sendToGame(game); @@ -589,16 +547,13 @@ void Server::broadcastRoomUpdate(const ServerInfo_Room &roomInfo, bool sendToIsl SessionEvent *se = Server_ProtocolHandler::prepareSessionEvent(event); clientsLock.lockForRead(); - for (auto &client : clients) { - if (client->getAcceptsRoomListChanges()) { + for (auto &client : clients) + if (client->getAcceptsRoomListChanges()) client->sendProtocolItem(*se); - } - } clientsLock.unlock(); - if (sendToIsl) { + if (sendToIsl) sendIsl_SessionEvent(*se); - } delete se; } @@ -636,9 +591,8 @@ void Server::sendIsl_Response(const Response &item, int serverId, qint64 session { IslMessage msg; msg.set_message_type(IslMessage::RESPONSE); - if (sessionId != -1) { + if (sessionId != -1) msg.set_session_id(static_cast(sessionId)); - } msg.mutable_response()->CopyFrom(item); emit sigSendIslMessage(msg, serverId); @@ -648,9 +602,8 @@ void Server::sendIsl_SessionEvent(const SessionEvent &item, int serverId, qint64 { IslMessage msg; msg.set_message_type(IslMessage::SESSION_EVENT); - if (sessionId != -1) { + if (sessionId != -1) msg.set_session_id(static_cast(sessionId)); - } msg.mutable_session_event()->CopyFrom(item); emit sigSendIslMessage(msg, serverId); @@ -660,9 +613,8 @@ void Server::sendIsl_GameEventContainer(const GameEventContainer &item, int serv { IslMessage msg; msg.set_message_type(IslMessage::GAME_EVENT_CONTAINER); - if (sessionId != -1) { + if (sessionId != -1) msg.set_session_id(static_cast(sessionId)); - } msg.mutable_game_event_container()->CopyFrom(item); emit sigSendIslMessage(msg, serverId); @@ -672,9 +624,8 @@ void Server::sendIsl_RoomEvent(const RoomEvent &item, int serverId, qint64 sessi { IslMessage msg; msg.set_message_type(IslMessage::ROOM_EVENT); - if (sessionId != -1) { + if (sessionId != -1) msg.set_session_id(static_cast(sessionId)); - } msg.mutable_room_event()->CopyFrom(item); emit sigSendIslMessage(msg, serverId); diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server.h b/libcockatrice_network/libcockatrice/network/server/remote/server.h index 2fca46593..ab57fac4e 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/server.h +++ b/libcockatrice_network/libcockatrice/network/server/remote/server.h @@ -64,7 +64,6 @@ public: QString &clientid, QString &clientVersion, QString &connectionType); - void broadcastUserInfoUpdate(Server_ProtocolHandler *source); const QMap &getRooms() { diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp index 641be1eed..f9b61ab48 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp @@ -45,28 +45,25 @@ void Server_AbstractUserInterface::sendResponseContainer(const ResponseContainer { const QList> &preResponseQueue = responseContainer.getPreResponseQueue(); - for (int i = 0; i < preResponseQueue.size(); ++i) { + for (int i = 0; i < preResponseQueue.size(); ++i) sendProtocolItemByType(preResponseQueue[i].first, *preResponseQueue[i].second); - } if (responseCode != Response::RespNothing) { Response response; response.set_cmd_id(responseContainer.getCmdId()); response.set_response_code(responseCode); ::google::protobuf::Message *responseExtension = responseContainer.getResponseExtension(); - if (responseExtension) { + if (responseExtension) response.GetReflection() ->MutableMessage(&response, responseExtension->GetDescriptor()->FindExtensionByName("ext")) ->CopyFrom(*responseExtension); - } sendProtocolItem(response); } const QList> &postResponseQueue = responseContainer.getPostResponseQueue(); - for (int i = 0; i < postResponseQueue.size(); ++i) { + for (int i = 0; i < postResponseQueue.size(); ++i) sendProtocolItemByType(postResponseQueue[i].first, *postResponseQueue[i].second); - } } void Server_AbstractUserInterface::playerRemovedFromGame(Server_Game *game) @@ -95,21 +92,18 @@ void Server_AbstractUserInterface::joinPersistentGames(ResponseContainer &rc) const PlayerReference &pr = gamesToJoin.at(i); Server_Room *room = server->getRooms().value(pr.getRoomId()); - if (!room) { + if (!room) continue; - } QReadLocker roomGamesLocker(&room->gamesLock); Server_Game *game = room->getGames().value(pr.getGameId()); - if (!game) { + if (!game) continue; - } QMutexLocker gameLocker(&game->gameMutex); auto *participant = game->getParticipants().value(pr.getPlayerId()); - if (!participant) { + if (!participant) continue; - } participant->setUserInterface(this); playerAddedToGame(game->getGameId(), room->getId(), participant->getPlayerId()); diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_player_reference.h b/libcockatrice_network/libcockatrice/network/server/remote/server_player_reference.h index b478a4244..07b2d3d2b 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/server_player_reference.h +++ b/libcockatrice_network/libcockatrice/network/server/remote/server_player_reference.h @@ -24,7 +24,7 @@ public: { return playerId; } - bool operator==(const PlayerReference &other) const + bool operator==(const PlayerReference &other) { return ((roomId == other.roomId) && (gameId == other.gameId) && (playerId == other.playerId)); } diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp index c441da781..bfd8d113c 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include Server_ProtocolHandler::Server_ProtocolHandler(Server *_server, Server_DatabaseInterface *_databaseInterface, @@ -48,9 +48,8 @@ Server_ProtocolHandler::~Server_ProtocolHandler() // The thread must not hold any server locks when calling this (e.g. clientsLock, roomsLock). void Server_ProtocolHandler::prepareDestroy() { - if (deleted) { + if (deleted) return; - } deleted = true; for (auto *room : rooms.values()) { @@ -65,9 +64,8 @@ void Server_ProtocolHandler::prepareDestroy() gameIterator.next(); Server_Room *room = server->getRooms().value(gameIterator.value().first); - if (!room) { + if (!room) continue; - } room->gamesLock.lockForRead(); Server_Game *game = room->getGames().value(gameIterator.key()); if (!game) { @@ -169,9 +167,8 @@ Response::ResponseCode Server_ProtocolHandler::processSessionCommandContainer(co default: resp = processExtendedSessionCommand(num, sc, rc); } - if (resp != Response::RespOk) { + if (resp != Response::RespOk) finalResponseCode = resp; - } } return finalResponseCode; } @@ -179,15 +176,13 @@ Response::ResponseCode Server_ProtocolHandler::processSessionCommandContainer(co Response::ResponseCode Server_ProtocolHandler::processRoomCommandContainer(const CommandContainer &cont, ResponseContainer &rc) { - if (authState == NotLoggedIn) { + if (authState == NotLoggedIn) return Response::RespLoginNeeded; - } QReadLocker locker(&server->roomsLock); Server_Room *room = rooms.value(cont.room_id(), 0); - if (!room) { + if (!room) return Response::RespNotInRoom; - } resetIdleTimer(); @@ -211,9 +206,8 @@ Response::ResponseCode Server_ProtocolHandler::processRoomCommandContainer(const resp = cmdJoinGame(sc.GetExtension(Command_JoinGame::ext), room, rc); break; } - if (resp != Response::RespOk) { + if (resp != Response::RespOk) finalResponseCode = resp; - } } return finalResponseCode; } @@ -238,21 +232,18 @@ Response::ResponseCode Server_ProtocolHandler::processGameCommandContainer(const // allows a user to sideboard without receiving flooding message << GameCommand::MOVE_CARD; - if (authState == NotLoggedIn) { + if (authState == NotLoggedIn) return Response::RespLoginNeeded; - } QMap> gameMap = getGames(); - if (!gameMap.contains(cont.game_id())) { + if (!gameMap.contains(cont.game_id())) return Response::RespNotInRoom; - } const QPair roomIdAndPlayerId = gameMap.value(cont.game_id()); QReadLocker roomsLocker(&server->roomsLock); Server_Room *room = server->getRooms().value(roomIdAndPlayerId.first); - if (!room) { + if (!room) return Response::RespNotInRoom; - } QReadLocker roomGamesLocker(&room->gamesLock); Server_Game *game = room->getGames().value(cont.game_id()); @@ -267,9 +258,8 @@ Response::ResponseCode Server_ProtocolHandler::processGameCommandContainer(const QMutexLocker gameLocker(&game->gameMutex); auto *participant = game->getParticipants().value(roomIdAndPlayerId.second); - if (!participant) { + if (!participant) return Response::RespNotInRoom; - } resetIdleTimer(); @@ -284,13 +274,11 @@ Response::ResponseCode Server_ProtocolHandler::processGameCommandContainer(const if (commandCountingInterval > 0) { int totalCount = 0; - if (commandCountOverTime.isEmpty()) { + if (commandCountOverTime.isEmpty()) commandCountOverTime.prepend(0); - } - if (!antifloodCommandsWhiteList.contains((GameCommand::GameCommandType)getPbExtension(sc))) { + if (!antifloodCommandsWhiteList.contains((GameCommand::GameCommandType)getPbExtension(sc))) ++commandCountOverTime[0]; - } for (int count : commandCountOverTime) { totalCount += count; @@ -303,9 +291,8 @@ Response::ResponseCode Server_ProtocolHandler::processGameCommandContainer(const Response::ResponseCode resp = participant->processGameCommand(sc, rc, ges); - if (resp != Response::RespOk) { + if (resp != Response::RespOk) finalResponseCode = resp; - } } ges.sendToGame(game); @@ -315,12 +302,10 @@ Response::ResponseCode Server_ProtocolHandler::processGameCommandContainer(const Response::ResponseCode Server_ProtocolHandler::processModeratorCommandContainer(const CommandContainer &cont, ResponseContainer &rc) { - if (!userInfo) { + if (!userInfo) return Response::RespLoginNeeded; - } - if (!(userInfo->user_level() & ServerInfo_User::IsModerator)) { + if (!(userInfo->user_level() & ServerInfo_User::IsModerator)) return Response::RespLoginNeeded; - } resetIdleTimer(); @@ -332,9 +317,8 @@ Response::ResponseCode Server_ProtocolHandler::processModeratorCommandContainer( logDebugMessage(getSafeDebugString(sc)); resp = processExtendedModeratorCommand(num, sc, rc); - if (resp != Response::RespOk) { + if (resp != Response::RespOk) finalResponseCode = resp; - } } return finalResponseCode; } @@ -342,12 +326,10 @@ Response::ResponseCode Server_ProtocolHandler::processModeratorCommandContainer( Response::ResponseCode Server_ProtocolHandler::processAdminCommandContainer(const CommandContainer &cont, ResponseContainer &rc) { - if (!userInfo) { + if (!userInfo) return Response::RespLoginNeeded; - } - if (!(userInfo->user_level() & ServerInfo_User::IsAdmin)) { + if (!(userInfo->user_level() & ServerInfo_User::IsAdmin)) return Response::RespLoginNeeded; - } resetIdleTimer(); @@ -359,9 +341,8 @@ Response::ResponseCode Server_ProtocolHandler::processAdminCommandContainer(cons logDebugMessage(getSafeDebugString(sc)); resp = processExtendedAdminCommand(num, sc, rc); - if (resp != Response::RespOk) { + if (resp != Response::RespOk) finalResponseCode = resp; - } } return finalResponseCode; } @@ -369,32 +350,29 @@ Response::ResponseCode Server_ProtocolHandler::processAdminCommandContainer(cons void Server_ProtocolHandler::processCommandContainer(const CommandContainer &cont) { // Command processing must be disabled after prepareDestroy() has been called. - if (deleted) { + if (deleted) return; - } lastDataReceived = timeRunning; ResponseContainer responseContainer(cont.has_cmd_id() ? cont.cmd_id() : -1); Response::ResponseCode finalResponseCode; - if (cont.game_command_size()) { + if (cont.game_command_size()) finalResponseCode = processGameCommandContainer(cont, responseContainer); - } else if (cont.room_command_size()) { + else if (cont.room_command_size()) finalResponseCode = processRoomCommandContainer(cont, responseContainer); - } else if (cont.session_command_size()) { + else if (cont.session_command_size()) finalResponseCode = processSessionCommandContainer(cont, responseContainer); - } else if (cont.moderator_command_size()) { + else if (cont.moderator_command_size()) finalResponseCode = processModeratorCommandContainer(cont, responseContainer); - } else if (cont.admin_command_size()) { + else if (cont.admin_command_size()) finalResponseCode = processAdminCommandContainer(cont, responseContainer); - } else { + else finalResponseCode = Response::RespInvalidCommand; - } - if ((finalResponseCode != Response::RespNothing)) { + if ((finalResponseCode != Response::RespNothing)) sendResponseContainer(responseContainer, finalResponseCode); - } } void Server_ProtocolHandler::pingClockTimeout() @@ -408,13 +386,11 @@ void Server_ProtocolHandler::pingClockTimeout() if (interval > 0) { if (pingclockinterval > 0) { messageSizeOverTime.prepend(0); - if (messageSizeOverTime.size() > (msgcountinterval / pingclockinterval)) { + if (messageSizeOverTime.size() > (msgcountinterval / pingclockinterval)) messageSizeOverTime.removeLast(); - } messageCountOverTime.prepend(0); - if (messageCountOverTime.size() > (msgcountinterval / pingclockinterval)) { + if (messageCountOverTime.size() > (msgcountinterval / pingclockinterval)) messageCountOverTime.removeLast(); - } } } @@ -422,15 +398,13 @@ void Server_ProtocolHandler::pingClockTimeout() if (interval > 0) { if (pingclockinterval > 0) { commandCountOverTime.prepend(0); - if (commandCountOverTime.size() > (cmdcountinterval / pingclockinterval)) { + if (commandCountOverTime.size() > (cmdcountinterval / pingclockinterval)) commandCountOverTime.removeLast(); - } } } - if (timeRunning - lastDataReceived > server->getMaxPlayerInactivityTime()) { + if (timeRunning - lastDataReceived > server->getMaxPlayerInactivityTime()) prepareDestroy(); - } // PrivLevel users, Moderators, and Admins are not subject to the server idle timeout policy const bool hasPrivLevel = userInfo && QString::fromStdString(userInfo->privlevel()).toLower() != "none"; @@ -470,9 +444,8 @@ Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd QString password; bool needsHash = false; if (cmd.has_password()) { - if (cmd.password().length() > MAX_NAME_LENGTH) { + if (cmd.password().length() > MAX_NAME_LENGTH) return Response::RespWrongPassword; - } password = QString::fromStdString(cmd.password()); needsHash = true; } else if (cmd.hashed_password().length() > MAX_NAME_LENGTH) { @@ -520,9 +493,8 @@ Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd case UserIsBanned: { auto *re = new Response_Login; re->set_denied_reason_str(reasonStr.toStdString()); - if (banSecondsLeft != 0) { + if (banSecondsLeft != 0) re->set_denied_end_time(QDateTime::currentDateTime().addSecs(banSecondsLeft).toSecsSinceEpoch()); - } rc.setResponseExtension(re); return Response::RespUserIsBanned; } @@ -567,22 +539,19 @@ Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd if (authState == PasswordRight) { QMapIterator buddyIterator(databaseInterface->getBuddyList(userName)); - while (buddyIterator.hasNext()) { + while (buddyIterator.hasNext()) re->add_buddy_list()->CopyFrom(buddyIterator.next().value()); - } QMapIterator ignoreIterator(databaseInterface->getIgnoreList(userName)); - while (ignoreIterator.hasNext()) { + while (ignoreIterator.hasNext()) re->add_ignore_list()->CopyFrom(ignoreIterator.next().value()); - } } // return to client any missing features the server has that the client does not if (!missingClientFeatures.isEmpty()) { QMap::iterator i; - for (i = missingClientFeatures.begin(); i != missingClientFeatures.end(); ++i) { + for (i = missingClientFeatures.begin(); i != missingClientFeatures.end(); ++i) re->add_missing_features(i.key().toStdString().c_str()); - } } joinPersistentGames(rc); @@ -593,9 +562,8 @@ Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd Response::ResponseCode Server_ProtocolHandler::cmdMessage(const Command_Message &cmd, ResponseContainer &rc) { - if (authState == NotLoggedIn) { + if (authState == NotLoggedIn) return Response::RespLoginNeeded; - } QReadLocker locker(&server->clientsLock); @@ -631,9 +599,8 @@ Response::ResponseCode Server_ProtocolHandler::cmdMessage(const Command_Message Response::ResponseCode Server_ProtocolHandler::cmdGetGamesOfUser(const Command_GetGamesOfUser &cmd, ResponseContainer &rc) { - if (authState == NotLoggedIn) { + if (authState == NotLoggedIn) return Response::RespLoginNeeded; - } // Do not show games to someone on the ignore list of that user, except for mods QString target_user = nameFromStdString(cmd.user_name()); @@ -657,9 +624,8 @@ Response::ResponseCode Server_ProtocolHandler::cmdGetGamesOfUser(const Command_G room->gamesLock.lockForRead(); room->getInfo(*re->add_room_list(), false, true); QListIterator gameIterator(room->getGamesOfUser(nameFromStdString(cmd.user_name()))); - while (gameIterator.hasNext()) { + while (gameIterator.hasNext()) re->add_game_list()->CopyFrom(gameIterator.next()); - } room->gamesLock.unlock(); } server->roomsLock.unlock(); @@ -670,15 +636,14 @@ Response::ResponseCode Server_ProtocolHandler::cmdGetGamesOfUser(const Command_G Response::ResponseCode Server_ProtocolHandler::cmdGetUserInfo(const Command_GetUserInfo &cmd, ResponseContainer &rc) { - if (authState == NotLoggedIn) { + if (authState == NotLoggedIn) return Response::RespLoginNeeded; - } QString userName = nameFromStdString(cmd.user_name()); auto *re = new Response_GetUserInfo; - if (userName.isEmpty()) { + if (userName.isEmpty()) re->mutable_user_info()->CopyFrom(*userInfo); - } else { + else { QReadLocker locker(&server->clientsLock); @@ -697,15 +662,13 @@ Response::ResponseCode Server_ProtocolHandler::cmdGetUserInfo(const Command_GetU Response::ResponseCode Server_ProtocolHandler::cmdListRooms(const Command_ListRooms & /*cmd*/, ResponseContainer &rc) { - if (authState == NotLoggedIn) { + if (authState == NotLoggedIn) return Response::RespLoginNeeded; - } Event_ListRooms event; QMapIterator roomIterator(server->getRooms()); - while (roomIterator.hasNext()) { + while (roomIterator.hasNext()) roomIterator.next().value()->getInfo(*event.add_room_list(), false); - } rc.enqueuePreResponseItem(ServerMessage::SESSION_EVENT, prepareSessionEvent(event)); acceptsRoomListChanges = true; @@ -714,25 +677,20 @@ Response::ResponseCode Server_ProtocolHandler::cmdListRooms(const Command_ListRo Response::ResponseCode Server_ProtocolHandler::cmdJoinRoom(const Command_JoinRoom &cmd, ResponseContainer &rc) { - if (authState == NotLoggedIn) { + if (authState == NotLoggedIn) return Response::RespLoginNeeded; - } - if (rooms.contains(cmd.room_id())) { + if (rooms.contains(cmd.room_id())) return Response::RespContextError; - } QReadLocker serverLocker(&server->roomsLock); Server_Room *room = server->getRooms().value(cmd.room_id(), 0); - if (!room) { + if (!room) return Response::RespNameNotFound; - } - if (!(userInfo->user_level() & ServerInfo_User::IsModerator)) { - if (!(room->userMayJoin(*userInfo))) { + if (!(userInfo->user_level() & ServerInfo_User::IsModerator)) + if (!(room->userMayJoin(*userInfo))) return Response::RespUserLevelTooLow; - } - } room->addClient(this); rooms.insert(room->getId(), room); @@ -764,20 +722,17 @@ Response::ResponseCode Server_ProtocolHandler::cmdJoinRoom(const Command_JoinRoo Response::ResponseCode Server_ProtocolHandler::cmdListUsers(const Command_ListUsers & /*cmd*/, ResponseContainer &rc) { - if (authState == NotLoggedIn) { + if (authState == NotLoggedIn) return Response::RespLoginNeeded; - } auto *re = new Response_ListUsers; server->clientsLock.lockForRead(); QMapIterator userIterator = server->getUsers(); - while (userIterator.hasNext()) { + while (userIterator.hasNext()) re->add_user_list()->CopyFrom(userIterator.next().value()->copyUserInfo(false)); - } QMapIterator extIterator = server->getExternalUsers(); - while (extIterator.hasNext()) { + while (extIterator.hasNext()) re->add_user_list()->CopyFrom(extIterator.next().value()->copyUserInfo(false)); - } acceptsUserListChanges = true; server->clientsLock.unlock(); @@ -844,12 +799,10 @@ Server_ProtocolHandler::cmdRoomSay(const Command_RoomSay &cmd, Server_Room *room Response::ResponseCode Server_ProtocolHandler::cmdCreateGame(const Command_CreateGame &cmd, Server_Room *room, ResponseContainer &rc) { - if (authState == NotLoggedIn) { + if (authState == NotLoggedIn) return Response::RespLoginNeeded; - } - if (cmd.password().length() > MAX_NAME_LENGTH) { + if (cmd.password().length() > MAX_NAME_LENGTH) return Response::RespContextError; - } auto level = userInfo->user_level(); bool isJudge = level & ServerInfo_User::IsJudge; @@ -899,9 +852,8 @@ Server_ProtocolHandler::cmdCreateGame(const Command_CreateGame &cmd, Server_Room Response::ResponseCode Server_ProtocolHandler::cmdJoinGame(const Command_JoinGame &cmd, Server_Room *room, ResponseContainer &rc) { - if (authState == NotLoggedIn) { + if (authState == NotLoggedIn) return Response::RespLoginNeeded; - } return room->processJoinGameCommand(cmd, rc, this); } diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp index 22fb199fb..9b07bdb91 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp @@ -25,9 +25,8 @@ GameEventStorage::GameEventStorage() : gameEventContext(0), privatePlayerId(0) GameEventStorage::~GameEventStorage() { delete gameEventContext; - for (int i = 0; i < gameEventList.size(); ++i) { + for (int i = 0; i < gameEventList.size(); ++i) delete gameEventList[i]; - } } void GameEventStorage::setGameEventContext(const ::google::protobuf::Message &_gameEventContext) @@ -45,16 +44,14 @@ void GameEventStorage::enqueueGameEvent(const ::google::protobuf::Message &event int _privatePlayerId) { gameEventList.append(new GameEventStorageItem(event, playerId, recipients)); - if (_privatePlayerId != -1) { + if (_privatePlayerId != -1) privatePlayerId = _privatePlayerId; - } } void GameEventStorage::sendToGame(Server_Game *game) { - if (gameEventList.isEmpty()) { + if (gameEventList.isEmpty()) return; - } auto *contPrivate = new GameEventContainer; auto *contOthers = new GameEventContainer; @@ -71,12 +68,10 @@ void GameEventStorage::sendToGame(Server_Game *game) for (const auto &i : gameEventList) { const GameEvent &event = i->getGameEvent(); const GameEventStorageItem::EventRecipients recipients = i->getRecipients(); - if (recipients.testFlag(GameEventStorageItem::SendToPrivate)) { + if (recipients.testFlag(GameEventStorageItem::SendToPrivate)) contPrivate->add_event_list()->CopyFrom(event); - } - if (recipients.testFlag(GameEventStorageItem::SendToOthers)) { + if (recipients.testFlag(GameEventStorageItem::SendToOthers)) contOthers->add_event_list()->CopyFrom(event); - } } if (gameEventContext) { contPrivate->mutable_context()->CopyFrom(*gameEventContext); @@ -93,10 +88,8 @@ ResponseContainer::ResponseContainer(int _cmdId) : cmdId(_cmdId), responseExtens ResponseContainer::~ResponseContainer() { delete responseExtension; - for (int i = 0; i < preResponseQueue.size(); ++i) { + for (int i = 0; i < preResponseQueue.size(); ++i) delete preResponseQueue[i].second; - } - for (int i = 0; i < postResponseQueue.size(); ++i) { + for (int i = 0; i < postResponseQueue.size(); ++i) delete postResponseQueue[i].second; - } } diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp index 1f29e62fb..bfa8912b1 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include Server_Room::Server_Room(int _id, int _chatHistorySize, @@ -42,9 +42,8 @@ Server_Room::~Server_Room() gamesLock.lockForWrite(); const QList gameList = games.values(); - for (int i = 0; i < gameList.size(); ++i) { + for (int i = 0; i < gameList.size(); ++i) delete gameList[i]; - } games.clear(); gamesLock.unlock(); @@ -56,23 +55,19 @@ Server_Room::~Server_Room() bool Server_Room::userMayJoin(const ServerInfo_User &userInfo) { - if (permissionLevel.toLower() == "administrator" || permissionLevel.toLower() == "moderator") { + if (permissionLevel.toLower() == "administrator" || permissionLevel.toLower() == "moderator") return false; - } - if (permissionLevel.toLower() == "registered" && !(userInfo.user_level() & ServerInfo_User::IsRegistered)) { + if (permissionLevel.toLower() == "registered" && !(userInfo.user_level() & ServerInfo_User::IsRegistered)) return false; - } if (privilegeLevel.toLower() != "none") { if (privilegeLevel.toLower() == "privileged") { - if (privilegeLevel.toLower() == "none") { + if (privilegeLevel.toLower() == "none") return false; - } } else { - if (privilegeLevel.toLower() != QString::fromStdString(userInfo.privlevel()).toLower()) { + if (privilegeLevel.toLower() != QString::fromStdString(userInfo.privlevel()).toLower()) return false; - } } } return true; @@ -97,14 +92,12 @@ Server_Room::getInfo(ServerInfo_Room &result, bool complete, bool showGameTypes, result.set_game_count(games.size() + externalGames.size()); if (complete) { QMapIterator gameIterator(games); - while (gameIterator.hasNext()) { + while (gameIterator.hasNext()) gameIterator.next().value()->getInfo(*result.add_game_list()); - } if (includeExternalData) { QMapIterator externalGameIterator(externalGames); - while (externalGameIterator.hasNext()) { + while (externalGameIterator.hasNext()) result.add_game_list()->CopyFrom(externalGameIterator.next().value()); - } } } gamesLock.unlock(); @@ -113,25 +106,22 @@ Server_Room::getInfo(ServerInfo_Room &result, bool complete, bool showGameTypes, result.set_player_count(users.size() + externalUsers.size()); if (complete) { QMapIterator userIterator(users); - while (userIterator.hasNext()) { + while (userIterator.hasNext()) result.add_user_list()->CopyFrom(userIterator.next().value()->copyUserInfo(false)); - } if (includeExternalData) { QMapIterator externalUserIterator(externalUsers); - while (externalUserIterator.hasNext()) { + while (externalUserIterator.hasNext()) result.add_user_list()->CopyFrom(externalUserIterator.next().value().copyUserInfo(false)); - } } } usersLock.unlock(); - if (complete || showGameTypes) { + if (complete || showGameTypes) for (int i = 0; i < gameTypes.size(); ++i) { ServerInfo_GameType *gameTypeInfo = result.add_gametype_list(); gameTypeInfo->set_game_type_id(i); gameTypeInfo->set_description(gameTypes[i].toStdString()); } - } return result; } @@ -218,9 +208,8 @@ void Server_Room::removeExternalUser(const QString &_name) roomInfo.set_room_id(id); usersLock.lockForWrite(); - if (externalUsers.contains(_name)) { + if (externalUsers.contains(_name)) externalUsers.remove(_name); - } roomInfo.set_player_count(users.size() + externalUsers.size()); usersLock.unlock(); @@ -238,11 +227,10 @@ void Server_Room::updateExternalGameList(const ServerInfo_Game &gameInfo) roomInfo.set_room_id(id); gamesLock.lockForWrite(); - if (!gameInfo.has_player_count() && externalGames.contains(gameInfo.game_id())) { + if (!gameInfo.has_player_count() && externalGames.contains(gameInfo.game_id())) externalGames.remove(gameInfo.game_id()); - } else { + else externalGames.insert(gameInfo.game_id(), gameInfo); - } roomInfo.set_game_count(games.size() + externalGames.size()); gamesLock.unlock(); @@ -254,9 +242,8 @@ Response::ResponseCode Server_Room::processJoinGameCommand(const Command_JoinGam ResponseContainer &rc, Server_AbstractUserInterface *userInterface) { - if (cmd.password().length() > MAX_NAME_LENGTH) { + if (cmd.password().length() > MAX_NAME_LENGTH) return Response::RespWrongPassword; - } // This function is called from the Server thread and from the S_PH thread. // server->roomsMutex is always locked. @@ -284,9 +271,8 @@ Response::ResponseCode Server_Room::processJoinGameCommand(const Command_JoinGam Response::ResponseCode result = game->checkJoin(userInterface->getUserInfo(), QString::fromStdString(cmd.password()), cmd.spectator(), cmd.override_restrictions(), cmd.join_as_judge()); - if (result == Response::RespOk) { + if (result == Response::RespOk) game->addPlayer(userInterface, rc, cmd.spectator(), cmd.join_as_judge()); - } return result; } @@ -343,15 +329,13 @@ void Server_Room::sendRoomEvent(RoomEvent *event, bool sendToIsl) usersLock.lockForRead(); { QMapIterator userIterator(users); - while (userIterator.hasNext()) { + while (userIterator.hasNext()) userIterator.next().value()->sendProtocolItem(*event); - } } usersLock.unlock(); - if (sendToIsl) { + if (sendToIsl) static_cast(parent())->sendIsl_RoomEvent(*event); - } delete event; } @@ -421,11 +405,9 @@ int Server_Room::getGamesCreatedByUser(const QString &userName) const QMapIterator gamesIterator(games); int result = 0; - while (gamesIterator.hasNext()) { - if (gamesIterator.next().value()->getCreatorInfo()->name() == userName.toStdString()) { + while (gamesIterator.hasNext()) + if (gamesIterator.next().value()->getCreatorInfo()->name() == userName.toStdString()) ++result; - } - } return result; } diff --git a/libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.cpp b/libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.cpp index 24e734a4e..77ff38906 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.cpp @@ -13,11 +13,10 @@ ServerInfo_User_Container::ServerInfo_User_Container(const ServerInfo_User &_use ServerInfo_User_Container::ServerInfo_User_Container(const ServerInfo_User_Container &other) { - if (other.userInfo) { + if (other.userInfo) userInfo = new ServerInfo_User(*other.userInfo); - } else { + else userInfo = nullptr; - } } ServerInfo_User_Container::~ServerInfo_User_Container() @@ -46,9 +45,8 @@ ServerInfo_User &ServerInfo_User_Container::copyUserInfo(ServerInfo_User &result result.clear_id(); result.clear_email(); } - if (!complete) { + if (!complete) result.clear_avatar_bmp(); - } } return result; } diff --git a/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp b/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp index 4d4889323..718487c18 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp +++ b/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include // FastFieldValuePrinter is added in protobuf 3.4, going out of our way to add the old FieldValuePrinter is not worth it #if GOOGLE_PROTOBUF_VERSION > 3004000 @@ -58,9 +58,8 @@ void SafePrinter::applySafePrinter(const ::google::protobuf::Message &message, case ::google::protobuf::FieldDescriptor::CPPTYPE_STRING: if (field->name().find("password") != std::string::npos) { // name contains password auto *safePrinter = new SafePrinter(); - if (!printer.RegisterFieldValuePrinter(field, safePrinter)) { + if (!printer.RegisterFieldValuePrinter(field, safePrinter)) delete safePrinter; // in case safePrinter has not been taken ownership of - } } break; case google::protobuf::FieldDescriptor::CPPTYPE_MESSAGE: diff --git a/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp b/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp index 3e687ef56..1b08c4040 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp +++ b/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp @@ -33,16 +33,14 @@ void FeatureSet::initalizeFeatureList(QMap &_featureList) void FeatureSet::enableRequiredFeature(QMap &_featureList, const QString &featureName) { - if (_featureList.contains(featureName)) { + if (_featureList.contains(featureName)) _featureList.insert(featureName, true); - } } void FeatureSet::disableRequiredFeature(QMap &_featureList, const QString &featureName) { - if (_featureList.contains(featureName)) { + if (_featureList.contains(featureName)) _featureList.insert(featureName, false); - } } QMap diff --git a/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp b/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp index a693ea5a7..d6235858a 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp +++ b/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp @@ -7,10 +7,8 @@ int getPbExtension(const ::google::protobuf::Message &message) { std::vector fieldList; message.GetReflection()->ListFields(message, &fieldList); - for (unsigned int j = 0; j < fieldList.size(); ++j) { - if (fieldList[j]->is_extension()) { + for (unsigned int j = 0; j < fieldList.size(); ++j) + if (fieldList[j]->is_extension()) return fieldList[j]->number(); - } - } return -1; } diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt b/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt index 20a4cb08d..212ab69dd 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt @@ -76,7 +76,6 @@ set(PROTO_FILES event_game_closed.proto event_game_host_changed.proto event_game_joined.proto - event_game_log_notice.proto event_game_say.proto event_game_state_changed.proto event_game_state_changed.proto @@ -122,7 +121,6 @@ set(PROTO_FILES response_activate.proto response_adjust_mod.proto response_ban_history.proto - response_card_art_rule_entry.proto response_deck_download.proto response_deck_list.proto response_deck_upload.proto diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_log_notice.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_log_notice.proto deleted file mode 100644 index ef0dcc102..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_log_notice.proto +++ /dev/null @@ -1,20 +0,0 @@ -syntax = "proto2"; -import "game_event.proto"; - -// Notifies clients of an event that happened, and which could safely be dropped without affect the game state. -// This mostly just means events that should cause a message to be logged to chat. -message Event_GameLogNotice { - - // The type of the notice. - // Clients who do not recognize the type should drop the event. - enum NoticeType { - // Player's "undo draw" command failed due to losing track of recent draw - UNDO_DRAW_FAILED = 1; - } - - extend GameEvent { - optional Event_GameLogNotice ext = 2022; - } - - optional NoticeType notice_type = 1; -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto index 7d3147701..8682128af 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto @@ -33,7 +33,6 @@ message GameEvent { // STOP_DUMP_ZONE = 2019; // obsolete CHANGE_ZONE_PROPERTIES = 2020; REVERSE_TURN = 2021; - GAME_LOG_NOTICE = 2022; } 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 ca46e4dd7..9d01b51d2 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto @@ -11,9 +11,6 @@ message ModeratorCommand { FORCE_ACTIVATE_USER = 1007; GET_ADMIN_NOTES = 1008; UPDATE_ADMIN_NOTES = 1009; - ADD_CARD_ART_RULE = 1010; - REMOVE_CARD_ART_RULE = 1011; - LIST_CARD_ART_RULES = 1012; } extensions 100 to max; } @@ -109,29 +106,3 @@ message Command_UpdateAdminNotes { optional string user_name = 1; optional string notes = 2; } - -message Command_AddCardArtRule { - extend ModeratorCommand { - optional Command_AddCardArtRule ext = 1010; - } - - optional string card_name = 1; - optional string card_provider_id = 2; - optional string mode = 3; // "ALLOW" or "DENY" - optional string reason = 4; -} - -message Command_RemoveCardArtRule { - extend ModeratorCommand { - optional Command_RemoveCardArtRule ext = 1011; - } - - optional string card_name = 1; - optional string card_provider_id = 2; -} - -message Command_ListCardArtRules { - extend ModeratorCommand { - optional Command_ListCardArtRules ext = 1012; - } -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response.proto index e719f3e92..dece8ae17 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/response.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response.proto @@ -68,7 +68,6 @@ message Response { REPLAY_LIST = 1100; REPLAY_DOWNLOAD = 1101; REPLAY_GET_CODE = 1102; - CARD_ART_RULE_LIST = 1200; } required uint64 cmd_id = 1; optional ResponseCode response_code = 2; diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_card_art_rule_entry.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_card_art_rule_entry.proto deleted file mode 100644 index 25b76e09f..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/response_card_art_rule_entry.proto +++ /dev/null @@ -1,16 +0,0 @@ -syntax = "proto2"; -import "response.proto"; - -message Response_CardArtRuleEntry { - optional string card_name = 1; - optional string card_provider_id = 2; - optional string mode = 3; - optional string reason = 4; -} - -message Response_ListCardArtRules { - extend Response { - optional Response_ListCardArtRules ext = 1200; - } - repeated Response_CardArtRuleEntry entries = 1; -} \ No newline at end of file diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user.proto index 98cc3ce6a..10add611f 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user.proto @@ -1,5 +1,4 @@ syntax = "proto2"; - message ServerInfo_User { enum UserLevelFlag { IsNothing = 0; @@ -13,14 +12,6 @@ message ServerInfo_User { optional string left_side = 1; optional string right_side = 2; }; - message CardArtParams { - optional string card_name = 1; - optional string card_provider_id = 2; - optional double margin_pct_l = 3 [default = 0.33]; - optional double margin_pct_r = 4 [default = 0.02]; - optional double vertical_offset = 5 [default = 0.35]; - optional double zoom = 6 [default = 1.0]; - }; optional string name = 1; optional uint32 user_level = 2; @@ -37,5 +28,4 @@ message ServerInfo_User { optional string clientid = 13; optional string privlevel = 14; optional PawnColorsOverride pawn_colors = 15; - optional CardArtParams card_art_params = 16; -} \ No newline at end of file +} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/session_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/session_commands.proto index 9d207c711..cecf87370 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/session_commands.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/session_commands.proto @@ -27,7 +27,6 @@ message SessionCommand { FORGOT_PASSWORD_RESET = 1022; FORGOT_PASSWORD_CHALLENGE = 1023; REQUEST_PASSWORD_SALT = 1024; - SET_CARD_ART_PARAMS = 1025; REPLAY_LIST = 1100; REPLAY_DOWNLOAD = 1101; REPLAY_MODIFY_MATCH = 1102; @@ -206,15 +205,3 @@ message Command_RequestPasswordSalt { } required string user_name = 1; } - -message Command_SetCardArtParams { - extend SessionCommand { - optional Command_SetCardArtParams ext = 1025; - } - optional string card_name = 1; - optional string card_provider_id = 2; - optional double margin_pct_l = 3; - optional double margin_pct_r = 4; - optional double vertical_offset = 5; - optional double zoom = 6; -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pending_command.h b/libcockatrice_protocol/libcockatrice/protocol/pending_command.h index dbe57e7fc..1d2d9ff17 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pending_command.h +++ b/libcockatrice_protocol/libcockatrice/protocol/pending_command.h @@ -1,8 +1,8 @@ /** * @file pending_command.h * @ingroup Messages + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef PENDING_COMMAND_H #define PENDING_COMMAND_H diff --git a/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp b/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp index 82404d351..63072b988 100644 --- a/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp +++ b/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp @@ -8,11 +8,10 @@ QVector RNG_Abstract::makeNumbersVector(int n, int min, int max) QVector result(bins); for (int i = 0; i < n; ++i) { int number = rand(min, max); - if ((number < min) || (number > max)) { + if ((number < min) || (number > max)) qDebug() << "rand(" << min << "," << max << ") returned " << number; - } else { + else result[number - min]++; - } } return result; } @@ -20,14 +19,12 @@ QVector RNG_Abstract::makeNumbersVector(int n, int min, int max) double RNG_Abstract::testRandom(const QVector &numbers) const { int n = 0; - for (int i = 0; i < numbers.size(); ++i) { + for (int i = 0; i < numbers.size(); ++i) n += numbers[i]; - } double expected = (double)n / (double)numbers.size(); double chisq = 0; - for (int i = 0; i < numbers.size(); ++i) { + for (int i = 0; i < numbers.size(); ++i) chisq += ((double)numbers[i] - expected) * ((double)numbers[i] - expected) / expected; - } return chisq; } diff --git a/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp index 5b38deb3f..5a6d8c862 100644 --- a/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp +++ b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp @@ -40,9 +40,8 @@ unsigned int RNG_SFMT::rand(int min, int max) } // For complete fairness and equal timing, this should be a roll, but let's skip it anyway - if (min == max) { + if (min == max) return max; - } // This is actually not used in Cockatrice: // Someone wants rand() % -foo, so we should compute -rand(0, +foo) diff --git a/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.c b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.c index fde6367a0..b4ac9308b 100644 --- a/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.c +++ b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.c @@ -60,9 +60,7 @@ inline static void swap(w128_t *array, int size); */ static const w128_t sse2_param_mask = {{SFMT_MSK1, SFMT_MSK2, SFMT_MSK3, SFMT_MSK4}}; - #if defined(__AVX2__) && (SFMT_SL1 >= 16) && !(SFMT_N & 1) && !(SFMT_POS1 & 1) - #include "SFMT-avx256.h" - #elif defined(_MSC_VER) + #if defined(_MSC_VER) #include "SFMT-sse2-msc.h" #else #include "SFMT-sse2.h" diff --git a/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.h b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.h index 34d9e746f..79e012d63 100644 --- a/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.h +++ b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.h @@ -88,13 +88,8 @@ union W128_T { uint64_t u64[2]; uint32x4_t si; }; -//#elif defined(HAVE_SSE2) #elif defined(HAVE_SSE2) - #if defined(__AVX2__) - #include - #else - #include - #endif + #include /** 128-bit data structure */ union W128_T { @@ -117,18 +112,8 @@ typedef union W128_T w128_t; * SFMT internal state */ struct SFMT_T { -#if defined(__AVX2__) - union { - w128_t state[SFMT_N]; - __m256i state_ymm[SFMT_N/2]; - #if defined(__AVX512VL__) - __m512i state_zmm[SFMT_N/4]; - #endif - }; -#else /** the 128-bit internal state array */ w128_t state[SFMT_N]; -#endif /** index counter to the 32-bit internal state array */ int idx; }; @@ -264,9 +249,9 @@ inline static double sfmt_genrand_real3(sfmt_t * sfmt) } /** - * converts an unsigned 64-bit integer to double on [0,1) + * converts an unsigned 32-bit integer to double on [0,1) * with 53-bit resolution. - * @param v 64-bit unsigned integer + * @param v 32-bit unsigned integer * @return double on [0,1)-real-interval with 53-bit resolution. */ inline static double sfmt_to_res53(uint64_t v) diff --git a/libcockatrice_settings/libcockatrice/settings/card_database_settings.h b/libcockatrice_settings/libcockatrice/settings/card_database_settings.h index 97efb5753..5dea1b552 100644 --- a/libcockatrice_settings/libcockatrice/settings/card_database_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/card_database_settings.h @@ -2,8 +2,8 @@ * @file card_database_settings.h * @ingroup CardDatabase * @ingroup CardSettings + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef CARDDATABASESETTINGS_H #define CARDDATABASESETTINGS_H diff --git a/libcockatrice_settings/libcockatrice/settings/card_override_settings.h b/libcockatrice_settings/libcockatrice/settings/card_override_settings.h index cd515d4da..3d9db4e65 100644 --- a/libcockatrice_settings/libcockatrice/settings/card_override_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/card_override_settings.h @@ -1,8 +1,8 @@ /** * @file card_override_settings.h * @ingroup CardSettings + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_CARD_OVERRIDE_SETTINGS_H #define COCKATRICE_CARD_OVERRIDE_SETTINGS_H diff --git a/libcockatrice_settings/libcockatrice/settings/debug_settings.h b/libcockatrice_settings/libcockatrice/settings/debug_settings.h index acb5cf313..30cdd5fa5 100644 --- a/libcockatrice_settings/libcockatrice/settings/debug_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/debug_settings.h @@ -1,8 +1,8 @@ /** * @file debug_settings.h * @ingroup CoreSettings + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef DEBUG_SETTINGS_H #define DEBUG_SETTINGS_H diff --git a/libcockatrice_settings/libcockatrice/settings/download_settings.h b/libcockatrice_settings/libcockatrice/settings/download_settings.h index 60e59220b..b7442301e 100644 --- a/libcockatrice_settings/libcockatrice/settings/download_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/download_settings.h @@ -1,8 +1,8 @@ /** * @file download_settings.h * @ingroup NetworkSettings + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef COCKATRICE_DOWNLOADSETTINGS_H #define COCKATRICE_DOWNLOADSETTINGS_H diff --git a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h index 24f582007..c0e60551a 100644 --- a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h @@ -2,8 +2,8 @@ * @file game_filters_settings.h * @ingroup Lobby * @ingroup GameSettings + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef GAMEFILTERSSETTINGS_H #define GAMEFILTERSSETTINGS_H diff --git a/libcockatrice_settings/libcockatrice/settings/layouts_settings.h b/libcockatrice_settings/libcockatrice/settings/layouts_settings.h index d5f26b61b..5353ce15a 100644 --- a/libcockatrice_settings/libcockatrice/settings/layouts_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/layouts_settings.h @@ -1,8 +1,8 @@ /** * @file layouts_settings.h * @ingroup CoreSettings + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef LAYOUTSSETTINGS_H #define LAYOUTSSETTINGS_H diff --git a/libcockatrice_settings/libcockatrice/settings/message_settings.h b/libcockatrice_settings/libcockatrice/settings/message_settings.h index 8276aa39d..ec70027af 100644 --- a/libcockatrice_settings/libcockatrice/settings/message_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/message_settings.h @@ -1,8 +1,8 @@ /** * @file message_settings.h * @ingroup NetworkSettings + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef MESSAGESETTINGS_H #define MESSAGESETTINGS_H diff --git a/libcockatrice_settings/libcockatrice/settings/recents_settings.h b/libcockatrice_settings/libcockatrice/settings/recents_settings.h index 01b2a37bc..3aebff334 100644 --- a/libcockatrice_settings/libcockatrice/settings/recents_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/recents_settings.h @@ -1,8 +1,8 @@ /** * @file recents_settings.h * @ingroup DeckSettings + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef RECENTS_SETTINGS_H #define RECENTS_SETTINGS_H diff --git a/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp b/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp index d9b98e036..0140182be 100644 --- a/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp @@ -58,11 +58,9 @@ int ServersSettings::getPrevioushostindex(const QString &saveName) const { 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()) { + for (int i = 0; i <= size; ++i) + if (saveName == getValue(QString("saveName%1").arg(i), "server", "server_details").toString()) return i; - } - } return -1; } @@ -94,9 +92,8 @@ QString ServersSettings::getPassword() { int index = getPrevioushostindex(getPrevioushostName()); - if (getSavePassword()) { + if (getSavePassword()) return getValue(QString("password%1").arg(index), "server", "server_details").toString(); - } return QString(); } @@ -171,9 +168,8 @@ void ServersSettings::addNewServer(const QString &saveName, bool savePassword, const QString &site) { - if (updateExistingServer(saveName, serv, port, username, password, savePassword, site)) { + if (updateExistingServer(saveName, serv, port, username, password, savePassword, site)) return; - } int index = getValue("totalServers", "server", "server_details").toInt() + 1; diff --git a/libcockatrice_settings/libcockatrice/settings/servers_settings.h b/libcockatrice_settings/libcockatrice/settings/servers_settings.h index 40fa996fb..22603a356 100644 --- a/libcockatrice_settings/libcockatrice/settings/servers_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/servers_settings.h @@ -1,8 +1,8 @@ /** * @file servers_settings.h * @ingroup NetworkSettings + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef SERVERSSETTINGS_H #define SERVERSSETTINGS_H diff --git a/libcockatrice_settings/libcockatrice/settings/settings_manager.h b/libcockatrice_settings/libcockatrice/settings/settings_manager.h index 4213cf4c1..a02bafcac 100644 --- a/libcockatrice_settings/libcockatrice/settings/settings_manager.h +++ b/libcockatrice_settings/libcockatrice/settings/settings_manager.h @@ -1,8 +1,8 @@ /** * @file settings_manager.h * @ingroup Settings + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef SETTINGSMANAGER_H #define SETTINGSMANAGER_H diff --git a/libcockatrice_utility/CMakeLists.txt b/libcockatrice_utility/CMakeLists.txt index 2d34cad31..c0c7d8cc9 100644 --- a/libcockatrice_utility/CMakeLists.txt +++ b/libcockatrice_utility/CMakeLists.txt @@ -15,12 +15,8 @@ set(UTILITY_HEADERS libcockatrice/utility/levenshtein.h libcockatrice/utility/macros.h libcockatrice/utility/passwordhasher.h - libcockatrice/utility/string_limits.h - libcockatrice/utility/dice_limits.h - libcockatrice/utility/counter_limits.h - libcockatrice/utility/clamped_arithmetic.h + libcockatrice/utility/trice_limits.h libcockatrice/utility/zone_names.h - libcockatrice/utility/days_years_between.h ) add_library(libcockatrice_utility STATIC ${UTILITY_SOURCES} ${UTILITY_HEADERS}) diff --git a/libcockatrice_utility/libcockatrice/utility/clamped_arithmetic.h b/libcockatrice_utility/libcockatrice/utility/clamped_arithmetic.h deleted file mode 100644 index 1afac758c..000000000 --- a/libcockatrice_utility/libcockatrice/utility/clamped_arithmetic.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef CLAMPED_ARITHMETIC_H -#define CLAMPED_ARITHMETIC_H - -#include -#include - -/** - * @brief Overflow-safe clamped addition: returns value + delta bounded to [minValue, maxValue]. - * - * Uses a 64-bit intermediate so the addition cannot overflow int. Shared by the bounded - * counter arithmetic in both the client and the server. - * - * @note Requires minValue <= maxValue. Bounds come from trusted compile-time call sites; - * qBound() asserts this internally in debug builds. - */ -inline int addClamped(int value, int delta, int minValue, int maxValue) -{ - const auto result = static_cast(value) + static_cast(delta); - return static_cast(qBound(static_cast(minValue), result, static_cast(maxValue))); -} - -#endif // CLAMPED_ARITHMETIC_H diff --git a/libcockatrice_utility/libcockatrice/utility/color.h b/libcockatrice_utility/libcockatrice/utility/color.h index 6afe984bd..f02df3a0e 100644 --- a/libcockatrice_utility/libcockatrice/utility/color.h +++ b/libcockatrice_utility/libcockatrice/utility/color.h @@ -22,7 +22,6 @@ inline color convertQColorToColor(const QColor &c) return result; } -#include #include namespace GameSpecificColors @@ -46,13 +45,11 @@ inline QColor colorHelper(const QString &name) {"Land", QColor(110, 80, 50)}, }; - if (colorMap.contains(name)) { + if (colorMap.contains(name)) return colorMap[name]; - } - if (name.length() == 1 && colorMap.contains(name.toUpper())) { + if (name.length() == 1 && colorMap.contains(name.toUpper())) return colorMap[name.toUpper()]; - } uint h = qHash(name); int r = 100 + (h % 120); diff --git a/libcockatrice_utility/libcockatrice/utility/counter_limits.h b/libcockatrice_utility/libcockatrice/utility/counter_limits.h deleted file mode 100644 index 1343dbb3f..000000000 --- a/libcockatrice_utility/libcockatrice/utility/counter_limits.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef COUNTER_LIMITS_H -#define COUNTER_LIMITS_H - -/** - * @brief Upper bound for a bounded counter's value: [0, MAX_COUNTER_VALUE]. - * - * Caps an individual counter's VALUE (e.g. a +1/+1 counter at 999), not how many counters - * something holds. Applies to counters that are constrained to a non-negative display range, - * such as card counters and commander tax. Unbounded counters (e.g. a player's life total) - * do not use this limit and may go negative, saturating only at the int range. - * - * The max of 999 is a display constraint (3-digit rendering) and a reasonable gameplay limit. - * The server enforces these bounds; the client may also check them for UX optimization. - */ -constexpr int MAX_COUNTER_VALUE = 999; - -#endif // COUNTER_LIMITS_H diff --git a/libcockatrice_utility/libcockatrice/utility/days_years_between.h b/libcockatrice_utility/libcockatrice/utility/days_years_between.h deleted file mode 100644 index 4b3b5bc0c..000000000 --- a/libcockatrice_utility/libcockatrice/utility/days_years_between.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef COCKATRICE_DAYS_YEARS_BETWEEN_H -#define COCKATRICE_DAYS_YEARS_BETWEEN_H - -#include - -inline static QPair getDaysAndYearsBetween(const QDate &then, const QDate &now) -{ - int years = now.addDays(1 - then.dayOfYear()).year() - then.year(); // there is no yearsTo - int days = then.addYears(years).daysTo(now); - return {days, years}; -} - -#endif // COCKATRICE_DAYS_YEARS_BETWEEN_H diff --git a/libcockatrice_utility/libcockatrice/utility/dice_limits.h b/libcockatrice_utility/libcockatrice/utility/dice_limits.h deleted file mode 100644 index e1407c57e..000000000 --- a/libcockatrice_utility/libcockatrice/utility/dice_limits.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef DICE_LIMITS_H -#define DICE_LIMITS_H - -#include // for uint - -/** @brief Fewest sides a rollable die may have. */ -constexpr uint MINIMUM_DIE_SIDES = 2; -/** @brief Most sides a rollable die may have. */ -constexpr uint MAXIMUM_DIE_SIDES = 1000000; -/** @brief Fewest dice that may be rolled at once. */ -constexpr uint MINIMUM_DICE_TO_ROLL = 1; -/** @brief Most dice that may be rolled at once. */ -constexpr uint MAXIMUM_DICE_TO_ROLL = 100; - -#endif // DICE_LIMITS_H diff --git a/libcockatrice_utility/libcockatrice/utility/expression.cpp b/libcockatrice_utility/libcockatrice/utility/expression.cpp index 718b0fe18..42073670c 100644 --- a/libcockatrice_utility/libcockatrice/utility/expression.cpp +++ b/libcockatrice_utility/libcockatrice/utility/expression.cpp @@ -54,9 +54,8 @@ double Expression::eval(const peg::Ast &ast) return stod(std::string(ast.token)); } else if (ast.name == "FUNCTION") { QString name = QString::fromStdString(std::string(nodes[0]->token)); - if (!fns.contains(name)) { + if (!fns.contains(name)) return 0; - } return fns[name](eval(*nodes[1])); } else if (ast.name == "VARIABLE") { return value; diff --git a/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp b/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp index f39d325fb..cfb972f91 100644 --- a/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp +++ b/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp @@ -9,12 +9,10 @@ int levenshteinDistance(const QString &s1, const QString &s2) int len2 = s2.size(); std::vector> dp(len1 + 1, std::vector(len2 + 1)); - for (int i = 0; i <= len1; i++) { + for (int i = 0; i <= len1; i++) dp[i][0] = i; - } - for (int j = 0; j <= len2; j++) { + for (int j = 0; j <= len2; j++) dp[0][j] = j; - } for (int i = 1; i <= len1; i++) { for (int j = 1; j <= len2; j++) { diff --git a/libcockatrice_utility/libcockatrice/utility/levenshtein.h b/libcockatrice_utility/libcockatrice/utility/levenshtein.h index 3da730e53..e83235470 100644 --- a/libcockatrice_utility/libcockatrice/utility/levenshtein.h +++ b/libcockatrice_utility/libcockatrice/utility/levenshtein.h @@ -1,8 +1,8 @@ /** * @file levenshtein.h * @ingroup Core + * @brief TODO: Document this. */ -//! \todo Document this file. #ifndef LEVENSHTEIN_H #define LEVENSHTEIN_H diff --git a/libcockatrice_utility/libcockatrice/utility/peglib.h b/libcockatrice_utility/libcockatrice/utility/peglib.h index e7e558dff..3ae6040c4 100644 --- a/libcockatrice_utility/libcockatrice/utility/peglib.h +++ b/libcockatrice_utility/libcockatrice/utility/peglib.h @@ -37,7 +37,6 @@ #include #include #include -#include #include #if !defined(__cplusplus) || __cplusplus < 201703L @@ -506,7 +505,7 @@ inline constexpr unsigned int str2tag(std::string_view sv) { namespace udl { -inline constexpr unsigned int operator"" _(const char *s, size_t l) { +inline constexpr unsigned int operator""_(const char *s, size_t l) { return str2tag_core(s, l, 0); } @@ -2435,11 +2434,10 @@ struct ComputeFirstSet : public TraversalVisitor { void visit(Sequence &ope) override { for (const auto &op : ope.opes_) { - FirstSet element_fs; auto save = result_; result_ = FirstSet{}; op->accept(*this); - element_fs = result_; + auto element_fs = result_; result_ = save; result_.chars |= element_fs.chars; if (element_fs.any_char) { result_.any_char = true; } @@ -2528,22 +2526,10 @@ struct ComputeFirstSet : public TraversalVisitor { void visit(BackReference &) override { result_.any_char = true; } void visit(Cut &) override { result_.can_be_empty = true; } - // Per-rule cache shared across a SetupFirstSets traversal. Without it, - // every alternative of every PrioritizedChoice re-walks referenced - // rules — O(refs^depth) work for grammars with many cross-references. - // Only cycle-free rule computations are cached; results computed under - // a cycle (left recursion) would be incomplete and unsafe to reuse from - // a different call context. - using FirstSetCache = std::unordered_map; - - explicit ComputeFirstSet(FirstSetCache &cache) : cache_(cache) {} - FirstSet result_; private: - FirstSetCache &cache_; - std::unordered_set refs_; - size_t cycle_count_ = 0; + std::unordered_set refs_; }; struct SetupFirstSets : public TraversalVisitor { @@ -2556,7 +2542,7 @@ struct SetupFirstSets : public TraversalVisitor { ope.first_sets_.clear(); ope.first_sets_.reserve(ope.opes_.size()); for (const auto &op : ope.opes_) { - ComputeFirstSet cfs(first_set_cache_); + ComputeFirstSet cfs; op->accept(cfs); ope.first_sets_.push_back(cfs.result_); } @@ -2573,8 +2559,7 @@ struct SetupFirstSets : public TraversalVisitor { void visit(Reference &ope) override; private: - ComputeFirstSet::FirstSetCache first_set_cache_; - std::unordered_set visited_rules_; + std::unordered_set refs_; }; /* @@ -3821,50 +3806,20 @@ inline void ComputeFirstSet::visit(Reference &ope) { result_.any_char = true; return; } - - auto it = cache_.find(ope.rule_); - FirstSet computed; - const FirstSet *rule_fs; - if (it != cache_.end()) { - rule_fs = &it->second; - } else { - if (!refs_.insert(ope.rule_).second) { - cycle_count_++; // cycle / left recursion - return; - } - auto save = std::exchange(result_, FirstSet{}); - auto saved_cycle_count = cycle_count_; - ope.rule_->accept(*this); - computed = std::move(result_); - result_ = std::move(save); - refs_.erase(ope.rule_); - if (cycle_count_ == saved_cycle_count) { - // Cycle-free: cached value is complete and safe to reuse. - it = cache_.try_emplace(ope.rule_, std::move(computed)).first; - rule_fs = &it->second; - } else { - // Cycle was hit during this rule's computation — its result may be - // missing contributions from rules that were on the call stack. - // Use the value here but do not cache it for other call contexts. - rule_fs = &computed; - } - } - - result_.merge(*rule_fs); - if (!result_.first_literal) { - result_.first_literal = rule_fs->first_literal; - } - if (!result_.first_rule) { - result_.first_rule = rule_fs->first_rule - ? rule_fs->first_rule - : (ope.rule_->is_token() ? ope.rule_ : nullptr); + if (refs_.count(ope.name_)) { return; } + refs_.insert(ope.name_); + ope.rule_->accept(*this); + if (!result_.first_rule && ope.rule_->is_token()) { + result_.first_rule = ope.rule_; } + refs_.erase(ope.name_); } inline void SetupFirstSets::visit(Reference &ope) { - if (!ope.rule_) { return; } - if (!visited_rules_.insert(ope.rule_).second) { return; } + if (!ope.rule_ || refs_.count(ope.name_)) { return; } + refs_.insert(ope.name_); ope.rule_->accept(*this); + refs_.erase(ope.name_); } inline void SetupFirstSets::visit(Sequence &ope) { diff --git a/libcockatrice_utility/libcockatrice/utility/qt_utils.h b/libcockatrice_utility/libcockatrice/utility/qt_utils.h index 8e5212031..606947143 100644 --- a/libcockatrice_utility/libcockatrice/utility/qt_utils.h +++ b/libcockatrice_utility/libcockatrice/utility/qt_utils.h @@ -1,6 +1,5 @@ #ifndef COCKATRICE_QT_UTILS_H #define COCKATRICE_QT_UTILS_H -#include #include namespace QtUtils @@ -19,17 +18,14 @@ template T *findParentOfType(const QObject *obj) static inline void clearLayoutRec(QLayout *l) { - if (!l) { + if (!l) return; - } QLayoutItem *it; while ((it = l->takeAt(0)) != nullptr) { - if (QWidget *w = it->widget()) { + if (QWidget *w = it->widget()) w->deleteLater(); - } - if (QLayout *sub = it->layout()) { + if (QLayout *sub = it->layout()) clearLayoutRec(sub); - } delete it; } } diff --git a/libcockatrice_utility/libcockatrice/utility/string_limits.h b/libcockatrice_utility/libcockatrice/utility/string_limits.h deleted file mode 100644 index cca804bf0..000000000 --- a/libcockatrice_utility/libcockatrice/utility/string_limits.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef STRING_LIMITS_H -#define STRING_LIMITS_H - -#include -#include -#include - -/** @brief Max size for short strings, like names and things that are generally a single phrase. */ -constexpr int MAX_NAME_LENGTH = 0xff; -/** @brief Max size for chat messages and text contents. */ -constexpr int MAX_TEXT_LENGTH = 0xfff; -/** @brief Max size for deck files and pictures (about 2 megabytes). */ -constexpr int MAX_FILE_LENGTH = 0x1fffff; - -/** @brief Returns a QString from a std::string, truncated to at most MAX_NAME_LENGTH bytes. */ -inline QString nameFromStdString(const std::string &_string) -{ - return QString::fromUtf8(_string.data(), std::min(int(_string.size()), MAX_NAME_LENGTH)); -} -/** @brief Returns a QString from a std::string, truncated to at most MAX_TEXT_LENGTH bytes. */ -inline QString textFromStdString(const std::string &_string) -{ - return QString::fromUtf8(_string.data(), std::min(int(_string.size()), MAX_TEXT_LENGTH)); -} -/** @brief Returns a QString from a std::string, truncated to at most MAX_FILE_LENGTH bytes. */ -inline QString fileFromStdString(const std::string &_string) -{ - return QString::fromUtf8(_string.data(), std::min(int(_string.size()), MAX_FILE_LENGTH)); -} - -#endif // STRING_LIMITS_H diff --git a/libcockatrice_utility/libcockatrice/utility/trice_limits.h b/libcockatrice_utility/libcockatrice/utility/trice_limits.h new file mode 100644 index 000000000..fa7ce7489 --- /dev/null +++ b/libcockatrice_utility/libcockatrice/utility/trice_limits.h @@ -0,0 +1,32 @@ +#ifndef TRICE_LIMITS_H +#define TRICE_LIMITS_H + +#include + +// max size for short strings, like names and things that are generally a single phrase +constexpr int MAX_NAME_LENGTH = 0xff; +// max size for chat messages and text contents +constexpr int MAX_TEXT_LENGTH = 0xfff; +// max size for deck files and pictures +constexpr int MAX_FILE_LENGTH = 0x1fffff; // about 2 megabytes + +constexpr uint MINIMUM_DIE_SIDES = 2; +constexpr uint MAXIMUM_DIE_SIDES = 1000000; +constexpr uint MINIMUM_DICE_TO_ROLL = 1; +constexpr uint MAXIMUM_DICE_TO_ROLL = 100; + +// optimized functions to get qstrings that are at most that long +static inline QString nameFromStdString(const std::string &_string) +{ + return QString::fromUtf8(_string.data(), std::min(int(_string.size()), MAX_NAME_LENGTH)); +} +static inline QString textFromStdString(const std::string &_string) +{ + return QString::fromUtf8(_string.data(), std::min(int(_string.size()), MAX_TEXT_LENGTH)); +} +static inline QString fileFromStdString(const std::string &_string) +{ + return QString::fromUtf8(_string.data(), std::min(int(_string.size()), MAX_FILE_LENGTH)); +} + +#endif // TRICE_LIMITS_H diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index a51982625..3bb4de5df 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -28,7 +28,6 @@ set(oracle_SOURCES ../cockatrice/src/client/settings/card_counter_settings.cpp ../cockatrice/src/client/settings/shortcuts_settings.cpp ../cockatrice/src/client/network/update/client/release_channel.cpp - ../cockatrice/src/interface/theme_config.cpp ../cockatrice/src/interface/theme_manager.cpp ../cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp ../cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp diff --git a/oracle/oracle_en@source.ts b/oracle/oracle_en@source.ts index b3263f861..943b44a97 100644 --- a/oracle/oracle_en@source.ts +++ b/oracle/oracle_en@source.ts @@ -278,7 +278,7 @@ OracleImporter - + Dummy set containing tokens @@ -286,7 +286,7 @@ OracleWizard - + Oracle Importer diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index bace63508..578afd98d 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -124,11 +124,10 @@ static void sortAndReduceColors(QString &colors) // reduce QChar lastChar = '\0'; for (int i = 0; i < colors.size(); ++i) { - if (colors.at(i) == lastChar) { + if (colors.at(i) == lastChar) colors.remove(i, 1); - } else { + else lastChar = colors.at(i); - } } } @@ -192,13 +191,12 @@ CardInfoPtr OracleImporter::addCard(QString name, // table row int tableRow = 1; QString mainCardType = properties.value("maintype").toString(); - if (mainCardType == "Land") { + if (mainCardType == "Land") tableRow = 0; - } else if (mainCardType == "Sorcery" || mainCardType == "Instant") { + else if (mainCardType == "Sorcery" || mainCardType == "Instant") tableRow = 3; - } else if (mainCardType == "Creature") { + else if (mainCardType == "Creature") tableRow = 2; - } // card side QString side = properties.value("side").toString() == "b" ? "back" : "front"; @@ -284,9 +282,8 @@ int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QList QString mtgjsonProperty = i.key(); QString xmlPropertyName = i.value(); QString propertyValue = getStringPropertyFromMap(card, mtgjsonProperty); - if (!propertyValue.isEmpty()) { + if (!propertyValue.isEmpty()) properties.insert(xmlPropertyName, propertyValue); - } } // per-set properties @@ -295,9 +292,8 @@ int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QList QString mtgjsonProperty = i.key(); QString xmlPropertyName = i.value(); QString propertyValue = getStringPropertyFromMap(card, mtgjsonProperty); - if (!propertyValue.isEmpty()) { + if (!propertyValue.isEmpty()) printingInfo.setProperty(xmlPropertyName, propertyValue); - } } // handle flavorNames specially due to double-faced cards @@ -473,8 +469,8 @@ FormatRulesNameMap OracleImporter::createDefaultMagicFormats() // Predefined common exceptions CardCondition superTypeIsBasic; superTypeIsBasic.field = "type"; - superTypeIsBasic.matchType = "regex"; - superTypeIsBasic.value = "\bBasic\b[^—]+\bLand\b"; + superTypeIsBasic.matchType = "contains"; + superTypeIsBasic.value = "Basic Land"; ExceptionRule basicLands; basicLands.conditions.append(superTypeIsBasic); @@ -548,9 +544,8 @@ int OracleImporter::startImport() CardSetPtr newSet = CardSet::newInstance(noOpController, curSetToParse.getShortName(), curSetToParse.getLongName(), curSetToParse.getSetType(), curSetToParse.getReleaseDate(), curSetToParse.getPriority()); - if (!sets.contains(newSet->getShortName())) { + if (!sets.contains(newSet->getShortName())) sets.insert(newSet->getShortName(), newSet); - } int numCardsInSet = importCardsFromSet(newSet, curSetToParse.getCards()); diff --git a/oracle/src/pagetemplates.h b/oracle/src/pagetemplates.h index 6e79c867e..79dcdd632 100644 --- a/oracle/src/pagetemplates.h +++ b/oracle/src/pagetemplates.h @@ -27,7 +27,7 @@ protected: inline OracleWizard *wizard() { return (OracleWizard *)QWizardPage::wizard(); - } + }; }; class SimpleDownloadFilePage : public OracleWizardPage diff --git a/oracle/translations/oracle_de.ts b/oracle/translations/oracle_de.ts index 196315a36..df12f40f4 100644 --- a/oracle/translations/oracle_de.ts +++ b/oracle/translations/oracle_de.ts @@ -276,7 +276,7 @@ OracleImporter - + Dummy set containing tokens Platzhalter Edition mit Spielsteinen @@ -284,7 +284,7 @@ OracleWizard - + Oracle Importer Oracle Importer diff --git a/oracle/translations/oracle_el.ts b/oracle/translations/oracle_el.ts index d3a2e081c..7934997cf 100644 --- a/oracle/translations/oracle_el.ts +++ b/oracle/translations/oracle_el.ts @@ -276,7 +276,7 @@ OracleImporter - + Dummy set containing tokens Εικονικό σετ που περιέχει tokens @@ -284,7 +284,7 @@ OracleWizard - + Oracle Importer Εισαγωγέας Oracle diff --git a/oracle/translations/oracle_en_US.ts b/oracle/translations/oracle_en_US.ts index 394e10b92..4b664bf57 100644 --- a/oracle/translations/oracle_en_US.ts +++ b/oracle/translations/oracle_en_US.ts @@ -276,7 +276,7 @@ OracleImporter - + Dummy set containing tokens Dummy set containing tokens @@ -284,7 +284,7 @@ OracleWizard - + Oracle Importer Oracle Importer diff --git a/oracle/translations/oracle_es.ts b/oracle/translations/oracle_es.ts index c11c1740a..eeb9f71bd 100644 --- a/oracle/translations/oracle_es.ts +++ b/oracle/translations/oracle_es.ts @@ -63,7 +63,7 @@ Sets file (%1) Sets JSON file (%1) - Archivo de ediciones (%1) + @@ -172,7 +172,7 @@ spoiler - spoiler + @@ -192,7 +192,7 @@ Local file: - Archivo local: + @@ -202,7 +202,7 @@ Choose file... - Elegir archivo... + @@ -230,7 +230,7 @@ tokens - fichas + @@ -250,7 +250,7 @@ Local file: - Archivo local: + @@ -260,7 +260,7 @@ Choose file... - Elegir archivo... + @@ -276,7 +276,7 @@ OracleImporter - + Dummy set containing tokens Set dedicado para tokens @@ -284,7 +284,7 @@ OracleWizard - + Oracle Importer Importador de Oracle @@ -391,12 +391,12 @@ Load %1 file - Cargar archivo de %1 + %1 file (%1) - archivo de %1 (%1) + @@ -420,12 +420,12 @@ Please choose a file. - Por favor elija un archivo. + Cannot open file '%1'. - No se puede abrir el archivo '%1'. + @@ -602,7 +602,7 @@ Run in no-confirm background mode - Ejecutar en modo del segundo plano sin confirmación + \ No newline at end of file diff --git a/oracle/translations/oracle_et.ts b/oracle/translations/oracle_et.ts index 5a5e915db..9f2c560cd 100644 --- a/oracle/translations/oracle_et.ts +++ b/oracle/translations/oracle_et.ts @@ -276,7 +276,7 @@ OracleImporter - + Dummy set containing tokens Nukk-komplekt mis sisaldab märgistusi @@ -284,7 +284,7 @@ OracleWizard - + Oracle Importer Oracle sissetooja diff --git a/oracle/translations/oracle_fi.ts b/oracle/translations/oracle_fi.ts index e2a193ca4..c7657cf7a 100644 --- a/oracle/translations/oracle_fi.ts +++ b/oracle/translations/oracle_fi.ts @@ -276,7 +276,7 @@ OracleImporter - + Dummy set containing tokens Tokeneja sisältävä mallisetti @@ -284,7 +284,7 @@ OracleWizard - + Oracle Importer Oracle-lataaja diff --git a/oracle/translations/oracle_fr.ts b/oracle/translations/oracle_fr.ts index 590a0b879..47ab5d0fa 100644 --- a/oracle/translations/oracle_fr.ts +++ b/oracle/translations/oracle_fr.ts @@ -276,7 +276,7 @@ OracleImporter - + Dummy set containing tokens Fausse édition contenant les jetons @@ -284,7 +284,7 @@ OracleWizard - + Oracle Importer Importateur Oracle diff --git a/oracle/translations/oracle_it.ts b/oracle/translations/oracle_it.ts index e266209d1..34bcb3cbc 100644 --- a/oracle/translations/oracle_it.ts +++ b/oracle/translations/oracle_it.ts @@ -277,7 +277,7 @@ e pedine che verranno usate da Cockatrice. OracleImporter - + Dummy set containing tokens Set finto contenente i token @@ -285,7 +285,7 @@ e pedine che verranno usate da Cockatrice. OracleWizard - + Oracle Importer Oracle Importer diff --git a/oracle/translations/oracle_ja.ts b/oracle/translations/oracle_ja.ts index a437db796..8319f37a2 100644 --- a/oracle/translations/oracle_ja.ts +++ b/oracle/translations/oracle_ja.ts @@ -276,7 +276,7 @@ OracleImporter - + Dummy set containing tokens ダミーセットを含むトークン @@ -284,7 +284,7 @@ OracleWizard - + Oracle Importer Oracle Importer - オラクル・インポーター diff --git a/oracle/translations/oracle_ko.ts b/oracle/translations/oracle_ko.ts index 3b0b0187c..c5c24583f 100644 --- a/oracle/translations/oracle_ko.ts +++ b/oracle/translations/oracle_ko.ts @@ -276,7 +276,7 @@ OracleImporter - + Dummy set containing tokens 토큰 정보가 들어있는 더미 확장판 @@ -284,7 +284,7 @@ OracleWizard - + Oracle Importer 오라클 diff --git a/oracle/translations/oracle_nb.ts b/oracle/translations/oracle_nb.ts index 698076fd5..b40868cc1 100644 --- a/oracle/translations/oracle_nb.ts +++ b/oracle/translations/oracle_nb.ts @@ -276,7 +276,7 @@ OracleImporter - + Dummy set containing tokens Dummy sett som inneholder tokens @@ -284,7 +284,7 @@ OracleWizard - + Oracle Importer Oracle importerer diff --git a/oracle/translations/oracle_nl.ts b/oracle/translations/oracle_nl.ts index 3fd3cc543..ed9a5fae9 100644 --- a/oracle/translations/oracle_nl.ts +++ b/oracle/translations/oracle_nl.ts @@ -276,7 +276,7 @@ OracleImporter - + Dummy set containing tokens Token voorbeeldset @@ -284,7 +284,7 @@ OracleWizard - + Oracle Importer Oracle importer diff --git a/oracle/translations/oracle_pl.ts b/oracle/translations/oracle_pl.ts index cad6309a9..d5d632f70 100644 --- a/oracle/translations/oracle_pl.ts +++ b/oracle/translations/oracle_pl.ts @@ -276,7 +276,7 @@ OracleImporter - + Dummy set containing tokens Dodatek-atrapa, zawierający tokeny. @@ -284,7 +284,7 @@ OracleWizard - + Oracle Importer Oracle – kreator importu diff --git a/oracle/translations/oracle_pt.ts b/oracle/translations/oracle_pt.ts index 069f3013e..c578a0365 100644 --- a/oracle/translations/oracle_pt.ts +++ b/oracle/translations/oracle_pt.ts @@ -276,7 +276,7 @@ OracleImporter - + Dummy set containing tokens Set básico contendo fichas @@ -284,7 +284,7 @@ OracleWizard - + Oracle Importer Importar Oracle diff --git a/oracle/translations/oracle_pt_BR.ts b/oracle/translations/oracle_pt_BR.ts index 30c4e5e65..96a6382ec 100644 --- a/oracle/translations/oracle_pt_BR.ts +++ b/oracle/translations/oracle_pt_BR.ts @@ -276,7 +276,7 @@ OracleImporter - + Dummy set containing tokens Esta expansão contém fichas. @@ -284,7 +284,7 @@ OracleWizard - + Oracle Importer Importador Oracle diff --git a/oracle/translations/oracle_ru.ts b/oracle/translations/oracle_ru.ts index 4e1bcd3c6..e2ff5b5a0 100644 --- a/oracle/translations/oracle_ru.ts +++ b/oracle/translations/oracle_ru.ts @@ -276,7 +276,7 @@ OracleImporter - + Dummy set containing tokens Пример сета с фишками @@ -284,7 +284,7 @@ OracleWizard - + Oracle Importer Импортер Oracle diff --git a/oracle/translations/oracle_sr.ts b/oracle/translations/oracle_sr.ts index 9532030b3..04d48688a 100644 --- a/oracle/translations/oracle_sr.ts +++ b/oracle/translations/oracle_sr.ts @@ -276,7 +276,7 @@ OracleImporter - + Dummy set containing tokens @@ -284,7 +284,7 @@ OracleWizard - + Oracle Importer diff --git a/oracle/translations/oracle_tr.ts b/oracle/translations/oracle_tr.ts index e65124c40..517f9248e 100644 --- a/oracle/translations/oracle_tr.ts +++ b/oracle/translations/oracle_tr.ts @@ -276,7 +276,7 @@ OracleImporter - + Dummy set containing tokens @@ -284,7 +284,7 @@ OracleWizard - + Oracle Importer diff --git a/oracle/translations/oracle_yue.ts b/oracle/translations/oracle_yue.ts index d13848c34..13a621b9e 100644 --- a/oracle/translations/oracle_yue.ts +++ b/oracle/translations/oracle_yue.ts @@ -276,7 +276,7 @@ OracleImporter - + Dummy set containing tokens 包含衍生物的虚拟牌組 @@ -284,7 +284,7 @@ OracleWizard - + Oracle Importer Oracle導入器 diff --git a/oracle/translations/oracle_zh-Hans.ts b/oracle/translations/oracle_zh-Hans.ts index 75ebdc138..ff19ab463 100644 --- a/oracle/translations/oracle_zh-Hans.ts +++ b/oracle/translations/oracle_zh-Hans.ts @@ -276,7 +276,7 @@ OracleImporter - + Dummy set containing tokens 包含衍生物的虚拟牌组 @@ -284,7 +284,7 @@ OracleWizard - + Oracle Importer Oracle导入器 diff --git a/servatrice/migrations/servatrice_0034_to_0035.sql b/servatrice/migrations/servatrice_0034_to_0035.sql deleted file mode 100644 index acaad9c8b..000000000 --- a/servatrice/migrations/servatrice_0034_to_0035.sql +++ /dev/null @@ -1,19 +0,0 @@ -ALTER TABLE `cockatrice_users` ADD COLUMN `card_art_params` TEXT DEFAULT NULL, ALGORITHM=INSTANT; - -CREATE TABLE IF NOT EXISTS `cockatrice_card_art_name_rules` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `card_name` varchar(255) NOT NULL, - `card_provider_id` varchar(255) NOT NULL, - `mode` enum('ALLOW','DENY') NOT NULL, - `reason` varchar(255) DEFAULT NULL, - `created_by` int(7) unsigned DEFAULT NULL, - `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - UNIQUE KEY `uniq_provider_card_name` (`card_provider_id`, `card_name`), - KEY `idx_mode` (`mode`), - FOREIGN KEY (`created_by`) REFERENCES `cockatrice_users`(`id`) - ON DELETE SET NULL - ON UPDATE CASCADE - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci; - -UPDATE cockatrice_schema_version SET version=35 WHERE version=34; diff --git a/servatrice/scripts/account_monitor/.gitignore b/servatrice/scripts/account_monitor/.gitignore deleted file mode 100644 index 40cd3839a..000000000 --- a/servatrice/scripts/account_monitor/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# Local state - never commit these -state.json -state.json.tmp -venv/ -__pycache__/ diff --git a/servatrice/scripts/account_monitor/README.md b/servatrice/scripts/account_monitor/README.md deleted file mode 100644 index e2c01d0ba..000000000 --- a/servatrice/scripts/account_monitor/README.md +++ /dev/null @@ -1,163 +0,0 @@ -# Account registration monitor - -Posts a Discord message whenever a new account is registered in Servatrice -(`cockatrice_users`). Each message includes the username, real name (if set), -email, and registration time. - -It runs as a periodic read-only query against the production database. It does -not modify the database and does not touch the running Servatrice process. - -## How it decides what is "new" - -Accounts get an auto-increment `id`, so "new since last time" is just -`id > last_seen_id`. The monitor stores that single high-water-mark id in its -state file. Each run it posts every account above the mark, oldest first, then -advances the mark to the highest id it posted. - -Because the mark only moves forward and an id is posted exactly once, there are -no duplicate messages and nothing is missed, even if the monitor is down for a -while. The state file holds a single number, so it never grows. - -The first run (when no state file exists yet) records the current maximum id as -the baseline and posts nothing. This prevents the entire existing user base from -being dumped into the channel. Only accounts registered after that baseline are -posted. - -If a post to Discord fails, the monitor stops there without advancing the mark -past it, so that account and everything after it are retried on the next run. - -## Privacy note - -Messages contain personal data (real name and email). Discord stores message -content on their servers, so post only to a private channel that the right -people can see, and treat the webhook URL as a secret. It lives in the config -ini alongside the database password, so keep that file readable only by the user -that runs the monitor. - -## Setup - -The monitor reads its database credentials and the webhook from a -servatrice-style ini file passed with `--config` (or the `CONFIG_FILE` env var). -You can point it at your existing `servatrice.ini`, or keep a small separate ini -just for the monitor. - -### 1. Create a read-only database user - -Run as a DB admin. Adjust the host (`'%'` allows any host; restrict it to the -machine running the monitor if you can) and the table prefix if yours is not the -default `cockatrice`. - -```sql -CREATE USER 'account_monitor'@'%' IDENTIFIED BY 'a-strong-password'; -GRANT SELECT (id, name, realname, email, registrationDate) - ON servatrice.cockatrice_users TO 'account_monitor'@'%'; -FLUSH PRIVILEGES; -``` - -Using a read-only user is recommended over pointing `--config` at the real -`servatrice.ini`, because Servatrice's own DB account usually has write access -the monitor does not need. - -### 2. Create the Discord webhook and add it to the config - -In Discord: open the target channel, then Edit Channel -> Integrations -> -Webhooks -> New Webhook. Name it, pick the channel, and copy the webhook URL. - -Add a `[discord]` section with the URL to the ini you will pass to `--config`. -If you want the read-only user above, set the `[database]` section to use it. A -small dedicated `monitor.ini` looks like this: - -```ini -[database] -hostname=127.0.0.1 -database=servatrice -user=account_monitor -password=a-strong-password -prefix=cockatrice - -[discord] -new_user_activation_webhook=https://discord.com/api/webhooks/XXXX/YYYY -``` - -If you would rather use one file, add the `[discord]` section to the real -`servatrice.ini` instead. Servatrice ignores sections it does not use. Note that -Servatrice (a Qt app) rewrites ini values it touches in quoted, backslash-escaped -form, for example `"https\://..."`. The monitor strips that encoding from the -webhook automatically, so either the plain or the escaped form works. - -### 3. Install - -```bash -cd servatrice/scripts/account_monitor -python3 -m venv venv -./venv/bin/pip install -r requirements.txt -``` - -### 4. Verify before scheduling - -```bash -# Confirm the webhook works (sends one test message to the channel) -./venv/bin/python ./account_monitor.py --config /path/to/monitor.ini --test-webhook - -# Confirm DB access and see what it would do, without posting or writing state -./venv/bin/python ./account_monitor.py --config /path/to/monitor.ini --dry-run --verbose -``` - -The first real run seeds the baseline and posts nothing: - -```bash -./venv/bin/python ./account_monitor.py --config /path/to/monitor.ini -``` - -After that, test it end to end by registering a throwaway account and confirming -a message appears on the next run. - -## Run it every 2 minutes with cron - -Edit the crontab of the user that owns the script directory (`crontab -e`) and -add one line. This runs the monitor every 2 minutes, using the venv's Python and -your config ini, and appends output to a log: - -```cron -*/2 * * * * cd /opt/cockatrice/servatrice/scripts/account_monitor && ./venv/bin/python ./account_monitor.py --config /etc/servatrice/servatrice.ini >> /var/log/account_monitor.log 2>&1 -``` - -Adjust the three paths to your install: the script directory after `cd`, and the -`--config` and log paths. The `*/2` field is what makes it run every 2 minutes; -change it to `*/5` for every 5, and so on. - -By default the high-water-mark is stored in `state.json` next to the script, so -the directory must be writable by the cron user. To put it elsewhere, set -`STATE_FILE`: - -```cron -*/2 * * * * STATE_FILE=/var/lib/account_monitor/state.json cd /opt/cockatrice/servatrice/scripts/account_monitor && ./venv/bin/python ./account_monitor.py --config /etc/servatrice/servatrice.ini >> /var/log/account_monitor.log 2>&1 -``` - -The interval only controls how often it checks; it is not a lookback window, so -a longer interval never causes missed accounts. The query is cheap: an indexed -range scan on the primary key for `id > last_seen`. - -## Options - -- `--config PATH` / `-c PATH` — read DB settings from `[database]` and the webhook from `[discord] new_user_activation_webhook` of a servatrice-style ini (falls back to the `CONFIG_FILE` env var). -- `--dry-run` — query and log what would be posted; no Discord posts, no state write. -- `--test-webhook` — send one test message to the webhook and exit (does not need DB credentials). -- `--verbose` — debug logging. - -## Configuration reference - -Settings come from the `--config` ini, with environment variables available as -overrides if you need them (env takes precedence over the ini). - -| Setting | ini (`--config`) | Environment override | -| --- | --- | --- | -| DB host | `[database] hostname` | `DB_HOST` | -| DB port | `[database] port` (optional) | `DB_PORT` | -| DB name | `[database] database` | `DB_NAME` | -| DB user | `[database] user` | `DB_USER` | -| DB password | `[database] password` | `DB_PASSWORD` | -| Table prefix | `[database] prefix` | `DB_TABLE_PREFIX` | -| Webhook URL | `[discord] new_user_activation_webhook` | `DISCORD_WEBHOOK_URL` | -| DB TLS | — | `DB_SSL` / `DB_SSL_CA` | -| State file path | — | `STATE_FILE` (default: `state.json` next to the script) | diff --git a/servatrice/scripts/account_monitor/account_monitor.py b/servatrice/scripts/account_monitor/account_monitor.py deleted file mode 100755 index 47cf23fd3..000000000 --- a/servatrice/scripts/account_monitor/account_monitor.py +++ /dev/null @@ -1,350 +0,0 @@ -#!/usr/bin/env python3 -"""Post a Discord message when a new Servatrice account is registered. - -Accounts get an auto-increment `id`, so "what is new since last time" is simply -`id > last_seen_id`. The monitor stores that single high-water-mark id in a -small state file. Each run it posts every account above the mark (oldest -first), then advances the mark. This means no duplicate posts, nothing missed -across downtime, and a state file that never grows (it holds one number). - -On the very first run (no state file yet) it records the current maximum id as -the baseline and posts nothing, so existing users are not dumped into the -channel. From then on only newly-registered accounts are posted. - -Intended to be run on a schedule (cron). Pass a servatrice-style ini with ---config (or CONFIG_FILE) for the database credentials and webhook; see -README.md. -""" - -import argparse -import configparser -import json -import logging -import os -import re -import sys -import time -import urllib.error -import urllib.request - -import pymysql - -log = logging.getLogger("account_monitor") - -# Columns we use. `id` drives the high-water-mark; `name` is the login/username, -# `realname` is the optional display name, `registrationDate` is when the account -# row was created. -NEW_ACCOUNTS_QUERY = ( - "SELECT id, name, realname, email, registrationDate " - "FROM `{prefix}_users` WHERE id > %s ORDER BY id ASC" -) - -EMBED_COLOR = 0x5865F2 # discord blurple -DISCORD_MAX_EMBED_FIELD = 1024 -POST_DELAY_SECONDS = 1.0 # gap between webhook posts to stay under rate limits -MAX_RATELIMIT_RETRIES = 5 - - -def _clean_ini_value(value): - """Undo Qt QSettings ini encoding of a value. - - Qt apps (including Servatrice) write ini values that contain special - characters wrapped in double quotes and backslash-escaped, e.g. a webhook - URL stored as "https\\://...". configparser returns that text literally, so - strip the wrapping quotes and remove the backslash escapes. This is applied - to the webhook URL only, where it is safe (URLs contain no quotes or - backslashes); DB values are left untouched so passwords are never altered. - """ - value = value.strip() - if len(value) >= 2 and value[0] == value[-1] and value[0] in "\"'": - value = value[1:-1] - return re.sub(r"\\(.)", r"\1", value) - - -def load_config_file(path): - """Read DB and Discord settings from a servatrice-style ini. - - Pulls the [database] section (hostname/database/user/password/prefix/port) - and the Discord webhook from [discord] new_user_activation_webhook. Returns - a dict using this module's internal config keys; only keys actually present - (and non-empty) in the file are returned, so missing values fall back to - defaults or the environment. - """ - # interpolation=None so a '%' in a password is not treated as a token. - parser = configparser.ConfigParser(interpolation=None) - if not parser.read(path): - log.error("Config file not found or unreadable: %s", path) - sys.exit(2) - - result = {} - if parser.has_section("database"): - db = parser["database"] - db_mapping = { - "hostname": "db_host", - "database": "db_name", - "user": "db_user", - "password": "db_password", - "prefix": "db_prefix", - "port": "db_port", # not in stock servatrice.ini, but honored if present - } - result.update({cfg_key: db[ini_key] for ini_key, cfg_key in db_mapping.items() if db.get(ini_key)}) - - if parser.has_section("discord") and parser["discord"].get("new_user_activation_webhook"): - result["webhook_url"] = _clean_ini_value(parser["discord"]["new_user_activation_webhook"]) - - return result - - -def get_config(config_path=None, require_db=True): - """Build configuration from defaults, an optional ini file, then env vars. - - Precedence, highest first: environment variables, the ini file, built-in - defaults. Database credentials and the Discord webhook may come from either - the ini file or the environment; the state file is environment-only. - """ - cfg = { - "db_host": "localhost", - "db_port": 3306, - "db_name": "servatrice", - "db_user": None, - "db_password": None, - "db_prefix": "cockatrice", - "db_ssl": False, - "db_ssl_ca": None, - "webhook_url": None, - "state_file": os.path.join(os.path.dirname(os.path.abspath(__file__)), "state.json"), - } - - if config_path: - cfg.update(load_config_file(config_path)) - - env_map = { - "DB_HOST": "db_host", - "DB_PORT": "db_port", - "DB_NAME": "db_name", - "DB_USER": "db_user", - "DB_PASSWORD": "db_password", - "DB_TABLE_PREFIX": "db_prefix", - "DB_SSL_CA": "db_ssl_ca", - "DISCORD_WEBHOOK_URL": "webhook_url", - "STATE_FILE": "state_file", - } - for env_key, cfg_key in env_map.items(): - if os.environ.get(env_key): - cfg[cfg_key] = os.environ[env_key] - if os.environ.get("DB_SSL"): - cfg["db_ssl"] = os.environ["DB_SSL"].lower() in ("1", "true", "yes") - - cfg["db_port"] = int(cfg["db_port"]) - - required = {"webhook_url": "DISCORD_WEBHOOK_URL or [discord] new_user_activation_webhook"} - if require_db: - required["db_user"] = "DB_USER or [database] user" - required["db_password"] = "DB_PASSWORD or [database] password" - missing = [label for key, label in required.items() if not cfg[key]] - if missing: - log.error("Missing required configuration: %s", "; ".join(missing)) - sys.exit(2) - - if cfg["webhook_url"] and not cfg["webhook_url"].lower().startswith(("http://", "https://")): - log.error("Webhook URL does not look like an http(s) URL: %r", cfg["webhook_url"]) - sys.exit(2) - return cfg - - -def connect(cfg): - """Open a read-only connection to the Servatrice database.""" - ssl = None - if cfg["db_ssl"]: - ssl = {"ca": cfg["db_ssl_ca"]} if cfg["db_ssl_ca"] else {} - return pymysql.connect( - host=cfg["db_host"], - port=cfg["db_port"], - user=cfg["db_user"], - password=cfg["db_password"], - database=cfg["db_name"], - charset="utf8mb4", - cursorclass=pymysql.cursors.DictCursor, - connect_timeout=15, - read_timeout=30, - ssl=ssl, - ) - - -def fetch_max_id(conn, prefix): - """Return the highest account id currently in the table, or 0 if empty.""" - with conn.cursor() as cur: - cur.execute("SELECT MAX(id) AS max_id FROM `{prefix}_users`".format(prefix=prefix)) - row = cur.fetchone() - return int(row["max_id"]) if row and row["max_id"] is not None else 0 - - -def fetch_new_accounts(conn, prefix, last_id): - """Return detail rows for accounts with id > last_id, oldest first.""" - with conn.cursor() as cur: - cur.execute(NEW_ACCOUNTS_QUERY.format(prefix=prefix), (last_id,)) - return cur.fetchall() - - -def load_state(path): - """Load the high-water-mark id. Returns (last_id, is_first_run).""" - if not os.path.exists(path): - return 0, True - with open(path, "r", encoding="utf-8") as fh: - data = json.load(fh) - return int(data.get("last_id", 0)), False - - -def save_state(path, last_id): - """Atomically persist the high-water-mark id.""" - directory = os.path.dirname(path) - if directory: - os.makedirs(directory, exist_ok=True) - tmp = path + ".tmp" - with open(tmp, "w", encoding="utf-8") as fh: - json.dump({"version": 2, "last_id": int(last_id)}, fh) - os.replace(tmp, path) - - -def build_embed(row): - """Build a Discord embed dict for one newly-registered account.""" - fields = [ - {"name": "Username", "value": str(row["name"]) or "(none)", "inline": False}, - ] - realname = (row.get("realname") or "").strip() - if realname: - fields.append({"name": "Real name", "value": realname[:DISCORD_MAX_EMBED_FIELD], "inline": False}) - fields.append({"name": "Email", "value": str(row.get("email") or "(none)"), "inline": False}) - reg = row.get("registrationDate") - fields.append({"name": "Reg time", "value": str(reg) if reg is not None else "(unknown)", "inline": False}) - return { - "title": "New account registered", - "color": EMBED_COLOR, - "fields": fields, - } - - -def post_embed(webhook_url, embed): - """POST a single embed to the Discord webhook, honoring 429 rate limits.""" - payload = json.dumps({"embeds": [embed]}).encode("utf-8") - for attempt in range(MAX_RATELIMIT_RETRIES): - req = urllib.request.Request( - webhook_url, - data=payload, - headers={"Content-Type": "application/json", "User-Agent": "servatrice-account-monitor/1.0"}, - method="POST", - ) - try: - with urllib.request.urlopen(req, timeout=30) as resp: - if resp.status in (200, 204): - return True - log.warning("Unexpected Discord status %s", resp.status) - return False - except urllib.error.HTTPError as err: - if err.code == 429: - retry_after = _retry_after_seconds(err) - log.warning("Rate limited by Discord; sleeping %.2fs", retry_after) - time.sleep(retry_after) - continue - log.error("Discord webhook HTTP %s: %s", err.code, err.read().decode("utf-8", "replace")[:500]) - return False - except urllib.error.URLError as err: - log.error("Discord webhook connection error: %s", err) - return False - log.error("Gave up posting after %d rate-limit retries", MAX_RATELIMIT_RETRIES) - return False - - -def _retry_after_seconds(err): - """Extract the retry delay (seconds) from a Discord 429 response.""" - header = err.headers.get("Retry-After") - if header: - try: - return float(header) - except ValueError: - pass - try: - body = json.loads(err.read().decode("utf-8", "replace")) - return float(body.get("retry_after", 1.0)) - except (ValueError, json.JSONDecodeError): - return 1.0 - - -def main(): - parser = argparse.ArgumentParser(description="Post new Servatrice account registrations to Discord.") - parser.add_argument( - "--config", "-c", - help="Path to a servatrice-style ini; reads DB settings from its [database] " - "section (hostname/database/user/password/prefix) and the webhook from " - "[discord] new_user_activation_webhook. Defaults to the CONFIG_FILE env " - "var if set.", - ) - parser.add_argument("--dry-run", action="store_true", help="Log what would be posted; do not post or write state.") - parser.add_argument("--test-webhook", action="store_true", help="Send a single test message to the webhook and exit.") - parser.add_argument("--verbose", action="store_true", help="Enable debug logging.") - args = parser.parse_args() - - logging.basicConfig( - level=logging.DEBUG if args.verbose else logging.INFO, - format="%(asctime)s %(levelname)s %(message)s", - ) - - config_path = args.config or os.environ.get("CONFIG_FILE") - - if args.test_webhook: - cfg = get_config(config_path, require_db=False) - ok = post_embed( - cfg["webhook_url"], - {"title": "Account monitor test", "color": EMBED_COLOR, - "description": "If you can see this, the webhook is configured correctly."}, - ) - sys.exit(0 if ok else 1) - - cfg = get_config(config_path) - - try: - conn = connect(cfg) - except pymysql.MySQLError as err: - log.error("Database connection failed: %s", err) - sys.exit(1) - - try: - last_id, first_run = load_state(cfg["state_file"]) - - if first_run: - baseline = fetch_max_id(conn, cfg["db_prefix"]) - log.info("First run: seeding high-water-mark at id=%d; posting nothing.", baseline) - if not args.dry_run: - save_state(cfg["state_file"], baseline) - return - - rows = fetch_new_accounts(conn, cfg["db_prefix"], last_id) - if not rows: - log.info("No new accounts since id=%d.", last_id) - return - - log.info("Found %d new account(s) since id=%d.", len(rows), last_id) - - # Post oldest first. Advance the mark only past accounts we successfully - # posted; on the first failure, stop so nothing after it is posted out of - # order or skipped. The failed account (and the rest) retry next run. - for row in rows: - if args.dry_run: - log.info("[dry-run] would post: id=%s name=%s email=%s reg=%s", - row["id"], row["name"], row.get("email"), row.get("registrationDate")) - continue - if not post_embed(cfg["webhook_url"], build_embed(row)): - log.error("Failed to post account id=%s; stopping. Will retry from here next run.", row["id"]) - break - last_id = row["id"] - log.info("Posted account id=%s (%s)", row["id"], row["name"]) - time.sleep(POST_DELAY_SECONDS) - - if not args.dry_run: - save_state(cfg["state_file"], last_id) - finally: - conn.close() - - -if __name__ == "__main__": - main() diff --git a/servatrice/scripts/account_monitor/requirements.txt b/servatrice/scripts/account_monitor/requirements.txt deleted file mode 100644 index 24d93c7a7..000000000 --- a/servatrice/scripts/account_monitor/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -PyMySQL==1.2.0 diff --git a/servatrice/servatrice.sql b/servatrice/servatrice.sql index 7f530063c..fa644dbc0 100644 --- a/servatrice/servatrice.sql +++ b/servatrice/servatrice.sql @@ -20,7 +20,7 @@ CREATE TABLE IF NOT EXISTS `cockatrice_schema_version` ( PRIMARY KEY (`version`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci; -INSERT INTO cockatrice_schema_version VALUES(35); +INSERT INTO cockatrice_schema_version VALUES(34); -- users and user data tables CREATE TABLE IF NOT EXISTS `cockatrice_users` ( @@ -43,7 +43,6 @@ CREATE TABLE IF NOT EXISTS `cockatrice_users` ( `passwordLastChangedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `leftPawnColorOverride` varchar(255), `rightPawnColorOverride` varchar(255), - `card_art_params` TEXT DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`), KEY `token` (`token`), @@ -301,19 +300,3 @@ CREATE TABLE IF NOT EXISTS `cockatrice_audit` ( PRIMARY KEY (`id`), KEY `user_name` (`name`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci; - -CREATE TABLE IF NOT EXISTS `cockatrice_card_art_name_rules` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `card_name` varchar(255) NOT NULL, - `card_provider_id` varchar(255) NOT NULL, - `mode` enum('ALLOW','DENY') NOT NULL, - `reason` varchar(255) DEFAULT NULL, - `created_by` int(7) unsigned DEFAULT NULL, - `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - UNIQUE KEY `uniq_provider_card_name` (`card_provider_id`, `card_name`), - KEY `idx_mode` (`mode`), - FOREIGN KEY (`created_by`) REFERENCES `cockatrice_users`(`id`) - ON DELETE SET NULL - ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci; diff --git a/servatrice/src/isl_interface.cpp b/servatrice/src/isl_interface.cpp index b0ee201bf..692a0fdba 100644 --- a/servatrice/src/isl_interface.cpp +++ b/servatrice/src/isl_interface.cpp @@ -76,9 +76,8 @@ IslInterface::~IslInterface() QMapIterator roomUsers(room->getExternalUsers()); while (roomUsers.hasNext()) { roomUsers.next(); - if (roomUsers.value().getUserInfo()->server_id() == serverId) { + if (roomUsers.value().getUserInfo()->server_id() == serverId) emit externalRoomUserLeft(room->getId(), roomUsers.key()); - } } room->usersLock.unlock(); } @@ -88,9 +87,8 @@ IslInterface::~IslInterface() QMapIterator extUsers(server->getExternalUsers()); while (extUsers.hasNext()) { extUsers.next(); - if (extUsers.value()->getUserInfo()->server_id() == serverId) { + if (extUsers.value()->getUserInfo()->server_id() == serverId) emit externalUserLeft(extUsers.key()); - } } server->clientsLock.unlock(); } @@ -103,12 +101,11 @@ void IslInterface::initServer() QList serverList = server->getServerList(); int listIndex = -1; - for (int i = 0; i < serverList.size(); ++i) { + for (int i = 0; i < serverList.size(); ++i) if (serverList[i].address == socket->peerAddress()) { listIndex = i; break; } - } if (listIndex == -1) { logger->logMessage( QString("[ISL] address %1 unknown, terminating connection").arg(socket->peerAddress().toString())); @@ -128,9 +125,9 @@ void IslInterface::initServer() return; } - if (serverList[listIndex].cert == socket->peerCertificate()) { + if (serverList[listIndex].cert == socket->peerCertificate()) logger->logMessage(QString("[ISL] Peer authenticated as " + serverList[listIndex].hostname)); - } else { + else { logger->logMessage(QString("[ISL] Authentication failed, terminating connection")); deleteLater(); return; @@ -142,9 +139,8 @@ void IslInterface::initServer() server->clientsLock.lockForRead(); QMapIterator userIterator(server->getUsers()); - while (userIterator.hasNext()) { + while (userIterator.hasNext()) event.add_user_list()->CopyFrom(userIterator.next().value()->copyUserInfo(true, true)); - } server->clientsLock.unlock(); server->roomsLock.lockForRead(); @@ -221,9 +217,8 @@ void IslInterface::initClient() void IslInterface::flushOutputBuffer() { QMutexLocker locker(&outputBufferMutex); - if (outputBuffer.isEmpty()) { + if (outputBuffer.isEmpty()) return; - } server->incTxBytes(outputBuffer.size()); socket->write(outputBuffer); socket->flush(); @@ -245,13 +240,11 @@ void IslInterface::readClient() ((quint32)(unsigned char)inputBuffer[3]); inputBuffer.remove(0, 4); messageInProgress = true; - } else { + } else return; - } } - if (inputBuffer.size() < messageLength) { + if (inputBuffer.size() < messageLength) return; - } IslMessage newMessage; bool ok = newMessage.ParseFromArray(inputBuffer.data(), messageLength); diff --git a/servatrice/src/main.cpp b/servatrice/src/main.cpp index 9e7fe38d9..b1294a04c 100644 --- a/servatrice/src/main.cpp +++ b/servatrice/src/main.cpp @@ -69,22 +69,19 @@ void testRNG() for (int i = 0; i <= maxMax - min; ++i) { std::cerr << (min + i); for (auto &number : numbers) { - if (i < number.size()) { + if (i < number.size()) std::cerr << "\t" << number[i]; - } else { + else std::cerr << "\t"; - } } std::cerr << std::endl; } std::cerr << std::endl << "Chi^2 ="; - for (double j : chisq) { + for (double j : chisq) std::cerr << "\t" << QString::number(j, 'f', 3).toStdString(); - } std::cerr << std::endl << "k ="; - for (int j = 0; j < chisq.size(); ++j) { + for (int j = 0; j < chisq.size(); ++j) std::cerr << "\t" << (j - min + minMax); - } std::cerr << std::endl << std::endl; } @@ -93,9 +90,8 @@ void testHash() const int n = 5000; std::cerr << "Benchmarking password hash function (n =" << n << ")..." << std::endl; QDateTime startTime = QDateTime::currentDateTime(); - for (int i = 0; i < n; ++i) { + for (int i = 0; i < n; ++i) PasswordHasher::computeHash("aaaaaa", "aaaaaaaaaaaaaaaa"); - } QDateTime endTime = QDateTime::currentDateTime(); std::cerr << startTime.secsTo(endTime) << "secs" << std::endl; } @@ -161,11 +157,10 @@ int main(int argc, char *argv[]) QMetaObject::invokeMethod(logger, "startLog", Qt::BlockingQueuedConnection, Q_ARG(QString, settingsCache->value("server/logfile", QString("server.log")).toString())); - if (logToConsole) { + if (logToConsole) qInstallMessageHandler(myMessageOutput); - } else { + else qInstallMessageHandler(myMessageOutput2); - } signalhandler = new SignalHandler(); diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp index aa50e068a..410bf4ed9 100644 --- a/servatrice/src/servatrice.cpp +++ b/servatrice/src/servatrice.cpp @@ -318,9 +318,8 @@ bool Servatrice::initServer() query2->bindValue(":id_room", query->value(0).toInt()); servatriceDatabaseInterface->execSqlQuery(query2); QStringList gameTypes; - while (query2->next()) { + while (query2->next()) gameTypes.append(query2->value(0).toString()); - } addRoom(new Server_Room(query->value(0).toInt(), query->value(7).toInt(), query->value(1).toString(), query->value(2).toString(), query->value(3).toString().toLower(), query->value(4).toString().toLower(), static_cast(query->value(5).toInt()), @@ -363,25 +362,21 @@ bool Servatrice::initServer() qDebug() << "Connecting to ISL network."; qDebug() << "Loading certificate..."; QFile certFile(getISLNetworkSSLCertFile()); - if (!certFile.open(QIODevice::ReadOnly)) { + if (!certFile.open(QIODevice::ReadOnly)) throw QString("Error opening certificate file: %1").arg(getISLNetworkSSLCertFile()); - } QSslCertificate cert(&certFile); const QDateTime currentTime = QDateTime::currentDateTime(); - if (currentTime < cert.effectiveDate() || currentTime > cert.expiryDate() || cert.isBlacklisted()) { + if (currentTime < cert.effectiveDate() || currentTime > cert.expiryDate() || cert.isBlacklisted()) throw QString("Invalid certificate."); - } qDebug() << "Loading private key..."; QFile keyFile(getISLNetworkSSLKeyFile()); - if (!keyFile.open(QIODevice::ReadOnly)) { + if (!keyFile.open(QIODevice::ReadOnly)) throw QString("Error opening private key file: %1").arg(getISLNetworkSSLKeyFile()); - } QSslKey key(&keyFile, QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey); - if (key.isNull()) { + if (key.isNull()) throw QString("Invalid private key."); - } QMutableListIterator serverIterator(serverList); while (serverIterator.hasNext()) { @@ -406,11 +401,10 @@ bool Servatrice::initServer() qDebug() << "Starting ISL server on port" << getISLNetworkPort(); islServer = new Servatrice_IslServer(this, cert, key, this); - if (islServer->listen(QHostAddress::Any, static_cast(getISLNetworkPort()))) { + if (islServer->listen(QHostAddress::Any, static_cast(getISLNetworkPort()))) qDebug() << "ISL server listening."; - } else { + else throw QString("islServer->listen()"); - } } } catch (QString &error) { qDebug() << "ERROR --" << error; @@ -435,9 +429,9 @@ bool Servatrice::initServer() gameServer->setMaxPendingConnections(1000); QHostAddress tcpHost = getServerTCPHost(); qDebug() << "Starting server on host" << tcpHost.toString() << "port" << getServerTCPPort(); - if (gameServer->listen(tcpHost, static_cast(getServerTCPPort()))) { + if (gameServer->listen(tcpHost, static_cast(getServerTCPPort()))) qDebug() << "Server listening."; - } else { + else { qDebug() << "gameServer->listen(): Error:" << gameServer->errorString(); return false; } @@ -451,9 +445,9 @@ bool Servatrice::initServer() QHostAddress webSocketHost = getServerWebSocketHost(); qDebug() << "Starting websocket server on host" << webSocketHost.toString() << "port" << getServerWebSocketPort(); - if (websocketGameServer->listen(webSocketHost, static_cast(getServerWebSocketPort()))) { + if (websocketGameServer->listen(webSocketHost, static_cast(getServerWebSocketPort()))) qDebug() << "Websocket server listening."; - } else { + else { qDebug() << "websocketGameServer->listen(): Error:" << websocketGameServer->errorString(); return false; } @@ -461,12 +455,11 @@ bool Servatrice::initServer() if (getIdleClientTimeout() > 0) { qDebug() << "Idle client timeout value:" << getIdleClientTimeout(); - if (getIdleClientTimeout() < 300) { + if (getIdleClientTimeout() < 300) qDebug() << "WARNING: It is not recommended to set the IdleClientTimeout value very low. Doing so will " "cause clients to very quickly be disconnected. Many players when connected may be searching " "for card details outside the client in the middle of matches or possibly drafting outside the " "client and short time out values will remove these players."; - } } setRequiredFeatures(getRequiredFeatures()); @@ -518,11 +511,9 @@ int Servatrice::getUsersWithAddress(const QHostAddress &address) const { int result = 0; QReadLocker locker(&clientsLock); - for (auto client : clients) { - if (static_cast(client)->getPeerAddress() == address) { + for (auto client : clients) + if (static_cast(client)->getPeerAddress() == address) ++result; - } - } return result; } @@ -531,24 +522,21 @@ QList Servatrice::getUsersWithAddressAsList(con { QList result; QReadLocker locker(&clientsLock); - for (auto client : clients) { - if (static_cast(client)->getPeerAddress() == address) { + for (auto client : clients) + if (static_cast(client)->getPeerAddress() == address) result.append(static_cast(client)); - } - } return result; } void Servatrice::updateLoginMessage() { - if (!servatriceDatabaseInterface->checkSql()) { + if (!servatriceDatabaseInterface->checkSql()) return; - } QSqlQuery *query = servatriceDatabaseInterface->prepareQuery( "select message from {prefix}_servermessages where id_server = :id_server order by timest desc limit 1"); query->bindValue(":id_server", serverId); - if (servatriceDatabaseInterface->execSqlQuery(query)) { + if (servatriceDatabaseInterface->execSqlQuery(query)) if (query->next()) { const QString newLoginMessage = query->value(0).toString(); @@ -560,12 +548,10 @@ void Servatrice::updateLoginMessage() event.set_message(newLoginMessage.toStdString()); SessionEvent *se = Server_ProtocolHandler::prepareSessionEvent(event); QMapIterator usersIterator(users); - while (usersIterator.hasNext()) { + while (usersIterator.hasNext()) usersIterator.next().value()->sendProtocolItem(*se); - } delete se; } - } } void Servatrice::setRequiredFeatures(const QString &featureList) @@ -574,20 +560,18 @@ void Servatrice::setRequiredFeatures(const QString &featureList) serverRequiredFeatureList.clear(); features.initalizeFeatureList(serverRequiredFeatureList); QStringList listReqFeatures = featureList.split(",", Qt::SkipEmptyParts); - if (!listReqFeatures.isEmpty()) { + if (!listReqFeatures.isEmpty()) for (const QString &reqFeature : listReqFeatures) { features.enableRequiredFeature(serverRequiredFeatureList, reqFeature); } - } qDebug() << "Set required client features to:" << serverRequiredFeatureList; } void Servatrice::statusUpdate() { - if (!servatriceDatabaseInterface->checkSql()) { + if (!servatriceDatabaseInterface->checkSql()) return; - } const int uc = getUsersCount(); // for correct mutex locking order @@ -627,9 +611,8 @@ void Servatrice::statusUpdate() auto servDbSelQuery = servatriceDatabaseInterface->prepareQuery("select a.name, b.email, b.token from " "{prefix}_activation_emails a left join " "{prefix}_users b on a.name = b.name"); - if (!servatriceDatabaseInterface->execSqlQuery(servDbSelQuery)) { + if (!servatriceDatabaseInterface->execSqlQuery(servDbSelQuery)) return; - } auto *queryDelete = servatriceDatabaseInterface->prepareQuery("delete from {prefix}_activation_emails where name = :name"); @@ -650,9 +633,8 @@ void Servatrice::statusUpdate() auto *forgotPwQuery = servatriceDatabaseInterface->prepareQuery( "select a.name, b.email, b.token from {prefix}_forgot_password a left join {prefix}_users b on a.name " "= b.name where a.emailed = 0"); - if (!servatriceDatabaseInterface->execSqlQuery(forgotPwQuery)) { + if (!servatriceDatabaseInterface->execSqlQuery(forgotPwQuery)) return; - } QSqlQuery *queryDelete = servatriceDatabaseInterface->prepareQuery( "update {prefix}_forgot_password set emailed = 1 where name = :name"); @@ -704,9 +686,8 @@ void Servatrice::shutdownTimeout() { // Show every time counter cut in half & every minute for last 5 minutes if (shutdownMinutes <= 5 || shutdownMinutes == nextShutdownMessageMinutes) { - if (shutdownMinutes == nextShutdownMessageMinutes) { + if (shutdownMinutes == nextShutdownMessageMinutes) nextShutdownMessageMinutes = shutdownMinutes / 2; - } SessionEvent *se; if (shutdownMinutes) { @@ -721,9 +702,8 @@ void Servatrice::shutdownTimeout() } clientsLock.lockForRead(); - for (auto &client : clients) { + for (auto &client : clients) client->sendProtocolItem(*se); - } clientsLock.unlock(); delete se; @@ -779,14 +759,12 @@ void Servatrice::doSendIslMessage(const IslMessage &msg, int _serverId) if (_serverId == -1) { QMapIterator islIterator(islInterfaces); - while (islIterator.hasNext()) { + while (islIterator.hasNext()) islIterator.next().value()->transmitMessage(msg); - } } else { IslInterface *interface = islInterfaces.value(_serverId); - if (interface) { + if (interface) interface->transmitMessage(msg); - } } } @@ -990,11 +968,10 @@ bool Servatrice::permitCreateGameAsJudge() const QHostAddress Servatrice::getServerTCPHost() const { QString host = settingsCache->value("server/host", "any").toString(); - if (host == "any") { + if (host == "any") return QHostAddress::Any; - } else { + else return QHostAddress(host); - } } int Servatrice::getServerTCPPort() const @@ -1010,11 +987,10 @@ int Servatrice::getNumberOfWebSocketPools() const QHostAddress Servatrice::getServerWebSocketHost() const { QString host = settingsCache->value("server/websocket_host", "any").toString(); - if (host == "any") { + if (host == "any") return QHostAddress::Any; - } else { + else return QHostAddress(host); - } } int Servatrice::getServerWebSocketPort() const diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp index d5e1f13ef..bce3542e8 100644 --- a/servatrice/src/servatrice_database_interface.cpp +++ b/servatrice/src/servatrice_database_interface.cpp @@ -7,8 +7,6 @@ #include #include #include -#include -#include #include #include #include @@ -57,9 +55,8 @@ bool Servatrice_DatabaseInterface::initDatabase(const QString &type, bool Servatrice_DatabaseInterface::openDatabase() { - if (sqlDatabase.isOpen()) { + if (sqlDatabase.isOpen()) sqlDatabase.close(); - } const QString poolStr = instanceId == -1 ? QString("main") : QString("pool %1").arg(instanceId); qCDebug(DatabaseInterfaceLog).noquote() << poolStr << "Opening database..."; @@ -142,9 +139,8 @@ QSqlQuery *Servatrice_DatabaseInterface::prepareQuery(const QString &queryText) bool Servatrice_DatabaseInterface::execSqlQuery(QSqlQuery *query) { - if (query->exec()) { + if (query->exec()) return true; - } const QString poolStr = instanceId == -1 ? QString("main") : QString("pool %1").arg(instanceId); qCCritical(DatabaseInterfaceLog) << poolStr << "Error executing query:" << query->lastError().text(); sqlDatabase.close(); @@ -155,9 +151,8 @@ bool Servatrice_DatabaseInterface::execSqlQuery(QSqlQuery *query) bool Servatrice_DatabaseInterface::usernameIsValid(const QString &user, QString &error) { int minNameLength = settingsCache->value("users/minnamelength", 6).toInt(); - if (minNameLength < 1) { + if (minNameLength < 1) minNameLength = 1; - } int maxNameLength = settingsCache->value("users/maxnamelength", 12).toInt(); bool allowLowercase = settingsCache->value("users/allowlowercase", true).toBool(); bool allowUppercase = settingsCache->value("users/allowuppercase", true).toBool(); @@ -189,36 +184,29 @@ bool Servatrice_DatabaseInterface::usernameIsValid(const QString &user, QString .arg(disallowedWordsStr) .arg(disallowedRegExpStr); - if (user.length() < minNameLength || user.length() > maxNameLength) { + if (user.length() < minNameLength || user.length() > maxNameLength) return false; - } - if (!allowPunctuationPrefix && allowedPunctuation.contains(user.at(0))) { + if (!allowPunctuationPrefix && allowedPunctuation.contains(user.at(0))) return false; - } for (const QString &word : disallowedWords) { - if (user.contains(word, Qt::CaseInsensitive)) { + if (user.contains(word, Qt::CaseInsensitive)) return false; - } } for (const QRegularExpression ®Exp : settingsCache->disallowedRegExp) { - if (regExp.match(user).hasMatch()) { + if (regExp.match(user).hasMatch()) return false; - } } QString regEx("\\A["); - if (allowLowercase) { + if (allowLowercase) regEx.append("a-z"); - } - if (allowUppercase) { + if (allowUppercase) regEx.append("A-Z"); - } - if (allowNumerics) { + if (allowNumerics) regEx.append("0-9"); - } regEx.append(QRegularExpression::escape(allowedPunctuation)); regEx.append("]+\\z"); @@ -234,9 +222,8 @@ bool Servatrice_DatabaseInterface::registerUser(const QString &userName, const QString &country, bool active) { - if (!checkSql()) { + if (!checkSql()) return false; - } QString passwordSha512; if (passwordNeedsHash) { @@ -272,9 +259,8 @@ bool Servatrice_DatabaseInterface::registerUser(const QString &userName, bool Servatrice_DatabaseInterface::activateUser(const QString &userName, const QString &token) { - if (!checkSql()) { + if (!checkSql()) return false; - } QSqlQuery *activateQuery = prepareQuery("select name from {prefix}_users where active=0 and name=:username and token=:token"); @@ -320,24 +306,20 @@ AuthenticationResult Servatrice_DatabaseInterface::checkUserPassword(Server_Prot return UnknownUser; case Servatrice::AuthenticationPassword: { QString configPassword = settingsCache->value("authentication/password").toString(); - if (configPassword == password) { + if (configPassword == password) return PasswordRight; - } return NotLoggedIn; } case Servatrice::AuthenticationSql: { - if (!checkSql()) { + if (!checkSql()) return UnknownUser; - } - if (!usernameIsValid(user, reasonStr)) { + if (!usernameIsValid(user, reasonStr)) return UsernameInvalid; - } - if (checkUserIsBanned(handler->getAddress(), user, clientId, reasonStr, banSecondsLeft)) { + if (checkUserIsBanned(handler->getAddress(), user, clientId, reasonStr, banSecondsLeft)) return UserIsBanned; - } QSqlQuery *passwordQuery = prepareQuery("select password_sha512, active from {prefix}_users where name = :name"); @@ -382,9 +364,8 @@ bool Servatrice_DatabaseInterface::checkUserIsBanned(const QString &ipAddress, QString &banReason, int &banSecondsRemaining) { - if (server->getAuthenticationMethod() != Servatrice::AuthenticationSql) { + if (server->getAuthenticationMethod() != Servatrice::AuthenticationSql) return false; - } if (!checkSql()) { qCWarning(DatabaseInterfaceLog) << "Failed to check if user is banned. Database invalid."; @@ -400,9 +381,8 @@ bool Servatrice_DatabaseInterface::checkUserIsIdBanned(const QString &clientId, QString &banReason, int &banSecondsRemaining) { - if (clientId.isEmpty()) { + if (clientId.isEmpty()) return false; - } QSqlQuery *idBanQuery = prepareQuery("select" @@ -507,9 +487,8 @@ bool Servatrice_DatabaseInterface::activeUserExists(const QString &user) QSqlQuery *query = prepareQuery("select 1 from {prefix}_users where name = :name and active = 1"); query->bindValue(":name", user); - if (!execSqlQuery(query)) { + if (!execSqlQuery(query)) return false; - } return query->next(); } return false; @@ -522,9 +501,8 @@ bool Servatrice_DatabaseInterface::userExists(const QString &user) QSqlQuery *query = prepareQuery("select 1 from {prefix}_users where name = :name"); query->bindValue(":name", user); - if (!execSqlQuery(query)) { + if (!execSqlQuery(query)) return false; - } return query->next(); } return false; @@ -557,12 +535,10 @@ int Servatrice_DatabaseInterface::getUserIdInDB(const QString &name) if (server->getAuthenticationMethod() == Servatrice::AuthenticationSql) { QSqlQuery *query = prepareQuery("select id from {prefix}_users where name = :name and active = 1"); query->bindValue(":name", name); - if (!execSqlQuery(query)) { + if (!execSqlQuery(query)) return -1; - } - if (!query->next()) { + if (!query->next()) return -1; - } return query->value(0).toInt(); } return -1; @@ -570,13 +546,11 @@ int Servatrice_DatabaseInterface::getUserIdInDB(const QString &name) bool Servatrice_DatabaseInterface::isInBuddyList(const QString &whoseList, const QString &who) { - if (server->getAuthenticationMethod() == Servatrice::AuthenticationNone) { + if (server->getAuthenticationMethod() == Servatrice::AuthenticationNone) return false; - } - if (!checkSql()) { + if (!checkSql()) return false; - } int id1 = getUserIdInDB(whoseList); int id2 = getUserIdInDB(who); @@ -585,21 +559,18 @@ bool Servatrice_DatabaseInterface::isInBuddyList(const QString &whoseList, const prepareQuery("select 1 from {prefix}_buddylist where id_user1 = :id_user1 and id_user2 = :id_user2"); query->bindValue(":id_user1", id1); query->bindValue(":id_user2", id2); - if (!execSqlQuery(query)) { + if (!execSqlQuery(query)) return false; - } return query->next(); } bool Servatrice_DatabaseInterface::isInIgnoreList(const QString &whoseList, const QString &who) { - if (server->getAuthenticationMethod() == Servatrice::AuthenticationNone) { + if (server->getAuthenticationMethod() == Servatrice::AuthenticationNone) return false; - } - if (!checkSql()) { + if (!checkSql()) return false; - } int id1 = getUserIdInDB(whoseList); int id2 = getUserIdInDB(who); @@ -608,9 +579,8 @@ bool Servatrice_DatabaseInterface::isInIgnoreList(const QString &whoseList, cons prepareQuery("select 1 from {prefix}_ignorelist where id_user1 = :id_user1 and id_user2 = :id_user2"); query->bindValue(":id_user1", id1); query->bindValue(":id_user2", id2); - if (!execSqlQuery(query)) { + if (!execSqlQuery(query)) return false; - } return query->next(); } @@ -618,34 +588,29 @@ ServerInfo_User Servatrice_DatabaseInterface::evalUserQueryResult(const QSqlQuer { ServerInfo_User result; - if (withId) { + if (withId) result.set_id(query->value(0).toInt()); - } result.set_name(query->value(1).toString().toStdString()); const int is_admin = query->value(2).toInt(); int userLevel = ServerInfo_User::IsUser | ServerInfo_User::IsRegistered; - if (is_admin & 1) { + if (is_admin & 1) userLevel |= ServerInfo_User::IsAdmin | ServerInfo_User::IsModerator; - } else if (is_admin & 2) { + else if (is_admin & 2) userLevel |= ServerInfo_User::IsModerator; - } - if (is_admin & 4) { + if (is_admin & 4) userLevel |= ServerInfo_User::IsJudge; - } result.set_user_level(userLevel); const QString country = query->value(3).toString(); - if (!country.isEmpty()) { + if (!country.isEmpty()) result.set_country(country.toStdString()); - } const QString privlevel = query->value(4).toString(); - if (!privlevel.isEmpty()) { + if (!privlevel.isEmpty()) result.set_privlevel(privlevel.toStdString()); - } const auto &pawn_left_override = query->value(5).toString(); const auto &pawn_right_override = query->value(6).toString(); @@ -658,14 +623,12 @@ ServerInfo_User Servatrice_DatabaseInterface::evalUserQueryResult(const QSqlQuer if (complete) { const QString realName = query->value(7).toString(); - if (!realName.isEmpty()) { + if (!realName.isEmpty()) result.set_real_name(realName.toStdString()); - } const QByteArray avatarBmp = query->value(8).toByteArray(); - if (avatarBmp.size()) { + if (avatarBmp.size()) result.set_avatar_bmp(avatarBmp.data(), avatarBmp.size()); - } const QDateTime regDate = query->value(9).toDateTime(); if (!regDate.toString(Qt::ISODate).isEmpty()) { @@ -675,41 +638,12 @@ ServerInfo_User Servatrice_DatabaseInterface::evalUserQueryResult(const QSqlQuer } const QString email = query->value(10).toString(); - if (!email.isEmpty()) { + if (!email.isEmpty()) result.set_email(email.toStdString()); - } const QString clientid = query->value(11).toString(); - if (!clientid.isEmpty()) { + if (!clientid.isEmpty()) result.set_clientid(clientid.toStdString()); - } - - const QString cardArtParamsJson = query->value(12).toString(); - if (!cardArtParamsJson.isEmpty()) { - const QJsonDocument doc = QJsonDocument::fromJson(cardArtParamsJson.toUtf8()); - if (doc.isObject()) { - const QJsonObject obj = doc.object(); - auto *cap = result.mutable_card_art_params(); - if (obj.contains("card_name")) { - cap->set_card_name(obj["card_name"].toString().toStdString()); - } - if (obj.contains("card_provider_id")) { - cap->set_card_provider_id(obj["card_provider_id"].toString().toStdString()); - } - if (obj.contains("marginPctL")) { - cap->set_margin_pct_l(obj["marginPctL"].toDouble(0.33)); - } - if (obj.contains("marginPctR")) { - cap->set_margin_pct_r(obj["marginPctR"].toDouble(0.02)); - } - if (obj.contains("verticalOffset")) { - cap->set_vertical_offset(obj["verticalOffset"].toDouble(0.35)); - } - if (obj.contains("zoom")) { - cap->set_zoom(obj["zoom"].toDouble(1.0)); - } - } - } } return result; } @@ -721,27 +655,23 @@ ServerInfo_User Servatrice_DatabaseInterface::getUserData(const QString &name, b result.set_user_level(ServerInfo_User::IsUser); if (server->getAuthenticationMethod() == Servatrice::AuthenticationSql) { - if (!checkSql()) { + if (!checkSql()) return result; - } QSqlQuery *query = prepareQuery("select id, name, admin, country, privlevel, leftPawnColorOverride, " "rightPawnColorOverride, realname, avatar_bmp, registrationDate, " - "email, clientid, card_art_params from {prefix}_users where " + "email, clientid from {prefix}_users where " "name = :name and active = 1"); query->bindValue(":name", name); - if (!execSqlQuery(query)) { + if (!execSqlQuery(query)) return result; - } - if (query->next()) { + if (query->next()) return evalUserQueryResult(query, true, withId); - } else { + else return result; - } - } else { + } else return result; - } } void Servatrice_DatabaseInterface::clearSessionTables() @@ -785,13 +715,11 @@ qint64 Servatrice_DatabaseInterface::startSession(const QString &userName, const QString &clientId, const QString &connectionType) { - if (server->getAuthenticationMethod() == Servatrice::AuthenticationNone) { + if (server->getAuthenticationMethod() == Servatrice::AuthenticationNone) return -1; - } - if (!checkSql()) { + if (!checkSql()) return -1; - } QSqlQuery *query = prepareQuery("insert into {prefix}_sessions (user_name, id_server, ip_address, start_time, " "clientid, connection_type) values(:user_name, :id_server, :ip_address, NOW(), " @@ -801,21 +729,18 @@ qint64 Servatrice_DatabaseInterface::startSession(const QString &userName, query->bindValue(":ip_address", address); query->bindValue(":client_id", clientId); query->bindValue(":connection_type", connectionType); - if (execSqlQuery(query)) { + if (execSqlQuery(query)) return query->lastInsertId().toInt(); - } return -1; } void Servatrice_DatabaseInterface::endSession(qint64 sessionId) { - if (server->getAuthenticationMethod() == Servatrice::AuthenticationNone) { + if (server->getAuthenticationMethod() == Servatrice::AuthenticationNone) return; - } - if (!checkSql()) { + if (!checkSql()) return; - } auto *query = prepareQuery("update {prefix}_sessions set end_time=NOW() where id = :id_session"); query->bindValue(":id_session", sessionId); @@ -834,9 +759,8 @@ QMap Servatrice_DatabaseInterface::getBuddyList(const "left join {prefix}_buddylist b on a.id = b.id_user2 left join {prefix}_users " "c on b.id_user1 = c.id where c.name = :name"); query->bindValue(":name", name); - if (!execSqlQuery(query)) { + if (!execSqlQuery(query)) return result; - } while (query->next()) { const ServerInfo_User &temp = evalUserQueryResult(query, false); @@ -858,9 +782,8 @@ QMap Servatrice_DatabaseInterface::getIgnoreList(const "left join {prefix}_ignorelist b on a.id = b.id_user2 left join {prefix}_users " "c on b.id_user1 = c.id where c.name = :name"); query->bindValue(":name", name); - if (!execSqlQuery(query)) { + if (!execSqlQuery(query)) return result; - } while (query->next()) { ServerInfo_User temp = evalUserQueryResult(query, false); @@ -872,13 +795,11 @@ QMap Servatrice_DatabaseInterface::getIgnoreList(const int Servatrice_DatabaseInterface::getNextGameId() { - if (!sqlDatabase.isValid()) { + if (!sqlDatabase.isValid()) return server->getNextLocalGameId(); - } - if (!checkSql()) { + if (!checkSql()) return -1; - } QSqlQuery *query = prepareQuery("insert into {prefix}_games (time_started) values (now())"); @@ -891,9 +812,8 @@ int Servatrice_DatabaseInterface::getNextGameId() int Servatrice_DatabaseInterface::getNextReplayId() { - if (!checkSql()) { + if (!checkSql()) return -1; - } QSqlQuery *query = prepareQuery("insert into {prefix}_replays (id_game) values (NULL)"); @@ -911,13 +831,11 @@ void Servatrice_DatabaseInterface::storeGameInformation(const QString &roomName, const QSet &allSpectatorsEver, const QList &replayList) { - if (!checkSql()) { + if (!checkSql()) return; - } - if (!settingsCache->value("game/store_replays", 1).toBool()) { + if (!settingsCache->value("game/store_replays", 1).toBool()) return; - } QVariantList gameIds1, playerNames, gameIds2, userIds, replayNames; QSetIterator playerIterator(allPlayersEver); @@ -930,9 +848,8 @@ void Servatrice_DatabaseInterface::storeGameInformation(const QString &roomName, QSetIterator allUsersIterator(allUsersInGame); while (allUsersIterator.hasNext()) { int id = getUserIdInDB(allUsersIterator.next()); - if (id == -1) { + if (id == -1) continue; - } gameIds2.append(gameInfo.game_id()); userIds.append(id); replayNames.append(QString::fromStdString(gameInfo.description())); @@ -971,9 +888,8 @@ void Servatrice_DatabaseInterface::storeGameInformation(const QString &roomName, query->bindValue(":password", gameInfo.with_password() ? 1 : 0); query->bindValue(":game_types", roomGameTypes.isEmpty() ? QString("") : roomGameTypes.join(", ")); query->bindValue(":player_count", gameInfo.max_players()); - if (!execSqlQuery(query)) { + if (!execSqlQuery(query)) return; - } } { QSqlQuery *query = @@ -1010,9 +926,8 @@ DeckList *Servatrice_DatabaseInterface::getDeckFromDatabase(int deckId, int user query->bindValue(":id", deckId); query->bindValue(":id_user", userId); execSqlQuery(query); - if (!query->next()) { + if (!query->next()) throw Response::RespNameNotFound; - } DeckList *deck = new DeckList; deck->loadFromString_Native(query->value(0).toString()); @@ -1031,27 +946,23 @@ void Servatrice_DatabaseInterface::logMessage(const int senderId, QString targetTypeString; switch (targetType) { case MessageTargetRoom: - if (!settingsCache->value("logging/log_user_msg_room", 0).toBool()) { + if (!settingsCache->value("logging/log_user_msg_room", 0).toBool()) return; - } targetTypeString = "room"; break; case MessageTargetGame: - if (!settingsCache->value("logging/log_user_msg_game", 0).toBool()) { + if (!settingsCache->value("logging/log_user_msg_game", 0).toBool()) return; - } targetTypeString = "game"; break; case MessageTargetChat: - if (!settingsCache->value("logging/log_user_msg_chat", 0).toBool()) { + if (!settingsCache->value("logging/log_user_msg_chat", 0).toBool()) return; - } targetTypeString = "chat"; break; case MessageTargetIslRoom: - if (!settingsCache->value("logging/log_user_msg_isl", 0).toBool()) { + if (!settingsCache->value("logging/log_user_msg_isl", 0).toBool()) return; - } targetTypeString = "room"; break; default: @@ -1084,9 +995,8 @@ bool Servatrice_DatabaseInterface::changeUserPassword(const QString &user, "passwordLastChangedDate = NOW() where name = :name"); passwordQuery->bindValue(":password", passwordSha512); passwordQuery->bindValue(":name", user); - if (execSqlQuery(passwordQuery)) { + if (execSqlQuery(passwordQuery)) return true; - } return false; } @@ -1097,18 +1007,15 @@ bool Servatrice_DatabaseInterface::changeUserPassword(const QString &user, const QString &newPassword, bool newPasswordNeedsHash) { - if (server->getAuthenticationMethod() != Servatrice::AuthenticationSql) { + if (server->getAuthenticationMethod() != Servatrice::AuthenticationSql) return false; - } - if (!checkSql()) { + if (!checkSql()) return false; - } QString error; - if (!usernameIsValid(user, error)) { + if (!usernameIsValid(user, error)) return false; - } QSqlQuery *passwordQuery = prepareQuery("select password_sha512 from {prefix}_users where name = :name"); passwordQuery->bindValue(":name", user); @@ -1118,9 +1025,8 @@ bool Servatrice_DatabaseInterface::changeUserPassword(const QString &user, return false; } - if (!passwordQuery->next()) { + if (!passwordQuery->next()) return false; - } const QString correctPasswordSha512 = passwordQuery->value(0).toString(); QString oldPasswordSha512 = oldPassword; @@ -1128,9 +1034,8 @@ bool Servatrice_DatabaseInterface::changeUserPassword(const QString &user, QString salt = correctPasswordSha512.left(16); oldPasswordSha512 = PasswordHasher::computeHash(oldPassword, salt); } - if (correctPasswordSha512 != oldPasswordSha512) { + if (correctPasswordSha512 != oldPasswordSha512) return false; - } return changeUserPassword(user, newPassword, newPasswordNeedsHash); } @@ -1139,28 +1044,23 @@ int Servatrice_DatabaseInterface::getActiveUserCount(QString connectionType) { int userCount = 0; - if (!checkSql()) { + if (!checkSql()) return userCount; - } QString text = "select count(*) from {prefix}_sessions where id_server = :serverid AND end_time is NULL"; - if (!connectionType.isEmpty()) { + if (!connectionType.isEmpty()) text += " AND connection_type = :connection_type"; - } QSqlQuery *query = prepareQuery(text); query->bindValue(":serverid", server->getServerID()); - if (!connectionType.isEmpty()) { + if (!connectionType.isEmpty()) query->bindValue(":connection_type", connectionType); - } - if (!execSqlQuery(query)) { + if (!execSqlQuery(query)) return userCount; - } - if (query->next()) { + if (query->next()) userCount = query->value(0).toInt(); - } return userCount; } @@ -1168,9 +1068,8 @@ int Servatrice_DatabaseInterface::getActiveUserCount(QString connectionType) void Servatrice_DatabaseInterface::updateUsersClientID(const QString &userName, const QString &userClientID) { - if (!checkSql()) { + if (!checkSql()) return; - } QSqlQuery *query = prepareQuery("update {prefix}_users set clientid = :clientid where name = :username"); query->bindValue(":clientid", userClientID); @@ -1181,9 +1080,8 @@ void Servatrice_DatabaseInterface::updateUsersClientID(const QString &userName, void Servatrice_DatabaseInterface::updateUsersLastLoginData(const QString &userName, const QString &clientVersion) { - if (!checkSql()) { + if (!checkSql()) return; - } int usersID = 0; @@ -1202,9 +1100,8 @@ void Servatrice_DatabaseInterface::updateUsersLastLoginData(const QString &userN int userCount = 0; query = prepareQuery("select count(id) from {prefix}_user_analytics where id = :user_id"); query->bindValue(":user_id", usersID); - if (!execSqlQuery(query)) { + if (!execSqlQuery(query)) return; - } if (query->next()) { userCount = query->value(0).toInt(); @@ -1231,9 +1128,8 @@ QList Servatrice_DatabaseInterface::getUserBanHistory(const QStr QList results; ServerInfo_Ban banDetails; - if (!checkSql()) { + if (!checkSql()) return results; - } QSqlQuery *query = prepareQuery("SELECT A.id_admin, A.time_from, A.minutes, A.reason, A.visible_reason, B.name AS name_admin FROM " @@ -1263,9 +1159,8 @@ bool Servatrice_DatabaseInterface::addWarning(const QString userName, const QString warningReason, const QString clientID) { - if (!checkSql()) { + if (!checkSql()) return false; - } int userID = getUserIdInDB(userName); QSqlQuery *query = @@ -1289,9 +1184,8 @@ QList Servatrice_DatabaseInterface::getUserWarnHistory(const QList results; ServerInfo_Warning warnDetails; - if (!checkSql()) { + if (!checkSql()) return results; - } int userID = getUserIdInDB(userName); QSqlQuery *query = @@ -1329,9 +1223,8 @@ QList Servatrice_DatabaseInterface::getMessageLogHistory QList results; ServerInfo_ChatMessage chatMessage; - if (!checkSql()) { + if (!checkSql()) return results; - } if (user.isEmpty() && ipaddress.isEmpty() && gameid.isEmpty() && gamename.isEmpty()) { // To ensure quick results and minimal lag, require an indexed field @@ -1340,58 +1233,48 @@ QList Servatrice_DatabaseInterface::getMessageLogHistory // BUILD QUERY STRING BASED ON PASSED IN VALUES QString queryString = "SELECT * FROM {prefix}_log WHERE `sender_ip` IS NOT NULL"; - if (!user.isEmpty()) { + if (!user.isEmpty()) queryString.append(" AND (`sender_name` = :user_name OR `target_name` = :user_name)"); - } - if (!ipaddress.isEmpty()) { + if (!ipaddress.isEmpty()) queryString.append(" AND `sender_ip` = :ip_to_find"); - } - if (!gameid.isEmpty()) { + if (!gameid.isEmpty()) queryString.append(" AND (`target_id` = :game_id AND `target_type` = 'game')"); - } - if (!gamename.isEmpty()) { + if (!gamename.isEmpty()) queryString.append(" AND (`target_name` = :game_name AND `target_type` = 'game')"); - } - if (!message.isEmpty()) { + if (!message.isEmpty()) queryString.append(" AND `log_message` LIKE :log_message"); - } if (chat || game || room) { queryString.append(" AND ("); - if (chat) { + if (chat) queryString.append("`target_type` = 'chat'"); - } if (game) { - if (chat) { + if (chat) queryString.append(" OR `target_type` = 'game'"); - } else { + else queryString.append("`target_type` = 'game'"); - } } if (room) { - if (game || chat) { + if (game || chat) queryString.append(" OR `target_type` = 'room'"); - } else { + else queryString.append("`target_type` = 'room'"); - } } queryString.append(")"); } - if (range) { + if (range) queryString.append(" AND log_time >= DATE_SUB(now(), INTERVAL :range_time HOUR)"); - } - if (maxresults) { + if (maxresults) queryString.append(" LIMIT :limit_size"); - } QSqlQuery *query = prepareQuery(queryString); if (!user.isEmpty()) { @@ -1438,9 +1321,8 @@ QList Servatrice_DatabaseInterface::getMessageLogHistory int Servatrice_DatabaseInterface::checkNumberOfUserAccounts(const QString &email) { - if (!checkSql()) { + if (!checkSql()) return 0; - } QSqlQuery *query = prepareQuery("SELECT count(email) FROM {prefix}_users WHERE email = :user_email"); query->bindValue(":user_email", email); @@ -1451,88 +1333,75 @@ int Servatrice_DatabaseInterface::checkNumberOfUserAccounts(const QString &email return 0; } - if (query->next()) { + if (query->next()) return query->value(0).toInt(); - } return 0; } bool Servatrice_DatabaseInterface::addForgotPassword(const QString &user) { - if (!checkSql()) { + if (!checkSql()) return false; - } - if (!updateUserToken(PasswordHasher::generateActivationToken(), user)) { + if (!updateUserToken(PasswordHasher::generateActivationToken(), user)) return false; - } QSqlQuery *query = prepareQuery("insert into {prefix}_forgot_password (name,requestDate) values (:username,NOW())"); query->bindValue(":username", user); - if (execSqlQuery(query)) { + if (execSqlQuery(query)) return true; - } return false; } bool Servatrice_DatabaseInterface::removeForgotPassword(const QString &user) { - if (!checkSql()) { + if (!checkSql()) return false; - } QSqlQuery *query = prepareQuery("delete from {prefix}_forgot_password where name = :username"); query->bindValue(":username", user); - if (execSqlQuery(query)) { + if (execSqlQuery(query)) return true; - } return false; } bool Servatrice_DatabaseInterface::doesForgotPasswordExist(const QString &user) { - if (!checkSql()) { + if (!checkSql()) return false; - } QSqlQuery *query = prepareQuery("select count(name) from {prefix}_forgot_password where name = :user_name AND " "requestDate > (now() - interval :minutes minute)"); query->bindValue(":user_name", user); query->bindValue(":minutes", QString::number(server->getForgotPasswordTokenLife())); - if (!execSqlQuery(query)) { + if (!execSqlQuery(query)) return false; - } - if (query->next()) { - if (query->value("count(name)").toInt() > 0) { + if (query->next()) + if (query->value("count(name)").toInt() > 0) return true; - } - } return false; } bool Servatrice_DatabaseInterface::updateUserToken(const QString &token, const QString &user) { - if (!checkSql()) { + if (!checkSql()) return false; - } - if (token.isEmpty() || user.isEmpty()) { + if (token.isEmpty() || user.isEmpty()) return false; - } QSqlQuery *query = prepareQuery("update {prefix}_users set token = :token where name = :user_name"); query->bindValue(":user_name", user); query->bindValue(":token", token); - if (execSqlQuery(query)) { + if (execSqlQuery(query)) return true; - } return false; } @@ -1542,27 +1411,22 @@ bool Servatrice_DatabaseInterface::validateTableColumnStringData(const QString & const QString &_user, const QString &_datatocheck) { - if (!checkSql()) { + if (!checkSql()) return false; - } - if (table.isEmpty() || column.isEmpty() || _user.isEmpty() || _datatocheck.isEmpty()) { + if (table.isEmpty() || column.isEmpty() || _user.isEmpty() || _datatocheck.isEmpty()) return false; - } QString formatedQuery = QString("select %1 from %2 where name = :user_name").arg(column).arg(table); QSqlQuery *query = prepareQuery(formatedQuery); query->bindValue(":user_name", _user); - if (!execSqlQuery(query)) { + if (!execSqlQuery(query)) return false; - } - if (query->next()) { - if (query->value(column).toString().toLower() == _datatocheck.toLower()) { + if (query->next()) + if (query->value(column).toString().toLower() == _datatocheck.toLower()) return true; - } - } return false; } @@ -1574,17 +1438,14 @@ void Servatrice_DatabaseInterface::addAuditRecord(const QString &user, const QString &details, const bool &results = false) { - if (!checkSql()) { + if (!checkSql()) return; - } - if (!server->getEnableAudit()) { + if (!server->getEnableAudit()) return; - } - if (user.isEmpty() || ipaddress.isEmpty() || clientid.isEmpty() || action.isEmpty()) { + if (user.isEmpty() || ipaddress.isEmpty() || clientid.isEmpty() || action.isEmpty()) return; - } QSqlQuery *query = prepareQuery("insert into {prefix}_audit " "(id_server,name,ip_address,clientid,incidentDate,action,results,details) values " diff --git a/servatrice/src/servatrice_database_interface.h b/servatrice/src/servatrice_database_interface.h index 1e3501ec7..68080404c 100644 --- a/servatrice/src/servatrice_database_interface.h +++ b/servatrice/src/servatrice_database_interface.h @@ -10,7 +10,7 @@ #include #include -#define DATABASE_SCHEMA_VERSION 35 +#define DATABASE_SCHEMA_VERSION 34 class Servatrice; diff --git a/servatrice/src/server_logger.cpp b/servatrice/src/server_logger.cpp index 620780052..de0befacb 100644 --- a/servatrice/src/server_logger.cpp +++ b/servatrice/src/server_logger.cpp @@ -39,23 +39,20 @@ void ServerLogger::startLog(const QString &logFileName) logFile = 0; return; } - } else { + } else logFile = 0; - } connect(this, SIGNAL(sigFlushBuffer()), this, SLOT(flushBuffer()), Qt::QueuedConnection); } void ServerLogger::logMessage(const QString &message, void *caller) { - if (!logFile) { + if (!logFile) return; - } QString callerString; - if (caller) { + if (caller) callerString = QString::number((qulonglong)caller, 16) + " "; - } // filter out all log entries based on values in configuration file bool shouldWeWriteLog = settingsCache->value("server/writelog", 1).toBool(); @@ -63,9 +60,8 @@ void ServerLogger::logMessage(const QString &message, void *caller) QStringList listlogFilters = logFilters.split(",", Qt::SkipEmptyParts); bool shouldWeSkipLine = false; - if (!shouldWeWriteLog) { + if (!shouldWeWriteLog) return; - } if (!logFilters.trimmed().isEmpty()) { shouldWeSkipLine = true; @@ -77,9 +73,8 @@ void ServerLogger::logMessage(const QString &message, void *caller) } } - if (shouldWeSkipLine) { + if (shouldWeSkipLine) return; - } bufferMutex.lock(); buffer.append(QDateTime::currentDateTime().toString() + " " + callerString + message); @@ -89,9 +84,8 @@ void ServerLogger::logMessage(const QString &message, void *caller) void ServerLogger::flushBuffer() { - if (flushRunning) { + if (flushRunning) return; - } flushRunning = true; QTextStream stream(logFile); @@ -109,17 +103,15 @@ void ServerLogger::flushBuffer() stream << message << "\n"; stream.flush(); - if (logToConsole) { + if (logToConsole) std::cout << message.toStdString() << std::endl; - } } } void ServerLogger::rotateLogs() { - if (!logFile) { + if (!logFile) return; - } flushBuffer(); diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp index 6ceebfca9..41e61ddec 100644 --- a/servatrice/src/serversocketinterface.cpp +++ b/servatrice/src/serversocketinterface.cpp @@ -31,8 +31,6 @@ #include #include #include -#include -#include #include #include #include @@ -61,10 +59,8 @@ #include #include #include -#include #include #include -#include #include #include #include @@ -83,7 +79,7 @@ #include #include #include -#include +#include #include #include #include @@ -121,9 +117,8 @@ bool AbstractServerSocketInterface::initSession() // allow unlimited number of connections from the trusted sources QString trustedSources = settingsCache->value("security/trusted_sources", "127.0.0.1,::1").toString(); - if (trustedSources.contains(getAddress(), Qt::CaseInsensitive)) { + if (trustedSources.contains(getAddress(), Qt::CaseInsensitive)) return true; - } int maxUsers = servatrice->getMaxUsersPerAddress(); if ((maxUsers > 0) && (servatrice->getUsersWithAddress(getPeerAddress()) > maxUsers)) { @@ -216,8 +211,6 @@ Response::ResponseCode AbstractServerSocketInterface::processExtendedSessionComm return cmdAccountEdit(cmd.GetExtension(Command_AccountEdit::ext), rc); case SessionCommand::ACCOUNT_IMAGE: return cmdAccountImage(cmd.GetExtension(Command_AccountImage::ext), rc); - case SessionCommand::SET_CARD_ART_PARAMS: - return cmdSetCardArtParams(cmd.GetExtension(Command_SetCardArtParams::ext), rc); case SessionCommand::ACCOUNT_PASSWORD: return cmdAccountPassword(cmd.GetExtension(Command_AccountPassword::ext), rc); case SessionCommand::REQUEST_PASSWORD_SALT: @@ -253,12 +246,6 @@ Response::ResponseCode AbstractServerSocketInterface::processExtendedModeratorCo return cmdGetAdminNotes(cmd.GetExtension(Command_GetAdminNotes::ext), rc); case ModeratorCommand::UPDATE_ADMIN_NOTES: return cmdUpdateAdminNotes(cmd.GetExtension(Command_UpdateAdminNotes::ext), rc); - case ModeratorCommand::ADD_CARD_ART_RULE: - return cmdAddCardArtRule(cmd.GetExtension((Command_AddCardArtRule::ext)), rc); - case ModeratorCommand::REMOVE_CARD_ART_RULE: - return cmdRemoveCardArtRule(cmd.GetExtension((Command_RemoveCardArtRule::ext)), rc); - case ModeratorCommand::LIST_CARD_ART_RULES: - return cmdListCardArtRules(cmd.GetExtension((Command_ListCardArtRules::ext)), rc); default: return Response::RespFunctionNotAllowed; } @@ -283,44 +270,35 @@ AbstractServerSocketInterface::processExtendedAdminCommand(int cmdType, const Ad Response::ResponseCode AbstractServerSocketInterface::cmdAddToList(const Command_AddToList &cmd, ResponseContainer &rc) { - if (authState != PasswordRight) { + if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - } QString list = nameFromStdString(cmd.list()); QString user = nameFromStdString(cmd.user_name()); - if ((list != "buddy") && (list != "ignore")) { + if ((list != "buddy") && (list != "ignore")) return Response::RespContextError; - } - if (list == "buddy") { - if (databaseInterface->isInBuddyList(QString::fromStdString(userInfo->name()), user)) { + if (list == "buddy") + if (databaseInterface->isInBuddyList(QString::fromStdString(userInfo->name()), user)) return Response::RespContextError; - } - } - if (list == "ignore") { - if (databaseInterface->isInIgnoreList(QString::fromStdString(userInfo->name()), user)) { + if (list == "ignore") + if (databaseInterface->isInIgnoreList(QString::fromStdString(userInfo->name()), user)) return Response::RespContextError; - } - } int id1 = userInfo->id(); int id2 = sqlInterface->getUserIdInDB(user); - if (id2 < 0) { + if (id2 < 0) return Response::RespNameNotFound; - } - if (id1 == id2) { + if (id1 == id2) return Response::RespContextError; - } QSqlQuery *query = sqlInterface->prepareQuery("insert into {prefix}_" + list + "list (id_user1, id_user2) values(:id1, :id2)"); query->bindValue(":id1", id1); query->bindValue(":id2", id2); - if (!sqlInterface->execSqlQuery(query)) { + if (!sqlInterface->execSqlQuery(query)) return Response::RespInternalError; - } Event_AddToList event; event.set_list_name(cmd.list()); @@ -333,41 +311,33 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAddToList(const Command Response::ResponseCode AbstractServerSocketInterface::cmdRemoveFromList(const Command_RemoveFromList &cmd, ResponseContainer &rc) { - if (authState != PasswordRight) { + if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - } QString list = nameFromStdString(cmd.list()); QString user = nameFromStdString(cmd.user_name()); - if ((list != "buddy") && (list != "ignore")) { + if ((list != "buddy") && (list != "ignore")) return Response::RespContextError; - } - if (list == "buddy") { - if (!databaseInterface->isInBuddyList(QString::fromStdString(userInfo->name()), user)) { + if (list == "buddy") + if (!databaseInterface->isInBuddyList(QString::fromStdString(userInfo->name()), user)) return Response::RespContextError; - } - } - if (list == "ignore") { - if (!databaseInterface->isInIgnoreList(QString::fromStdString(userInfo->name()), user)) { + if (list == "ignore") + if (!databaseInterface->isInIgnoreList(QString::fromStdString(userInfo->name()), user)) return Response::RespContextError; - } - } int id1 = userInfo->id(); int id2 = sqlInterface->getUserIdInDB(user); - if (id2 < 0) { + if (id2 < 0) return Response::RespNameNotFound; - } QSqlQuery *query = sqlInterface->prepareQuery("delete from {prefix}_" + list + "list where id_user1 = :id1 and id_user2 = :id2"); query->bindValue(":id1", id1); query->bindValue(":id2", id2); - if (!sqlInterface->execSqlQuery(query)) { + if (!sqlInterface->execSqlQuery(query)) return Response::RespInternalError; - } Event_RemoveFromList event; event.set_list_name(cmd.list()); @@ -379,30 +349,25 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRemoveFromList(const Co int AbstractServerSocketInterface::getDeckPathId(int basePathId, QStringList path) { - if (path.isEmpty()) { + if (path.isEmpty()) return 0; - } - if (path[0].isEmpty()) { + if (path[0].isEmpty()) return 0; - } QSqlQuery *query = sqlInterface->prepareQuery("select id from {prefix}_decklist_folders where id_parent = " ":id_parent and name = :name and id_user = :id_user"); query->bindValue(":id_parent", basePathId); query->bindValue(":name", path.takeFirst()); query->bindValue(":id_user", userInfo->id()); - if (!sqlInterface->execSqlQuery(query)) { + if (!sqlInterface->execSqlQuery(query)) return -1; - } - if (!query->next()) { + if (!query->next()) return -1; - } int id = query->value(0).toInt(); - if (path.isEmpty()) { + if (path.isEmpty()) return id; - } else { + else return getDeckPathId(id, path); - } } int AbstractServerSocketInterface::getDeckPathId(const QString &path) @@ -416,32 +381,28 @@ bool AbstractServerSocketInterface::deckListHelper(int folderId, ServerInfo_Deck "select id, name from {prefix}_decklist_folders where id_parent = :id_parent and id_user = :id_user"); query->bindValue(":id_parent", folderId); query->bindValue(":id_user", userInfo->id()); - if (!sqlInterface->execSqlQuery(query)) { + if (!sqlInterface->execSqlQuery(query)) return false; - } QMap results; - while (query->next()) { + while (query->next()) results[query->value(0).toInt()] = query->value(1).toString(); - } for (int key : results.keys()) { ServerInfo_DeckStorage_TreeItem *newItem = folder->add_items(); newItem->set_id(key); newItem->set_name(results.value(key).toStdString()); - if (!deckListHelper(newItem->id(), newItem->mutable_folder())) { + if (!deckListHelper(newItem->id(), newItem->mutable_folder())) return false; - } } query = sqlInterface->prepareQuery("select id, name, upload_time from {prefix}_decklist_files where id_folder = " ":id_folder and id_user = :id_user"); query->bindValue(":id_folder", folderId); query->bindValue(":id_user", userInfo->id()); - if (!sqlInterface->execSqlQuery(query)) { + if (!sqlInterface->execSqlQuery(query)) return false; - } while (query->next()) { ServerInfo_DeckStorage_TreeItem *newItem = folder->add_items(); @@ -461,18 +422,16 @@ bool AbstractServerSocketInterface::deckListHelper(int folderId, ServerInfo_Deck Response::ResponseCode AbstractServerSocketInterface::cmdDeckList(const Command_DeckList & /*cmd*/, ResponseContainer &rc) { - if (authState != PasswordRight) { + if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - } sqlInterface->checkSql(); Response_DeckList *re = new Response_DeckList; ServerInfo_DeckStorage_Folder *root = re->mutable_root(); - if (!deckListHelper(0, root)) { + if (!deckListHelper(0, root)) return Response::RespContextError; - } rc.setResponseExtension(re); return Response::RespOk; @@ -481,31 +440,27 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckList(const Command_ Response::ResponseCode AbstractServerSocketInterface::cmdDeckNewDir(const Command_DeckNewDir &cmd, ResponseContainer & /*rc*/) { - if (authState != PasswordRight) { + if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - } sqlInterface->checkSql(); QString path = nameFromStdString(cmd.path()); int folderId = getDeckPathId(path); - if (folderId == -1) { + if (folderId == -1) return Response::RespNameNotFound; - } QString name = nameFromStdString(cmd.dir_name()); - if (path.length() + name.length() + 1 > MAX_NAME_LENGTH) { + if (path.length() + name.length() + 1 > MAX_NAME_LENGTH) return Response::RespContextError; // do not allow creation of paths that would be too long to delete - } QSqlQuery *query = sqlInterface->prepareQuery( "insert into {prefix}_decklist_folders (id_parent, id_user, name) values(:id_parent, :id_user, :name)"); query->bindValue(":id_parent", folderId); query->bindValue(":id_user", userInfo->id()); query->bindValue(":name", name); - if (!sqlInterface->execSqlQuery(query)) { + if (!sqlInterface->execSqlQuery(query)) return Response::RespContextError; - } return Response::RespOk; } @@ -516,9 +471,8 @@ void AbstractServerSocketInterface::deckDelDirHelper(int basePathId) sqlInterface->prepareQuery("select id from {prefix}_decklist_folders where id_parent = :id_parent"); query->bindValue(":id_parent", basePathId); sqlInterface->execSqlQuery(query); - while (query->next()) { + while (query->next()) deckDelDirHelper(query->value(0).toInt()); - } query = sqlInterface->prepareQuery("delete from {prefix}_decklist_files where id_folder = :id_folder"); query->bindValue(":id_folder", basePathId); @@ -533,9 +487,8 @@ void AbstractServerSocketInterface::sendServerMessage(const QString userName, co { AbstractServerSocketInterface *user = static_cast(server->getUsers().value(userName)); - if (!user) { + if (!user) return; - } Event_UserMessage event; event.set_sender_name("Servatrice"); @@ -549,25 +502,22 @@ void AbstractServerSocketInterface::sendServerMessage(const QString userName, co Response::ResponseCode AbstractServerSocketInterface::cmdDeckDelDir(const Command_DeckDelDir &cmd, ResponseContainer & /*rc*/) { - if (authState != PasswordRight) { + if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - } sqlInterface->checkSql(); int basePathId = getDeckPathId(nameFromStdString(cmd.path())); - if ((basePathId == -1) || (basePathId == 0)) { + if ((basePathId == -1) || (basePathId == 0)) return Response::RespNameNotFound; - } deckDelDirHelper(basePathId); return Response::RespOk; } Response::ResponseCode AbstractServerSocketInterface::cmdDeckDel(const Command_DeckDel &cmd, ResponseContainer & /*rc*/) { - if (authState != PasswordRight) { + if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - } sqlInterface->checkSql(); QSqlQuery *query = @@ -575,9 +525,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckDel(const Command_D query->bindValue(":id", cmd.deck_id()); query->bindValue(":id_user", userInfo->id()); sqlInterface->execSqlQuery(query); - if (!query->next()) { + if (!query->next()) return Response::RespNameNotFound; - } query = sqlInterface->prepareQuery("delete from {prefix}_decklist_files where id = :id"); query->bindValue(":id", cmd.deck_id()); @@ -589,32 +538,27 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckDel(const Command_D Response::ResponseCode AbstractServerSocketInterface::cmdDeckUpload(const Command_DeckUpload &cmd, ResponseContainer &rc) { - if (authState != PasswordRight) { + if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - } - if (!cmd.has_deck_list()) { + if (!cmd.has_deck_list()) return Response::RespInvalidData; - } sqlInterface->checkSql(); QString deckStr = fileFromStdString(cmd.deck_list()); DeckList deck; - if (!deck.loadFromString_Native(deckStr)) { + if (!deck.loadFromString_Native(deckStr)) return Response::RespContextError; - } QString deckName = deck.getName(); - if (deckName.isEmpty()) { + if (deckName.isEmpty()) deckName = "Unnamed deck"; - } if (cmd.has_path()) { int folderId = getDeckPathId(nameFromStdString(cmd.path())); - if (folderId == -1) { + if (folderId == -1) return Response::RespNameNotFound; - } QSqlQuery *query = sqlInterface->prepareQuery("insert into {prefix}_decklist_files (id_folder, id_user, name, upload_time, " @@ -641,9 +585,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckUpload(const Comman query->bindValue(":content", deckStr); sqlInterface->execSqlQuery(query); - if (query->numRowsAffected() == 0) { + if (query->numRowsAffected() == 0) return Response::RespNameNotFound; - } Response_DeckUpload *re = new Response_DeckUpload; ServerInfo_DeckStorage_TreeItem *fileInfo = re->mutable_new_file(); @@ -651,9 +594,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckUpload(const Comman fileInfo->set_name(deckName.toStdString()); fileInfo->mutable_file()->set_creation_time(QDateTime::currentDateTime().toSecsSinceEpoch()); rc.setResponseExtension(re); - } else { + } else return Response::RespInvalidData; - } return Response::RespOk; } @@ -661,9 +603,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckUpload(const Comman Response::ResponseCode AbstractServerSocketInterface::cmdDeckDownload(const Command_DeckDownload &cmd, ResponseContainer &rc) { - if (authState != PasswordRight) { + if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - } DeckList *deck; try { @@ -683,9 +624,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckDownload(const Comm Response::ResponseCode AbstractServerSocketInterface::cmdReplayList(const Command_ReplayList & /*cmd*/, ResponseContainer &rc) { - if (authState != PasswordRight) { + if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - } Response_ReplayList *re = new Response_ReplayList; @@ -714,9 +654,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReplayList(const Comman sqlInterface->prepareQuery("select player_name from {prefix}_games_players where id_game = :id_game"); query2->bindValue(":id_game", gameId); sqlInterface->execSqlQuery(query2); - while (query2->next()) { + while (query2->next()) matchInfo->add_player_names(query2->value(0).toString().toStdString()); - } } { QSqlQuery *query3 = @@ -739,9 +678,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReplayList(const Comman Response::ResponseCode AbstractServerSocketInterface::cmdReplayDownload(const Command_ReplayDownload &cmd, ResponseContainer &rc) { - if (authState != PasswordRight) { + if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - } { QSqlQuery *query = @@ -749,22 +687,18 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReplayDownload(const Co "a.id_game = b.id_game where b.id = :id_replay and a.id_player = :id_player"); query->bindValue(":id_replay", cmd.replay_id()); query->bindValue(":id_player", userInfo->id()); - if (!sqlInterface->execSqlQuery(query)) { + if (!sqlInterface->execSqlQuery(query)) return Response::RespInternalError; - } - if (!query->next()) { + if (!query->next()) return Response::RespAccessDenied; - } } QSqlQuery *query = sqlInterface->prepareQuery("select replay from {prefix}_replays where id = :id_replay"); query->bindValue(":id_replay", cmd.replay_id()); - if (!sqlInterface->execSqlQuery(query)) { + if (!sqlInterface->execSqlQuery(query)) return Response::RespInternalError; - } - if (!query->next()) { + if (!query->next()) return Response::RespNameNotFound; - } QByteArray data = query->value(0).toByteArray(); @@ -778,13 +712,11 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReplayDownload(const Co Response::ResponseCode AbstractServerSocketInterface::cmdReplayModifyMatch(const Command_ReplayModifyMatch &cmd, ResponseContainer & /*rc*/) { - if (authState != PasswordRight) { + if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - } - if (!sqlInterface->checkSql()) { + if (!sqlInterface->checkSql()) return Response::RespInternalError; - } QSqlQuery *query = sqlInterface->prepareQuery("update {prefix}_replays_access set do_not_hide=:do_not_hide where " "id_player = :id_player and id_game = :id_game"); @@ -792,31 +724,27 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReplayModifyMatch(const query->bindValue(":id_game", cmd.game_id()); query->bindValue(":do_not_hide", cmd.do_not_hide()); - if (!sqlInterface->execSqlQuery(query)) { + if (!sqlInterface->execSqlQuery(query)) return Response::RespInternalError; - } return query->numRowsAffected() > 0 ? Response::RespOk : Response::RespNameNotFound; } Response::ResponseCode AbstractServerSocketInterface::cmdReplayDeleteMatch(const Command_ReplayDeleteMatch &cmd, ResponseContainer & /*rc*/) { - if (authState != PasswordRight) { + if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - } - if (!sqlInterface->checkSql()) { + if (!sqlInterface->checkSql()) return Response::RespInternalError; - } QSqlQuery *query = sqlInterface->prepareQuery( "delete from {prefix}_replays_access where id_player = :id_player and id_game = :id_game"); query->bindValue(":id_player", userInfo->id()); query->bindValue(":id_game", cmd.game_id()); - if (!sqlInterface->execSqlQuery(query)) { + if (!sqlInterface->execSqlQuery(query)) return Response::RespInternalError; - } return query->numRowsAffected() > 0 ? Response::RespOk : Response::RespNameNotFound; } @@ -836,9 +764,8 @@ QString AbstractServerSocketInterface::createHashForReplay(int gameId) sqlInterface->prepareQuery("select replay from {prefix}_replays where id_game = :id_game limit 3"); query->bindValue(":id_game", gameId); - if (!sqlInterface->execSqlQuery(query)) { + if (!sqlInterface->execSqlQuery(query)) return ""; - } QByteArray replaysBytes; while (query->next()) { @@ -856,9 +783,8 @@ QString AbstractServerSocketInterface::createHashForReplay(int gameId) Response::ResponseCode AbstractServerSocketInterface::cmdReplayGetCode(const Command_ReplayGetCode &cmd, ResponseContainer &rc) { - if (authState != PasswordRight) { + if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - } // Check that user has access to replay match { @@ -866,12 +792,10 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReplayGetCode(const Com "select 1 from {prefix}_replays_access where id_game = :id_game and id_player = :id_player"); query->bindValue(":id_game", cmd.game_id()); query->bindValue(":id_player", userInfo->id()); - if (!sqlInterface->execSqlQuery(query)) { + if (!sqlInterface->execSqlQuery(query)) return Response::RespInternalError; - } - if (!query->next()) { + if (!query->next()) return Response::RespAccessDenied; - } } QString hash = createHashForReplay(cmd.game_id()); @@ -970,15 +894,12 @@ Response::ResponseCode AbstractServerSocketInterface::cmdGetLogHistory(const Com bool roomType = false; for (int i = 0; i != cmd.log_location_size(); ++i) { - if (nameFromStdString(cmd.log_location(i)).simplified() == "room") { + if (nameFromStdString(cmd.log_location(i)).simplified() == "room") roomType = true; - } - if (nameFromStdString(cmd.log_location(i)).simplified() == "game") { + if (nameFromStdString(cmd.log_location(i)).simplified() == "game") gameType = true; - } - if (nameFromStdString(cmd.log_location(i)).simplified() == "chat") { + if (nameFromStdString(cmd.log_location(i)).simplified() == "chat") chatType = true; - } } int dateRange = cmd.date_range(); @@ -989,9 +910,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdGetLogHistory(const Com if (servatrice->getEnableLogQuery()) { QListIterator messageIterator(sqlInterface->getMessageLogHistory( userName, ipAddress, gameName, gameID, message, chatType, gameType, roomType, dateRange, maximumResults)); - while (messageIterator.hasNext()) { + while (messageIterator.hasNext()) re->add_log_message()->CopyFrom(messageIterator.next()); - } } else { ServerInfo_ChatMessage chatMessage; @@ -1029,9 +949,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdGetLogHistory(const Com messageList << chatMessage; QListIterator messageIterator(messageList); - while (messageIterator.hasNext()) { + while (messageIterator.hasNext()) re->add_log_message()->CopyFrom(messageIterator.next()); - } } rc.setResponseExtension(re); @@ -1046,9 +965,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdGetBanHistory(const Com Response_BanHistory *re = new Response_BanHistory; QListIterator banIterator(sqlInterface->getUserBanHistory(userName)); - while (banIterator.hasNext()) { + while (banIterator.hasNext()) re->add_ban_list()->CopyFrom(banIterator.next()); - } rc.setResponseExtension(re); return Response::RespOk; } @@ -1077,9 +995,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdGetWarnHistory(const Co Response_WarnHistory *re = new Response_WarnHistory; QListIterator warnIterator(sqlInterface->getUserWarnHistory(userName)); - while (warnIterator.hasNext()) { + while (warnIterator.hasNext()) re->add_warn_list()->CopyFrom(warnIterator.next()); - } rc.setResponseExtension(re); return Response::RespOk; } @@ -1139,18 +1056,16 @@ Response::ResponseCode AbstractServerSocketInterface::cmdWarnUser(const Command_ Response::ResponseCode AbstractServerSocketInterface::cmdBanFromServer(const Command_BanFromServer &cmd, ResponseContainer & /*rc*/) { - if (!sqlInterface->checkSql()) { + if (!sqlInterface->checkSql()) return Response::RespInternalError; - } QString userName = nameFromStdString(cmd.user_name()).simplified(); QString address = nameFromStdString(cmd.address()).simplified(); QString clientId = nameFromStdString(cmd.clientid()).simplified(); QString visibleReason = textFromStdString(cmd.visible_reason()); - if (userName.isEmpty() && address.isEmpty() && clientId.isEmpty()) { + if (userName.isEmpty() && address.isEmpty() && clientId.isEmpty()) return Response::RespOk; - } int amountRemove = cmd.remove_messages(); if (amountRemove != 0) { @@ -1158,9 +1073,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdBanFromServer(const Com } QString trustedSources = settingsCache->value("server/trusted_sources", "127.0.0.1,::1").toString(); int minutes = cmd.minutes(); - if (trustedSources.contains(address, Qt::CaseInsensitive)) { + if (trustedSources.contains(address, Qt::CaseInsensitive)) address = ""; - } QSqlQuery *query = sqlInterface->prepareQuery( "insert into {prefix}_bans (user_name, ip_address, id_admin, time_from, minutes, reason, visible_reason, " @@ -1181,9 +1095,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdBanFromServer(const Com if (!userName.isEmpty()) { AbstractServerSocketInterface *user = static_cast(server->getUsers().value(userName)); - if (user && !userList.contains(user)) { + if (user && !userList.contains(user)) userList.append(user); - } } if (userName.isEmpty() && address.isEmpty() && (!clientId.isEmpty())) { @@ -1198,9 +1111,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdBanFromServer(const Com userName = clientIdQuery->value(0).toString(); AbstractServerSocketInterface *user = static_cast(server->getUsers().value(userName)); - if (user && !userList.contains(user)) { + if (user && !userList.contains(user)) userList.append(user); - } } } } @@ -1209,12 +1121,10 @@ Response::ResponseCode AbstractServerSocketInterface::cmdBanFromServer(const Com if (!userList.isEmpty()) { Event_ConnectionClosed event; event.set_reason(Event_ConnectionClosed::BANNED); - if (cmd.has_visible_reason()) { + if (cmd.has_visible_reason()) event.set_reason_str(visibleReason.toStdString()); - } - if (minutes) { + if (minutes) event.set_end_time(QDateTime::currentDateTime().addSecs(60 * minutes).toSecsSinceEpoch()); - } for (int i = 0; i < userList.size(); ++i) { SessionEvent *se = userList[i]->prepareSessionEvent(event); userList[i]->sendProtocolItem(*se); @@ -1226,15 +1136,12 @@ Response::ResponseCode AbstractServerSocketInterface::cmdBanFromServer(const Com for (QString &moderator : moderatorList) { QString notificationMessage = QString::fromStdString(userInfo->name()).simplified() + " has placed a ban with the following information"; - if (!userName.isEmpty()) { + if (!userName.isEmpty()) notificationMessage.append("\n Username: " + userName); - } - if (!address.isEmpty()) { + if (!address.isEmpty()) notificationMessage.append("\n IP Address: " + address); - } - if (!clientId.isEmpty()) { + if (!clientId.isEmpty()) notificationMessage.append("\n Client ID: " + clientId); - } notificationMessage.append("\n Length: " + QString::number(minutes) + " minute(s)"); notificationMessage.append("\n Internal Reason: " + textFromStdString(cmd.reason())); @@ -1254,10 +1161,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C bool registrationEnabled = settingsCache->value("registration/enabled", false).toBool(); if (!registrationEnabled) { - if (servatrice->getEnableRegistrationAudit()) { + if (servatrice->getEnableRegistrationAudit()) sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(), "REGISTER_ACCOUNT", "Server functionality disabled", false); - } return Response::RespRegistrationDisabled; } @@ -1290,21 +1196,19 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C // If a blacklist exists, ensure the email address domain is NOT in the blacklist if (!emailBlackListFilters.isEmpty() && emailBlackListFilters.contains(emailDomain, Qt::CaseInsensitive)) { - if (servatrice->getEnableRegistrationAudit()) { + if (servatrice->getEnableRegistrationAudit()) sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(), "REGISTER_ACCOUNT", "Email used is blacklisted", false); - } return Response::RespEmailBlackListed; } - //! \todo Move this method outside of the db interface. + //! \todo Move this method outside of the db interface QString errorString; if (!sqlInterface->usernameIsValid(userName, errorString)) { - if (servatrice->getEnableRegistrationAudit()) { + if (servatrice->getEnableRegistrationAudit()) sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(), "REGISTER_ACCOUNT", "Username is invalid", false); - } Response_Register *re = new Response_Register; re->set_denied_reason_str(errorString.toStdString()); @@ -1313,19 +1217,17 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C } if (userName.toLower().simplified() == "servatrice") { - if (servatrice->getEnableRegistrationAudit()) { + if (servatrice->getEnableRegistrationAudit()) sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(), "REGISTER_ACCOUNT", "Username is invalid", false); - } return Response::RespUsernameInvalid; } if (sqlInterface->userExists(userName)) { - if (servatrice->getEnableRegistrationAudit()) { + if (servatrice->getEnableRegistrationAudit()) sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(), "REGISTER_ACCOUNT", "Username already exists", false); - } return Response::RespUserAlreadyExists; } @@ -1333,11 +1235,10 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C const auto parsedEmailAddress = EmailParser::getParsedEmailAddress(parsedEmailParts); if (servatrice->getMaxAccountsPerEmail() > 0 && sqlInterface->checkNumberOfUserAccounts(parsedEmailAddress) >= servatrice->getMaxAccountsPerEmail()) { - if (servatrice->getEnableRegistrationAudit()) { + if (servatrice->getEnableRegistrationAudit()) sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(), "REGISTER_ACCOUNT", "Too many usernames registered with this email address", false); - } return Response::RespTooManyRequests; } @@ -1345,26 +1246,23 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C QString banReason; int banSecondsRemaining; if (sqlInterface->checkUserIsBanned(this->getAddress(), userName, clientId, banReason, banSecondsRemaining)) { - if (servatrice->getEnableRegistrationAudit()) { + if (servatrice->getEnableRegistrationAudit()) sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(), "REGISTER_ACCOUNT", "User is banned", false); - } Response_Register *re = new Response_Register; re->set_denied_reason_str(banReason.toStdString()); - if (banSecondsRemaining != 0) { + if (banSecondsRemaining != 0) re->set_denied_end_time(QDateTime::currentDateTime().addSecs(banSecondsRemaining).toSecsSinceEpoch()); - } rc.setResponseExtension(re); return Response::RespUserIsBanned; } if (tooManyRegistrationAttempts(this->getAddress())) { - if (servatrice->getEnableRegistrationAudit()) { + if (servatrice->getEnableRegistrationAudit()) sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(), "REGISTER_ACCOUNT", "Too many registration attempts from this ip address", false); - } return Response::RespTooManyRequests; } @@ -1374,9 +1272,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C QString password; bool passwordNeedsHash = false; if (cmd.has_password()) { - if (cmd.password().length() > MAX_NAME_LENGTH) { + if (cmd.password().length() > MAX_NAME_LENGTH) return Response::RespRegistrationFailed; - } password = QString::fromStdString(cmd.password()); passwordNeedsHash = true; if (!isPasswordLongEnough(password.length())) { @@ -1402,30 +1299,26 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C QSqlQuery *query = sqlInterface->prepareQuery("insert into {prefix}_activation_emails (name) values(:name)"); query->bindValue(":name", userName); - if (!sqlInterface->execSqlQuery(query)) { + if (!sqlInterface->execSqlQuery(query)) return Response::RespRegistrationFailed; - } - if (servatrice->getEnableRegistrationAudit()) { + if (servatrice->getEnableRegistrationAudit()) sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(), "REGISTER_ACCOUNT", "", true); - } return Response::RespRegistrationAcceptedNeedsActivation; } else { - if (servatrice->getEnableRegistrationAudit()) { + if (servatrice->getEnableRegistrationAudit()) sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(), "REGISTER_ACCOUNT", "", true); - } return Response::RespRegistrationAccepted; } } else { - if (servatrice->getEnableRegistrationAudit()) { + if (servatrice->getEnableRegistrationAudit()) sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(), "REGISTER_ACCOUNT", "Unknown reason for failure", false); - } return Response::RespRegistrationFailed; } @@ -1433,7 +1326,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C bool AbstractServerSocketInterface::tooManyRegistrationAttempts(const QString &ipAddress) { - //! \todo Implement registration attempt limiting. + //! \todo implement Q_UNUSED(ipAddress); return false; } @@ -1445,27 +1338,24 @@ Response::ResponseCode AbstractServerSocketInterface::cmdActivateAccount(const C QString token = nameFromStdString(cmd.token()); QString clientId = nameFromStdString(cmd.clientid()); - if (clientId.isEmpty()) { + if (clientId.isEmpty()) clientId = "UNKNOWN"; - } if (sqlInterface->activateUser(userName, token)) { qCDebug(AbstractServerSocketInterfaceLog) << "Accepted activation for user" << userName; - if (servatrice->getEnableRegistrationAudit()) { + if (servatrice->getEnableRegistrationAudit()) sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(), "ACTIVATE_ACCOUNT", "", true); - } return Response::RespActivationAccepted; } else { qCDebug(AbstractServerSocketInterfaceLog) << "Failed activation for user" << userName; - if (servatrice->getEnableRegistrationAudit()) { + if (servatrice->getEnableRegistrationAudit()) sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(), "ACTIVATE_ACCOUNT", "Failed to activate account, incorrect activation token", false); - } return Response::RespActivationFailed; } @@ -1474,9 +1364,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdActivateAccount(const C Response::ResponseCode AbstractServerSocketInterface::cmdAccountEdit(const Command_AccountEdit &cmd, ResponseContainer & /* rc */) { - if (authState != PasswordRight) { + if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - } QString realName = nameFromStdString(cmd.real_name()); const auto parsedEmailAddress = EmailParser::getParsedEmailAddress(nameFromStdString(cmd.email())); @@ -1485,9 +1374,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAccountEdit(const Comma bool checkedPassword = false; QString userName = QString::fromStdString(userInfo->name()); if (cmd.has_password_check()) { - if (cmd.password_check().length() > MAX_NAME_LENGTH) { + if (cmd.password_check().length() > MAX_NAME_LENGTH) return Response::RespWrongPassword; - } QString password = QString::fromStdString(cmd.password_check()); QString clientId = QString::fromStdString(userInfo->clientid()); QString reasonStr{}; @@ -1518,9 +1406,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAccountEdit(const Comma queryList << "country=:country"; } - if (queryList.isEmpty()) { + if (queryList.isEmpty()) return Response::RespOk; - } QString queryText = QString("update {prefix}_users set %1 where name=:userName").arg(queryList.join(", ")); QSqlQuery *query = sqlInterface->prepareQuery(queryText); @@ -1538,9 +1425,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAccountEdit(const Comma } query->bindValue(":userName", userName); - if (!sqlInterface->execSqlQuery(query)) { + if (!sqlInterface->execSqlQuery(query)) return Response::RespInternalError; - } if (cmd.has_real_name()) { userInfo->set_real_name(realName.toStdString()); @@ -1558,9 +1444,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAccountEdit(const Comma Response::ResponseCode AbstractServerSocketInterface::cmdAccountImage(const Command_AccountImage &cmd, ResponseContainer & /* rc */) { - if (authState != PasswordRight) { + if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - } size_t length = qMin(cmd.image().length(), (size_t)MAX_FILE_LENGTH); QByteArray image(cmd.image().c_str(), length); @@ -1569,203 +1454,31 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAccountImage(const Comm QSqlQuery *query = sqlInterface->prepareQuery("update {prefix}_users set avatar_bmp=:image where id=:id"); query->bindValue(":image", image); query->bindValue(":id", id); - if (!sqlInterface->execSqlQuery(query)) { + if (!sqlInterface->execSqlQuery(query)) return Response::RespInternalError; - } userInfo->set_avatar_bmp(cmd.image().c_str(), length); return Response::RespOk; } -bool AbstractServerSocketInterface::isCardNameAllowed(const QString &cardName, const QString &cardProviderId) -{ - QSqlQuery *q = sqlInterface->prepareQuery( - "SELECT mode FROM {prefix}_card_art_name_rules WHERE card_name = :name AND card_provider_id = :provider"); - - q->bindValue(":name", cardName); - q->bindValue(":provider", cardProviderId); - - if (!sqlInterface->execSqlQuery(q)) { - qWarning() << "Card art rule lookup failed; failing open for" << cardName; - return true; - } - - if (!q->next()) { - return true; // default allow - } - - return q->value(0).toString() != "DENY"; -} - -Response::ResponseCode AbstractServerSocketInterface::cmdSetCardArtParams(const Command_SetCardArtParams &cmd, - ResponseContainer & /* rc */) -{ - if (authState != PasswordRight) { - return Response::RespFunctionNotAllowed; - } - - const QString cardName = QString::fromStdString(cmd.card_name()); - const QString cardProviderId = QString::fromStdString(cmd.card_provider_id()); - - if (cardName.length() > MAX_NAME_LENGTH || cardProviderId.length() > MAX_NAME_LENGTH) { - return Response::RespInvalidData; - } - - if (cardName.isEmpty()) { - // Removal path - QSqlQuery *q = sqlInterface->prepareQuery("UPDATE {prefix}_users SET card_art_params = NULL WHERE id = :id"); - q->bindValue(":id", userInfo->id()); - if (!sqlInterface->execSqlQuery(q)) { - return Response::RespInternalError; - } - userInfo->clear_card_art_params(); - server->broadcastUserInfoUpdate(this); - return Response::RespOk; - } - - if (!isCardNameAllowed(cardName, cardProviderId)) { - return Response::RespFunctionNotAllowed; - } - - // Clamp everything to sane ranges server-side so a malicious client - // can't store garbage that breaks other clients' rendering. - const double marginPctL = qBound(0.0, cmd.margin_pct_l(), 0.95); - const double marginPctR = qBound(0.0, cmd.margin_pct_r(), 0.95); - const double verticalOffset = qBound(0.0, cmd.vertical_offset(), 1.0); - const double zoom = qBound(0.1, cmd.zoom(), 4.0); - - QJsonObject obj; - obj["card_name"] = cardName; - obj["card_provider_id"] = cardProviderId; - obj["marginPctL"] = marginPctL; - obj["marginPctR"] = marginPctR; - obj["verticalOffset"] = verticalOffset; - obj["zoom"] = zoom; - const QString json = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact)); - - QSqlQuery *query = sqlInterface->prepareQuery("update {prefix}_users set card_art_params=:params where id=:id"); - query->bindValue(":params", json); - query->bindValue(":id", userInfo->id()); - if (!sqlInterface->execSqlQuery(query)) { - return Response::RespInternalError; - } - - // Keep the in-memory userInfo in sync - auto *cap = userInfo->mutable_card_art_params(); - cap->set_card_name(cmd.card_name()); - cap->set_card_provider_id(cmd.card_provider_id()); - cap->set_margin_pct_l(marginPctL); - cap->set_margin_pct_r(marginPctR); - cap->set_vertical_offset(verticalOffset); - cap->set_zoom(zoom); - - const QString name = QString::fromStdString(userInfo->name()); - server->broadcastUserInfoUpdate(this); - - return Response::RespOk; -} - -Response::ResponseCode AbstractServerSocketInterface::cmdAddCardArtRule(const Command_AddCardArtRule &cmd, - ResponseContainer &) -{ - const QString cardName = QString::fromStdString(cmd.card_name()); - const QString cardProviderId = QString::fromStdString(cmd.card_provider_id()); - const QString mode = QString::fromStdString(cmd.mode()); - - if (mode != "ALLOW" && mode != "DENY") { - return Response::RespInvalidData; - } - if (cardName.isEmpty() || cardName.length() > MAX_NAME_LENGTH || cardProviderId.length() > MAX_NAME_LENGTH) { - return Response::RespInvalidData; - } - - QSqlQuery *q = sqlInterface->prepareQuery("INSERT INTO {prefix}_card_art_name_rules " - "(card_name, card_provider_id, mode, reason, created_by) " - "VALUES (:name, :provider, :mode, :reason, :uid) " - "ON DUPLICATE KEY UPDATE mode=:mode2, reason=:reason2"); - - q->bindValue(":name", cardName); - q->bindValue(":provider", cardProviderId); - q->bindValue(":mode", mode); - q->bindValue(":mode2", mode); - q->bindValue(":reason", QString::fromStdString(cmd.reason())); - q->bindValue(":reason2", QString::fromStdString(cmd.reason())); - q->bindValue(":uid", userInfo->id()); - - if (!sqlInterface->execSqlQuery(q)) { - return Response::RespInternalError; - } - - return Response::RespOk; -} - -Response::ResponseCode AbstractServerSocketInterface::cmdRemoveCardArtRule(const Command_RemoveCardArtRule &cmd, - ResponseContainer &) -{ - auto cardName = QString::fromStdString(cmd.card_name()); - auto cardProviderId = QString::fromStdString(cmd.card_provider_id()); - if (cardName.length() > MAX_NAME_LENGTH || cardProviderId.length() > MAX_NAME_LENGTH) { - return Response::RespInvalidData; - } - QSqlQuery *q = sqlInterface->prepareQuery( - "DELETE FROM {prefix}_card_art_name_rules WHERE card_name=:name AND card_provider_id=:provider"); - - q->bindValue(":name", cardName); - q->bindValue(":provider", cardProviderId); - - if (!sqlInterface->execSqlQuery(q)) { - return Response::RespInternalError; - } - - return Response::RespOk; -} - -Response::ResponseCode AbstractServerSocketInterface::cmdListCardArtRules(const Command_ListCardArtRules &, - ResponseContainer &rc) -{ - QSqlQuery *q = sqlInterface->prepareQuery( - "SELECT card_name, card_provider_id, mode, reason FROM {prefix}_card_art_name_rules"); - - if (!sqlInterface->execSqlQuery(q)) { - return Response::RespInternalError; - } - - auto *re = new Response_ListCardArtRules; - - while (q->next()) { - auto *entry = re->add_entries(); - entry->set_card_name(q->value(0).toString().toStdString()); - entry->set_card_provider_id(q->value(1).toString().toStdString()); - entry->set_mode(q->value(2).toString().toStdString()); - entry->set_reason(q->value(3).toString().toStdString()); - } - - rc.setResponseExtension(re); - return Response::RespOk; -} - Response::ResponseCode AbstractServerSocketInterface::cmdAccountPassword(const Command_AccountPassword &cmd, ResponseContainer & /* rc */) { - if (authState != PasswordRight) { + if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - } - if (cmd.old_password().length() > MAX_NAME_LENGTH) { + if (cmd.old_password().length() > MAX_NAME_LENGTH) return Response::RespWrongPassword; - } QString oldPassword = QString::fromStdString(cmd.old_password()); QString newPassword; bool newPasswordNeedsHash = false; if (cmd.has_new_password()) { - if (cmd.new_password().length() > MAX_NAME_LENGTH) { + if (cmd.new_password().length() > MAX_NAME_LENGTH) return Response::RespContextError; - } newPassword = QString::fromStdString(cmd.new_password()); newPasswordNeedsHash = true; - if (!isPasswordLongEnough(newPassword.length())) { + if (!isPasswordLongEnough(newPassword.length())) return Response::RespPasswordTooShort; - } } else if (cmd.hashed_new_password().length() > MAX_NAME_LENGTH) { return Response::RespContextError; } else { @@ -1773,9 +1486,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAccountPassword(const C } QString userName = QString::fromStdString(userInfo->name()); - if (!databaseInterface->changeUserPassword(userName, oldPassword, true, newPassword, newPasswordNeedsHash)) { + if (!databaseInterface->changeUserPassword(userName, oldPassword, true, newPassword, newPasswordNeedsHash)) return Response::RespWrongPassword; - } return Response::RespOk; } @@ -1789,10 +1501,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdForgotPasswordRequest(c qCDebug(AbstractServerSocketInterfaceLog) << "Received reset password request from user:" << userName; if (!servatrice->getEnableForgotPassword()) { - if (servatrice->getEnableForgotPasswordAudit()) { + if (servatrice->getEnableForgotPasswordAudit()) sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(), "PASSWORD_RESET_REQUEST", "Server functionality disabled", false); - } return Response::RespFunctionNotAllowed; } @@ -1805,10 +1516,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdForgotPasswordRequest(c } if (!sqlInterface->userExists(userName)) { - if (servatrice->getEnableForgotPasswordAudit()) { + if (servatrice->getEnableForgotPasswordAudit()) sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(), "PASSWORD_RESET_REQUEST", "User does not exist", false); - } return Response::RespFunctionNotAllowed; } @@ -1823,10 +1533,9 @@ Response::ResponseCode AbstractServerSocketInterface::continuePasswordRequest(co { if (sqlInterface->doesForgotPasswordExist(userName)) { - if (servatrice->getEnableForgotPasswordAudit()) { + if (servatrice->getEnableForgotPasswordAudit()) sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(), "PASSWORD_RESET_REQUEST", "Request already exists", true); - } Response_ForgotPasswordRequest *re = new Response_ForgotPasswordRequest; re->set_challenge_email(false); @@ -1837,10 +1546,9 @@ Response::ResponseCode AbstractServerSocketInterface::continuePasswordRequest(co QString banReason; int banTimeRemaining; if (sqlInterface->checkUserIsBanned(this->getAddress(), userName, clientId, banReason, banTimeRemaining)) { - if (servatrice->getEnableForgotPasswordAudit()) { + if (servatrice->getEnableForgotPasswordAudit()) sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(), "PASSWORD_RESET_REQUEST", "User is banned", false); - } return Response::RespFunctionNotAllowed; } @@ -1875,20 +1583,18 @@ Response::ResponseCode AbstractServerSocketInterface::cmdForgotPasswordReset(con qCDebug(AbstractServerSocketInterfaceLog) << "Received reset password reset from user:" << userName; if (!sqlInterface->doesForgotPasswordExist(userName)) { - if (servatrice->getEnableForgotPasswordAudit()) { + if (servatrice->getEnableForgotPasswordAudit()) sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(), "PASSWORD_RESET", "Request does not exist for user", false); - } return Response::RespFunctionNotAllowed; } if (!sqlInterface->validateTableColumnStringData("{prefix}_users", "token", userName, nameFromStdString(cmd.token()))) { - if (servatrice->getEnableForgotPasswordAudit()) { + if (servatrice->getEnableForgotPasswordAudit()) sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), userName.simplified(), "PASSWORD_RESET", "Failed token validation", false); - } return Response::RespFunctionNotAllowed; } @@ -1896,9 +1602,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdForgotPasswordReset(con QString password; bool passwordNeedsHash = false; if (cmd.has_new_password()) { - if (cmd.new_password().length() > MAX_NAME_LENGTH) { + if (cmd.new_password().length() > MAX_NAME_LENGTH) return Response::RespContextError; - } password = QString::fromStdString(cmd.new_password()); passwordNeedsHash = true; } else if (cmd.hashed_new_password().length() > MAX_NAME_LENGTH) { @@ -1908,10 +1613,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdForgotPasswordReset(con } if (sqlInterface->changeUserPassword(nameFromStdString(cmd.user_name()), password, passwordNeedsHash)) { - if (servatrice->getEnableForgotPasswordAudit()) { + if (servatrice->getEnableForgotPasswordAudit()) sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(), "PASSWORD_RESET", "", true); - } sqlInterface->removeForgotPassword(nameFromStdString(cmd.user_name())); return Response::RespOk; @@ -2257,9 +1961,8 @@ void TcpServerSocketInterface::initSessionDeprecated() void TcpServerSocketInterface::flushOutputQueue() { QMutexLocker locker(&outputQueueMutex); - if (outputQueue.isEmpty()) { + if (outputQueue.isEmpty()) return; - } int totalBytes = 0; while (!outputQueue.isEmpty()) { @@ -2308,13 +2011,11 @@ void TcpServerSocketInterface::readClient() ((quint32)(unsigned char)inputBuffer[3]); inputBuffer.remove(0, 4); messageInProgress = true; - } else { + } else return; - } } - if (inputBuffer.size() < messageLength || messageLength < 0) { + if (inputBuffer.size() < messageLength || messageLength < 0) return; - } CommandContainer newCommandContainer; bool ok; @@ -2347,13 +2048,12 @@ void TcpServerSocketInterface::readClient() if (ok) { // dirty hack to make v13 client display the correct error message - if (handshakeStarted) { + if (handshakeStarted) processCommandContainer(newCommandContainer); - } else if (!newCommandContainer.has_cmd_id()) { + else if (!newCommandContainer.has_cmd_id()) { handshakeStarted = true; - if (!initTcpSession()) { + if (!initTcpSession()) prepareDestroy(); - } } // end of hack } else { @@ -2365,9 +2065,8 @@ void TcpServerSocketInterface::readClient() bool TcpServerSocketInterface::initTcpSession() { - if (!initSession()) { + if (!initSession()) return false; - } // limit the number of websocket users based on configuration settings bool enforceUserLimit = settingsCache->value("security/enable_max_user_limit", false).toBool(); @@ -2439,16 +2138,14 @@ void WebsocketServerSocketInterface::initConnection(void *_socket) QString("Incoming websocket connection: %1 (%2)").arg(address.toString()).arg(socket->peerAddress().toString()), this); - if (!initWebsocketSession()) { + if (!initWebsocketSession()) prepareDestroy(); - } } bool WebsocketServerSocketInterface::initWebsocketSession() { - if (!initSession()) { + if (!initSession()) return false; - } // limit the number of websocket users based on configuration settings bool enforceUserLimit = settingsCache->value("security/enable_max_user_limit", false).toBool(); @@ -2475,9 +2172,8 @@ bool WebsocketServerSocketInterface::initWebsocketSession() void WebsocketServerSocketInterface::flushOutputQueue() { QMutexLocker locker(&outputQueueMutex); - if (outputQueue.isEmpty()) { + if (outputQueue.isEmpty()) return; - } qint64 totalBytes = 0; while (!outputQueue.isEmpty()) { diff --git a/servatrice/src/serversocketinterface.h b/servatrice/src/serversocketinterface.h index 0d66ae78f..e10aa0dde 100644 --- a/servatrice/src/serversocketinterface.h +++ b/servatrice/src/serversocketinterface.h @@ -129,11 +129,6 @@ private: Response::ResponseCode cmdAccountEdit(const Command_AccountEdit &cmd, ResponseContainer &rc); Response::ResponseCode cmdAccountImage(const Command_AccountImage &cmd, ResponseContainer &rc); - bool isCardNameAllowed(const QString &cardName, const QString &cardProviderId); - Response::ResponseCode cmdSetCardArtParams(const Command_SetCardArtParams &cmd, ResponseContainer &); - Response::ResponseCode cmdAddCardArtRule(const Command_AddCardArtRule &cmd, ResponseContainer &); - Response::ResponseCode cmdRemoveCardArtRule(const Command_RemoveCardArtRule &cmd, ResponseContainer &); - Response::ResponseCode cmdListCardArtRules(const Command_ListCardArtRules &, ResponseContainer &rc); Response::ResponseCode cmdAccountPassword(const Command_AccountPassword &cmd, ResponseContainer &rc); Response::ResponseCode cmdGrantReplayAccess(const Command_GrantReplayAccess &cmd, ResponseContainer &rc); Response::ResponseCode cmdForceActivateUser(const Command_ForceActivateUser &cmd, ResponseContainer &rc); diff --git a/servatrice/src/settingscache.cpp b/servatrice/src/settingscache.cpp index f6c862904..f6dcd5fc8 100644 --- a/servatrice/src/settingscache.cpp +++ b/servatrice/src/settingscache.cpp @@ -30,16 +30,14 @@ QString SettingsCache::guessConfigurationPath() // application directory path guessFileName = QCoreApplication::applicationDirPath() + "/" + fileName; - if (QFile::exists(guessFileName)) { + if (QFile::exists(guessFileName)) return guessFileName; - } #ifdef Q_OS_UNIX // /etc guessFileName = "/etc/servatrice/" + fileName; - if (QFile::exists(guessFileName)) { + if (QFile::exists(guessFileName)) return guessFileName; - } #endif guessFileName = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/" + fileName; diff --git a/servatrice/src/signalhandler.cpp b/servatrice/src/signalhandler.cpp index b4513979f..f7cb207a9 100644 --- a/servatrice/src/signalhandler.cpp +++ b/servatrice/src/signalhandler.cpp @@ -86,11 +86,10 @@ void SignalHandler::sigSegvHandler(int sig) fprintf(stderr, "Error: signal %d:\n", sig); backtrace_symbols_fd(array, size, STDERR_FILENO); - if (sig == SIGSEGV) { + if (sig == SIGSEGV) logger->logMessage("CRASH: SIGSEGV"); - } else if (sig == SIGABRT) { + else if (sig == SIGABRT) logger->logMessage("CRASH: SIGABRT"); - } logger->deleteLater(); loggerThread->wait(); diff --git a/servatrice/src/smtpclient.cpp b/servatrice/src/smtpclient.cpp index 3ec333413..ee7214904 100644 --- a/servatrice/src/smtpclient.cpp +++ b/servatrice/src/smtpclient.cpp @@ -125,13 +125,11 @@ bool SmtpClient::enqueueForgotPasswordTokenMail(const QString &nickname, const Q void SmtpClient::sendAllEmails() { // still connected from the previous round - if (smtp->socket()->state() == QAbstractSocket::ConnectedState) { + if (smtp->socket()->state() == QAbstractSocket::ConnectedState) return; - } - if (smtp->pendingMessages() == 0) { + if (smtp->pendingMessages() == 0) return; - } QString connectionType = settingsCache->value("smtp/connection", "tcp").toString(); QString host = settingsCache->value("smtp/host", "localhost").toString(); @@ -145,9 +143,8 @@ void SmtpClient::sendAllEmails() // Connect if (connectionType == "ssl") { - if (acceptAllCerts) { + if (acceptAllCerts) smtp->sslSocket()->setPeerVerifyMode(QSslSocket::QueryPeer); - } smtp->connectToSecureHost(host, port); } else { smtp->connectToHost(host, port); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a179a3603..fffaf1bda 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -4,11 +4,8 @@ enable_testing() add_test(NAME dummy_test COMMAND dummy_test) add_test(NAME expression_test COMMAND expression_test) -add_test(NAME clamped_arithmetic_test COMMAND clamped_arithmetic_test) add_test(NAME test_age_formatting COMMAND test_age_formatting) add_test(NAME password_hash_test COMMAND password_hash_test) -add_test(NAME server_card_counter_test COMMAND server_card_counter_test) -add_test(NAME server_counter_test COMMAND server_counter_test) add_test(NAME deck_hash_performance_test COMMAND deck_hash_performance_test) set_tests_properties(deck_hash_performance_test PROPERTIES TIMEOUT 5) @@ -17,12 +14,9 @@ set_tests_properties(deck_hash_performance_test PROPERTIES TIMEOUT 5) add_executable(dummy_test dummy_test.cpp) add_executable(expression_test expression_test.cpp) -add_executable(clamped_arithmetic_test clamped_arithmetic_test.cpp) add_executable(test_age_formatting test_age_formatting.cpp) add_executable(password_hash_test password_hash_test.cpp) add_executable(deck_hash_performance_test deck_hash_performance_test.cpp) -add_executable(server_card_counter_test server_card_counter_test.cpp) -add_executable(server_counter_test server_counter_test.cpp) find_package(GTest) @@ -51,23 +45,15 @@ if(NOT GTEST_FOUND) set(GTEST_BOTH_LIBRARIES gtest) add_dependencies(dummy_test gtest) add_dependencies(expression_test gtest) - add_dependencies(clamped_arithmetic_test gtest) add_dependencies(test_age_formatting gtest) add_dependencies(password_hash_test gtest) add_dependencies(deck_hash_performance_test gtest) - add_dependencies(server_card_counter_test gtest) - add_dependencies(server_counter_test gtest) endif() include_directories(${GTEST_INCLUDE_DIRS}) target_link_libraries(dummy_test Threads::Threads ${GTEST_BOTH_LIBRARIES}) target_link_libraries(expression_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}) -target_link_libraries( - clamped_arithmetic_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} -) -target_link_libraries( - test_age_formatting libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} -) +target_link_libraries(test_age_formatting Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}) target_link_libraries( password_hash_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} ) @@ -75,12 +61,6 @@ target_link_libraries( deck_hash_performance_test libcockatrice_deck_list libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} ) -target_link_libraries( - server_card_counter_test libcockatrice_network Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} -) -target_link_libraries( - server_counter_test libcockatrice_network Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} -) add_subdirectory(card_zone_algorithms) add_subdirectory(carddatabase) diff --git a/tests/card_zone_algorithms/CMakeLists.txt b/tests/card_zone_algorithms/CMakeLists.txt index e03d8f77d..889e92eaa 100644 --- a/tests/card_zone_algorithms/CMakeLists.txt +++ b/tests/card_zone_algorithms/CMakeLists.txt @@ -1,6 +1,6 @@ add_executable(card_zone_algorithms_test card_zone_algorithms_test.cpp) -target_include_directories(card_zone_algorithms_test PRIVATE ${CMAKE_SOURCE_DIR}/cockatrice/src/game/zones) +target_include_directories(card_zone_algorithms_test PRIVATE ${CMAKE_SOURCE_DIR}/cockatrice/src/game/zones/logic) target_link_libraries( card_zone_algorithms_test diff --git a/tests/clamped_arithmetic_test.cpp b/tests/clamped_arithmetic_test.cpp deleted file mode 100644 index 2471d5870..000000000 --- a/tests/clamped_arithmetic_test.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/** @file clamped_arithmetic_test.cpp - * @brief Tests for shared helpers in clamped_arithmetic.h. - * @ingroup Tests - */ - -#include -#include -#include - -TEST(AddClamped, AddsWithinBounds) -{ - EXPECT_EQ(addClamped(5, 3, 0, 100), 8); - EXPECT_EQ(addClamped(10, -3, 0, 100), 7); -} - -TEST(AddClamped, ClampsToUpperAndLowerBound) -{ - EXPECT_EQ(addClamped(99, 5, 0, 100), 100); // saturates at max - EXPECT_EQ(addClamped(2, -10, 0, 100), 0); // saturates at min - EXPECT_EQ(addClamped(999, 1, 0, 999), 999); // crossing the counter cap holds at the bound -} - -TEST(AddClamped, IntOverflowDoesNotWrap) -{ - // The 64-bit intermediate must prevent signed-int overflow UB. - constexpr int intMax = std::numeric_limits::max(); - constexpr int intMin = std::numeric_limits::min(); - EXPECT_EQ(addClamped(intMax, 1, intMin, intMax), intMax); - EXPECT_EQ(addClamped(intMax, intMax, intMin, intMax), intMax); -} - -TEST(AddClamped, IntUnderflowDoesNotWrap) -{ - constexpr int intMax = std::numeric_limits::max(); - constexpr int intMin = std::numeric_limits::min(); - EXPECT_EQ(addClamped(intMin, -1, intMin, intMax), intMin); - EXPECT_EQ(addClamped(intMin, intMin, intMin, intMax), intMin); -} - -int main(int argc, char **argv) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/tests/server_card_counter_test.cpp b/tests/server_card_counter_test.cpp deleted file mode 100644 index c8bc43f8f..000000000 --- a/tests/server_card_counter_test.cpp +++ /dev/null @@ -1,183 +0,0 @@ -/** @file server_card_counter_test.cpp - * @brief Tests for Server_Card counter operations. - * @ingroup Tests - */ - -#include -#include -#include -#include -#include -#include - -TEST(ServerCardCounter, IncrementNewCounter) -{ - Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0); - EXPECT_TRUE(card.incrementCounter(1, 10)); - EXPECT_EQ(card.getCounter(1), 10); -} - -TEST(ServerCardCounter, IncrementExistingCounter) -{ - Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0); - ASSERT_TRUE(card.setCounter(1, 50)); - EXPECT_TRUE(card.incrementCounter(1, 10)); - EXPECT_EQ(card.getCounter(1), 60); -} - -TEST(ServerCardCounter, IncrementOverflowProtection) -{ - Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0); - ASSERT_TRUE(card.setCounter(1, MAX_COUNTER_VALUE)); - EXPECT_FALSE(card.incrementCounter(1, 1)); - EXPECT_EQ(card.getCounter(1), MAX_COUNTER_VALUE); -} - -TEST(ServerCardCounter, DecrementUnderflowProtection) -{ - Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0); - ASSERT_TRUE(card.setCounter(1, 5)); - EXPECT_TRUE(card.incrementCounter(1, -10)); - EXPECT_EQ(card.getCounter(1), 0); - EXPECT_FALSE(card.getCounters().contains(1)); -} - -TEST(ServerCardCounter, ReturnsFalseWhenUnchanged) -{ - Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0); - ASSERT_TRUE(card.setCounter(1, 50)); - EXPECT_FALSE(card.incrementCounter(1, 0)); - EXPECT_EQ(card.getCounter(1), 50); -} - -TEST(ServerCardCounter, DecrementToZeroRemovesCounter) -{ - Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0); - ASSERT_TRUE(card.setCounter(1, 10)); - EXPECT_TRUE(card.incrementCounter(1, -10)); - EXPECT_EQ(card.getCounter(1), 0); - EXPECT_FALSE(card.getCounters().contains(1)); -} - -TEST(ServerCardCounter, SetToZeroRemovesCounter) -{ - Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0); - ASSERT_TRUE(card.setCounter(1, 10)); - EXPECT_TRUE(card.setCounter(1, 0)); - EXPECT_EQ(card.getCounter(1), 0); - EXPECT_FALSE(card.getCounters().contains(1)); -} - -TEST(ServerCardCounter, SetCounterReturnsFalseWhenUnchanged) -{ - Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0); - ASSERT_TRUE(card.setCounter(1, 50)); - EXPECT_FALSE(card.setCounter(1, 50)); - EXPECT_EQ(card.getCounter(1), 50); -} - -TEST(ServerCardCounter, SetCounterReturnsTrueWhenChanged) -{ - Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0); - ASSERT_TRUE(card.setCounter(1, 50)); - EXPECT_TRUE(card.setCounter(1, 100)); - EXPECT_EQ(card.getCounter(1), 100); -} - -TEST(ServerCardCounter, SetCounterEventNotPopulatedWhenUnchanged) -{ - Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0); - ASSERT_TRUE(card.setCounter(1, 50)); - - Event_SetCardCounter event; - event.set_counter_id(999); - event.set_counter_value(999); - - EXPECT_FALSE(card.setCounter(1, 50, &event)); - EXPECT_EQ(event.counter_id(), 999); - EXPECT_EQ(event.counter_value(), 999); -} - -TEST(ServerCardCounter, IncrementCounterPopulatesEvent) -{ - Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0); - ASSERT_TRUE(card.setCounter(1, 50)); - - Event_SetCardCounter event; - EXPECT_TRUE(card.incrementCounter(1, 10, &event)); - - EXPECT_EQ(event.counter_id(), 1); - EXPECT_EQ(event.counter_value(), 60); -} - -TEST(ServerCardCounter, IncrementCounterEventReflectsClampedValue) -{ - Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0); - ASSERT_TRUE(card.setCounter(1, MAX_COUNTER_VALUE - 5)); - - Event_SetCardCounter event; - EXPECT_TRUE(card.incrementCounter(1, 10, &event)); - - EXPECT_EQ(event.counter_id(), 1); - EXPECT_EQ(event.counter_value(), MAX_COUNTER_VALUE); -} - -TEST(ServerCardCounter, IncrementCounterNoEventWhenNullptr) -{ - Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0); - ASSERT_TRUE(card.setCounter(1, 50)); - EXPECT_TRUE(card.incrementCounter(1, 10, nullptr)); - EXPECT_EQ(card.getCounter(1), 60); -} - -TEST(ServerCardCounter, IncrementCounterEventNotPopulatedWhenUnchanged) -{ - Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0); - ASSERT_TRUE(card.setCounter(1, MAX_COUNTER_VALUE)); - - Event_SetCardCounter event; - event.set_counter_id(999); - event.set_counter_value(999); - - EXPECT_FALSE(card.incrementCounter(1, 1, &event)); - EXPECT_EQ(event.counter_id(), 999); - EXPECT_EQ(event.counter_value(), 999); -} - -TEST(ServerCardCounter, SetCounterClampsNegativeToZero) -{ - Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0); - EXPECT_FALSE(card.setCounter(1, -5)); - EXPECT_EQ(card.getCounter(1), 0); - EXPECT_FALSE(card.getCounters().contains(1)); -} - -TEST(ServerCardCounter, SetCounterClampsAboveMaxToMax) -{ - Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0); - EXPECT_TRUE(card.setCounter(1, 1500)); - EXPECT_EQ(card.getCounter(1), MAX_COUNTER_VALUE); -} - -TEST(ServerCardCounter, IncrementDoesNotGoBelowZero) -{ - Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0); - ASSERT_TRUE(card.setCounter(1, 5)); - EXPECT_TRUE(card.incrementCounter(1, -10)); - EXPECT_EQ(card.getCounter(1), 0); - EXPECT_FALSE(card.getCounters().contains(1)); -} - -TEST(ServerCardCounter, IncrementDoesNotExceedMax) -{ - Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0); - ASSERT_TRUE(card.setCounter(1, MAX_COUNTER_VALUE - 5)); - EXPECT_TRUE(card.incrementCounter(1, 10)); - EXPECT_EQ(card.getCounter(1), MAX_COUNTER_VALUE); -} - -int main(int argc, char **argv) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/tests/server_counter_test.cpp b/tests/server_counter_test.cpp deleted file mode 100644 index 0f41f2cbd..000000000 --- a/tests/server_counter_test.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/** @file server_counter_test.cpp - * @brief Tests for Server_Counter operations. - * @ingroup Tests - */ - -#include -#include -#include - -TEST(ServerCounter, IncrementDoesNotOverflow) -{ - Server_Counter c(1, "test", color(), 10, std::numeric_limits::max()); - bool changed = c.incrementCount(1); - EXPECT_FALSE(changed); - EXPECT_EQ(c.getCount(), std::numeric_limits::max()); -} - -TEST(ServerCounter, DecrementDoesNotUnderflow) -{ - Server_Counter c(1, "test", color(), 10, std::numeric_limits::min()); - bool changed = c.incrementCount(-1); - EXPECT_FALSE(changed); - EXPECT_EQ(c.getCount(), std::numeric_limits::min()); -} - -TEST(ServerCounter, SetCountReturnsFalseWhenUnchanged) -{ - Server_Counter c(1, "test", color(), 10, 50); - bool changed = c.setCount(50); - EXPECT_FALSE(changed); -} - -TEST(ServerCounter, IncrementReturnsChangeStatus) -{ - Server_Counter c(1, "test", color(), 10, 50); - EXPECT_TRUE(c.incrementCount(10)); - EXPECT_EQ(c.getCount(), 60); - EXPECT_FALSE(c.incrementCount(0)); - EXPECT_EQ(c.getCount(), 60); -} - -TEST(ServerCounter, LargePositiveDeltaDoesNotOverflow) -{ - Server_Counter c(1, "test", color(), 10, std::numeric_limits::max() - 10); - bool changed = c.incrementCount(std::numeric_limits::max()); - EXPECT_TRUE(changed); // Value changes from INT_MAX-10 to INT_MAX (clamped) - EXPECT_EQ(c.getCount(), std::numeric_limits::max()); -} - -TEST(ServerCounter, LargeNegativeDeltaDoesNotUnderflow) -{ - Server_Counter c(1, "test", color(), 10, std::numeric_limits::min() + 10); - bool changed = c.incrementCount(std::numeric_limits::min()); - EXPECT_TRUE(changed); // Value changes from INT_MIN+10 to INT_MIN (clamped) - EXPECT_EQ(c.getCount(), std::numeric_limits::min()); -} - -TEST(ServerCounter, SetCountReturnsTrueWhenChanged) -{ - Server_Counter c(1, "test", color(), 10, 50); - EXPECT_TRUE(c.setCount(100)); - EXPECT_EQ(c.getCount(), 100); -} - -TEST(ServerCounter, BasicIncrementWorks) -{ - Server_Counter c(1, "test", color(), 10, 50); - EXPECT_TRUE(c.incrementCount(10)); - EXPECT_EQ(c.getCount(), 60); - EXPECT_TRUE(c.incrementCount(-20)); - EXPECT_EQ(c.getCount(), 40); -} - -TEST(ServerCounter, MixedExtremesDoNotClamp) -{ - Server_Counter c(1, "test", color(), 10, std::numeric_limits::max()); - bool changed = c.incrementCount(std::numeric_limits::min()); - EXPECT_TRUE(changed); - EXPECT_EQ(c.getCount(), -1); -} - -int main(int argc, char **argv) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/tests/test_age_formatting.cpp b/tests/test_age_formatting.cpp index 6a9d5d4af..e4fc64cf9 100644 --- a/tests/test_age_formatting.cpp +++ b/tests/test_age_formatting.cpp @@ -1,5 +1,6 @@ +#include "../cockatrice/src/interface/widgets/server/user/user_info_box.h" + #include "gtest/gtest.h" -#include namespace { @@ -7,31 +8,31 @@ using dayyear = QPair; TEST(AgeFormatting, Zero) { - auto got = getDaysAndYearsBetween(QDate(2000, 1, 1), QDate(2000, 1, 1)); + auto got = UserInfoBox::getDaysAndYearsBetween(QDate(2000, 1, 1), QDate(2000, 1, 1)); ASSERT_EQ(got, dayyear(0, 0)) << "these are the same day"; } TEST(AgeFormatting, LeapDay) { - auto got = getDaysAndYearsBetween(QDate(2000, 2, 28), QDate(2000, 3, 1)); + auto got = UserInfoBox::getDaysAndYearsBetween(QDate(2000, 2, 28), QDate(2000, 3, 1)); ASSERT_EQ(got, dayyear(2, 0)) << "there is a leap day in between these days"; } TEST(AgeFormatting, LeapYear) { - auto got = getDaysAndYearsBetween(QDate(2000, 1, 1), QDate(2001, 1, 1)); + auto got = UserInfoBox::getDaysAndYearsBetween(QDate(2000, 1, 1), QDate(2001, 1, 1)); ASSERT_EQ(got, dayyear(0, 1)) << "there is a leap day in between these dates, but that's fine"; } TEST(AgeFormatting, LeapDayWithYear) { - auto got = getDaysAndYearsBetween(QDate(2000, 2, 28), QDate(2001, 3, 1)); + auto got = UserInfoBox::getDaysAndYearsBetween(QDate(2000, 2, 28), QDate(2001, 3, 1)); ASSERT_EQ(got, dayyear(1, 1)) << "there is a leap day in between these days but not in the last year"; } TEST(AgeFormatting, LeapDayThisYear) { - auto got = getDaysAndYearsBetween(QDate(2003, 2, 28), QDate(2004, 3, 1)); + auto got = UserInfoBox::getDaysAndYearsBetween(QDate(2003, 2, 28), QDate(2004, 3, 1)); ASSERT_EQ(got, dayyear(2, 1)) << "there is a leap day in between these days this year"; } } // namespace diff --git a/vcpkg b/vcpkg index 56bb24116..d29e8309d 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 56bb2411609227288b70117ead2c47585ba07713 +Subproject commit d29e8309d1cf7a7cb6998a935b2ac5b1958a7432