Merge pull request #1840 from xiaoyifang/staged

merge staged to dev
This commit is contained in:
shenleban tongying 2024-10-19 16:03:23 -04:00 committed by GitHub
commit dc6f168586
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
30 changed files with 536 additions and 638 deletions

View file

@ -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

271
.github/workflows/Release-all.yml vendored Normal file
View file

@ -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<details>\n<summary>🔴 Uncategorized</summary>\n\n#{{UNCATEGORIZED}}\n</details>",
"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 <<HEREDOC > 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

View file

@ -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 \

View file

@ -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 }}

View file

@ -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<details>\n<summary>🔴 Uncategorized</summary>\n\n#{{UNCATEGORIZED}}\n</details>",
"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}}

View file

@ -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<details>\n<summary>🔴 Uncategorized</summary>\n\n#{{UNCATEGORIZED}}\n</details>",
"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 ..

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 39 KiB

View file

@ -198,7 +198,6 @@ void LoadDictionaries::loadingDictionary( string const & dictionaryName ) noexce
void loadDictionaries( QWidget * parent,
bool showInitially,
Config::Class const & cfg,
std::vector< sptr< Dictionary::Class > > & 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

View file

@ -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,

View file

@ -5,19 +5,17 @@
#include "initializing.hh"
#include <QCloseEvent>
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();
}

View file

@ -12,7 +12,7 @@ class Initializing: public QDialog
public:
Initializing( QWidget * parent, bool showOnStartup );
Initializing( QWidget * parent );
public slots:

View file

@ -12,6 +12,8 @@
#endif
#include "multimediaaudioplayer.hh"
#include <QDebug>
MultimediaAudioPlayer::MultimediaAudioPlayer()
#if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
:

View file

@ -84,6 +84,10 @@ pre {
background-color: hsl(0deg 0% 70%);
}
.ankibutton img {
width: 32px;
}
.gddicttitle {
user-select: none;
}

View file

@ -3,7 +3,7 @@
<class>About</class>
<widget class="QDialog" name="About">
<property name="windowModality">
<enum>Qt::NonModal</enum>
<enum>Qt::WindowModality::NonModal</enum>
</property>
<property name="geometry">
<rect>
@ -46,7 +46,7 @@
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
<property name="margin">
<number>10</number>
@ -66,7 +66,7 @@
<string>GoldenDict-ng dictionary lookup program, version </string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
</property>
</widget>
</item>
@ -79,7 +79,7 @@
<string notr="true">#.#</string>
</property>
<property name="textInteractionFlags">
<set>Qt::TextEditorInteraction</set>
<set>Qt::TextInteractionFlag::TextEditorInteraction</set>
</property>
</widget>
</item>
@ -91,7 +91,7 @@
<string notr="true">(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
</property>
</widget>
</item>
@ -101,7 +101,7 @@
<string>Licensed under GNU GPLv3 or later</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
</property>
</widget>
</item>
@ -111,7 +111,7 @@
<string notr="true">Based on Qt #.#.# (GCC #.#, 32/64 bit)</string>
</property>
<property name="textInteractionFlags">
<set>Qt::TextEditorInteraction</set>
<set>Qt::TextInteractionFlag::TextEditorInteraction</set>
</property>
</widget>
</item>
@ -146,7 +146,7 @@
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -168,7 +168,7 @@
<string>Credits:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
</property>
</widget>
</item>
@ -188,10 +188,10 @@
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::StandardButton::Ok</set>
</property>
<property name="centerButtons">
<bool>true</bool>

View file

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>389</width>
<height>120</height>
<width>428</width>
<height>150</height>
</rect>
</property>
<property name="windowTitle">
@ -44,24 +44,24 @@
<item row="2" column="1">
<widget class="QLineEdit" name="passwordEdit">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
<enum>QLineEdit::EchoMode::Password</enum>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
</property>
</widget>
</item>
<item row="3" column="0">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>

View file

@ -35,7 +35,7 @@
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>

View file

@ -129,7 +129,7 @@
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>

View file

@ -50,7 +50,7 @@
<string/>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
</property>
</widget>
</item>
@ -60,7 +60,7 @@
<string notr="true"/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
@ -98,7 +98,7 @@
<string notr="true"/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
@ -160,7 +160,7 @@
<bool>false</bool>
</property>
<property name="lineWrapMode">
<enum>QPlainTextEdit::NoWrap</enum>
<enum>QPlainTextEdit::LineWrapMode::NoWrap</enum>
</property>
<property name="readOnly">
<bool>true</bool>
@ -183,7 +183,7 @@
<string notr="true"/>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
<enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum>
</property>
<property name="readOnly">
<bool>true</bool>
@ -205,7 +205,7 @@
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -228,7 +228,7 @@
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>

View file

@ -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 );

View file

@ -29,10 +29,10 @@
<item>
<widget class="QDialogButtonBox" name="buttons">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::StandardButton::Apply|QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Help|QDialogButtonBox::StandardButton::Ok</set>
</property>
</widget>
</item>

View file

@ -73,7 +73,7 @@
<number>-1</number>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
@ -142,7 +142,7 @@
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -168,7 +168,7 @@
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -188,7 +188,7 @@
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -208,7 +208,7 @@
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>

View file

@ -36,7 +36,7 @@
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -99,7 +99,7 @@
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -123,10 +123,10 @@
<item>
<widget class="DictGroupsWidget" name="groups">
<property name="tabPosition">
<enum>QTabWidget::North</enum>
<enum>QTabWidget::TabPosition::North</enum>
</property>
<property name="elideMode">
<enum>Qt::ElideNone</enum>
<enum>Qt::TextElideMode::ElideNone</enum>
</property>
<widget class="QWidget" name="tab_4">
<attribute name="title">
@ -180,7 +180,7 @@
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -224,7 +224,7 @@
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>

View file

@ -3,7 +3,7 @@
<class>Initializing</class>
<widget class="QDialog" name="Initializing">
<property name="windowModality">
<enum>Qt::ApplicationModal</enum>
<enum>Qt::WindowModality::ApplicationModal</enum>
</property>
<property name="geometry">
<rect>
@ -75,7 +75,7 @@
<number>-1</number>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
<widget class="QWidget" name="layoutWidget">
@ -105,7 +105,7 @@
<string>Indexing: </string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
</property>
</widget>
</item>
@ -127,7 +127,7 @@
<string>Dictionary Name</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>

View file

@ -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 ) {

View file

@ -39,7 +39,7 @@
</size>
</property>
<property name="elideMode">
<enum>Qt::ElideRight</enum>
<enum>Qt::TextElideMode::ElideRight</enum>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
@ -293,7 +293,7 @@
<string>F3</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
<enum>QAction::MenuRole::NoRole</enum>
</property>
</action>
<action name="preferences">
@ -308,7 +308,7 @@
<string>F4</string>
</property>
<property name="menuRole">
<enum>QAction::PreferencesRole</enum>
<enum>QAction::MenuRole::PreferencesRole</enum>
</property>
</action>
<action name="visitHomepage">
@ -316,7 +316,7 @@
<string>&amp;Homepage</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
<enum>QAction::MenuRole::NoRole</enum>
</property>
</action>
<action name="about">
@ -327,7 +327,7 @@
<string>About GoldenDict-ng</string>
</property>
<property name="menuRole">
<enum>QAction::AboutRole</enum>
<enum>QAction::MenuRole::AboutRole</enum>
</property>
</action>
<action name="quit">
@ -341,7 +341,7 @@
<string>Ctrl+Q</string>
</property>
<property name="menuRole">
<enum>QAction::QuitRole</enum>
<enum>QAction::MenuRole::QuitRole</enum>
</property>
</action>
<action name="visitForum">
@ -349,7 +349,7 @@
<string>&amp;Forum</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
<enum>QAction::MenuRole::NoRole</enum>
</property>
</action>
<action name="actionCloseToTray">
@ -363,7 +363,7 @@
<string>Ctrl+F4</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
<enum>QAction::MenuRole::NoRole</enum>
</property>
</action>
<action name="saveArticle">
@ -382,7 +382,7 @@
<string>F2</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
<enum>QAction::MenuRole::NoRole</enum>
</property>
</action>
<action name="print">
@ -397,7 +397,7 @@
<string>Ctrl+P</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
<enum>QAction::MenuRole::NoRole</enum>
</property>
</action>
<action name="pageSetup">
@ -405,7 +405,7 @@
<string>Page Set&amp;up</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
<enum>QAction::MenuRole::NoRole</enum>
</property>
</action>
<action name="printPreview">
@ -413,7 +413,7 @@
<string>Print Pre&amp;view</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
<enum>QAction::MenuRole::NoRole</enum>
</property>
</action>
<action name="rescanFiles">
@ -424,7 +424,7 @@
<string>Ctrl+F5</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
<enum>QAction::MenuRole::NoRole</enum>
</property>
</action>
<action name="clearHistory">
@ -432,7 +432,7 @@
<string>&amp;Clear</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
<enum>QAction::MenuRole::NoRole</enum>
</property>
</action>
<action name="newTab">
@ -447,10 +447,10 @@
<string>Ctrl+T</string>
</property>
<property name="shortcutContext">
<enum>Qt::WidgetShortcut</enum>
<enum>Qt::ShortcutContext::WidgetShortcut</enum>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
<enum>QAction::MenuRole::NoRole</enum>
</property>
</action>
<action name="openConfigFolder">
@ -458,7 +458,7 @@
<string>&amp;Configuration Folder</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
<enum>QAction::MenuRole::NoRole</enum>
</property>
</action>
<action name="showHideHistory">
@ -469,7 +469,7 @@
<string>Ctrl+H</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
<enum>QAction::MenuRole::NoRole</enum>
</property>
</action>
<action name="exportHistory">
@ -477,7 +477,7 @@
<string>&amp;Export</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
<enum>QAction::MenuRole::NoRole</enum>
</property>
</action>
<action name="importHistory">
@ -485,7 +485,7 @@
<string>&amp;Import</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
<enum>QAction::MenuRole::NoRole</enum>
</property>
</action>
<action name="alwaysOnTop">
@ -522,7 +522,7 @@
<string>Ctrl+F</string>
</property>
<property name="menuRole">
<enum>QAction::TextHeuristicRole</enum>
<enum>QAction::MenuRole::TextHeuristicRole</enum>
</property>
</action>
<action name="fullTextSearchAction">
@ -533,10 +533,10 @@
<string>Ctrl+Shift+F</string>
</property>
<property name="shortcutContext">
<enum>Qt::WidgetWithChildrenShortcut</enum>
<enum>Qt::ShortcutContext::WidgetWithChildrenShortcut</enum>
</property>
<property name="menuRole">
<enum>QAction::TextHeuristicRole</enum>
<enum>QAction::MenuRole::TextHeuristicRole</enum>
</property>
</action>
<action name="showReference">

View file

@ -82,10 +82,10 @@
<string notr="true">TextLabel</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
<enum>Qt::TextFormat::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
</property>
</widget>
</item>
@ -95,7 +95,7 @@
<string notr="true">TextLabel</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
<enum>Qt::TextFormat::PlainText</enum>
</property>
</widget>
</item>
@ -119,7 +119,7 @@
<string notr="true">TextLabel</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
<enum>Qt::TextFormat::PlainText</enum>
</property>
</widget>
</item>
@ -143,7 +143,7 @@
<string notr="true">TextLabel</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
<enum>Qt::TextFormat::RichText</enum>
</property>
</widget>
</item>
@ -153,7 +153,7 @@
<string notr="true">TextLabel</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
<enum>Qt::TextFormat::RichText</enum>
</property>
</widget>
</item>
@ -169,7 +169,7 @@
<item>
<widget class="QTextEdit" name="dictionaryDescription">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
<enum>QFrame::Shape::NoFrame</enum>
</property>
<property name="readOnly">
<bool>true</bool>
@ -179,7 +179,7 @@
<item>
<spacer name="infoVerticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -192,7 +192,7 @@
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -230,10 +230,10 @@
</size>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
<enum>QFrame::Shape::NoFrame</enum>
</property>
<property name="lineWrapMode">
<enum>QPlainTextEdit::NoWrap</enum>
<enum>QPlainTextEdit::LineWrapMode::NoWrap</enum>
</property>
<property name="readOnly">
<bool>true</bool>

View file

@ -33,7 +33,7 @@
</size>
</property>
<property name="elideMode">
<enum>Qt::ElideNone</enum>
<enum>Qt::TextElideMode::ElideNone</enum>
</property>
<property name="usesScrollButtons">
<bool>false</bool>
@ -179,7 +179,7 @@ to open main window and perform other tasks.</string>
<string>Enable system tray icon</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
</property>
<property name="flat">
<bool>false</bool>
@ -219,7 +219,7 @@ the application.</string>
<item row="16" column="0" colspan="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -322,7 +322,7 @@ the application.</string>
</size>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
<enum>QComboBox::SizeAdjustPolicy::AdjustToContents</enum>
</property>
</widget>
</item>
@ -419,7 +419,7 @@ the application.</string>
<item>
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -508,7 +508,7 @@ the application.</string>
</sizepolicy>
</property>
<property name="fontFilters">
<set>QFontComboBox::MonospacedFonts</set>
<set>QFontComboBox::FontFilter::MonospacedFonts</set>
</property>
</widget>
</item>
@ -562,7 +562,7 @@ the application.</string>
<string>Track Selection change</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
</property>
<property name="checkable">
<bool>true</bool>
@ -582,10 +582,10 @@ in the pressed state when the word selection changes.</string>
<item>
<widget class="QFrame" name="scanPopupModifiers">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
<enum>QFrame::Shape::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
<enum>QFrame::Shadow::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
@ -608,7 +608,7 @@ in the pressed state when the word selection changes.</string>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -665,10 +665,10 @@ in the pressed state when the word selection changes.</string>
<item>
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
<enum>QFrame::Shape::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
<enum>QFrame::Shadow::Raised</enum>
</property>
<property name="lineWidth">
<number>0</number>
@ -749,7 +749,7 @@ in the pressed state when the word selection changes.</string>
<item>
<spacer name="verticalSpacer_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -782,7 +782,7 @@ in the pressed state when the word selection changes.</string>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -809,7 +809,7 @@ in the pressed state when the word selection changes.</string>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -827,10 +827,10 @@ in the pressed state when the word selection changes.</string>
<item>
<spacer name="verticalSpacer_13">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -853,7 +853,7 @@ in the pressed state when the word selection changes.</string>
<item>
<spacer name="verticalSpacer_12">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -946,7 +946,7 @@ in the pressed state when the word selection changes.</string>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1072,7 +1072,7 @@ for all program's network requests.</string>
<item>
<widget class="QLineEdit" name="proxyPassword">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
<enum>QLineEdit::EchoMode::Password</enum>
</property>
</widget>
</item>
@ -1138,7 +1138,7 @@ for all program's network requests.</string>
<item>
<spacer name="horizontalSpacer_16">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1175,7 +1175,7 @@ for all program's network requests.</string>
<item>
<spacer name="horizontalSpacer_17">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1300,7 +1300,7 @@ clears its network cache from disk during exit.</string>
<item>
<spacer name="horizontalSpacer_15">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1329,7 +1329,7 @@ download page.</string>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1468,7 +1468,7 @@ download page.</string>
<item>
<spacer name="horizontalSpacer_10">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1511,7 +1511,7 @@ download page.</string>
<item>
<spacer name="verticalSpacer_7">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1584,7 +1584,7 @@ download page.</string>
<item>
<spacer name="horizontalSpacer_8">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1631,7 +1631,7 @@ download page.</string>
<item>
<spacer name="horizontalSpacer_9">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1646,7 +1646,7 @@ download page.</string>
<item>
<spacer name="verticalSpacer_8">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1721,7 +1721,7 @@ download page.</string>
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1799,7 +1799,7 @@ from mouse-over, selection, clipboard or command line</string>
<item row="1" column="3">
<spacer name="horizontalSpacer_14">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1855,7 +1855,7 @@ from mouse-over, selection, clipboard or command line</string>
<item row="0" column="3">
<spacer name="horizontalSpacer_11">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1922,7 +1922,7 @@ from Stardict, Babylon and GLS dictionaries</string>
<item>
<spacer name="verticalSpacer_17">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1939,10 +1939,10 @@ from Stardict, Babylon and GLS dictionaries</string>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Help|QDialogButtonBox::StandardButton::Ok</set>
</property>
</widget>
</item>

View file

@ -36,10 +36,10 @@
<item>
<widget class="QFrame" name="outerFrame">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
<enum>QFrame::Shape::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
<enum>QFrame::Shadow::Raised</enum>
</property>
<property name="lineWidth">
<number>0</number>
@ -76,7 +76,7 @@
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
<enum>QComboBox::SizeAdjustPolicy::AdjustToContents</enum>
</property>
</widget>
</item>
@ -177,7 +177,7 @@
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>

View file

@ -26,7 +26,7 @@
</size>
</property>
<property name="elideMode">
<enum>Qt::ElideNone</enum>
<enum>Qt::TextElideMode::ElideNone</enum>
</property>
<property name="usesScrollButtons">
<bool>true</bool>
@ -71,7 +71,7 @@
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -134,7 +134,7 @@
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -207,7 +207,7 @@ Add appropriate dictionaries to the bottoms
of the appropriate groups to use them.</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
<enum>Qt::TextFormat::PlainText</enum>
</property>
<property name="wordWrap">
<bool>false</bool>
@ -258,10 +258,10 @@ of the appropriate groups to use them.</string>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
<enum>QSizePolicy::Policy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -317,7 +317,7 @@ of the appropriate groups to use them.</string>
<item>
<spacer name="verticalSpacer_8">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -381,7 +381,7 @@ of the appropriate groups to use them.</string>
<item>
<spacer name="verticalSpacer_18">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -440,7 +440,7 @@ of the appropriate groups to use them.</string>
<item>
<spacer name="verticalSpacer_12">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -512,7 +512,7 @@ Full list of availiable languages can be found &lt;a href=&quot;https://linguali
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -567,7 +567,7 @@ Full list of availiable languages can be found &lt;a href=&quot;https://linguali
<item>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
<enum>QFormLayout::FieldGrowthPolicy::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_12">
@ -586,10 +586,10 @@ Full list of availiable languages can be found &lt;a href=&quot;https://linguali
<item row="1" column="0">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -629,10 +629,10 @@ Full list of availiable languages can be found &lt;a href=&quot;https://linguali
<item row="3" column="0">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -657,7 +657,7 @@ Full list of availiable languages can be found &lt;a href=&quot;https://linguali
<item>
<spacer name="verticalSpacer_10">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>

View file

@ -51,7 +51,7 @@
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -90,10 +90,10 @@
<bool>false</bool>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksAbove</enum>
<enum>QSlider::TickPosition::TicksAbove</enum>
</property>
<property name="tickInterval">
<number>10</number>
@ -128,10 +128,10 @@
<bool>false</bool>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksAbove</enum>
<enum>QSlider::TickPosition::TicksAbove</enum>
</property>
<property name="tickInterval">
<number>10</number>
@ -192,7 +192,7 @@
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>