Commit graph

5004 commits

Author SHA1 Message Date
Xiao YiFang 7bbc70190e fix merge conflict of upstream 2022-09-06 07:52:29 +08:00
Xiao YiFang 113bbcb020 fix upstream merge conflict 2022-09-06 07:49:55 +08:00
xiaoyifang bb3d6c86de
Merge pull request #134 from xiaoyifang/feature/m1
github: install hombrew
2022-09-06 07:44:02 +08:00
Xiao YiFang 93a2510aec github: install hombrew 2022-09-06 07:43:46 +08:00
Xiao YiFang 89cbd92e5e github:action add version number to m1 action 2022-09-06 07:40:08 +08:00
Xiao YiFang f0e3c38970 github:add macos homebrew based package github action 2022-09-06 00:29:01 +08:00
Abs62 c5f0f536fa DSL: Fix links with multiple spaces 2022-09-05 18:38:03 +03:00
Xiao YiFang f47162e280 Merge branch 'staged' of github.com:xiaoyifang/goldendict into staged 2022-09-05 20:17:38 +08:00
Xiao YiFang 6aedd80ec0 opt:iframe set height logic restricted to most 10 seconds 2022-09-05 20:17:00 +08:00
Xiao YiFang 9333af47e0 style:default font family of the web page 2022-09-05 20:11:55 +08:00
xiaoyifang 5242ed57c4
Merge branch 'goldendict:master' into staged 2022-09-05 15:26:58 +08:00
Xiao YiFang e91cc9021c opt:block url logic 2022-09-04 19:52:23 +08:00
Xiao YiFang 6e74c27ea2 opt:iframe height auto resize
some website ,the page content is lazy load, the iframe-resizer seems has trouble with them.
2022-09-04 19:03:27 +08:00
Igor Kushnir 8f41079069 Make saving complete article work in Qt 5.15
The old code works correctly in Qt 4.8.7. But in Qt 5.15.5
selectedFilter is never equal to either element of filters. So HTML Only
is saved no matter which option the user selects.
2022-09-04 12:09:42 +03:00
Xiao YiFang 19378d2f83 opt:iframe max-height value 2022-09-04 14:17:25 +08:00
Xiao YiFang 7e2a489765 fix: wordlist panel background color regression
after add a new default style ,the wordlist panel's background does not change because it was set by ui

close #132
2022-09-04 10:47:29 +08:00
Xiao YiFang df1906d4f2 opt: move jquery js from resources to scripts folder 2022-09-04 10:47:29 +08:00
Xiao YiFang 349ac86d47 opt: use iframe resizer plugin to resize the iframe height. 2022-09-04 10:47:29 +08:00
Xiao YiFang 6584954a40 opt:iframe style refractor 2022-09-03 14:17:21 +08:00
Xiao YiFang 5c9b6b0171 forbid iframe focus operation 2022-09-02 21:27:25 +08:00
Xiao YiFang b9dcb71f23 style: remove font-family from the new-default-style & modern style 2022-09-02 20:09:02 +08:00
Xiao YiFang 68a3b2a1ff fix: audio url block check 2022-09-01 21:12:48 +08:00
Xiao YiFang 682c3ac46e Merge branch 'staged' of github.com:xiaoyifang/goldendict into staged 2022-08-31 22:52:23 +08:00
Xiao YiFang 097cd44f3d github: modify release note 2022-08-31 22:51:57 +08:00
xiaoyifang e6f001c1e5
Update CHANGES.md 2022-08-31 22:30:41 +08:00
Xiao YiFang 57d5f845c5 style: optimize the custom style sheet when enabled system dark mode 2022-08-31 22:12:05 +08:00
Xiao YiFang 306c435ae0 fix: clipboard tracking in windows should not be functioned when not enabled. 2022-08-31 21:54:53 +08:00
Xiao YiFang 92e06428f7 fix: trayicon scan popup icon display not correct 2022-08-31 21:53:56 +08:00
Xiao YiFang 54389a72eb update help file
the original qch file can not be opened by qt6.3
2022-08-27 20:31:12 +08:00
Xiao YiFang cda1cd51f8 fix: Win Specific, add help files 2022-08-26 20:36:01 +08:00
Xiao YiFang e6abb1596d add translation of Swiss High-German
thanks to Patrik Studer
2022-08-26 20:27:34 +08:00
Xiao YiFang 2adfdc031b opt: resource file detection optimize 2022-08-24 21:30:47 +08:00
Xiao YiFang 4d7020b9f0 fix:about blank page handle 2022-08-23 20:12:54 +08:00
Xiao YiFang 5180dfb35e fix:about blank page handle 2022-08-23 20:12:03 +08:00
Xiao YiFang 77e6b69cc1 github: clean PullRequest check action 2022-08-23 19:38:23 +08:00
Xiao YiFang cc094bceb0 fix conflict 2022-08-23 19:34:36 +08:00
Xiao YiFang 229b98e24d fix: blank page 2022-08-23 19:09:58 +08:00
Xiao YiFang f00bf25d55 Revert "opt: customized about:blank page"
This reverts commit cee57d69ce.
2022-08-23 18:47:58 +08:00
Xiao YiFang 0a07ab2278 test: inspector windows 2022-08-22 21:28:07 +08:00
Xiao YiFang 874b032baa opt: modify goldendict.pro file 2022-08-22 20:38:14 +08:00
Xiao YiFang e5a26a2969 bump alpha version to 22.8.24 2022-08-22 20:37:30 +08:00
Xiao YiFang aa12e5a232 bump version to 22.8.23 release 2022-08-22 20:36:13 +08:00
Xiao YiFang 1c4ed819be merge dev and fix conflict 2022-08-22 20:32:52 +08:00
Xiao YiFang 990fab782d github: action release file name 2022-08-22 20:28:25 +08:00
Xiao YiFang cee57d69ce opt: customized about:blank page 2022-08-22 20:22:14 +08:00
Xiao YiFang ee6371d579 style: fix lingoes style
panels background-color should be yellow
2022-08-21 22:02:42 +08:00
Xiao YiFang f0a289fba0 fix: Ctrl+T new tab's tab name is empty 2022-08-21 14:10:42 +08:00
Xiao YiFang 563b1484fa fix: inspect dialog 2022-08-21 13:59:30 +08:00
Xiao YiFang cce2cd6802 fix: style ,restore noResult style. 2022-08-21 13:21:24 +08:00
Xiao YiFang c8dda72e1d Merge branch 'staged' into dev 2022-08-21 12:47:57 +08:00