diff --git a/.github/workflows/macos-6.2.yml b/.github/workflows/macos-6.2.yml index 2ae9338e..627e57b9 100644 --- a/.github/workflows/macos-6.2.yml +++ b/.github/workflows/macos-6.2.yml @@ -61,7 +61,7 @@ jobs: run: | brew uninstall opencc hunspell ffmpeg@5 ffmpeg@4 libtiff xz lzo libogg libvorbis zstd || true brew install create-dmg - qmake CONFIG+=release CONFIG+=zim_support CONFIG+=chinese_conversion_support QMAKE_APPLE_DEVICE_ARCHS="x86_64 arm64" + qmake CONFIG+=release CONFIG+=no_extra_tiff_handler CONFIG+=zim_support CONFIG+=chinese_conversion_support QMAKE_APPLE_DEVICE_ARCHS="x86_64 arm64" make -j$(nproc) # 打包 - name: package diff --git a/.github/workflows/macos-PR-check.yml b/.github/workflows/macos-PR-check.yml index 3fb902b7..7691b867 100644 --- a/.github/workflows/macos-PR-check.yml +++ b/.github/workflows/macos-PR-check.yml @@ -67,5 +67,5 @@ jobs: run: | brew uninstall opencc hunspell ffmpeg@5 ffmpeg@4 libtiff xz lzo libogg libvorbis zstd || true brew install create-dmg - qmake CONFIG+=release CONFIG+=zim_support CONFIG+=chinese_conversion_support #QMAKE_APPLE_DEVICE_ARCHS="x86_64 arm64" + qmake CONFIG+=release CONFIG+=no_extra_tiff_handler CONFIG+=zim_support CONFIG+=chinese_conversion_support #QMAKE_APPLE_DEVICE_ARCHS="x86_64 arm64" make -j$(nproc) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 15dc3d20..c5cc2d64 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -62,7 +62,7 @@ jobs: run: | brew uninstall opencc hunspell ffmpeg@5 ffmpeg@4 libtiff xz lzo libogg libvorbis zstd || true brew install create-dmg - qmake CONFIG+=release CONFIG+=zim_support CONFIG+=chinese_conversion_support + qmake CONFIG+=release CONFIG+=no_extra_tiff_handler CONFIG+=zim_support CONFIG+=chinese_conversion_support make -j$(nproc) # 打包 - name: package diff --git a/.github/workflows/ubuntu-6.2.yml b/.github/workflows/ubuntu-6.2.yml index 5fbf32cc..42641c9b 100644 --- a/.github/workflows/ubuntu-6.2.yml +++ b/.github/workflows/ubuntu-6.2.yml @@ -62,7 +62,7 @@ jobs: - name: build goldendict run: | - qmake CONFIG+=release PREFIX=/usr CONFIG+=zim_support CONFIG+=chinese_conversion_support + qmake CONFIG+=release CONFIG+=no_extra_tiff_handler PREFIX=/usr CONFIG+=zim_support CONFIG+=chinese_conversion_support make INSTALL_ROOT=appdir -j`nproc` install; find appdir/ ls -al appdir diff --git a/.github/workflows/ubuntu-PR-check.yml b/.github/workflows/ubuntu-PR-check.yml index 207b6124..603f90c8 100644 --- a/.github/workflows/ubuntu-PR-check.yml +++ b/.github/workflows/ubuntu-PR-check.yml @@ -74,7 +74,7 @@ jobs: - name: build goldendict run: | - qmake CONFIG+=release PREFIX=/usr CONFIG+=zim_support CONFIG+=chinese_conversion_support + qmake CONFIG+=release CONFIG+=no_extra_tiff_handler PREFIX=/usr CONFIG+=zim_support CONFIG+=chinese_conversion_support make INSTALL_ROOT=appdir -j`nproc` install; find appdir/ #copy missing shared dll to appdir. diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 0b507b37..c7ac47c9 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -61,7 +61,7 @@ jobs: - name: build goldendict run: | - qmake CONFIG+=release PREFIX=/usr CONFIG+=zim_support CONFIG+=chinese_conversion_support + qmake CONFIG+=release CONFIG+=no_extra_tiff_handler PREFIX=/usr CONFIG+=zim_support CONFIG+=chinese_conversion_support make INSTALL_ROOT=appdir -j`nproc` install; find appdir/ #copy missing shared dll to appdir. diff --git a/.github/workflows/windows-6.2.yml b/.github/workflows/windows-6.2.yml index 67358650..6587deab 100644 --- a/.github/workflows/windows-6.2.yml +++ b/.github/workflows/windows-6.2.yml @@ -44,7 +44,6 @@ jobs: version: ${{ matrix.qt_ver }} # target: ${{ matrix.qt_target }} arch: ${{ matrix.qt_arch }} - cached: 'false' modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats setup-python: 'false' py7zrversion: '==0.18.1' @@ -181,4 +180,4 @@ jobs: tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }} overwrite: true release_name: GoldenDict-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }} - prerelease: ${{env.prerelease}} \ No newline at end of file + prerelease: ${{env.prerelease}} diff --git a/articleview.cc b/articleview.cc index 4135d83b..ada189cf 100644 --- a/articleview.cc +++ b/articleview.cc @@ -2492,11 +2492,6 @@ void ArticleView::copyAsText() QApplication::clipboard()->setText( text ); } -void ArticleView::inspect() -{ - ui.definition->triggerPageAction( QWebEnginePage::InspectElement ); -} - void ArticleView::highlightFTSResults() { closeSearch(); diff --git a/articleview.hh b/articleview.hh index d47dfc05..8a09d71e 100644 --- a/articleview.hh +++ b/articleview.hh @@ -362,9 +362,6 @@ private slots: /// Copy current selection as plain text void copyAsText(); - /// Inspect element - void inspect(); - void setActiveDictIds(ActiveDictIds); void dictionaryClear( ActiveDictIds ad ); diff --git a/articlewebview.cc b/articlewebview.cc index 916f98d7..bcdfe0c5 100644 --- a/articlewebview.cc +++ b/articlewebview.cc @@ -34,11 +34,6 @@ void ArticleWebView::setUp( Config::Class * cfg ) setZoomFactor(cfg->preferences.zoomFactor); } -void ArticleWebView::triggerPageAction( QWebEnginePage::WebAction action, bool checked ) -{ - QWebEngineView::triggerPageAction( action, checked ); -} - QWebEngineView * ArticleWebView::createWindow( QWebEnginePage::WebWindowType type ) { if(type==QWebEnginePage::WebWindowType::WebDialog) diff --git a/articlewebview.hh b/articlewebview.hh index bfab5f71..8a942172 100644 --- a/articlewebview.hh +++ b/articlewebview.hh @@ -35,8 +35,6 @@ public: void setSelectionBySingleClick( bool set ) { selectionBySingleClick = set; } - void triggerPageAction(QWebEnginePage::WebAction action, bool checked = false); - bool eventFilter(QObject *obj, QEvent *ev); signals: