-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Group and reorder the Main Menu (tabs & icons) #4707
Group and reorder the Main Menu (tabs & icons) #4707
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you very much for your contribution!
I only have some minor things to change, but apart from that it looks good.
Thanks a lot for your work on this. The code changes look good to me. I believe that removing the three tools "Opening a folder, file or URL/DOI apply" disables the associated shortcuts (e.g. F4 to open a file). Can you please make sure the shortcuts work as expected and if not add some code for this here: I've a few questions for @MartinKarim, why he proposed certain changes (some of which are not too intuitive for me):
|
Yes, you are right, now those shortcuts are disabled. Although Ctrl + A for selecting all is still working. I will deal with it in a while! |
The check synchronization might be a problem with setting the values correctly in the preferences, I remember having similar issues with shown/not shown in the OpenOffice Panel. I had to explicitly set the preferences to new values. |
I hope the check synchronization is solved now. Also, I have recovered the previous entry preview elements and behavior. Please, tell me if it is OK. Thank you! |
You seem to have a compile error now. Probably because of the parameter removal in the Check menu stuff. |
Yes, my fault. I am so busy these days and cannot focus on it properly. I will solve this ASAP. |
No problem. Take your time. |
@Siedlerchr What about the coverage test? Do I need to get an equal or greather percent? |
You can ignore the code coverage and the dependency update test. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
codewise lgtm to far.
By the way, I have forgotten to say that this code keeps the associated shortcuts because those choices are also in the right-click menu. |
@tobiasdiez I am sorry for being late in answering your questions. Here are my thoughts on why I moved the items/features you mentioned:
I think all four points are up to discussion and depend on the view of the individual. This is why I think that especially the grouping of items in the main menu would profit from more user data to have a more objective center in that discussion. |
Thanks @MartinKarim for your detailed explanation! That clarifies a lot for me and I'm fine with these changes. For the sake of moving forward with this PR, I would propose to
Then, as a second step, we should discuss in the devcall:
|
@tobiasdiez, I think it is done now! |
…tofx * upstream/master: (25 commits) Convert "Manage external file types" dialog to JavaFX (#4711) Remove add/move/remove from group dialog (#4695) Fix entry preview copy exception (#4721) Fix default import format pattern (#4731) Add key bindings (#4732) Convert "wait for save" dialog to JavaFX (#4697) Add changes to CHANGELOG and fix New Library icons Adding GENERATE_CITE_KEYS button to toolbar. Change toolbar icons and add separators Adding additional modifiers to be used in bibtex key generator Adding "von" part to Author's last name when exporting to MS Office 2007 (#4725) Bump mockito-core from 2.24.5 to 2.25.0 (#4723) remove obsolete localization strings fix checkstyle fix build cleanup convert file chooser in preferences remove unused swing stuff convert help buttons Fix #4703: Newline format couldn't be changed (#4720) Group and reorder the Main Menu (tabs & icons) (#4707) Convert Manage keywords dialog to JavaFX (#4701) ...
06785fa Update le-tapuscrit-author-date.csl (JabRef#4708) ada5282 Update norois.csl (JabRef#4707) c1793d2 Create isnad-metinici.csl (JabRef#4704) 099f4a1 Create isnad-dipnotlu.csl (JabRef#4703) 8e8639e Update norois.csl (JabRef#4706) 62f6221 Create amsterdam-university-press.csl (JabRef#4699) c31d9ca Create tagungsberichte-der-historischen-kommission-fur-ost-und-westpr… (JabRef#4700) 34220d3 Change apa-fr-provost.csl to fr-CA locale (JabRef#4701) bbdc9c4 Update to better match RMIT Easy Cite (JabRef#4697) 7c506d9 Create Anatomia Histologia Embryologia csl file (JabRef#4688) 61f3dc5 Update pravnik.csl, masarykova-univerzita-pravnicka-fakulta.csl and iso690-full-note-cs.csl (JabRef#4705) 449eaec add DOI to mdpi.csl back (JabRef#4695) 642002e Create muni-law.csl (JabRef#4691) 483d04a Create iso690-author-date-pt (JabRef#4694) 505c006 Update pravnik.csl (JabRef#4690) eb260ef Update instituto-brasileiro-de-informacao-em-ciencia-e-tecnologia-abn… (JabRef#4692) 9279f0d Update instituto-brasileiro-de-informacao-em-ciencia-e-tecnologia-abn… (JabRef#4693) 70f7be6 Create iso690-full-note-cs-pravnik.csl (JabRef#4686) db54e56 Update CONTRIBUTING.md 2f16a9b Update CONTRIBUTING.md 4cd05ba Create associacao-brasileira-de-normas-tecnicas-ufrgs-footnote-ibid.csl (JabRef#4369) 4d4655e Update instituto-brasileiro-de-informacao-em-ciencia-e-tecnologia-abn… (JabRef#4684) 5948265 Update instituto-brasileiro-de-informacao-em-ciencia-e-tecnologia-abn… (JabRef#4683) f8b744c Create aberdeen-university-school-of-education-harvard.csl (JabRef#4685) 807930a Update trabajos-de-prehistoria.csl (JabRef#4680) c25709f Update society-for-american-archaeology.csl (JabRef#4681) 86f888a Update archeosciences.csl (JabRef#4682) 99c4fd3 Create sylwan.csl (JabRef#4678) d9ba2de Update equine-veterinary-education.csl (JabRef#4677) 7d30659 Update equine-veterinary-education.csl (JabRef#4675) 9a7791f Update equine-veterinary-education.csl (JabRef#4674) 0a46235 Create norois.csl (JabRef#4673) 88726cb Update Rhinology (JabRef#4672) 900e4d5 Create revista-de-biologia-marina-y-oceanografia.csl (JabRef#4671) 01672e3 polimdosains-politeknik-negeri-manado.csl (JabRef#4662) d97d4b7 Update iso690-author-date-sk.csl (JabRef#4669) 22e0bab Create trabajos-de-prehistoria.csl (JabRef#4670) 6c6bf37 Create proceedings-of-the-joint-international-grassland-and-international-rangeland-congress-2021.csl (JabRef#4667) b91deaf Create rhinology.csl (JabRef#4666) d3b58b2 Add OSA dependents (JabRef#4668) a0d4bab Create the-international-journal-of-tuberculosis-and-lung-disease.csl (JabRef#4663) 5a865de Update harvard-university-for-the-creative-arts.csl (JabRef#4665) 8695d97 Update societe-francaise-detude-de-la-ceramique-antique-en-gaule.csl (JabRef#4660) 0dc2e37 Update freshwater-science.csl (JabRef#4658) 118cfab Update ayer.csl (JabRef#4659) 3ba11bc Create optics-letters.csl (JabRef#4661) a51eb4f Create societe-francaise-detude-de-la-ceramique-antique-en-gaule.csl (JabRef#4653) 9032e5b Create geografia-fisica-e-dinamica-quaternaria.csl (JabRef#4650) 38996d6 Create multimed.csl (JabRef#4644) 9cd28d3 Update journal-of-urban-technology.csl (JabRef#4652) 265c93f Correct Acta Palaeontologica Polonica in-text citation format (JabRef#4655) 9cf9ddc Create bioscience.csl (JabRef#4654) 277f340 Update brazilian-journal-of-veterinary-research-and-animal-science.csl (JabRef#4656) a3e4ecf Update associacao-brasileira-de-normas-tecnicas-ufrgs-initials.csl (JabRef#4461) 960b316 Create journal-of-urban-technology.csl (JabRef#4645) ddf2572 Create universitat-stuttgart-mpp-standard.csl (JabRef#4639) bde92d6 Update environmental-microbiology.csl (JabRef#4641) efa68bc Update presses-universitaires-de-rennes.csl (JabRef#4640) 0872e3e Fixes JabRef#4648 (JabRef#4649) 9a159a4 Create studi-e-materiali-di-storia-delle-religioni.csl (JabRef#4642) e63f13e further updates for websites and paper-conference Update ieee.csl (JabRef#4646) 0cb6762 Create Bulletin du Centre d’études médiévales d’Auxerre (JabRef#4635) 784a1c9 Update instituto-de-pesquisas-energeticas-e-nucleares.csl (JabRef#4634) e5f9eed Update ieee.csl (JabRef#4636) e82a783 Fix paper-conference in journal-of-new-zealand-grasslands.csl (JabRef#4637) 7365ce8 fix editor label for french apa.csl (JabRef#4616) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: 06785fa
06785fa Update le-tapuscrit-author-date.csl (JabRef#4708) ada5282 Update norois.csl (JabRef#4707) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: 06785fa
143464e Fix comma before et al. for the-oncologist.csl (#4724) 3b331b6 fixed bug with "near-note" position univ.-bordeaux-ecole-doctorale-de… (#4719) b2c0c1e APA: in-text title in title-case (#4725) 88c68d2 Fix et-al and indetation settings for mammalia.csl (#4717) 05940a2 Update the-febs-journal.csl (#4720) 1d77ba8 Request for review and assessment of the repa.csl (#4698) 76b4be5 Update isnad.csl (#4716) f709c84 Update isnad-dipnotlu.csl (#4715) 45d7655 Create mammalia.csl (#4714) eb333ca Update society-for-american-archaeology.csl (#4710) d944e71 Update masarykova-univerzita-pravnicka-fakulta.csl (#4712) 5e34eb1 Update animal-welfare.csl (#4713) 06785fa Update le-tapuscrit-author-date.csl (#4708) ada5282 Update norois.csl (#4707) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: 143464e
143464e Fix comma before et al. for the-oncologist.csl (JabRef#4724) 3b331b6 fixed bug with "near-note" position univ.-bordeaux-ecole-doctorale-de… (JabRef#4719) b2c0c1e APA: in-text title in title-case (JabRef#4725) 88c68d2 Fix et-al and indetation settings for mammalia.csl (JabRef#4717) 05940a2 Update the-febs-journal.csl (JabRef#4720) 1d77ba8 Request for review and assessment of the repa.csl (JabRef#4698) 76b4be5 Update isnad.csl (JabRef#4716) f709c84 Update isnad-dipnotlu.csl (JabRef#4715) 45d7655 Create mammalia.csl (JabRef#4714) eb333ca Update society-for-american-archaeology.csl (JabRef#4710) d944e71 Update masarykova-univerzita-pravnicka-fakulta.csl (JabRef#4712) 5e34eb1 Update animal-welfare.csl (JabRef#4713) 06785fa Update le-tapuscrit-author-date.csl (JabRef#4708) ada5282 Update norois.csl (JabRef#4707) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: 143464e
906cd6d Create technische-universitat-dresden-linguistik-author-date (JabRef#4730) 607a056 Create ifao-publications.csl (JabRef#4731) 5a65f50 remove et-al settings for bibliography for PVS (JabRef#4735) 4a145d4 Create current-opinion-in-endocrinology-diabetes-and-obesity.csl (JabRef#4734) d70c2a4 Add chapter section in bibliography (JabRef#4732) 366dbc1 Create economic-history-review.csl (JabRef#4643) 7069ddc Create the-open-university-harvard-s390-modules.csl (JabRef#4711) a789973 Chicago: Uppercase "Presentated at" if no `genre` (JabRef#4729) 143464e Fix comma before et al. for the-oncologist.csl (JabRef#4724) 3b331b6 fixed bug with "near-note" position univ.-bordeaux-ecole-doctorale-de… (JabRef#4719) b2c0c1e APA: in-text title in title-case (JabRef#4725) 88c68d2 Fix et-al and indetation settings for mammalia.csl (JabRef#4717) 05940a2 Update the-febs-journal.csl (JabRef#4720) 1d77ba8 Request for review and assessment of the repa.csl (JabRef#4698) 76b4be5 Update isnad.csl (JabRef#4716) f709c84 Update isnad-dipnotlu.csl (JabRef#4715) 45d7655 Create mammalia.csl (JabRef#4714) eb333ca Update society-for-american-archaeology.csl (JabRef#4710) d944e71 Update masarykova-univerzita-pravnicka-fakulta.csl (JabRef#4712) 5e34eb1 Update animal-welfare.csl (JabRef#4713) 06785fa Update le-tapuscrit-author-date.csl (JabRef#4708) ada5282 Update norois.csl (JabRef#4707) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: 906cd6d
906cd6d Create technische-universitat-dresden-linguistik-author-date (JabRef#4730) 607a056 Create ifao-publications.csl (JabRef#4731) 5a65f50 remove et-al settings for bibliography for PVS (JabRef#4735) 4a145d4 Create current-opinion-in-endocrinology-diabetes-and-obesity.csl (JabRef#4734) d70c2a4 Add chapter section in bibliography (JabRef#4732) 366dbc1 Create economic-history-review.csl (JabRef#4643) 7069ddc Create the-open-university-harvard-s390-modules.csl (JabRef#4711) a789973 Chicago: Uppercase "Presentated at" if no `genre` (JabRef#4729) 143464e Fix comma before et al. for the-oncologist.csl (JabRef#4724) 3b331b6 fixed bug with "near-note" position univ.-bordeaux-ecole-doctorale-de… (JabRef#4719) b2c0c1e APA: in-text title in title-case (JabRef#4725) 88c68d2 Fix et-al and indetation settings for mammalia.csl (JabRef#4717) 05940a2 Update the-febs-journal.csl (JabRef#4720) 1d77ba8 Request for review and assessment of the repa.csl (JabRef#4698) 76b4be5 Update isnad.csl (JabRef#4716) f709c84 Update isnad-dipnotlu.csl (JabRef#4715) 45d7655 Create mammalia.csl (JabRef#4714) eb333ca Update society-for-american-archaeology.csl (JabRef#4710) d944e71 Update masarykova-univerzita-pravnicka-fakulta.csl (JabRef#4712) 5e34eb1 Update animal-welfare.csl (JabRef#4713) 06785fa Update le-tapuscrit-author-date.csl (JabRef#4708) ada5282 Update norois.csl (JabRef#4707) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: 906cd6d
906cd6d Create technische-universitat-dresden-linguistik-author-date (JabRef#4730) 607a056 Create ifao-publications.csl (JabRef#4731) 5a65f50 remove et-al settings for bibliography for PVS (JabRef#4735) 4a145d4 Create current-opinion-in-endocrinology-diabetes-and-obesity.csl (JabRef#4734) d70c2a4 Add chapter section in bibliography (JabRef#4732) 366dbc1 Create economic-history-review.csl (JabRef#4643) 7069ddc Create the-open-university-harvard-s390-modules.csl (JabRef#4711) a789973 Chicago: Uppercase "Presentated at" if no `genre` (JabRef#4729) 143464e Fix comma before et al. for the-oncologist.csl (JabRef#4724) 3b331b6 fixed bug with "near-note" position univ.-bordeaux-ecole-doctorale-de… (JabRef#4719) b2c0c1e APA: in-text title in title-case (JabRef#4725) 88c68d2 Fix et-al and indetation settings for mammalia.csl (JabRef#4717) 05940a2 Update the-febs-journal.csl (JabRef#4720) 1d77ba8 Request for review and assessment of the repa.csl (JabRef#4698) 76b4be5 Update isnad.csl (JabRef#4716) f709c84 Update isnad-dipnotlu.csl (JabRef#4715) 45d7655 Create mammalia.csl (JabRef#4714) eb333ca Update society-for-american-archaeology.csl (JabRef#4710) d944e71 Update masarykova-univerzita-pravnicka-fakulta.csl (JabRef#4712) 5e34eb1 Update animal-welfare.csl (JabRef#4713) 06785fa Update le-tapuscrit-author-date.csl (JabRef#4708) ada5282 Update norois.csl (JabRef#4707) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: 906cd6d
906cd6d Create technische-universitat-dresden-linguistik-author-date (JabRef#4730) 607a056 Create ifao-publications.csl (JabRef#4731) 5a65f50 remove et-al settings for bibliography for PVS (JabRef#4735) 4a145d4 Create current-opinion-in-endocrinology-diabetes-and-obesity.csl (JabRef#4734) d70c2a4 Add chapter section in bibliography (JabRef#4732) 366dbc1 Create economic-history-review.csl (JabRef#4643) 7069ddc Create the-open-university-harvard-s390-modules.csl (JabRef#4711) a789973 Chicago: Uppercase "Presentated at" if no `genre` (JabRef#4729) 143464e Fix comma before et al. for the-oncologist.csl (JabRef#4724) 3b331b6 fixed bug with "near-note" position univ.-bordeaux-ecole-doctorale-de… (JabRef#4719) b2c0c1e APA: in-text title in title-case (JabRef#4725) 88c68d2 Fix et-al and indetation settings for mammalia.csl (JabRef#4717) 05940a2 Update the-febs-journal.csl (JabRef#4720) 1d77ba8 Request for review and assessment of the repa.csl (JabRef#4698) 76b4be5 Update isnad.csl (JabRef#4716) f709c84 Update isnad-dipnotlu.csl (JabRef#4715) 45d7655 Create mammalia.csl (JabRef#4714) eb333ca Update society-for-american-archaeology.csl (JabRef#4710) d944e71 Update masarykova-univerzita-pravnicka-fakulta.csl (JabRef#4712) 5e34eb1 Update animal-welfare.csl (JabRef#4713) 06785fa Update le-tapuscrit-author-date.csl (JabRef#4708) ada5282 Update norois.csl (JabRef#4707) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: 906cd6d
906cd6d Create technische-universitat-dresden-linguistik-author-date (JabRef#4730) 607a056 Create ifao-publications.csl (JabRef#4731) 5a65f50 remove et-al settings for bibliography for PVS (JabRef#4735) 4a145d4 Create current-opinion-in-endocrinology-diabetes-and-obesity.csl (JabRef#4734) d70c2a4 Add chapter section in bibliography (JabRef#4732) 366dbc1 Create economic-history-review.csl (JabRef#4643) 7069ddc Create the-open-university-harvard-s390-modules.csl (JabRef#4711) a789973 Chicago: Uppercase "Presentated at" if no `genre` (JabRef#4729) 143464e Fix comma before et al. for the-oncologist.csl (JabRef#4724) 3b331b6 fixed bug with "near-note" position univ.-bordeaux-ecole-doctorale-de… (JabRef#4719) b2c0c1e APA: in-text title in title-case (JabRef#4725) 88c68d2 Fix et-al and indetation settings for mammalia.csl (JabRef#4717) 05940a2 Update the-febs-journal.csl (JabRef#4720) 1d77ba8 Request for review and assessment of the repa.csl (JabRef#4698) 76b4be5 Update isnad.csl (JabRef#4716) f709c84 Update isnad-dipnotlu.csl (JabRef#4715) 45d7655 Create mammalia.csl (JabRef#4714) eb333ca Update society-for-american-archaeology.csl (JabRef#4710) d944e71 Update masarykova-univerzita-pravnicka-fakulta.csl (JabRef#4712) 5e34eb1 Update animal-welfare.csl (JabRef#4713) 06785fa Update le-tapuscrit-author-date.csl (JabRef#4708) ada5282 Update norois.csl (JabRef#4707) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: 906cd6d
906cd6d Create technische-universitat-dresden-linguistik-author-date (JabRef#4730) 607a056 Create ifao-publications.csl (JabRef#4731) 5a65f50 remove et-al settings for bibliography for PVS (JabRef#4735) 4a145d4 Create current-opinion-in-endocrinology-diabetes-and-obesity.csl (JabRef#4734) d70c2a4 Add chapter section in bibliography (JabRef#4732) 366dbc1 Create economic-history-review.csl (JabRef#4643) 7069ddc Create the-open-university-harvard-s390-modules.csl (JabRef#4711) a789973 Chicago: Uppercase "Presentated at" if no `genre` (JabRef#4729) 143464e Fix comma before et al. for the-oncologist.csl (JabRef#4724) 3b331b6 fixed bug with "near-note" position univ.-bordeaux-ecole-doctorale-de… (JabRef#4719) b2c0c1e APA: in-text title in title-case (JabRef#4725) 88c68d2 Fix et-al and indetation settings for mammalia.csl (JabRef#4717) 05940a2 Update the-febs-journal.csl (JabRef#4720) 1d77ba8 Request for review and assessment of the repa.csl (JabRef#4698) 76b4be5 Update isnad.csl (JabRef#4716) f709c84 Update isnad-dipnotlu.csl (JabRef#4715) 45d7655 Create mammalia.csl (JabRef#4714) eb333ca Update society-for-american-archaeology.csl (JabRef#4710) d944e71 Update masarykova-univerzita-pravnicka-fakulta.csl (JabRef#4712) 5e34eb1 Update animal-welfare.csl (JabRef#4713) 06785fa Update le-tapuscrit-author-date.csl (JabRef#4708) ada5282 Update norois.csl (JabRef#4707) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: 906cd6d
906cd6d Create technische-universitat-dresden-linguistik-author-date (JabRef#4730) 607a056 Create ifao-publications.csl (JabRef#4731) 5a65f50 remove et-al settings for bibliography for PVS (JabRef#4735) 4a145d4 Create current-opinion-in-endocrinology-diabetes-and-obesity.csl (JabRef#4734) d70c2a4 Add chapter section in bibliography (JabRef#4732) 366dbc1 Create economic-history-review.csl (JabRef#4643) 7069ddc Create the-open-university-harvard-s390-modules.csl (JabRef#4711) a789973 Chicago: Uppercase "Presentated at" if no `genre` (JabRef#4729) 143464e Fix comma before et al. for the-oncologist.csl (JabRef#4724) 3b331b6 fixed bug with "near-note" position univ.-bordeaux-ecole-doctorale-de… (JabRef#4719) b2c0c1e APA: in-text title in title-case (JabRef#4725) 88c68d2 Fix et-al and indetation settings for mammalia.csl (JabRef#4717) 05940a2 Update the-febs-journal.csl (JabRef#4720) 1d77ba8 Request for review and assessment of the repa.csl (JabRef#4698) 76b4be5 Update isnad.csl (JabRef#4716) f709c84 Update isnad-dipnotlu.csl (JabRef#4715) 45d7655 Create mammalia.csl (JabRef#4714) eb333ca Update society-for-american-archaeology.csl (JabRef#4710) d944e71 Update masarykova-univerzita-pravnicka-fakulta.csl (JabRef#4712) 5e34eb1 Update animal-welfare.csl (JabRef#4713) 06785fa Update le-tapuscrit-author-date.csl (JabRef#4708) ada5282 Update norois.csl (JabRef#4707) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: 906cd6d
143464e Fix comma before et al. for the-oncologist.csl (JabRef#4724) 3b331b6 fixed bug with "near-note" position univ.-bordeaux-ecole-doctorale-de… (JabRef#4719) b2c0c1e APA: in-text title in title-case (JabRef#4725) 88c68d2 Fix et-al and indetation settings for mammalia.csl (JabRef#4717) 05940a2 Update the-febs-journal.csl (JabRef#4720) 1d77ba8 Request for review and assessment of the repa.csl (JabRef#4698) 76b4be5 Update isnad.csl (JabRef#4716) f709c84 Update isnad-dipnotlu.csl (JabRef#4715) 45d7655 Create mammalia.csl (JabRef#4714) eb333ca Update society-for-american-archaeology.csl (JabRef#4710) d944e71 Update masarykova-univerzita-pravnicka-fakulta.csl (JabRef#4712) 5e34eb1 Update animal-welfare.csl (JabRef#4713) 06785fa Update le-tapuscrit-author-date.csl (JabRef#4708) ada5282 Update norois.csl (JabRef#4707) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: 143464e
Group and reorder the Main Menu (File, Edit, Library, Quality, Tools, and View tabs & icons). Now it looks like on the @MartinKarim's prototypes.
This PR fixes #4666 & fixes #4667 & fixes #4668 & fixes #4669 & fixes #4670 & fixes #4671 & fixes #4672 & fixes #4673.