diff --git a/.github/workflows/PR-check-cmake.yml b/.github/workflows/PR-check-cmake.yml index 1cb61ded..c04bf589 100644 --- a/.github/workflows/PR-check-cmake.yml +++ b/.github/workflows/PR-check-cmake.yml @@ -106,3 +106,57 @@ jobs: -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" ` -DWITH_FFMPEG_PLAYER=OFF cmake --build "./build_dir" + + job_archlinux_build_check: + name: archlinux Build and analyze + runs-on: ubuntu-24.04 + container: + image: ghcr.io/archlinux/archlinux:base-devel + steps: + - name: Print Version + run: | + if [[ -f /etc/os-release ]]; then + cat /etc/os-release + fi + - name: Install dependencies + run: | + # https://github.com/archlinux/archlinux-docker + # base-devel is already included in the `base-devel` image + pacman --noconfirm -Syuu \ + cmake \ + ffmpeg \ + fmt \ + hunspell \ + libvorbis \ + libxtst \ + libzim \ + lzo \ + ninja \ + opencc \ + qt6-5compat \ + qt6-base \ + qt6-multimedia \ + qt6-speech \ + qt6-svg \ + qt6-tools \ + qt6-webengine \ + tomlplusplus \ + xapian-core + + - uses: actions/checkout@v4 + with: + submodules: false + - name: Run build + run: | + mkdir build_dir + # eb is only available in AUR, so it is disabled + cmake -S . \ + -B ./build_dir \ + -G Ninja \ + -DWITH_EPWING_SUPPORT=OFF \ + -DWITH_FFMPEG_PLAYER=ON \ + -DWITH_TTS=ON \ + -DUSE_SYSTEM_FMT=ON \ + -DUSE_SYSTEM_TOML=ON + + cmake --build ./build_dir diff --git a/.github/workflows/Release-all.yml b/.github/workflows/Release-all.yml new file mode 100644 index 00000000..b7872995 --- /dev/null +++ b/.github/workflows/Release-all.yml @@ -0,0 +1,271 @@ +name: Release All +env: + version: 24.11.0 + prerelease: ${{ !contains(github.ref_name,'master') }} + versionSuffix: ${{ !contains(github.ref_name,'master') && 'alpha' || 'Release' }} +on: + workflow_dispatch: + push: + branches: + - dev + - master + - experimental + paths-ignore: + - 'docs/**' + - "howto/**" + - "*.md" + - ".clang-format" +jobs: + build_macOS: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [macos-13,macos-14] + qt_ver: [ 6.6.3, 6.7.3 ] + steps: + - uses: actions/checkout@v4 + with: + submodules: true + - name: Install dependencies + run: | + brew install \ + bzip2 \ + create-dmg \ + hunspell \ + libiconv \ + libogg \ + libvorbis \ + libzim \ + lzip \ + ninja \ + opencc \ + xapian + + git clone https://github.com/xiaoyifang/eb.git + cd eb && ./configure && make -j 8 && sudo make install && cd .. + - uses: jurplel/install-qt-action@v4 + with: + version: ${{ matrix.qt_ver }} + arch: clang_64 + modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtspeech + - name: Build + run: | + mkdir build_dir + cmake -S . -B build_dir \ + -G Ninja \ + -DWITH_FFMPEG_PLAYER=OFF \ + -DWITH_TTS=OFF \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_OSX_DEPLOYMENT_TARGET="12.0" + cmake --build build_dir + - name: Package + run: | + cmake --install build_dir/ + - uses: actions/upload-artifact@v4 + with: + name: macOS-${{ matrix.os }}-Qt${{ matrix.qt_ver }} + if-no-files-found: error + retention-days: 7 + path: '*.dmg' + + build_Windows: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [windows-2022] + qt_ver: [ 6.6.3, 6.7.3 ] + steps: + - uses: jurplel/install-qt-action@v4 + with: + version: ${{ matrix.qt_ver }} + arch: win64_msvc2019_64 + modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtspeech + setup-python: 'false' + - uses: actions/checkout@v4 + with: + submodules: true + - name: Build + id: build + run: | + # Launch-VsDevShell also provides Ninja + & 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1' ` + -SkipAutomaticLocation -Arch amd64 -HostArch amd64 + New-Item -Path './build_dir' -ItemType Directory + + # RelWithDebInfo + msvc's = .pdb file beside program file. + cmake -S . -B "./build_dir" ` + -G Ninja ` + -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" ` + -DCMAKE_BUILD_TYPE=RelWithDebInfo ` + -DWITH_FFMPEG_PLAYER=OFF ` + -DWITH_VCPKG_BREAKPAD=ON + cmake --build "./build_dir" + - name: Package + run: | + cd './build_dir' + cpack --verbose --trace + cd .. + - name: Move files + shell: bash + run: | + namePrefix=$(basename "$(ls ./build_dir/*.7z)" .7z) + + # note the name will ensure `installer` ranked higher after sorting + cd ./build_dir + mv "${namePrefix}.7z" "${namePrefix}-Windows-installer.7z" + mv "${namePrefix}.exe" "${namePrefix}-Windows-installer.exe" + mv ./goldendict/goldendict.exe "./${namePrefix}-Windows-main-exe-file-only.exe" + mv ./goldendict/goldendict.pdb "./${namePrefix}-Windows-pdb-debug-file.pdb" + cd .. + ls -R + - uses: actions/upload-artifact@v4 + with: + name: Windows-Qt${{ matrix.qt_ver }} + if-no-files-found: error + retention-days: 7 + path: | + ./build_dir/*.exe + ./build_dir/*.7z + ./build_dir/*.pdb + + generate_other_staffs: + runs-on: ubuntu-latest + outputs: + newTag: ${{ steps.getNewTag.outputs.newTag }} + releaseTitle: ${{steps.getReleaseTitle.outputs.releaseTitle}} + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 # need all tags to genearte changelog + - name: Get git short SHA + id: shortSHA + run: | + echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + - name: Get changelog tags + id: changelogTags + run: | + if [[ '${{env.prerelease}}' == 'true' ]] + then + echo "This is a pre-release" + previousTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 2p) + currentTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 1p) + else + echo "This is not a pre-release" + previousTag=$(git tag --sort=-creatordate | grep "^v" | grep -v "alpha" | sed -n 2p) + currentTag=$(git tag --sort=-creatordate | grep "^v" | grep -v "alpha" | sed -n 1p) + fi + + echo "prev_tag=$previousTag" >> $GITHUB_OUTPUT + echo "curr_tag=$currentTag" >> $GITHUB_OUTPUT + echo "previousTag : $previousTag" + echo "currentTag : $currentTag" + - name: Get new tag + id: getNewTag + run: | + echo "newTag=v${{ env.version }}-${{ env.versionSuffix }}.${{ steps.shortSHA.outputs.sha_short }}" >> $GITHUB_OUTPUT + - name: Build Changelog + id: build_changelog + uses: mikepenz/release-changelog-builder-action@v3 + with: + commitMode: false + fromTag: ${{ steps.changelogTags.outputs.prev_tag }} + toTag: "${{ steps.changelogTags.outputs.curr_tag }}" + configurationJson: | + { + "template": "#{{CHANGELOG}}\n\n
\n🔴 Uncategorized\n\n#{{UNCATEGORIZED}}\n
", + "categories": [ + { + "title": "## 🚀 Features", + "labels": ["feature","feat","opt"] + }, + { + "title": "## 🐛 Fixes", + "labels": ["fix","bug"] + } + , + { + "title": "## 🤖 DevOps", + "labels": ["action"] + } + , + { + "title": "## 🧼 Clean Code", + "labels": ["clean","refactor"] + } + + ], + "label_extractor": [ + { + "pattern": "([^:]*):.*", + "target": "$1", + "on_property": "title", + "flags": "gu" + } + ] + } + - name: Get changelog.txt + run: | + cat < changelog.txt + [Install instructions for Windows, macOS and Linux](https://xiaoyifang.github.io/goldendict-ng/install/). + + Filename pattern: GoldenDict-ng-[version]-[Qt version]-[system name]... + + For Linux, the released version is on Flathub → [io.github.xiaoyifang.goldendict_ng](https://flathub.org/apps/io.github.xiaoyifang.goldendict_ng). + + Based on branch: ${{ github.ref_name }} + #### Changes + ${{ steps.build_changelog.outputs.changelog }} + HEREDOC + - name: Get release title + id: getReleaseTitle + run: | + if [[ '${{ env.prerelease }}' == 'true' ]] + then + echo "releaseTitle=Daily build v${{env.version}}-${{ steps.shortSHA.outputs.sha_short }}" >> $GITHUB_OUTPUT + else + echo "releaseTitle=v${{ env.version }}-${{ env.versionSuffix }}.${{ steps.shortSHA.outputs.sha_short }}" >> $GITHUB_OUTPUT + fi + + - uses: actions/upload-artifact@v4 + with: + name: changelog.txt + if-no-files-found: error + retention-days: 7 + path: ./changelog.txt + + publish: + needs: [build_macOS, build_Windows, generate_other_staffs] + runs-on: ubuntu-24.04 + env: + newTag: ${{ needs.generate_other_staffs.outputs.newTag }} + releaseTitle: ${{ needs.generate_other_staffs.outputs.releaseTitle }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + steps: + - uses: actions/download-artifact@v4 + with: + merge-multiple: true + - name: List all files + run: ls -R + - name: Create new tag + run: | + if [[ '${{ env.prerelease }}' == 'true' ]] + then + gh release create '${{ env.newTag }}' \ + -t '${{ env.releaseTitle }}' \ + --target '${{ github.ref_name }}' \ + --notes-file=./changelog.txt \ + --latest=false \ + --prerelease \ + --repo ${GITHUB_REPOSITORY} + else + gh release create '${{ env.newTag }}' \ + -t '${{ env.releaseTitle }}' \ + --target '${{ github.ref_name }}' \ + --notes-file=./changelog.txt \ + --latest=true \ + --repo ${GITHUB_REPOSITORY} + fi + - name: Upload artifacts + run: | + gh release upload '${{ env.newTag }}' --repo ${GITHUB_REPOSITORY} --clobber \ + *.7z *.exe *.pdb *.dmg diff --git a/.github/workflows/Sonar Cloud.yml b/.github/workflows/Sonar Cloud.yml index 50b6031c..2a99383a 100644 --- a/.github/workflows/Sonar Cloud.yml +++ b/.github/workflows/Sonar Cloud.yml @@ -19,6 +19,8 @@ jobs: steps: - name: ubuntu install thirdparty dependencies run: | + sudo apt-get update + sudo apt-get install build-essential ninja-build \ libvorbis-dev zlib1g-dev libhunspell-dev x11proto-record-dev \ libxtst-dev liblzo2-dev libbz2-dev \ diff --git a/.github/workflows/release-AutoTag.yml b/.github/workflows/release-AutoTag.yml deleted file mode 100644 index 0a476754..00000000 --- a/.github/workflows/release-AutoTag.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: Release AutoTag -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true -on: - workflow_dispatch: - push: - branches: - - dev - - master - - experimental - - paths-ignore: - - 'docs/**' - - "howto/**" - - "*.md" - - ".clang-format" - -jobs: - build: - name: Build - runs-on: ubuntu-latest - - env: - version: 24.11.0 - version-suffix: ${{ !contains(github.ref_name,'master') && 'alpha' || 'Release' }} - prerelease: ${{ !contains(github.ref_name,'master') }} - - steps: - - uses: actions/checkout@v4 - - - name: set git short sha - id: vars - run: | - echo "sha_short=$(git rev-parse --short=8 HEAD)" >> $GITHUB_OUTPUT - echo "release_hm=$(date +'%y%m%d')" >> $GITHUB_OUTPUT - - name: Bump version and push tag - id: tag_version - uses: mathieudutour/github-tag-action@v6.0 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - custom_tag: ${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.sha_short }} diff --git a/.github/workflows/release-macos-homebrew.yml b/.github/workflows/release-macos-homebrew.yml deleted file mode 100644 index ab6907d2..00000000 --- a/.github/workflows/release-macos-homebrew.yml +++ /dev/null @@ -1,173 +0,0 @@ -name: Release macOS -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true -on: - workflow_dispatch: - push: - branches: - - dev - - master - - experimental - # - staged - paths-ignore: - - 'docs/**' - # - ".github/**" - - "howto/**" - - "*.md" - - ".clang-format" -jobs: - build: - name: Build - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [macos-13,macos-14] - qt_ver: [ 6.7.3,6.6.3 ] - qt_arch: [clang_64] - env: - targetName: GoldenDict - version: 24.11.0 - version-suffix: ${{ !contains(github.ref_name,'master') && 'alpha' || 'Release' }} - prerelease: ${{ !contains(github.ref_name,'master') }} - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - submodules: true - - name: Set outputs - id: githash - run: | - echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - - - name: install deps on macos - run: | - export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE - brew install cmake ninja pkg-config create-dmg \ - opencc libzim hunspell xapian \ - libiconv libogg libvorbis \ - lzo bzip2 zstd lzip - - git clone https://github.com/xiaoyifang/eb.git - cd eb && ./configure && make -j 8 && sudo make install && cd .. - - - name: version-file - shell: bash - env: - VAR_SUFFIX: ${{env.version-suffix}} - VAR_VERSION: ${{env.version}} - run: | - current_tag=$(git rev-parse --short=8 HEAD) - release_date=$(date +'%Y%m%d') - echo "$VAR_VERSION-$VAR_SUFFIX.$release_date.$current_tag">version.txt - cat version.txt - echo "$version" - - - name: Install Qt - uses: jurplel/install-qt-action@v3 - with: - version: ${{ matrix.qt_ver }} - arch: ${{ matrix.qt_arch }} - modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtspeech - - - name: compile - run: | - mkdir build_dir - cmake -S . -B build_dir -G Ninja -DWITH_FFMPEG_PLAYER=OFF -DWITH_TTS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_OSX_DEPLOYMENT_TARGET="12.0" - cmake --build build_dir - - - name: package - run: | - cmake --install build_dir/ - - name: changelog - id: changelog - env: - prerelease: ${{env.prerelease}} - run: | - if [[ "$prerelease" == 'true' ]] - then - echo "This is a pre-release" - previousTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 2p) - currentTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 1p) - else - echo "This is not a pre-release" - previousTag=$(git tag --sort=-creatordate | grep "^v" | grep -v "alpha" | sed -n 2p) - currentTag=$(git tag --sort=-creatordate | grep "^v" | grep -v "alpha" | sed -n 1p) - fi - echo "prev_tag=$previousTag" >> $GITHUB_OUTPUT - echo "curr_tag=$currentTag" >> $GITHUB_OUTPUT - echo "previousTag : $previousTag" - echo "currentTag : $currentTag" - - - name: Set outputs - id: vars - run: | - echo "sha_short=$(git rev-parse --short=8 HEAD)" >> $GITHUB_OUTPUT - echo "release_date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT - echo "release_time=$(date +'%H%M%S')" >> $GITHUB_OUTPUT - echo "release_time_clock=$(date +'%H:%M:%S')" >> $GITHUB_OUTPUT - echo "release_hm=$(date +'%y%m%d')" >> $GITHUB_OUTPUT - - # tag 上传Release - - name: "Build Changelog" - id: build_changelog - uses: mikepenz/release-changelog-builder-action@v3 - with: - commitMode: false - fromTag: ${{ steps.changelog.outputs.prev_tag }} - toTag: "${{ steps.changelog.outputs.curr_tag }}" - configurationJson: | - { - "template": "#{{CHANGELOG}}\n\n
\n🔴 Uncategorized\n\n#{{UNCATEGORIZED}}\n
", - "categories": [ - { - "title": "## 🚀 Features", - "labels": ["feature","feat","opt"] - }, - { - "title": "## 🐛 Fixes", - "labels": ["fix","bug"] - } - , - { - "title": "## 🤖 Github action", - "labels": ["action"] - } - , - { - "title": "## 🧼 Clean Code", - "labels": ["clean"] - } - - ], - "label_extractor": [ - { - "pattern": "([^:]*):.*", - "target": "$1", - "on_property": "title", - "flags": "gu" - } - ] - } - - name: uploadRelease - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: "*.dmg" - file_glob: true - tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.sha_short }} - overwrite: true - release_name: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }} - prerelease: ${{env.prerelease}} - body: | - [Install instructions for Windows, macOS and Linux](https://xiaoyifang.github.io/goldendict-ng/install/). - - Filename pattern: GoldenDict-ng-[version]-[Qt version]-[system name]-... - - For Linux, the released version is on Flathub → [io.github.xiaoyifang.goldendict_ng](https://flathub.org/apps/io.github.xiaoyifang.goldendict_ng). - - Based on branch: ${{github.ref_name}} - - #### Changes - - ${{steps.build_changelog.outputs.changelog}} \ No newline at end of file diff --git a/.github/workflows/release-windows-vcpkg-cmake.yml b/.github/workflows/release-windows-vcpkg-cmake.yml deleted file mode 100644 index 294f2014..00000000 --- a/.github/workflows/release-windows-vcpkg-cmake.yml +++ /dev/null @@ -1,189 +0,0 @@ -name: Release Windows CMake -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true -on: - workflow_dispatch: - push: - branches: - - dev - - master - - experimental - paths-ignore: - - 'docs/**' - - "*.md" - - ".*" - -jobs: - build: - name: Build - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [windows-2022] - qt_ver: [ 6.7.3, 6.6.3 ] - qt_arch: [win64_msvc2019_64] - env: - version: 24.11.0 - versionSuffix: ${{ !contains(github.ref_name,'master') && 'alpha' || 'Release' }} - prerelease: ${{ !contains(github.ref_name,'master') }} - steps: - - name: Install Qt - uses: jurplel/install-qt-action@v3 - with: - version: ${{ matrix.qt_ver }} - # target: ${{ matrix.qt_target }} - arch: ${{ matrix.qt_arch }} - modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtspeech - setup-python: 'false' - - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - submodules: true - - - name: Setup changelog - id: changelog - shell: bash - env: - prerelease: ${{env.prerelease}} - run: | - if [[ "$prerelease" == 'true' ]] - then - echo "This is a pre-release" - previousTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 2p) - currentTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 1p) - else - echo "This is not a pre-release" - previousTag=$(git tag --sort=-creatordate | grep "^v" | grep -v "alpha" | sed -n 2p) - currentTag=$(git tag --sort=-creatordate | grep "^v" | grep -v "alpha" | sed -n 1p) - fi - echo "prev_tag=$previousTag" >> $GITHUB_OUTPUT - echo "curr_tag=$currentTag" >> $GITHUB_OUTPUT - echo "previousTag : $previousTag" - echo "currentTag : $currentTag" - - - name: "Build Changelog" - id: build_changelog - uses: mikepenz/release-changelog-builder-action@v3 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - commitMode: false - fromTag: "${{ steps.changelog.outputs.prev_tag }}" - toTag: "${{ steps.changelog.outputs.curr_tag }}" - configurationJson: | - { - "template": "#{{CHANGELOG}}\n\n
\n🔴 Uncategorized\n\n#{{UNCATEGORIZED}}\n
", - "categories": [ - { - "title": "## 🚀 Features", - "labels": ["feature","feat","opt"] - }, - { - "title": "## 🐛 Fixes", - "labels": ["fix","bug"] - } - , - { - "title": "## 🤖 Github action", - "labels": ["action"] - } - , - { - "title": "## 🧼 Clean Code", - "labels": ["clean"] - } - - - ], - "label_extractor": [ - { - "pattern": "([^:]*):.*", - "target": "$1", - "on_property": "title", - "flags": "gu" - } - ] - } - - name: Build binaries - id: build - run: | - # Launch-VsDevShell also provides Ninja - & 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1' ` - -SkipAutomaticLocation -Arch amd64 -HostArch amd64 - New-Item -Path './build_dir' -ItemType Directory - - # RelWithDebInfo + msvc's = .pdb file beside program file. - cmake -S . -B "./build_dir" ` - -G Ninja ` - -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" ` - -DCMAKE_BUILD_TYPE=RelWithDebInfo ` - -DWITH_FFMPEG_PLAYER=OFF ` - -DWITH_VCPKG_BREAKPAD=ON - cmake --build "./build_dir" - - name: CPack create package - run: | - cd './build_dir' - cpack --verbose --trace - cd .. - pwd - - name: Upload packages - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - $tagName = "v$env:version-$env:versionSuffix.$(git rev-parse --short=8 HEAD)" - $releaseName = "v$env:version-$env:versionSuffix.$(date +'%y%m%d').$(git rev-parse --short=8 HEAD)" - - Add-Content -Path ./change_note.txt -Value " - [Install instructions for Windows, macOS and Linux](https://xiaoyifang.github.io/goldendict-ng/install/). - - Filename pattern: GoldenDict-ng-[version]-[Qt version]-[system name]-... - - For Linux, the released version is on Flathub → [io.github.xiaoyifang.goldendict_ng](https://flathub.org/apps/io.github.xiaoyifang.goldendict_ng). - - Based on branch: ${{github.ref_name}} - - #### Changes - " - - Add-Content -Path ./change_note.txt -Value @' - ${{steps.build_changelog.outputs.changelog}} - '@ - - $tagExist = gh api --silent "repos/:owner/:repo/git/refs/tags/${tagName}" - if (-not $?) { - if ($env:prerelease -eq "true") { - gh release create ${tagName} -t ${releaseName} --target ${{github.ref_name}} --notes-file=./change_note.txt --latest=false --prerelease - } else { - gh release create ${tagName} -t ${releaseName} --target ${{github.ref_name}} --notes-file=./change_note.txt --latest=true - } - } - - # file name after # is display label - - $namePrefix="GoldenDict-ng-${{env.version}}-Qt${{matrix.qt_ver}}" - - cd './build_dir' - gh release upload "${tagName}" "${namePrefix}.7z#${namePrefix}-Windows.7z" --clobber - gh release upload "${tagName}" "${namePrefix}.exe#${namePrefix}-Windows-installer.exe" --clobber - - - - name: Upload Single packages - shell: bash - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - tagName="v${{env.version}}-${{env.versionSuffix}}.$(git rev-parse --short=8 HEAD)" - echo $tagName - namePrefix="GoldenDict-ng-${{env.version}}-Qt${{matrix.qt_ver}}" - - cd ./build_dir/goldendict - - # rename to avoid conflict with other packages - mv goldendict.exe goldendict-Qt${{matrix.qt_ver}}.exe - mv goldendict.pdb goldendict-Qt${{matrix.qt_ver}}.pdb - - gh release upload "${tagName}" "goldendict-Qt${{matrix.qt_ver}}.exe#${namePrefix}-Windows-main-exe-file-only.exe" --clobber - gh release upload "${tagName}" "goldendict-Qt${{matrix.qt_ver}}.pdb#${namePrefix}-Windows-debug-file.pdb" --clobber - cd .. \ No newline at end of file diff --git a/icons/add-anki-icon.svg b/icons/add-anki-icon.svg index ab5fa119..50e14c1e 100644 --- a/icons/add-anki-icon.svg +++ b/icons/add-anki-icon.svg @@ -2,16 +2,15 @@ + + + + stroke-width="0" + transform="matrix(0.51271947,0,0,0.51271947,-0.96216631,0.4434346)" /> + stroke="#cccccc" + stroke-width="0.102" + transform="matrix(0.51271947,0,0,0.51271947,-0.96216631,0.4434346)" /> + id="SVGRepo_iconCarrier" + clip-path="url(#clipPath98)" + transform="matrix(-0.51271947,0,0,-0.51271947,7.7540647,7.1088194)"> + transform="translate(0.5,0.5)"> + d="M 0.50003662,1.2207031e-4 A 0.5,0.5 0 0 0 1.2207031e-4,0.50003662 V 11.500024 A 0.5,0.5 0 0 0 0.50003662,11.999939 H 3.6495605 c 0.00481,-0.142019 0.0029,-0.145587 -0.00747,-0.511121 -0.00462,-0.162989 -0.00611,-0.325845 -0.012451,-0.488708 H 0.99995117 V 0.99995117 H 15.000049 V 4.000061 h 0.999829 V 0.50003662 A 0.5,0.5 0 0 0 15.499963,1.2207031e-4 Z M 3.9807617,11.00011 c 0.00582,0.158752 0.00778,0.317442 0.012451,0.476257 0.010597,0.360714 0.012629,0.375645 0.00809,0.523572 h 0.155017 C 4.1123499,11.635389 4.0736845,11.30483 4.0392822,11.00011 Z m 0.4121338,0 c 0.034329,0.302271 0.074086,0.633819 0.1182861,0.999829 H 8 V 11.00011 Z" /> + d="M 38,12.5 A 0.5,0.5 0 0 1 37.5,13 H 35 v 2.5 a 0.5,0.5 0 0 1 -1,0 V 13 h -2.5 a 0.5,0.5 0 0 1 0,-1 H 34 V 9.5 a 0.5,0.5 0 0 1 1,0 V 12 h 2.5 a 0.5,0.5 0 0 1 0.5,0.5 z" + transform="translate(-22,-4)" /> - - - > & dictionaries, QNetworkAccessManager & dictNetMgr, @@ -206,7 +205,7 @@ void loadDictionaries( QWidget * parent, { dictionaries.clear(); - ::Initializing init( parent, showInitially ); + ::Initializing init( parent ); // Start a thread to load all the dictionaries diff --git a/src/dict/loaddictionaries.hh b/src/dict/loaddictionaries.hh index bae93521..ca060bb1 100644 --- a/src/dict/loaddictionaries.hh +++ b/src/dict/loaddictionaries.hh @@ -67,7 +67,6 @@ signals: /// If doDeferredInit is true (default), doDeferredInit() is done on all /// dictionaries at the end. void loadDictionaries( QWidget * parent, - bool showInitially, Config::Class const & cfg, std::vector< sptr< Dictionary::Class > > &, QNetworkAccessManager & dictNetMgr, diff --git a/src/initializing.cc b/src/initializing.cc index 0acf099d..62fc88e7 100644 --- a/src/initializing.cc +++ b/src/initializing.cc @@ -5,19 +5,17 @@ #include "initializing.hh" #include -Initializing::Initializing( QWidget * parent, bool showOnStartup ): +Initializing::Initializing( QWidget * parent ): QDialog( parent ) { ui.setupUi( this ); setWindowFlags( Qt::Dialog | Qt::FramelessWindowHint ); - setWindowIcon( QIcon( ":/icons/programicon.png" ) ); - if ( showOnStartup ) { + if ( parent->isVisible() ) { ui.operation->setText( tr( "Please wait..." ) ); - ui.dictionary->hide(); - ui.progressBar->hide(); + ui.dictionary->setText( "" ); show(); } } @@ -26,9 +24,6 @@ void Initializing::indexing( QString const & dictionaryName ) { ui.operation->setText( tr( "Indexing..." ) ); ui.dictionary->setText( dictionaryName ); - ui.dictionary->show(); - ui.progressBar->show(); - adjustSize(); show(); } @@ -36,9 +31,6 @@ void Initializing::loading( QString const & dictionaryName ) { ui.operation->setText( tr( "Loading..." ) ); ui.dictionary->setText( dictionaryName ); - ui.dictionary->show(); - ui.progressBar->show(); - adjustSize(); show(); } diff --git a/src/initializing.hh b/src/initializing.hh index c32cefaf..7f4104c4 100644 --- a/src/initializing.hh +++ b/src/initializing.hh @@ -12,7 +12,7 @@ class Initializing: public QDialog public: - Initializing( QWidget * parent, bool showOnStartup ); + Initializing( QWidget * parent ); public slots: diff --git a/src/multimediaaudioplayer.cc b/src/multimediaaudioplayer.cc index 3bf12907..c117c629 100644 --- a/src/multimediaaudioplayer.cc +++ b/src/multimediaaudioplayer.cc @@ -12,6 +12,8 @@ #endif #include "multimediaaudioplayer.hh" + #include + MultimediaAudioPlayer::MultimediaAudioPlayer() #if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) ) : diff --git a/src/stylesheets/article-style.css b/src/stylesheets/article-style.css index 825b1320..c7fc6f06 100644 --- a/src/stylesheets/article-style.css +++ b/src/stylesheets/article-style.css @@ -84,6 +84,10 @@ pre { background-color: hsl(0deg 0% 70%); } +.ankibutton img { + width: 32px; +} + .gddicttitle { user-select: none; } diff --git a/src/ui/about.ui b/src/ui/about.ui index 7d13a55c..b0434ecc 100644 --- a/src/ui/about.ui +++ b/src/ui/about.ui @@ -3,7 +3,7 @@ About - Qt::NonModal + Qt::WindowModality::NonModal @@ -46,7 +46,7 @@ true - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter 10 @@ -66,7 +66,7 @@ GoldenDict-ng dictionary lookup program, version - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -79,7 +79,7 @@ #.# - Qt::TextEditorInteraction + Qt::TextInteractionFlag::TextEditorInteraction @@ -91,7 +91,7 @@ (c) 2008-2013 Konstantin Isakov (ikm@goldendict.org) - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -101,7 +101,7 @@ Licensed under GNU GPLv3 or later - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -111,7 +111,7 @@ Based on Qt #.#.# (GCC #.#, 32/64 bit) - Qt::TextEditorInteraction + Qt::TextInteractionFlag::TextEditorInteraction @@ -146,7 +146,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -168,7 +168,7 @@ Credits: - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -188,10 +188,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QDialogButtonBox::Ok + QDialogButtonBox::StandardButton::Ok true diff --git a/src/ui/authentication.ui b/src/ui/authentication.ui index 9fcdca5d..79051160 100644 --- a/src/ui/authentication.ui +++ b/src/ui/authentication.ui @@ -6,8 +6,8 @@ 0 0 - 389 - 120 + 428 + 150 @@ -44,24 +44,24 @@ - QLineEdit::Password + QLineEdit::EchoMode::Password - Qt::Horizontal + Qt::Orientation::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok - Qt::Vertical + Qt::Orientation::Vertical diff --git a/src/ui/dictgroupwidget.ui b/src/ui/dictgroupwidget.ui index 3865de47..714df8d3 100644 --- a/src/ui/dictgroupwidget.ui +++ b/src/ui/dictgroupwidget.ui @@ -35,7 +35,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal diff --git a/src/ui/dictheadwords.ui b/src/ui/dictheadwords.ui index ab6599fc..afc3881a 100644 --- a/src/ui/dictheadwords.ui +++ b/src/ui/dictheadwords.ui @@ -101,35 +101,35 @@ - - - Specify the maximum filtered headwords returned. - - - Filter max results: - - + + + Specify the maximum filtered headwords returned. + + + Filter max results: + + - - - - - - - 10 - - - 3000 - - - 10 - - - - + + + + + + + 10 + + + 3000 + + + 10 + + + + - Qt::Vertical + Qt::Orientation::Vertical diff --git a/src/ui/dictinfo.ui b/src/ui/dictinfo.ui index d799a6f9..21d90e6e 100644 --- a/src/ui/dictinfo.ui +++ b/src/ui/dictinfo.ui @@ -50,7 +50,7 @@ - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse @@ -60,7 +60,7 @@ - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -98,7 +98,7 @@ - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -160,7 +160,7 @@ false - QPlainTextEdit::NoWrap + QPlainTextEdit::LineWrapMode::NoWrap true @@ -183,7 +183,7 @@ - Qt::ScrollBarAlwaysOff + Qt::ScrollBarPolicy::ScrollBarAlwaysOff true @@ -205,7 +205,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -228,7 +228,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal diff --git a/src/ui/editdictionaries.cc b/src/ui/editdictionaries.cc index 56045ea0..0730d61e 100644 --- a/src/ui/editdictionaries.cc +++ b/src/ui/editdictionaries.cc @@ -208,7 +208,7 @@ void EditDictionaries::acceptChangedSources( bool rebuildGroups ) groups.clear(); orderAndProps.clear(); - loadDictionaries( this, true, cfg, dictionaries, dictNetMgr ); + loadDictionaries( this, cfg, dictionaries, dictNetMgr ); // If no changes to groups were made, update the original data const bool noGroupEdits = ( origCfg.groups == savedGroups ); diff --git a/src/ui/editdictionaries.ui b/src/ui/editdictionaries.ui index 4553d692..a376e21f 100644 --- a/src/ui/editdictionaries.ui +++ b/src/ui/editdictionaries.ui @@ -29,10 +29,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok + QDialogButtonBox::StandardButton::Apply|QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Help|QDialogButtonBox::StandardButton::Ok diff --git a/src/ui/fulltextsearch.ui b/src/ui/fulltextsearch.ui index fb213151..48c69429 100644 --- a/src/ui/fulltextsearch.ui +++ b/src/ui/fulltextsearch.ui @@ -73,7 +73,7 @@ -1 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -142,7 +142,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -168,7 +168,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -188,7 +188,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -208,7 +208,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal diff --git a/src/ui/groups.ui b/src/ui/groups.ui index 3d542e0e..33482f7a 100644 --- a/src/ui/groups.ui +++ b/src/ui/groups.ui @@ -36,7 +36,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -99,7 +99,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -123,10 +123,10 @@ - QTabWidget::North + QTabWidget::TabPosition::North - Qt::ElideNone + Qt::TextElideMode::ElideNone @@ -180,7 +180,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -224,7 +224,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal diff --git a/src/ui/initializing.ui b/src/ui/initializing.ui index 59358217..0df55571 100644 --- a/src/ui/initializing.ui +++ b/src/ui/initializing.ui @@ -3,7 +3,7 @@ Initializing - Qt::ApplicationModal + Qt::WindowModality::ApplicationModal @@ -75,7 +75,7 @@ -1 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -105,7 +105,7 @@ Indexing: - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter @@ -127,7 +127,7 @@ Dictionary Name - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter true diff --git a/src/ui/mainwindow.cc b/src/ui/mainwindow.cc index 23483792..78689ba7 100644 --- a/src/ui/mainwindow.cc +++ b/src/ui/mainwindow.cc @@ -1585,7 +1585,7 @@ void MainWindow::makeDictionaries() ftsIndexing.stopIndexing(); ftsIndexing.clearDictionaries(); - loadDictionaries( this, isVisible(), cfg, dictionaries, dictNetMgr, false ); + loadDictionaries( this, cfg, dictionaries, dictNetMgr, false ); //create map dictMap = Dictionary::dictToMap( dictionaries ); @@ -3478,7 +3478,7 @@ void MainWindow::on_rescanFiles_triggered() dictionariesUnmuted.clear(); dictionaryBar.setDictionaries( dictionaries ); - loadDictionaries( this, true, cfg, dictionaries, dictNetMgr ); + loadDictionaries( this, cfg, dictionaries, dictNetMgr ); dictMap = Dictionary::dictToMap( dictionaries ); for ( const auto & dictionarie : dictionaries ) { diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui index 056fbc21..bbb47d60 100644 --- a/src/ui/mainwindow.ui +++ b/src/ui/mainwindow.ui @@ -39,7 +39,7 @@ - Qt::ElideRight + Qt::TextElideMode::ElideRight @@ -293,7 +293,7 @@ F3 - QAction::NoRole + QAction::MenuRole::NoRole @@ -308,7 +308,7 @@ F4 - QAction::PreferencesRole + QAction::MenuRole::PreferencesRole @@ -316,7 +316,7 @@ &Homepage - QAction::NoRole + QAction::MenuRole::NoRole @@ -327,7 +327,7 @@ About GoldenDict-ng - QAction::AboutRole + QAction::MenuRole::AboutRole @@ -341,7 +341,7 @@ Ctrl+Q - QAction::QuitRole + QAction::MenuRole::QuitRole @@ -349,7 +349,7 @@ &Forum - QAction::NoRole + QAction::MenuRole::NoRole @@ -363,7 +363,7 @@ Ctrl+F4 - QAction::NoRole + QAction::MenuRole::NoRole @@ -382,7 +382,7 @@ F2 - QAction::NoRole + QAction::MenuRole::NoRole @@ -397,7 +397,7 @@ Ctrl+P - QAction::NoRole + QAction::MenuRole::NoRole @@ -405,7 +405,7 @@ Page Set&up - QAction::NoRole + QAction::MenuRole::NoRole @@ -413,7 +413,7 @@ Print Pre&view - QAction::NoRole + QAction::MenuRole::NoRole @@ -424,7 +424,7 @@ Ctrl+F5 - QAction::NoRole + QAction::MenuRole::NoRole @@ -432,7 +432,7 @@ &Clear - QAction::NoRole + QAction::MenuRole::NoRole @@ -447,10 +447,10 @@ Ctrl+T - Qt::WidgetShortcut + Qt::ShortcutContext::WidgetShortcut - QAction::NoRole + QAction::MenuRole::NoRole @@ -458,7 +458,7 @@ &Configuration Folder - QAction::NoRole + QAction::MenuRole::NoRole @@ -469,7 +469,7 @@ Ctrl+H - QAction::NoRole + QAction::MenuRole::NoRole @@ -477,7 +477,7 @@ &Export - QAction::NoRole + QAction::MenuRole::NoRole @@ -485,7 +485,7 @@ &Import - QAction::NoRole + QAction::MenuRole::NoRole @@ -522,7 +522,7 @@ Ctrl+F - QAction::TextHeuristicRole + QAction::MenuRole::TextHeuristicRole @@ -533,10 +533,10 @@ Ctrl+Shift+F - Qt::WidgetWithChildrenShortcut + Qt::ShortcutContext::WidgetWithChildrenShortcut - QAction::TextHeuristicRole + QAction::MenuRole::TextHeuristicRole diff --git a/src/ui/orderandprops.ui b/src/ui/orderandprops.ui index ceb388e7..71b465f2 100644 --- a/src/ui/orderandprops.ui +++ b/src/ui/orderandprops.ui @@ -82,10 +82,10 @@ TextLabel - Qt::PlainText + Qt::TextFormat::PlainText - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse @@ -95,7 +95,7 @@ TextLabel - Qt::PlainText + Qt::TextFormat::PlainText @@ -119,7 +119,7 @@ TextLabel - Qt::PlainText + Qt::TextFormat::PlainText @@ -143,7 +143,7 @@ TextLabel - Qt::RichText + Qt::TextFormat::RichText @@ -153,7 +153,7 @@ TextLabel - Qt::RichText + Qt::TextFormat::RichText @@ -169,7 +169,7 @@ - QFrame::NoFrame + QFrame::Shape::NoFrame true @@ -179,7 +179,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -192,7 +192,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -230,10 +230,10 @@ - QFrame::NoFrame + QFrame::Shape::NoFrame - QPlainTextEdit::NoWrap + QPlainTextEdit::LineWrapMode::NoWrap true diff --git a/src/ui/preferences.ui b/src/ui/preferences.ui index d616e44c..1c513cef 100644 --- a/src/ui/preferences.ui +++ b/src/ui/preferences.ui @@ -33,7 +33,7 @@ - Qt::ElideNone + Qt::TextElideMode::ElideNone false @@ -179,7 +179,7 @@ to open main window and perform other tasks. Enable system tray icon - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter false @@ -219,7 +219,7 @@ the application. - Qt::Vertical + Qt::Orientation::Vertical @@ -322,7 +322,7 @@ the application. - QComboBox::AdjustToContents + QComboBox::SizeAdjustPolicy::AdjustToContents @@ -419,7 +419,7 @@ the application. - Qt::Vertical + Qt::Orientation::Vertical @@ -508,7 +508,7 @@ the application. - QFontComboBox::MonospacedFonts + QFontComboBox::FontFilter::MonospacedFonts @@ -562,7 +562,7 @@ the application. Track Selection change - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop true @@ -582,10 +582,10 @@ in the pressed state when the word selection changes. - QFrame::NoFrame + QFrame::Shape::NoFrame - QFrame::Plain + QFrame::Shadow::Plain 0 @@ -608,7 +608,7 @@ in the pressed state when the word selection changes. - Qt::Horizontal + Qt::Orientation::Horizontal @@ -665,10 +665,10 @@ in the pressed state when the word selection changes. - QFrame::NoFrame + QFrame::Shape::NoFrame - QFrame::Raised + QFrame::Shadow::Raised 0 @@ -749,7 +749,7 @@ in the pressed state when the word selection changes. - Qt::Vertical + Qt::Orientation::Vertical @@ -782,7 +782,7 @@ in the pressed state when the word selection changes. - Qt::Horizontal + Qt::Orientation::Horizontal @@ -809,7 +809,7 @@ in the pressed state when the word selection changes. - Qt::Horizontal + Qt::Orientation::Horizontal @@ -827,10 +827,10 @@ in the pressed state when the word selection changes. - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::Fixed + QSizePolicy::Policy::Fixed @@ -853,7 +853,7 @@ in the pressed state when the word selection changes. - Qt::Vertical + Qt::Orientation::Vertical @@ -946,7 +946,7 @@ in the pressed state when the word selection changes. - Qt::Vertical + Qt::Orientation::Vertical @@ -1072,7 +1072,7 @@ for all program's network requests. - QLineEdit::Password + QLineEdit::EchoMode::Password @@ -1138,7 +1138,7 @@ for all program's network requests. - Qt::Horizontal + Qt::Orientation::Horizontal @@ -1175,7 +1175,7 @@ for all program's network requests. - Qt::Horizontal + Qt::Orientation::Horizontal @@ -1300,7 +1300,7 @@ clears its network cache from disk during exit. - Qt::Horizontal + Qt::Orientation::Horizontal @@ -1329,7 +1329,7 @@ download page. - Qt::Vertical + Qt::Orientation::Vertical @@ -1468,7 +1468,7 @@ download page. - Qt::Horizontal + Qt::Orientation::Horizontal @@ -1511,7 +1511,7 @@ download page. - Qt::Vertical + Qt::Orientation::Vertical @@ -1584,7 +1584,7 @@ download page. - Qt::Horizontal + Qt::Orientation::Horizontal @@ -1631,7 +1631,7 @@ download page. - Qt::Horizontal + Qt::Orientation::Horizontal @@ -1646,7 +1646,7 @@ download page. - Qt::Vertical + Qt::Orientation::Vertical @@ -1721,7 +1721,7 @@ download page. - Qt::Vertical + Qt::Orientation::Vertical @@ -1799,7 +1799,7 @@ from mouse-over, selection, clipboard or command line - Qt::Horizontal + Qt::Orientation::Horizontal @@ -1855,7 +1855,7 @@ from mouse-over, selection, clipboard or command line - Qt::Horizontal + Qt::Orientation::Horizontal @@ -1922,7 +1922,7 @@ from Stardict, Babylon and GLS dictionaries - Qt::Vertical + Qt::Orientation::Vertical @@ -1939,10 +1939,10 @@ from Stardict, Babylon and GLS dictionaries - Qt::Horizontal + Qt::Orientation::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok + QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Help|QDialogButtonBox::StandardButton::Ok diff --git a/src/ui/scanpopup.ui b/src/ui/scanpopup.ui index e9550651..accc7a51 100644 --- a/src/ui/scanpopup.ui +++ b/src/ui/scanpopup.ui @@ -36,10 +36,10 @@ - QFrame::NoFrame + QFrame::Shape::NoFrame - QFrame::Raised + QFrame::Shadow::Raised 0 @@ -76,7 +76,7 @@ - QComboBox::AdjustToContents + QComboBox::SizeAdjustPolicy::AdjustToContents @@ -177,7 +177,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal diff --git a/src/ui/sources.ui b/src/ui/sources.ui index 3ecee4dc..a5ebfc20 100644 --- a/src/ui/sources.ui +++ b/src/ui/sources.ui @@ -26,7 +26,7 @@ - Qt::ElideNone + Qt::TextElideMode::ElideNone true @@ -71,7 +71,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -134,7 +134,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -207,7 +207,7 @@ Add appropriate dictionaries to the bottoms of the appropriate groups to use them. - Qt::PlainText + Qt::TextFormat::PlainText false @@ -258,10 +258,10 @@ of the appropriate groups to use them. - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::Expanding + QSizePolicy::Policy::Expanding @@ -317,7 +317,7 @@ of the appropriate groups to use them. - Qt::Vertical + Qt::Orientation::Vertical @@ -381,7 +381,7 @@ of the appropriate groups to use them. - Qt::Vertical + Qt::Orientation::Vertical @@ -440,7 +440,7 @@ of the appropriate groups to use them. - Qt::Vertical + Qt::Orientation::Vertical @@ -512,7 +512,7 @@ Full list of availiable languages can be found <a href="https://linguali - Qt::Vertical + Qt::Orientation::Vertical @@ -567,7 +567,7 @@ Full list of availiable languages can be found <a href="https://linguali - QFormLayout::ExpandingFieldsGrow + QFormLayout::FieldGrowthPolicy::ExpandingFieldsGrow @@ -586,10 +586,10 @@ Full list of availiable languages can be found <a href="https://linguali - Qt::Horizontal + Qt::Orientation::Horizontal - QSizePolicy::Fixed + QSizePolicy::Policy::Fixed @@ -629,10 +629,10 @@ Full list of availiable languages can be found <a href="https://linguali - Qt::Horizontal + Qt::Orientation::Horizontal - QSizePolicy::Fixed + QSizePolicy::Policy::Fixed @@ -657,7 +657,7 @@ Full list of availiable languages can be found <a href="https://linguali - Qt::Vertical + Qt::Orientation::Vertical diff --git a/src/ui/texttospeechsource.ui b/src/ui/texttospeechsource.ui index 8b7975f9..c1b9a58c 100644 --- a/src/ui/texttospeechsource.ui +++ b/src/ui/texttospeechsource.ui @@ -51,7 +51,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -90,10 +90,10 @@ false - Qt::Horizontal + Qt::Orientation::Horizontal - QSlider::TicksAbove + QSlider::TickPosition::TicksAbove 10 @@ -128,10 +128,10 @@ false - Qt::Horizontal + Qt::Orientation::Horizontal - QSlider::TicksAbove + QSlider::TickPosition::TicksAbove 10 @@ -192,7 +192,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal