Convert merge entries dialog to JavaFX #4410
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tobiasdiez
added
the
status: ready-for-review
Siedlerchr
reviewed
Oct 26, 2018
|
|
||
| initialize(); | ||
| private static String getDisplayText(DiffMode mode) { | ||
| switch (mode) { |
There was a problem hiding this comment.
Is DiffMode an enum? Then it should be uppercase only for the keys
Siedlerchr
reviewed
Oct 26, 2018
| } | ||
|
|
||
| enum DiffMode { | ||
| Plain, |
Siedlerchr
reviewed
Oct 26, 2018
| new ViewModelListCellFactory<DiffMode>() | ||
| .withText(MergeEntries::getDisplayText) | ||
| .install(diffMode); | ||
| diffMode.getSelectionModel().select(Globals.prefs.getInt(JabRefPreferences.MERGE_ENTRIES_DIFF_MODE)); |
There was a problem hiding this comment.
Why not store the actual value in the prefs instead of the index?
36 tasks
Siedlerchr
added a commit
that referenced
this pull request
Nov 1, 2018
* upstream/master: Add submodule pull to circle ci and fix theme loading css (#4443) fix groups drag and drop (#4439) Convert merge entries dialog to JavaFX (#4410) Fix ArrayIndexOutOfBoundsException on second pdf import (#4426) Fix radiobuttons in preference menu (#4409) Add citation styles as git submodule (#4431) Fix highlight color of selected text and progress bar (#4420) Fix two new issues Fix Violations of Always Use Braces (#4400) Delete PreferencesService.java.orig Add JabRef icon to installer and change watermark to JabRef (#4421) Checkstyle: force braces around code blocks
Siedlerchr
added a commit
that referenced
this pull request
Nov 3, 2018
* upstream/master: New Crowdin translations (#4454) Fix error in l10n file: Toogle -> Toggle (#4453) Remove depandabot Bump junit-pioneer from 0.2.2 to 0.3.0 (#4451) Add Depandabot badge Emphasize that users should try out the newest version before reporting a bug Add a preference to add files in entry editor (#4408) Add submodule pull to circle ci and fix theme loading css (#4443) fix groups drag and drop (#4439) Convert merge entries dialog to JavaFX (#4410) Fix ArrayIndexOutOfBoundsException on second pdf import (#4426) Fix radiobuttons in preference menu (#4409) Add citation styles as git submodule (#4431) Fix highlight color of selected text and progress bar (#4420) Fix two new issues Fix Violations of Always Use Braces (#4400) Delete PreferencesService.java.orig Add JabRef icon to installer and change watermark to JabRef (#4421) Checkstyle: force braces around code blocks
1 task
Siedlerchr
added a commit
that referenced
this pull request
Dec 11, 2019
49a1841 Update queen-margaret-university-harvard.csl (#4443) f841560 Create uni-bern-institut-fur-musikwissenschaft-note.csl (#4401) 6ee503c Create harvard-cite-them-right-all-authors.csl (#4416) 3eceec4 Create harvard-queen-margaret-university.csl (#4441) 3c2299d JEMS.csl (#4436) bb2f60f Create open-window.csl (#4430) a908ab4 Nutrition Research Reviews (#4434) 208b693 Bump nokogiri from 1.10.3 to 1.10.4 (#4439) 122a3bb Create nmfs-west-coast-region-national-environmental-policy-act.csl (#4426) 3565fc2 Update tissue-engineering.csl (#4435) 981044e Create transposition.csl (#4375) 73ef6f3 Update tissue-engineering.csl (#4431) 7c4a4cf Update r-and-d-management.csl (#4432) 8628afb Create china-national-standard-gb-t-7714-2015-numeric.csl (#4065) 6ce148c removed spaces in harvard-gesellschaft-fur-bildung-und-forschung-in-europa.csl (#4422) 2af1c6f Create japanese-journal-of-applied-physics.csl (#4425) fc16579 Add Presses universitaires de Strasbourg style (#4411) 01e58fb Correct spacing issues and documentation link (#4423) d97cf3f Update geistes-und-kulturwissenschaften-heilmann.csl (#4421) 017947d Update ens-de-lyon-centre-d-ingenierie-documentaire.csl (#4413) bffe57e Create instituto-de-pesquisas-energeticas-e-nucleares-sp.csl (#4368) 18686d1 Update and rename zeitschrift-fuer-digitale-geisteswissenschaften.csl… (#4410) bd3a5f6 Final fix for journal article cit plus other updates - uniwersytet-im-adama-mickiewicza-w-poznaniu-wydzial-anglistyki (#4417) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: 49a1841
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Converts the merge entries dialog to JavaFX. Fixes #4348. The dialog now looks like as follows (still not too beautiful, but at least it works):
