Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

opt: do not need to reload webview when initialize dictionaries #1690

Merged
merged 13 commits into from
Jul 17, 2024
Merged

opt: do not need to reload webview when initialize dictionaries #1690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6273723
opt: do not need to reload webview when initialize dictionaries
xiaoyifang Jul 15, 2024
9d4bc31
opt: do not need to reload webview when initialize dictionaries
xiaoyifang Jul 15, 2024
059f48d
1
xiaoyifang Jul 16, 2024
658baea
qt6.6.3
xiaoyifang Jul 16, 2024
22888ca
qt6.6.3
xiaoyifang Jul 16, 2024
f36af09
qt6.6.3
xiaoyifang Jul 16, 2024
efa0909
qt6.6.3
xiaoyifang Jul 16, 2024
9ee1cda
qt6.6.3
xiaoyifang Jul 16, 2024
6073c29
qt6.6.3
xiaoyifang Jul 16, 2024
7868829
1
xiaoyifang Jul 16, 2024
60778f2
1
xiaoyifang Jul 16, 2024
e2b6403
1
xiaoyifang Jul 16, 2024
e3da266
1
xiaoyifang Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions .github/workflows/release-windows-vcpkg-cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
matrix:
os: [windows-2022]
qt_ver: [ 6.7.2 ]
qt_ver: [ 6.7.2, 6.6.3 ]
qt_arch: [win64_msvc2019_64]
env:
version: 24.05.13
Expand Down Expand Up @@ -168,8 +168,22 @@ jobs:
gh release upload "${tagName}" "${namePrefix}.7z#${namePrefix}-Windows.7z" --clobber
gh release upload "${tagName}" "${namePrefix}.exe#${namePrefix}-Windows-installer.exe" --clobber

cd './goldendict'
gh release upload "${tagName}" "goldendict.exe#${namePrefix}-Windows-main-exe-file-only.exe" --clobber
gh release upload "${tagName}" "goldendict.pdb#${namePrefix}-Windows-debug-file.pdb" --clobber
cd ..

- 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 ..
6 changes: 3 additions & 3 deletions src/ui/mainwindow.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1535,7 +1535,7 @@ void MainWindow::makeDictionaries()
ftsIndexing.doIndexing();

updateStatusLine();
updateGroupList();
updateGroupList( false );
}

void MainWindow::updateStatusLine()
Expand Down Expand Up @@ -1597,9 +1597,9 @@ void MainWindow::updateGroupList( bool reload )

updateDictionaryBar();

qDebug() << "Reloading all the tabs...";

if ( reload ) {
qDebug() << "Reloading all the tabs...";

for ( int i = 0; i < ui.tabWidget->count(); ++i ) {
auto & view = dynamic_cast< ArticleView & >( *( ui.tabWidget->widget( i ) ) );

Expand Down
Loading