Integrate Javafx into master #2290
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
Travis.yml had to be changed to use the newest oracle jdk 8.
The old dialog and html layout file have been removed. The layout of the dialog panel is defined in the AboutDialog.fxml file located in the resources with its stylesheet. The AboutDialogViewModel class takes care of the text initialization of any components in the layout. It also implements any methodes called from any component of the dialog panel. The dialog is build and shown in the AboutDialogView class.
Implemented about dialog in Java FX
Merge master into javafx branch
* Add MathSciNet tab * Use progressIndicator instead of progressBar and disable navigating * Fix javafx import order * Fix language key
* Support language keys with spaces for JavaFX * Add comment
* Initial port of the keybindings dialog to javafx * Test javafx import order
# Conflicts: # .travis.yml # CHANGELOG.md # src/main/java/net/sf/jabref/JabRefMain.java # src/main/java/net/sf/jabref/gui/JabRefFrame.java # src/main/java/net/sf/jabref/gui/keyboard/KeyBindingPreferences.java # src/main/java/net/sf/jabref/gui/keyboard/KeyBindingsDialog.java # src/main/resources/l10n/JabRef_da.properties # src/main/resources/l10n/JabRef_de.properties # src/main/resources/l10n/JabRef_en.properties # src/main/resources/l10n/JabRef_es.properties # src/main/resources/l10n/JabRef_fa.properties # src/main/resources/l10n/JabRef_fr.properties # src/main/resources/l10n/JabRef_in.properties # src/main/resources/l10n/JabRef_it.properties # src/main/resources/l10n/JabRef_ja.properties # src/main/resources/l10n/JabRef_nl.properties # src/main/resources/l10n/JabRef_no.properties # src/main/resources/l10n/JabRef_pt_BR.properties # src/main/resources/l10n/JabRef_ru.properties # src/main/resources/l10n/JabRef_sv.properties # src/main/resources/l10n/JabRef_tr.properties # src/main/resources/l10n/JabRef_vi.properties # src/main/resources/l10n/JabRef_zh.properties
* Initial port of the journal abbreviations dialog * A file can not be added anymore when it already exists Created test and improved test coverage Also cleaned up and refactored the code * Missing Translation Keys added * Changelog entry added * Replaced callbacks with lambda expressions * Now using java nio and changed delete abbreviation icon * Code refactoring * Added extension filter for file open/save dialogs - also made first two columns resizable * Changed size and top layout of the dialog - replaced button text with icons for the top buttons - fixed import order - place holder added for the combo box * Added missing translation keys and set minimum size for the dialog * Added option to view uneditable built in journal abbreviation lists * Removed old journal abbreviations panel class and fixed imports * Added comments and removed built in lists button * Exchanged add button with add icon in table * Fixed some bugs * Adjusted test class for journal abbreviations view model * Fixed failing tests * More tests and removed unnecessary code * Make cells editable * Added missing translations * Minor code refactoring * Throwing exceptions in test class instead of catching them * Addressed first few github comments - made path an Optional object - Parameters renamed - Renamed AbbreviationsFile to AbbreviationsFileViewModel - Changelog javafx entries regrouped - moved evalution for deletion of abbreviations to view model - view model now provides a mthod to selecting the last abbreviation * Addressed more github comments - created new exceptions instead of using generic ones - created new method to create graphic nodes in Icontheme - added more localizations - minor code refactoring * changed newline since it moved from globals to os * Fixed import orders * refactored bindings * More Code refactoring - foreach converted to stream - return path as optional - updated language - test class completely refactored * Moved listeners to view model * Moved enable disable logic to the view model the view model now decides whether a file or abbreviation can be edited or removed and provides boolean properties for easy binding with the ui components * Fix pseudoAbbreviation not showing add button * Fixed wrong button tool tips * Fix abbreviation couldn't be edited * Refactored view model so less code is needed * Saving abbreviations moved to new background thread
# Conflicts: # src/main/java/net/sf/jabref/gui/JabRefFrame.java # src/main/java/net/sf/jabref/gui/entryeditor/EntryEditor.java # src/main/java/net/sf/jabref/gui/help/AboutAction.java # src/main/java/net/sf/jabref/gui/help/AboutDialog.java # src/main/java/net/sf/jabref/gui/journals/ManageJournalsAction.java # src/main/java/net/sf/jabref/gui/journals/ManageJournalsPanel.java # src/main/java/net/sf/jabref/gui/keyboard/KeyBinding.java # src/main/java/net/sf/jabref/gui/keyboard/KeyBindingsDialog.java # src/main/java/net/sf/jabref/logic/journals/Abbreviation.java
# Conflicts: # src/main/java/net/sf/jabref/logic/l10n/Localization.java
…1940) * Added default icon to all fx dialogs created via FXAlert * Using normal localization files to get key binding category names
# Conflicts: # src/main/java/net/sf/jabref/gui/JabRefFrame.java # src/main/java/net/sf/jabref/gui/keyboard/KeyBinding.java
Merged master into javafx branch
# Conflicts: # src/main/java/net/sf/jabref/gui/JabRefFrame.java
[ciskip]
|
The error console works, just one thing: Do we really want to add the possibility to open automatic bug reports from the console? I am afraid this will drown us in useless bug reports :-( There should be a minimum hurdle for filing a report. |
|
Journal abbreviations dialog (which looks cool overall): When having loaded a custom list and clicking the X, I get: When closing and reopening the dialog, I get: Also, when opening the dialog after having closed it I get this when the custom lists are loaded: |
tobiasdiez
changed the title
6 tasks
* Initial redesign * Style icon in selected row * Add disclosure node on the right * Increase left padding for root * Style second and further down levels * Fix styling of root * Add more dummy groups and highlight around hits * Remove divder * Decrease padding * Rework group tree * Remove debug statement * Add binding to currently open database * A bit of code cleanup * Set hit values in JavaFX thread * Remove unused imports * Fix build * Fix localizaiton
|
When starting a JabRef instance on this branch, I get: In the same instance, when trying to open the About dialog or the error console, I get: Something seems to be broken at the moment. |
|
Both issues should be fixed now. |
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.
This PR is to track the current state of the JavaFX branch. In my opinion it is ready to go!!
Any ways, these dialogs should be tested again:
Please test these and just tick them here. Thanks.
Finally:
Previous review PRs:
gradle localizationUpdate?