Commit graph

5352 commits

Author SHA1 Message Date
Igor Kushnir 7df106c68c Refactor: get rid of ArticleView::articleToJump
This variable overrides history user data, which makes the current
article and position restoring code in ArticleView::loadFinished()
difficult to understand.

Encode the same logic in the history user data instead. This should make
the code more straightforward and less brittle in the face of changes.
2022-06-12 20:14:22 +03:00
Igor Kushnir 40dd01755e Always jump to current article before reloading
MainWindow calls ArticleView::reload() when the group list is updated.
This updating may add/remove/reorder dictionaries in the active group.

MainWindow also calls ArticleView::reload() when the display or addon
style changes.

In both of the above scenarios uncontrolled jumps and current article
change can occur (see also the parent commit message).

Move setting articleToJump from above the only ArticleView's reload()
call into ArticleView::reload() itself.
2022-06-12 20:14:22 +03:00
Igor Kushnir 0173251b22 Jump to the first article too after expanding optional parts
When the first article in the list is current, expanding or collapsing
optional parts results in:
1) uncontrolled jumps due to the content height changes if the scroll
   position is not (0, 0);
2) current article change if a non-first article is saved in history
   user data (e.g. if a mouse click had made the first article active).

Treat the first current article in the same way as non-first ones.

This change also affects the case when the current article is not
present in the article list. If the current article is simply empty,
then there is no behavior change. If the current article is not empty,
it *must* be in the list, unless something else went wrong.
2022-06-12 20:14:22 +03:00
Igor Kushnir de69036e9e ArticleView: deduplicate expand-optional-parts code 2022-06-12 20:14:22 +03:00
Igor Kushnir e8a1358bce Refactor: extract ArticleView::load()
This way it is clearer that the pages history is updated just before
each navigation to a different page.

The call to ArticleView::saveHistoryUserData() now occurs slightly later
in ArticleView::showDefinition(). I don't think the intervening code can
affect the current article or window position. So the reordering most
likely does not affect application behavior.
2022-06-12 20:13:54 +03:00
Igor Kushnir ca0209faff Save current article and window position before loading DSL picture
Without the added saveHistoryUserData() call, returning back from the
enlarged picture page ("gdpicture") restores the current article and the
window position that were last saved. At this commit the "gdpicture"
behavior is consistent with regular links: returning back from the
enlarged picture page sets the article with the picture as current and
restores the window position at the time of the click on the picture.
2022-06-12 20:13:54 +03:00
Xiao YiFang 058ba392fd opt: fullindex need not to care about stylesheet 2022-06-11 21:06:59 +08:00
Xiao YiFang 837dcfbf63 qt5.15.2 does not work with qtconcurrent::blockingmapped 2022-06-11 21:06:59 +08:00
Xiao YiFang 76969aa49d fulltext search add concurrent support 2022-06-11 20:55:16 +08:00
Xiao YiFang 886aa7f25d github: PR check add concurrency restriction 2022-06-11 20:55:16 +08:00
Xiao YiFang 33b3a95e34 add qt5.15.2 compatibility with qtconcurrent 2022-06-11 20:55:15 +08:00
Xiao YiFang 6c82bf71b6 improve: move temporary to global static 2022-06-11 20:55:15 +08:00
Xiao YiFang dcaebf4948 imp. add QtConcurrent to checkArticle 2022-06-11 20:55:15 +08:00
Xiao YiFang 880f2df1b0 clean code: remove useless code 2022-06-11 20:55:15 +08:00
Xiao YiFang a7955b3887 Merge branch 'staged' into dev 2022-06-11 16:26:17 +08:00
Xiao YiFang 9ea83f1299 fix : control character cause qdomdocument can not parse attribute 2022-06-11 16:25:56 +08:00
Xiao YiFang 3ed7ce5ccb syntaticly space is more reasonable than remove directly. 2022-06-10 20:44:59 +08:00
Xiao YiFang faa1ee480c fix conflict,ignore upstream change
the codebase has already changed. the upstream fix does not apply to current situation
2022-06-09 20:18:44 +08:00
Xiao YiFang 0c21dacc8a fix : inspect element hang forever if opened by right context menu on the first time. 2022-06-09 20:15:02 +08:00
xiaoyifang 73e02719d3
Update CHANGES.md 2022-06-09 12:47:59 +08:00
Igor Kushnir 10d0d8193b setCurrentArticle(): return false if the article doesn't exist
201f11e656 missed this possibility and may
have inadvertently changed the application behavior in a corner case.
2022-06-08 19:05:02 +03:00
Xiao YiFang 1c27c2e71d Revert "github: changelog modify"
This reverts commit 01da9c93ab.
2022-06-08 21:47:59 +08:00
Xiao YiFang eb7b924e4e Merge branch 'staged' into dev 2022-06-08 21:25:35 +08:00
Xiao YiFang 01da9c93ab github: changelog modify 2022-06-08 21:16:04 +08:00
Xiao YiFang 4ce03e9415 html unescape 2022-06-08 21:13:07 +08:00
Xiao YiFang 3e6c85b404 add dict's margin back to lingos style 2022-06-08 20:55:08 +08:00
Xiao YiFang 547f2a4cd2 remember last link's groupId and muted dictionary 2022-06-08 20:52:44 +08:00
Xiao YiFang 88b265765f add entry:// link support 2022-06-07 21:22:37 +08:00
Xiao YiFang b2e9728510 Merge branch 'staged' into dev 2022-06-07 08:16:08 +08:00
Xiao YiFang 9daff6ae37 support mdex builtin link entry: 2022-06-07 08:14:53 +08:00
Xiao YiFang 5f856bf2ae refactor getqueryword 2022-06-07 08:14:53 +08:00
xiaoyifang ccd8ace0ec
Merge pull request #93 from xiaoyifang/feature/0606string-convert-replace
opt: replace string() with QString::toStdstring
2022-06-06 21:59:56 +08:00
Xiao YiFang aa93d9f2d9 opt: replace string() with QString::toStdstring 2022-06-06 20:22:55 +08:00
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