Skip to content

Commit

Permalink
Merge branch 'staged' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@xiaoyifang
xiaoyifang committed May 11, 2022
2 parents 3efaf8c + 5fc5040 commit c835af3
Show file tree
Hide file tree
Showing 12 changed files with 31 additions and 18 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/macos-6.2.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,15 @@ jobs:
release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}
branch: ${{ github.ref_name }}
commit: ${{ steps.vars.outputs.sha_short }}
Qt version: ${{ matrix.qt_ver }} ${{ matrix.qt_arch }}
Qt version: Qt5.15.2,Qt6.X ${{ matrix.qt_arch }}
Windows built with: msvc64 Visual studio 2019
## goldendict.exe can not be used alone
if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
AppImage built with: Ubuntu-20.04 ,latest gcc
macos built with: macos-10.15,macos-11.0,clang_64 x86_64
qt6.X(Univeral Build)
qt5.15.2(Intel Kind)
Qt6.X(Universal Build)
Qt5.15.2(Intel Kind)
auto built by github action. use on your on risk:-)
CHANGES:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,14 @@ jobs:
release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}
branch: ${{ github.ref_name }}
commit: ${{ steps.vars.outputs.sha_short }}
Qt version: ${{ matrix.qt_ver }} ${{ matrix.qt_arch }}
Qt version: Qt5.15.2,Qt6.X ${{ matrix.qt_arch }}
Windows built with: msvc64 Visual studio 2019
## goldendict.exe can not be used alone
if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
AppImage built with: Ubuntu-20.04 ,latest gcc
macos built with: macos-10.15,macos-11.0,clang_64 x86_64
qt6.X(Univeral Build)
qt6.X(Universal Build)
qt5.15.2(Intel Kind)
auto built by github action. use on your on risk:-)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu-6.2.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,14 @@ jobs:
release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}
branch: ${{ github.ref_name }}
commit: ${{ steps.vars.outputs.sha_short }}
Qt version: ${{ matrix.qt_ver }} ${{ matrix.qt_arch }}
Qt version: Qt5.15.2,Qt6.X ${{ matrix.qt_arch }}
Windows built with: msvc64 Visual studio 2019
## goldendict.exe can not be used alone
if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
AppImage built with: Ubuntu-20.04 ,latest gcc
macos built with: macos-10.15,macos-11.0,clang_64 x86_64
qt6.X(Univeral Build)
qt6.X(Universal Build)
qt5.15.2(Intel Kind)
auto built by github action. use on your on risk:-)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,14 @@ jobs:
release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}
branch: ${{ github.ref_name }}
commit: ${{ steps.vars.outputs.sha_short }}
Qt version: ${{ matrix.qt_ver }} ${{ matrix.qt_arch }}
Qt version: Qt5.15.2,Qt6.X ${{ matrix.qt_arch }}
Windows built with: msvc64 Visual studio 2019
## goldendict.exe can not be used alone
if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
AppImage built with: Ubuntu-20.04 ,latest gcc
macos built with: macos-10.15,macos-11.0,clang_64 x86_64
qt6.X(Univeral Build)
qt6.X(Universal Build)
qt5.15.2(Intel Kind)
auto built by github action. use on your on risk:-)
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/windows-6.2.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}
branch: ${{ github.ref_name }}
commit: ${{ steps.vars.outputs.sha_short }}
Qt version: ${{ matrix.qt_ver }} ${{ matrix.qt_arch }}
Qt version: Qt5.15.2,Qt6.X ${{ matrix.qt_arch }}
Windows built with: msvc64 Visual studio 2019
AppImage built with: Ubuntu-20.04 ,latest gcc
Expand All @@ -137,11 +137,11 @@ jobs:
release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}
branch: ${{ github.ref_name }}
commit: ${{ steps.vars.outputs.sha_short }}
Qt version: ${{ matrix.qt_ver }} ${{ matrix.qt_arch }}
Qt version: Qt5.15.2,Qt6.X ${{ matrix.qt_arch }}
Windows built with: msvc64 Visual studio 2019
goldendict.exe was provided alone ,if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
AppImage built with: Ubuntu-20.04 ,latest gcc
macos built with: macos-10.15,macos-11.0,clang_64 x86_64
qt6.X(Univeral Build)
qt6.X(Universal Build)
qt5.15.2(Intel Kind)
auto built by github action. use on your on risk:-)
6 changes: 3 additions & 3 deletions .github/workflows/windows.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jobs:
release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}
branch: ${{ github.ref_name }}
commit: ${{ steps.vars.outputs.sha_short }}
Qt version: ${{ matrix.qt_ver }} ${{ matrix.qt_arch }}
Qt version: Qt5.15.2,Qt6.X ${{ matrix.qt_arch }}
Windows built with: msvc64 Visual studio 2019
## goldendict.exe can not be used alone
if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
Expand All @@ -143,13 +143,13 @@ jobs:
release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}
branch: ${{ github.ref_name }}
commit: ${{ steps.vars.outputs.sha_short }}
Qt version: ${{ matrix.qt_ver }} ${{ matrix.qt_arch }}
Qt version: Qt5.15.2,Qt6.X ${{ matrix.qt_arch }}
Windows built with: msvc64 Visual studio 2019
## goldendict.exe can not be used alone
if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
AppImage built with: Ubuntu-20.04 ,latest gcc
macos built with: macos-10.15,macos-11.0,clang_64 x86_64
qt6.X(Univeral Build)
qt6.X(Universal Build)
qt5.15.2(Intel Kind)
auto built by github action. use on your on risk:-)
5 changes: 5 additions & 0 deletions CHANGES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@

- **CLEANING OLD/USELESS CODE**
- fix a zim about:blank#block [issue](https://github.com/goldendict/goldendict/issues/1472#issuecomment-1086776611)
- add fallback font family configuration for dictionary through preference dialog.
- fix mdx (compact html) display error on the last item.
- fix article count calculation error due to qt bug. QTBUG-102757
- fix devtool localization blocked by GD with qt6.3

## Until to 2022-4-1

- fix save file progress dialog never close bug @ngn999
Expand Down
5 changes: 5 additions & 0 deletions articleview.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2275,6 +2275,11 @@ void ArticleView::doubleClicked( QPoint pos )
if ( cfg.preferences.doubleClickTranslates )
{
QString selectedText = ui.definition->selectedText();

// ignore empty word;
if( selectedText.isEmpty() )
return;

emit sendWordToInputLine( selectedText );
// Do some checks to make sure there's a sensible selection indeed
if ( Folding::applyWhitespaceOnly( gd::toWString( selectedText ) ).size() &&
Expand Down
Binary file modified icons/playsound_full.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion locale/zh_CN.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3867,7 +3867,7 @@ however, the article from the topmost dictionary is shown.</source>
<message>
<location filename="../preferences.ui" line="356"/>
<source>Dictionary Font: </source>
<translation>词典字体： </translation>
<translation>词典字体：</translation>
</message>
<message>
<location filename="../preferences.ui" line="369"/>
Expand Down
1 change: 1 addition & 0 deletions tools/nsis/gen_uninstall/gen_uninstall.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// Why is this not part of NSIS? Ask NSIS developers.

#include <QtCore>
#include <QtCore5Compat/QRegExp>

int main( int argc, char *argv[] )
{
Expand Down
6 changes: 4 additions & 2 deletions tools/nsis/gen_uninstall/gen_uninstall.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
######################################################################

TEMPLATE = app
TARGET =
TARGET = gen_uninstall
DEPENDPATH += .
INCLUDEPATH += .

QT += core5compat core
CONFIG+=utf8_source
# Input
SOURCES += gen_uninstall.cc

RC_FILE = gen_uninstall.rc
#RC_FILE = gen_uninstall.rc

0 comments on commit c835af3

Please sign in to comment.