Commit graph

4630 commits

Author SHA1 Message Date
Xiao YiFang a16dba22e3 ignore upstream 2023-02-05 20:22:32 +08:00
xiaoyifang 36ccf97daf
Merge pull request #328 from shenlebantongying/fix/center-arrow
fix: group combo box isn't centered
2023-02-05 14:05:50 +08:00
Xiao YiFang 1072adfad9 Revert "fix: mdx headword total count is incorrect"
This reverts commit 66ec6b6d63.
2023-02-05 13:45:48 +08:00
Xiao YiFang 3825a8d94e action:add iconv to ubuntu 2023-02-05 13:42:52 +08:00
shenleban tongying 62c92fce03 Fix styles of GroupComboBox and translateLine
* fix GroupComboBox's drop down arrow isn't centered by correct padding
* merge #translateLine of navToolbar and ScanPopup
* special boarder handling when using #searchPane
2023-02-04 23:55:19 -05:00
Abs62 7e1063f22e DSL: Fix freezes on some incorrect dictionaries 2023-02-04 18:53:35 +03:00
Xiao YiFang 698c02ed6c Merge branch 'staged' into dev 2023-02-02 07:41:51 +08:00
xiaoyifang 3e33576c72
Merge pull request #324 from xiaoyifang/feature/iconv
add iconv as an extra encoding converter
2023-02-02 07:40:52 +08:00
Xiao YiFang caa1ab45b6 feat:add iconv support 2023-02-02 00:36:18 +08:00
Xiao YiFang c5112a3120 action:modify action to support iconv 2023-02-01 23:33:47 +08:00
Xiao YiFang 859def7ae0 feat:add iconv as an extra encoding converter
win specific:add iconv libs to winlibs
2023-02-01 23:33:46 +08:00
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