Xiao YiFang
0e1ce78216
Merge branch 'staged' into dev
2023-01-25 21:30:51 +08:00
xiaoyifang
069714e3a2
Merge pull request #322 from xiaoyifang/feature/cherry-pick-upstream
...
cherry pick upstream
2023-01-24 22:01:17 +08:00
Xiao YiFang
fabb9d6487
fix:compile error after merge xdxf.cc changes
2023-01-24 21:28:34 +08:00
Xiao YiFang
e4595fb6d9
fix:bgl encoding convert exception
2023-01-24 21:07:59 +08:00
Abs62
cbdfa586d1
XDXF: Add support for draft revision 034 (issue #1600 )
2023-01-24 20:07:15 +08:00
Abs62
620346bfaa
Remove 0xAD symbol (soft hyphen) for popup window search
2023-01-24 20:04:14 +08:00
Abs62
8e2e6d8658
Zim: One more check for Zim header
2023-01-24 20:02:13 +08:00
shenleban tongying
bc2a64f94c
Merge pull request #319 from bekcpear/fix-equals-6.4.0-block
...
fix qmake build
2023-01-22 12:30:15 -05:00
Ryan Qian
131cffbdb2
fix: qtmultimedia dependency
...
audiooutput.cpp includes the QAudioFormat unconditionally, but it looks
like this file is only used by ffmpeg_player and qtmultimedia_player,
so add an extra condition to append this file and its header.
2023-01-22 20:10:58 +08:00
Ryan Qian
db432206e5
fix: 'equals' built-in test function block
...
the opening brace must stand on the same line as the condition,
otherwise the condition will be invalid.
2023-01-22 19:33:10 +08:00
Abs62
661dd4d140
XDXF: Add support for draft revision 034 (issue #1600 )
2023-01-19 17:57:47 +03:00
Abs62
1921771bbd
Remove 0xAD symbol (soft hyphen) for popup window search
2023-01-18 20:50:03 +03:00
Abs62
46a34e805c
Zim: One more check for Zim header
2023-01-17 20:59:13 +03:00
xiaoyifang
e184162dc3
Merge pull request #311 from xiaoyifang/staged
...
merge staged to dev
2023-01-13 16:46:01 +08:00
Xiao YiFang
52f11d4a46
fix: articleview focus
2023-01-12 23:36:36 +08:00
Xiao YiFang
daa1aa3a5f
clean code: remove useless code
2023-01-09 21:22:13 +08:00
Xiao YiFang
b47a6acf4e
Merge branch 'staged' into dev
2023-01-09 20:55:41 +08:00
Xiao YiFang
0d496ff236
bump qt from 6.3.2 to 6.4.2
2023-01-09 20:55:22 +08:00
xiaoyifang
65eb349465
Merge pull request #306 from shenlebantongying/staged
...
update urls
2023-01-06 11:20:16 +08:00
shenleban tongying
ce037dbfda
doc: update urls
...
Replace old goldendict.org
2023-01-05 20:34:53 -05:00
shenleban tongying
c58119c3cd
fix cmake build
2023-01-05 20:32:05 -05:00
xiaoyifang
7a6db312b4
Merge branch 'staged' into dev
2023-01-03 17:22:59 +08:00
xiaoyifang
1f613f1bf9
Merge pull request #305 from xiaoyifang/fix/lingulibre-cancel-method
...
fix:lingualibre cancel the request
2023-01-03 17:21:53 +08:00
xiaoyifang
954d6ffe06
fix:lingualibre cancel the request
2023-01-03 14:03:40 +08:00
Xiao YiFang
d8398a2be7
fix: scanpopup was trigger twice
...
fix #304
2023-01-02 22:45:07 +08:00
Xiao YiFang
4a30302864
fix: move Contexts to header file
2023-01-02 22:00:42 +08:00
Xiao YiFang
e0b74fea4b
Merge branch 'staged' into dev
2022-12-31 19:05:45 +08:00
Xiao YiFang
9acbd3aa2f
fix: headwords dialog export function
...
sorted the exported headwords and remove duplicated items.
2022-12-31 14:01:48 +08:00
Xiao YiFang
101a673cf6
fix: filter headword return less than expected matched results.
2022-12-31 11:01:45 +08:00
Xiao YiFang
4b9906dc52
Merge branch 'staged' into dev
2022-12-31 00:37:22 +08:00
xiaoyifang
0089420801
Merge pull request #302 from xiaoyifang/fix/qkeysequenceedit
...
Fix: replace preference.ui hotkeyedit with qkeysequenceedit
2022-12-30 11:39:14 +08:00
xiaoyifang
d5544ca058
fix: method definition in linux and macos
2022-12-30 10:46:44 +08:00
xiaoyifang
01245bce15
Merge pull request #301 from shenlebantongying/staged
...
fix: Unsatisfactory "Close To Tray" behavior on macOS
2022-12-30 10:15:28 +08:00
Xiao YiFang
068c2f9a21
fix: remove hotkeyedit.cc(.hh)
2022-12-30 01:12:57 +08:00
Xiao YiFang
794d4b934f
fix: replace hhotkeyedit with qkeysequenceedit
...
related to #291
2022-12-30 01:11:22 +08:00
shenleban tongying
e2bd010b19
fix: Unsatisfactory "Close To Tray" behavior on macOS
2022-12-29 11:36:01 -05:00
xiaoyifang
8ffa1f6643
Merge pull request #299 from shenlebantongying/staged
...
replace dict group's hotkeyedit with qKeySequenceEdit
2022-12-29 21:48:05 +08:00
shenlebantongying
e8063bf0eb
replace dict group's hotkeyedit with qKeySequenceEdit
2022-12-29 07:34:55 -05:00
xiaoyifang
fa591a365d
Merge pull request #298 from shenlebantongying/staged
...
fix: reload all pages when articleview style changes
2022-12-29 18:17:07 +08:00
shenlebantongying
7daf9b4e56
fix: articleview style switching
2022-12-29 04:44:46 -05:00
xiaoyifang
3e39169858
Merge pull request #295 from shenlebantongying/staged
...
lingua: add " " audio link and href url
2022-12-29 17:19:31 +08:00
shenlebantongying
43859df431
lingua: add " " to links
2022-12-29 04:11:34 -05:00
shenlebantongying
0d149337ca
lingua: add " " to <a href= >
2022-12-29 04:02:57 -05:00
xiaoyifang
1196e11cf3
Merge pull request #293 from shenlebantongying/staged
...
clang-tidy: apply modernize-use-override
2022-12-29 16:51:57 +08:00
shenleban tongying
2aeed5e705
clang-tidy: apply modernize-use-override
2022-12-29 02:14:53 -05:00
xiaoyifang
12e8c796a1
Merge pull request #290 from shenlebantongying/staged
...
fix remaining problems of scanpop clipboard on linux
2022-12-29 14:09:09 +08:00
shenleban tongying
7fa87b6b42
fix: remove unused isScanningEnabled, the logic is handled in mainwindow::clipboardChanged()
2022-12-28 21:58:27 -05:00
shenleban tongying
b933d52245
fix: remove unused clipboard change method in scanpopup
2022-12-28 21:37:09 -05:00
shenleban tongying
bdc43650bb
fix: add a mini delay for selection clipboard
2022-12-28 21:36:02 -05:00
shenleban tongying
a28aec3c9f
fix: clipboard changes isn't ignored
2022-12-28 21:19:58 -05:00