-
-
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
Fixes problems with managing external file types (issue 5846) #5894
Conversation
The last commit is a quick fix and could be improved, since the old table entry gets replaced by a new one, even if the user would then cancel the process of editing the entry. Nevertheless, even if the user cancelled the edit process, everything is still fine and valid. Editing external file types is now fully functional. No problems are known. Suggestions are welcome. The line |
Thanks for the fix @systemoperator. |
Yes, I have noticed this as well. github actions "did" that. It's the first time, that I have seen that, but I am new here anyway, so I don't know whether this occurs sometimes and it is fine or not. The good thing is, that there are no merge conflicts. Maybe @tobiasdiez can have a look at this. |
Hey @systemoperator, got a hint by @koppor. This might help solving the branch issue with your PR: https://lostechies.com/joshuaflanagan/2010/09/03/use-gitk-to-understand-git/ |
You can create one single commit containing your changes with following commands:
Assumption: |
…am"/"custom program" fixed: it now gets updated properly (binding added); - "Edit file type dialog": correct value get loaded now for the input field "Name" - when storing an updated file type: no differentiation will be made any more whether program runs on Windows or somewhere else - quick fix for pending issue: editing an ExternalFileType works now (still room for improvement); visual bug concerning "lazy" update of table could be a Linux issue, since other tables are affected as well; so basically - except the "lazy" update thing -- everything works concerning external file types
f37df3f
to
cb497fb
Compare
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.
Thanks for your PR. The changes look good to me. I've one remark concerning the introduction of the custom application property, which I don't think is necessary.
src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeEntryDialog.java
Show resolved
Hide resolved
@@ -40,6 +40,7 @@ public CustomizeExternalFileTypesDialog() { | |||
this.setResultConverter(button -> { | |||
if (button == ButtonType.OK) { | |||
viewModel.storeSettings(); | |||
fileTypesTable.refresh(); |
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.
If it does not work, then you can delete this indeed.
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.
done
For testing purposes, I made some changes in My questions are:
|
Are the multiple changes to authors.md really intended? |
Yes, I simply ran the script |
Theres something odd: Igor Steinmacher appears in full name as well in concatenaded form (also Oscar Gustafsson ) Maybe you've configured git to return only nicknames instead of full names? |
You don't need to run the script manually. We will do this from time to time or at least in preparation for a release |
Maybe he commited with his username first and later on with his real name. Nevertheless, this will always reappear by running the script. But I could now remove the entry with his username? I did it, because it is mentioned in the docs, that one can do it. And I wanted to try it. :) |
@koppor what is our policy concerning this? (which then should be clarified in the docs) As these changes are not directly related to the main theme of this PR, can you please remove these changes for now so that we can merge? Thanks |
We maintain the Typically, we update the AUTHORS file now and then. Especially before a release. (See https://github.com/JabRef/jabref/wiki/Releasing-a-new-Version) I also thought to setup a GitHub action to comment at the PR with the new entry in the AUTHORS file. Should be doable... |
Maybe a quick fix to get this PR mergable: leave your name in authors.md and remove the other additions, they will be put in before release. |
done |
Thanks again for contribution, and sorry for the confusion caused. I hope the additional effort on your side wasn't too great. Your next PR should go more smoothly 😄 |
* upstream/master: reference to issue added (#5911) Fix properly resolves OrFields of required fields (#5903) IDE setup updated and extended (#5901) Squashed 'src/main/resources/csl-styles/' changes from e71363e..c531528 Fixes problems with managing external file types (issue 5846) (#5894) Squashed 'src/main/resources/csl-locales/' changes from 41da445acc..4fa753374e Squashed 'src/main/resources/csl-styles/' changes from f0c7374..e71363e Update development-strategy.md
* master: reference to issue added (#5911) Fix properly resolves OrFields of required fields (#5903) IDE setup updated and extended (#5901) Squashed 'src/main/resources/csl-styles/' changes from e71363e..c531528 Fixes problems with managing external file types (issue 5846) (#5894) Squashed 'src/main/resources/csl-locales/' changes from 41da445acc..4fa753374e Squashed 'src/main/resources/csl-styles/' changes from f0c7374..e71363e Update development-strategy.md Replace link to Workspace set-up with new one (#5896) Fixes making paths of linked files relative (web urls will not be touched anymore) (#5879)
eb97405 Create frattura-ed-integrita-strutturale-fracture-and-structural-inte… (#5877) b33ebfc make journal names title case (#5900) 1c7ecf2 Update uclouvain-centre-charles-de-visscher-pour-le-droit-internation… (#5901) 1a2ea12 Create trinity-college-dublin-zoology-botany-environmental-sciences-h… (#5893) 6bd742c Update harvard-anglia-ruskin-university.csl (#5840) bc8f258 Update chicago-author-date.csl (#5836) 80aded6 Fix missing prefix for URL field (#5894) b850a0d Update american-society-of-civil-engineers.csl (#5891) 94c1cb3 Update deutsche-gesellschaft-fur-psychologie.csl (#5861) f66f384 Update universite-cheikh-anta-diop-faculte-de-medecine-de-pharmacie-et-dodontologie.csl (#5863) 82cf786 Update and rename acta-psychiatrica-scandinavica.csl to dependent/acta-psychiatrica-scandinavica.csl (#5879) git-subtree-dir: buildres/csl/csl-styles git-subtree-split: eb97405
Fixes #5846
Changed:
CustomExternalFileType
is now working properly as well.config.xml
file.ExternalFileType
works now as well. (changes are not lost anymore)config.xml
file.Remarks:
Tasks: