diff --git a/.github/workflows/release-windows-vcpkg-cmake.yml b/.github/workflows/release-windows-vcpkg-cmake.yml index b87b8332..a909a0fa 100644 --- a/.github/workflows/release-windows-vcpkg-cmake.yml +++ b/.github/workflows/release-windows-vcpkg-cmake.yml @@ -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 @@ -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 .. \ No newline at end of file diff --git a/src/ui/mainwindow.cc b/src/ui/mainwindow.cc index 2e4a2af3..e240d00c 100644 --- a/src/ui/mainwindow.cc +++ b/src/ui/mainwindow.cc @@ -1535,7 +1535,7 @@ void MainWindow::makeDictionaries() ftsIndexing.doIndexing(); updateStatusLine(); - updateGroupList(); + updateGroupList( false ); } void MainWindow::updateStatusLine() @@ -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 ) ) );