Commit graph

5319 commits

Author SHA1 Message Date
Xiao YiFang 8fb1e81d75 style:add body : 100% 2022-06-06 20:11:32 +08:00
Xiao YiFang da85ee97c7 Merge branch 'staged' into dev 2022-06-05 08:33:19 +08:00
Xiao YiFang ee2fc14311 fix: indexSearch should pass the searchregex
the current logic will use an empty regex ,make it will match any to-be-checked article
2022-06-04 23:55:04 +08:00
Xiao YiFang fec256da4e Merge branch 'staged' into dev 2022-06-04 17:33:27 +08:00
Xiao YiFang 37215e5dc3 Merge branch 'feature/cjk' into staged 2022-06-04 17:33:14 +08:00
Xiao YiFang c3abe99162 feat: cjk regex match 2022-06-04 17:32:55 +08:00
Xiao YiFang c26a8cfd90 Merge branch 'staged' into dev 2022-06-04 16:12:14 +08:00
xiaoyifang c42513ebe8
Merge pull request #90 from xiaoyifang/feature/cjk
improve: fulltext search checkArticle optimize
2022-06-04 16:11:50 +08:00
Xiao YiFang 3e05e711e5 improve: fulltext search checkArticle optimize 2022-06-04 15:24:06 +08:00
Xiao YiFang 8e53415a31 Merge branch 'feature/clang-2' into staged 2022-06-03 21:30:38 +08:00
Xiao YiFang ba10f68c1c clean code: replace throw() with noexcept 2022-06-03 21:29:06 +08:00
Xiao YiFang 5fc3bd8d83 modify clang format 2022-06-03 20:53:10 +08:00
xiaoyifang 58fdbae34f
Merge pull request #89 from xiaoyifang/feature/cjk
feat:add cjk fulltext search
2022-06-03 15:59:45 +08:00
Xiao YiFang 647041cec3 feat:add cjk fulltext search 2022-06-03 15:34:00 +08:00
Xiao YiFang e26db104f7 fix: regression introduce by replacing qBinaryFind 2022-06-03 15:33:16 +08:00
Xiao YiFang 80021a6328 opt: findText will clear the last findText , so this line is useless
it will override by the following findText
2022-06-03 13:09:18 +08:00
Xiao YiFang 0eb89a68cb pro file add date to version 2022-06-03 12:50:59 +08:00
Xiao YiFang 7f62859b1f style: content-intrinsic-size increase to 600px 2022-06-03 12:45:46 +08:00
Xiao YiFang c397af5241 style: minor change .mdict css style
remove .mdict's margin-top: 1em

add .gddictnamebodyseparator with clear:both
2022-06-03 12:44:37 +08:00
Xiao YiFang b5d005d3ed opt: clear the delayedHighlight text earlier 2022-06-03 12:32:27 +08:00
Xiao YiFang 6a18eb9dac Merge remote-tracking branch 'origin/staged' into dev 2022-06-03 11:12:55 +08:00
xiaoyifang 006c45e0e9
Merge pull request #88 from xiaoyifang/goldendict-master
ArticleView: expose only minimal API to JavaScript
2022-06-03 11:01:18 +08:00
Xiao YiFang 638117d0bd merge upstrem
the features introduced in upstream ,to expose minimum api is already implemented in webchannel

so all the implementation in the upstream has been ignored.
2022-06-03 10:59:13 +08:00
xiaoyifang 3ec948a13c
Merge pull request #85 from xiaoyifang/feature/bookmark
a workround to achieve bookmark feature
2022-06-02 21:11:52 +08:00
xiaoyifang 86ca8f3e75
Merge pull request #86 from xiaoyifang/fix/clean-useless-file
remove uselesscode
2022-06-02 21:11:36 +08:00
Xiao YiFang 5fdfaa5aec remove uselesscode
the gdDebug gdWarning method,  set the QTextCodec, does not seem to take effect
2022-06-02 20:38:55 +08:00
Xiao YiFang 235bd8dc57 add translation to save bookmark action 2022-06-02 20:32:31 +08:00
Xiao YiFang 66499007f6 clean code: remove \n in parameter of GD_DPRINTF 2022-06-02 20:11:05 +08:00
Igor Kushnir 99982a1c11 ArticleView: expose only minimal API to JavaScript
https://doc.qt.io/archives/qt-5.5/qtwebkit-bridge.html#internet-security
Qt WebKit Bridge documentation recommends:
  When exposing native objects to an open web environment, it is
  important to understand the security implications. Think whether the
  exposed object enables the web environment access things that
  shouldn't be open, and whether the web content loaded by that web page
  comes from a trusted source.

The author of Qt WebChannel has said the following in a talk that
introduced this Qt module (WebKit Bridge replacement for Qt WebEngine):
  My suggestion here is to write dedicated QObjects with a slim, minimal
  API that only have the signals and methods that you deem safe to be
  used from the outside.
- see a comment under https://redirect.invidious.io/watch?v=KnvnTi6XafA
2022-06-02 13:51:13 +03:00
Xiao YiFang f015ff555f feature: save bookmark to favorite panel
reuse fulltext match to implement this bookmark feature
2022-06-02 08:16:01 +08:00
Xiao YiFang 3262fe4fe4 Merge branch 'goldendict-master' into staged 2022-06-02 07:14:49 +08:00
Xiao YiFang 8f6284747f fix merge upstream conflict 2022-06-02 07:14:38 +08:00
Igor Kushnir aa33b8bebc Disable assert macro checks in Release builds 2022-06-01 18:40:35 +03:00
Xiao YiFang 85e2bcfa43 Merge branch 'goldendict-master' into staged 2022-06-01 23:23:55 +08:00
Xiao YiFang 077d139fb5 fix merge conflict 2022-06-01 23:23:41 +08:00
Igor Kushnir 8acec2e062 Reduce build log verbosity
The default qmake build output is overly verbose. Adding the "silent"
switch to CONFIG makes it much more concise, comparable to default CMake
output. This way warnings and errors are much easier to find.

Adding CONFIG-=silent to the qmake command line doesn't restore the
verbosity because it is applied before the "CONFIG += silent" line in
goldendict.pro. Add a new CONFIG switch "verbose_build_output" to allow
increasing build log verbosity without editing goldendict.pro.
2022-06-01 18:00:45 +03:00
Abs62 f9652487b9 Zim: A little more support for new format features 2022-06-01 17:51:56 +03:00
Xiao YiFang 530591ffbd fix: add unicodeoption to qregularexpression 2022-06-01 21:15:25 +08:00
xiaoyifang 35efa7ac06
Merge branch 'goldendict:master' into staged 2022-06-01 07:24:52 +08:00
xiaoyifang 297aaa2435
Merge pull request #82 from xiaoyifang/feature/add-date
add date to version
2022-06-01 07:22:41 +08:00
Abs62 55122eb739 Zim: Handle new namespace (issue #1502) 2022-05-31 21:08:47 +03:00
Xiao YiFang 5302403d8a add date to version 2022-06-01 00:06:32 +08:00
Xiao YiFang accbfd8f02 Merge branch 'staged' into dev 2022-05-31 00:07:04 +08:00
Xiao YiFang d13390befc add html css 100% 2022-05-31 00:06:21 +08:00
Xiao YiFang 8e65958ee0 Merge branch 'staged' into dev 2022-05-30 20:38:01 +08:00
Xiao YiFang 71b5d3e6ba opt:remove runnable in ftshelper 2022-05-30 20:21:44 +08:00
Xiao YiFang 002a4c8302 add debug info to release version 2022-05-30 20:04:33 +08:00
Xiao YiFang 5bb2fce3c4 fix:clang warning in macos 2022-05-29 16:42:04 +08:00
Xiao YiFang 99876e6680 Merge branch 'staged' into dev 2022-05-29 16:01:13 +08:00
Xiao YiFang 9c1a22d142 rename utils getHostBase(QUrl) to getHostBaseFromUrl 2022-05-29 16:00:30 +08:00