Commit graph

4259 commits

Author SHA1 Message Date
Xiao YiFang 19ee6bbeb2 Merge branch 'staged' into dev 2022-07-10 14:28:47 +08:00
Xiao YiFang 6b15f5d466 opt: handle the url click before the page finished loaded 2022-07-10 14:27:50 +08:00
Xiao YiFang 20e3dc78a3 Merge branch 'staged' into dev 2022-07-10 12:55:40 +08:00
Xiao YiFang bbf562911a opt: click audio link before the page has been loaded completely. 2022-07-10 12:55:27 +08:00
Xiao YiFang 30f3b64deb Merge branch 'goldendict-master' into staged 2022-07-10 12:40:20 +08:00
Xiao YiFang 5b4f112110 Merge branch 'master' of https://github.com/goldendict/goldendict into goldendict-master
# Conflicts:
#	.travis.yml
#	articleview.cc
#	locale/ar_SA.ts
#	locale/ay_WI.ts
#	locale/be_BY.ts
#	locale/be_BY@latin.ts
#	locale/bg_BG.ts
#	locale/cs_CZ.ts
#	locale/de_DE.ts
#	locale/el_GR.ts
#	locale/eo_EO.ts
#	locale/es_AR.ts
#	locale/es_BO.ts
#	locale/es_ES.ts
#	locale/fa_IR.ts
#	locale/fi_FI.ts
#	locale/fr_FR.ts
#	locale/hi_IN.ts
#	locale/ie_001.ts
#	locale/it_IT.ts
#	locale/ja_JP.ts
#	locale/jb_JB.ts
#	locale/ko_KR.ts
#	locale/lt_LT.ts
#	locale/mk_MK.ts
#	locale/nl_NL.ts
#	locale/pl_PL.ts
#	locale/pt_BR.ts
#	locale/qu_WI.ts
#	locale/ru_RU.ts
#	locale/sk_SK.ts
#	locale/sq_AL.ts
#	locale/sr_SR.ts
#	locale/sv_SE.ts
#	locale/tg_TJ.ts
#	locale/tk_TM.ts
#	locale/tr_TR.ts
#	locale/uk_UA.ts
#	locale/vi_VN.ts
#	locale/zh_CN.ts
#	locale/zh_TW.ts
2022-07-10 12:39:12 +08:00
Xiao YiFang a503fd776b Merge branch 'staged' into dev 2022-07-10 12:20:23 +08:00
Xiao YiFang ce35085f25 opt: forbid the page to redirect to audio link url. 2022-07-10 12:19:09 +08:00
Xiao YiFang 786fafded2 Merge branch 'staged' into dev 2022-07-10 10:18:24 +08:00
Xiao YiFang 45c2bf38bd opt: do not allow open audio link in new tab 2022-07-10 10:18:02 +08:00
Xiao YiFang e32062cf82 opt:format gd-custom file 2022-07-09 12:52:33 +08:00
Xiao YiFang 505dd9efc8 clean:minor change to the goldendict.pro file 2022-07-09 11:20:15 +08:00
Xiao YiFang 5105f12516 opt: refract the code to monitor iframe height 2022-07-09 11:17:58 +08:00
Xiao YiFang ec0fd2ab74 Merge branch 'staged' into dev 2022-07-09 11:05:13 +08:00
Xiao YiFang 3ef3535213 opt: disable websecurity to enable cross domain access
without this , javascript can not access certain website dictionary (using iframe )
add --disable-web-security to qapplication argv
2022-07-09 11:04:39 +08:00
Xiao YiFang 7cac8c79b8 opt:deal with empty reply. 2022-07-09 10:37:40 +08:00
Xiao YiFang 055abee7f4 Merge branch 'staged' into dev 2022-07-08 22:17:49 +08:00
Xiao YiFang 79cec220de github:remove qt6.2.4 build 2022-07-08 22:17:37 +08:00
Xiao YiFang a3df30abbd Merge branch 'staged' into dev 2022-07-08 22:16:14 +08:00
Xiao YiFang dc058e7d68 fix: remove useless code . 2022-07-08 22:13:40 +08:00
Abs62 b73687b586 Lupdate all translations, update Russian translation 2022-07-07 18:12:55 +03:00
Igor Kushnir 7db10b6664 Show current match and match count during FTS result navigation
This information is going to be especially useful in the upcoming Qt
WebEngine version of GoldenDict. In the Qt WebEngine version only the
words equal to the last found result can be highlighted, not all FTS
matches as in the Qt WebKit version.
2022-07-02 18:54:03 +03:00
Abs62 440380a763 Linux-specific: Add OpenSSL libraries to .Appimage 2022-07-02 16:18:59 +03:00
Xiao YiFang 4d81b3b9e0 fix merge conflict 2022-07-02 19:13:53 +08:00
Igor Kushnir d8d3002329 Revert "Replace a fruitless check with an assertion"
The assertion failure can be triggered by full-text-searching for a
common word, selecting a result with many large articles and quickly
selecting text in the first article while the page is still loading.

This reverts commit c936d03fa0.
2022-07-02 12:21:34 +03:00
Igor Kushnir 1e43bdf18c highlightFTSResults: return earlier if the regexp is empty
A default-constructed QRegExp is passed to ArticleView::showDefinition()
when a user navigates from an FTS-result page by clicking a link or
double-clicking a word. QRegExp().pattern() returns an empty string,
which is stored in the "regexp" query item of an URL. When this URL is
loaded, ArticleView::loadFinished() calls highlightFTSResults(), which
then calls closeSearch(), performs multiple string and regular
expression operations and early-returns because the regular expression
pattern is empty. Returning earlier skips useless work in this case.

An alternative optimization is not calling highlightFTSResults() at all
when the regular expression is empty, but that would skip the
closeSearch() call and keep the FTS search frame visible on a page with
an empty regexp.
2022-07-01 19:48:42 +03:00
Igor Kushnir c936d03fa0 Replace a fruitless check with an assertion
This reduces CPU time waste and simplifies adding Qt WebEngine support.
2022-07-01 18:43:43 +03:00
Xiao YiFang 02f6c0e47f work around to fix too long headword in dsl 2022-06-29 20:41:42 +08:00
Xiao YiFang 9f5218b305 remove useless ontop icon 2022-06-29 20:29:34 +08:00
Xiao YiFang 51e5e3bb2a Merge branch 'staged' into dev 2022-06-29 20:26:24 +08:00
Xiao YiFang a88758f4ef fix:inspect windows ,related to qtbug-101724 2022-06-29 20:24:55 +08:00
Xiao YiFang 8f5a552e77 work around to fix too long headword in dsl 2022-06-28 20:47:38 +08:00
xiaoyifang 417628292d
Merge branch 'goldendict:master' into staged 2022-06-28 15:06:10 +08:00
xiaoyifang 4eae6ad388
Merge pull request #112 from xiaoyifang/staged
Update scanpopup.ui
2022-06-28 09:20:19 +08:00
xiaoyifang 01a6ffa061
Update scanpopup.ui 2022-06-28 09:18:59 +08:00
Xiao YiFang f399a12466 Merge branch 'staged' into dev 2022-06-28 08:03:22 +08:00
Xiao YiFang 5a2efe20bb feat: replace ontop icon in the scan popup dialog 2022-06-28 08:03:04 +08:00
Abs62 5d51f183d6 DSL: A little more fix resource loading in some cases 2022-06-27 17:43:32 +03:00
xiaoyifang d9e25834b2
Update README.md 2022-06-26 19:07:16 +08:00
Xiao YiFang 7a642c1917 feat: tracking clipboard 2022-06-25 20:56:26 +08:00
xiaoyifang 8c8d8b8198
Update README.md 2022-06-25 06:48:55 +08:00
Xiao YiFang 40e1410c38 Merge branch 'staged' into dev 2022-06-24 21:34:18 +08:00
Xiao YiFang 3d5f3d6616 feat: clipboard tracking 2022-06-24 21:34:03 +08:00
Xiao YiFang 994a931eee Merge branch 'staged' into dev 2022-06-24 21:20:34 +08:00
Xiao YiFang 7eb603a9c5 feat: expose clipboard tracking function 2022-06-24 21:20:16 +08:00
Xiao YiFang b617323bfc the last headword in the block has incorrect data length 2022-06-23 20:15:55 +08:00
Xiao YiFang 4a3905c701 fix:inspect windows on qt6 can not work with right context menu 2022-06-23 20:15:49 +08:00
Xiao YiFang 4e4c9375be opt: langcoder optimization 2022-06-23 20:03:29 +08:00
Xiao YiFang af4946d7a7 fix upstream merge conflict 2022-06-22 17:48:52 +08:00
Xiao YiFang 77c1fb0100 Merge branch 'staged' into dev 2022-06-22 07:52:34 +08:00