hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-30 17:24:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'staged' into dev

Browse source
This commit is contained in:
Xiao YiFang 2022-08-05 22:26:57 +08:00
parent c14009d9f7 48711e73ba
commit 9fb60f3b03
11 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/macos-6.2.yml vendored
View file

@ -61,7 +61,7 @@ jobs:
run: | run: |
brew uninstall opencc hunspell ffmpeg@5 ffmpeg@4 libtiff xz lzo libogg libvorbis zstd || true brew uninstall opencc hunspell ffmpeg@5 ffmpeg@4 libtiff xz lzo libogg libvorbis zstd || true
brew install create-dmg 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) make -j$(nproc)
# 打包 # 打包
- name: package - name: package

2
.github/workflows/macos-PR-check.yml vendored
View file

@ -67,5 +67,5 @@ jobs:
run: | run: |
brew uninstall opencc hunspell ffmpeg@5 ffmpeg@4 libtiff xz lzo libogg libvorbis zstd || true brew uninstall opencc hunspell ffmpeg@5 ffmpeg@4 libtiff xz lzo libogg libvorbis zstd || true
brew install create-dmg 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) make -j$(nproc)

2
.github/workflows/macos.yml vendored
View file

@ -62,7 +62,7 @@ jobs:
run: | run: |
brew uninstall opencc hunspell ffmpeg@5 ffmpeg@4 libtiff xz lzo libogg libvorbis zstd || true brew uninstall opencc hunspell ffmpeg@5 ffmpeg@4 libtiff xz lzo libogg libvorbis zstd || true
brew install create-dmg 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) make -j$(nproc)
# 打包 # 打包
- name: package - name: package

2
.github/workflows/ubuntu-6.2.yml vendored
View file

@ -62,7 +62,7 @@ jobs:
- name: build goldendict - name: build goldendict
run: | 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/ make INSTALL_ROOT=appdir -j`nproc` install; find appdir/
ls -al appdir ls -al appdir

2
.github/workflows/ubuntu-PR-check.yml vendored
View file

@ -74,7 +74,7 @@ jobs:
- name: build goldendict - name: build goldendict
run: | 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/ make INSTALL_ROOT=appdir -j`nproc` install; find appdir/
#copy missing shared dll to appdir. #copy missing shared dll to appdir.

2
.github/workflows/ubuntu.yml vendored
View file

@ -61,7 +61,7 @@ jobs:
- name: build goldendict - name: build goldendict
run: | 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/ make INSTALL_ROOT=appdir -j`nproc` install; find appdir/
#copy missing shared dll to appdir. #copy missing shared dll to appdir.

3
.github/workflows/windows-6.2.yml vendored
View file

@ -44,7 +44,6 @@ jobs:
version: ${{ matrix.qt_ver }} version: ${{ matrix.qt_ver }}
# target: ${{ matrix.qt_target }} # target: ${{ matrix.qt_target }}
arch: ${{ matrix.qt_arch }} arch: ${{ matrix.qt_arch }}
cached: 'false'
modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats
setup-python: 'false' setup-python: 'false'
py7zrversion: '==0.18.1' 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 }} tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
overwrite: true overwrite: true
release_name: GoldenDict-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }} release_name: GoldenDict-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
prerelease: ${{env.prerelease}} prerelease: ${{env.prerelease}}

5
articleview.cc
View file

@ -2492,11 +2492,6 @@ void ArticleView::copyAsText()
QApplication::clipboard()->setText( text ); QApplication::clipboard()->setText( text );
} }
void ArticleView::inspect()
{
ui.definition->triggerPageAction( QWebEnginePage::InspectElement );
}
void ArticleView::highlightFTSResults() void ArticleView::highlightFTSResults()
{ {
closeSearch(); closeSearch();

3
articleview.hh
View file

@ -362,9 +362,6 @@ private slots:
/// Copy current selection as plain text /// Copy current selection as plain text
void copyAsText(); void copyAsText();
/// Inspect element
void inspect();
void setActiveDictIds(ActiveDictIds); void setActiveDictIds(ActiveDictIds);
void dictionaryClear( ActiveDictIds ad ); void dictionaryClear( ActiveDictIds ad );

5
articlewebview.cc
View file

@ -34,11 +34,6 @@ void ArticleWebView::setUp( Config::Class * cfg )
setZoomFactor(cfg->preferences.zoomFactor); setZoomFactor(cfg->preferences.zoomFactor);
} }
void ArticleWebView::triggerPageAction( QWebEnginePage::WebAction action, bool checked )
{
QWebEngineView::triggerPageAction( action, checked );
}
QWebEngineView * ArticleWebView::createWindow( QWebEnginePage::WebWindowType type ) QWebEngineView * ArticleWebView::createWindow( QWebEnginePage::WebWindowType type )
{ {
if(type==QWebEnginePage::WebWindowType::WebDialog) if(type==QWebEnginePage::WebWindowType::WebDialog)

2
articlewebview.hh
View file

@ -35,8 +35,6 @@ public:
void setSelectionBySingleClick( bool set ) void setSelectionBySingleClick( bool set )
{ selectionBySingleClick = set; } { selectionBySingleClick = set; }
void triggerPageAction(QWebEnginePage::WebAction action, bool checked = false);
bool eventFilter(QObject *obj, QEvent *ev); bool eventFilter(QObject *obj, QEvent *ev);
signals: signals: