Skip to content
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

Convert OO/LO SidePanel to javafx #4341

Merged
merged 53 commits into from
Jan 25, 2019
Merged

Convert OO/LO SidePanel to javafx #4341

merged 53 commits into from
Jan 25, 2019

Conversation

Siedlerchr
Copy link
Member

@Siedlerchr Siedlerchr commented Sep 13, 2018

Converted the OO/LO side panel to javafx. Ported all dialogs do javafx.

grafik

grafik

grafik

Mange citations: Double click on the right column to enter text
grafik

grafik

grafik

Manual connection dialog
grafik


  • Change in CHANGELOG.md described
  • Tests created for changes
  • Manually tested changed features in running JabRef
  • Screenshots added in PR description (for bigger UI changes)
  • Ensured that the git commit message is a good one
  • Check documentation status (Issue created for outdated help page at help.jabref.org?)

First attempt at converting the OpenOffice side panel
@Siedlerchr Siedlerchr changed the title Convert OO/LO SidePanel to javafx [WIP] Convert OO/LO SidePanel to javafx Sep 13, 2018
* upstream/master:
  Completely rework save operation (#4309)
add edit function
implement rest of logic
load last selected style
subscribe preview panel to changes
wrap preview panel in vbox
rework manual connect
rework settings popup
initialize oo prefs to avoid NPE
remove old style dialog
fix preference storage
fix manual path select
todo: find out how to change the values
fix passing of prefs
fix advanced cite dialog
* upstream/master:
  Update Libraries (#4366)
  ArXiv fetcher support http url (#4367)
  Fix issue 3861 : XMP Dialog, Add new Groups dialog, Append Library dialog to javafx (#4264)
  fix IndexOutOfBoundsException when saving preferences
  group RadioButtons in ExportSortingPrefsTab to prevent the selection of multiple or no order types
  Convert Part of the Issue#3861 Quality->Cleanup entries (#4268)
  UPDATE gradle to 4.10.2 (#4358)
  Completed General Fields Customizer conversion to JavaFX (#4346)
  Fix JavaFX thread exception when fetching new infos (#4354)
  Auto trim url field (#4355)
  Fix freezes in entry editor (#4351)

# Conflicts:
#	src/main/java/org/jabref/preferences/PreferencesService.java
add some dialog basics for manage citatiosn

add.setGraphic(IconTheme.JabRefIcons.ADD.getGraphicNode());

EasyBind.subscribe(viewModel.selectedItemProperty(), style -> {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@NorwayMaple As you wanted an example for EasyBind and FXML and javafx, here is one

* upstream/master: (30 commits)
  Update README.md (#4419)
  Fix generate bibtex key overwrite warning dialog (#4418)
  Fix group hit counter when adding entries (#4413)
  Update README.md
  fix java.nio.file.FileSystemNotFoundException and reorganize code (#4416)
  fixed an issue where corresponding groups are sometimes not highlighted when clicking on entries (#4404)
  Add a few journal abbreviations (#4412)
  Fix display of radio buttons (#4411)
  Update issue templates
  Delete ISSUE_TEMPLATE.md
  Update issue templates
  Integrate mrdlib redesign (#4361)
  fix "save" button in preference dialog not response (#4406)
  show dialog before creating entry (#4405)
  Scrollbar invisible in Preferences -> BibTex Key Pattern (#4287) (#4398)
  Updates (#4402)
  Fixes for all mods exporter tests (#4396)
  Fix EntryType dialog not closed after generate button (#4390)
  Make rank image narrower (#4395)
  Fix showing multiple icons for one menu entry - fixes #4384 (#4392)
  ...
* 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
fix l10n parts

TODO: editing of extra info does not yet work
* upstream/master:
  Fix move to group always moves first entry (#4457)
  Add eprint cleanup (#4445)
  respect preference state (#4468)
  Set auto-update checkbox enable/disable when reading preferences (#4446)
  Improve MathSciNet fetcher and add ISBN fetcher to entry editor toolbar  (#4444)
  New translations JabRef_en.properties (German) (#4455)
Allow editing of page info directly in the table
Replace html bold with Text-Bold style
@Siedlerchr
Copy link
Member Author

@tobiasdiez Do you have any styling idea on how to fix the display of the TextFlow in the javafx table?
One entry/row in the table nearly occupies the whole dialog screen although the text istself is not that much.

(I had to use a TextFlow to have bold text inbeween)

The dialog is defined in ManageCitationsDialog.fxml

grafik

remove old dialog
fix l10n
set titles
add tooltips
* upstream/master:
  Change location of some fields in the entry editor (#4448)
  Bump applicationinsights-core from 2.2.0 to 2.2.1 (#4488)
  Added feature to add server timezone when connecting to shared database (#4483)
  Bump applicationinsights-logging-log4j2 from 2.2.0 to 2.2.1 (#4487)
  fix save button
  Update archunit from 0.9.1 -> 0.9.2
Siedlerchr and others added 7 commits December 28, 2018 18:06
* upstream/master:
  improve styling of preferences side menu (#4556)
  Cleanup interfaces (#4553)
  Bump fontbox from 2.0.12 to 2.0.13 (#4552)
  Bump pdfbox from 2.0.12 to 2.0.13 (#4551)
  Bump wiremock from 2.19.0 to 2.20.0 (#4550)
  Fixes that renaming a group did not change the group name in the interface (#4549)
* upstream/master:
  Refactor BibEntry deprecated method (#4554)
  Added extra stats to be sent with MrDLib recommendations (#4452)
* 'ooPanel' of github.com:JabRef/jabref:
  Refactor BibEntry deprecated method (#4554)
  Added extra stats to be sent with MrDLib recommendations (#4452)
  checkstyle
  change mac default settings to LO path
  Add Book as preview as well
  fix style file select layout and inline variable'
  improve styling of preferences side menu (#4556)
  Cleanup interfaces (#4553)
@Siedlerchr
Copy link
Member Author

I would really appreciate that beeing merged soon as it provides a performance improvement at startup over the current FX panel with swing ontop.

* upstream/master:
  Add uncaught exception message (#4565)
  Converts integrity check dialog to JavaFX (#4559)
  Do not extract file ending from Urls (#4547)
  Bump checkstyle from 8.15 to 8.16 (#4562)
  Bump xmpbox from 2.0.12 to 2.0.13 (#4561)
  Delete the deprecated BibEntry Constructor (#4560)

# Conflicts:
#	src/main/java/org/jabref/gui/DialogService.java
#	src/main/java/org/jabref/gui/FXDialogService.java
#	src/main/java/org/jabref/gui/actions/CopyFilesAction.java
#	src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java
* upstream/master:
  Don't set column sort type at startup (#4577)
Copy link
Member

@tobiasdiez tobiasdiez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puhhh. What a huge PR. Nice job!
I still have a few remarks, but these are mostly minor comments. Good night ;-)

put visible/managed bindings in fxml
Store show/hide info of panel in preferences
@Siedlerchr
Copy link
Member Author

Selected style is now present after closing and the open/closed panel status is saved

* upstream/master:
  update jfoenix and gradle plugins Replace outdated transformer log4j2 with official new one
  Update journalList.txt
  Fix for Issue #4437 - Some bugs in preference->Entry table columns (#4546)
TODO: Fix execution in fx thread
Fix saving of settings after auto connect
Add notification when connections are cleared
remove custom dialog hack
@Siedlerchr
Copy link
Member Author

Addressed all open issues. @LinusDietz Could you please test if this works now on mac? or could you search for the libs so that we maybe adjust the path? unoil.jar, ridl.jar java_uno.

@Siedlerchr Siedlerchr merged commit 18aba35 into master Jan 25, 2019
@Siedlerchr Siedlerchr deleted the ooPanel branch January 25, 2019 15:36
Siedlerchr added a commit that referenced this pull request Jan 27, 2019
* upstream/master: (229 commits)
  Try to fix not on FX thread for search and autocomplete (#4618)
  Convert DuplicateResolverDialog to javafx (#4601)
  Fix for BibTex source tab parsing issue if field contains {} (#4581)
  Convert OO/LO SidePanel to javafx (#4341)
  Convert "Customize importer" dialog to JavaFX (#4608)
  Convert "From Aux file" dialog to JavaFX (#4607)
  Convert "Show preferences" dialog to JavaFX (#4605)
  Fix not on FX thread exception
  Force javafx to run thread (#4604)
  Convert new version dialog to JavaFX (#4602)
  Add a variable to track the change in preview style (#4587)
  Solution for submitting dialog with Ctrl + Enter (#4496) (#4592)
  Bump mysql-connector-java from 8.0.13 to 8.0.14 (#4599)
  Fix overlapping font in id entry type (#4595)
  update jfoenix and gradle plugins Replace outdated transformer log4j2 with official new one
  Update journalList.txt
  Fix for Issue #4437 - Some bugs in preference->Entry table columns (#4546)
  Don't set column sort type at startup (#4577)
  Add uncaught exception message (#4565)
  Converts integrity check dialog to JavaFX (#4559)
  ...

# Conflicts:
#	build.gradle
#	src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java
#	src/main/java/org/jabref/gui/JabRefFrame.java
#	src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
#	src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
#	src/main/java/org/jabref/gui/openoffice/CitationManager.java
#	src/main/java/org/jabref/gui/openoffice/OOBibBase.java
#	src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
#	src/main/java/org/jabref/gui/openoffice/OpenOfficeSidePanel.java
Siedlerchr added a commit that referenced this pull request Feb 1, 2019
* upstream/master:
  Fix NPE and not on FX Thread in PreviewPrefs Tabs (#4624)
  Fix preview style configuration (#4613)
  Bump wiremock from 2.20.0 to 2.21.0 (#4623)
  snap: disable tests build, add removable media and specify architectures (#4619)
  Bump checkstyle from 8.16 to 8.17 (#4620)
  Fix preferences path: use _JAVA_OPTIONS
  Try to fix not on FX thread for search and autocomplete (#4618)
  Update snapcraft.yaml Move to snap folder
  Convert DuplicateResolverDialog to javafx (#4601)
  Fix for BibTex source tab parsing issue if field contains {} (#4581)
  Convert OO/LO SidePanel to javafx (#4341)
  Convert "Customize importer" dialog to JavaFX (#4608)
  Convert "From Aux file" dialog to JavaFX (#4607)
  Convert "Show preferences" dialog to JavaFX (#4605)
  Fix not on FX thread exception
  Force javafx to run thread (#4604)
  Convert new version dialog to JavaFX (#4602)
  Add a variable to track the change in preview style (#4587)
  Solution for submitting dialog with Ctrl + Enter (#4496) (#4592)
  Bump mysql-connector-java from 8.0.13 to 8.0.14 (#4599)

# Conflicts:
#	src/main/resources/l10n/JabRef_en.properties
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants