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

[WIP] Main table JavaFX migration #3621

Merged
merged 294 commits into from
Jun 3, 2018
Merged

[WIP] Main table JavaFX migration #3621

merged 294 commits into from
Jun 3, 2018

Conversation

tobiasdiez
Copy link
Member

@tobiasdiez tobiasdiez commented Jan 9, 2018

This PR tracks the progress of the migration of the maintable to JavaFX. See also the Maintable in JavaFX project. The current version can be downloaded here.

image

Please report any bugs that appear or missing features, which are not listed below. Moreover, we appreciate feedback about the general design (what do guys like, what not)

Known bugs:

Changelog:

Fixed:

Changed:

  • The special fields like Printed and Read status now show gray icons when the row is hovered.
  • We added a button in the tab header which allows you to close the database with one click. Add Tab close button to tab title #494
  • Sorting in the main table now takes information from cross-referenced entries into account. Year sorting does not work for crossref entries #2808
  • If a group has a color specified, then entries matched by this group have a small colored bar in front of them in the main table.
  • Change default icon for groups to a circle because a colored version of the old icon was hard to distinguish from its black counterpart.
  • In the main table, the context menu appears now when you press the "context menu" button on the keyboard. feature request in the forum
  • We added icons to the group side panel to quickly switch between union and intersection group view mode 4.0 Groups: fast access to View options #3269

Removed:

  • The feature to "mark entries" was removed and merged with the groups functionality. For migration, a group is created for every value of the __markedentry field and the entry is added to this group.
  • The number column was removed.
  • We removed the coloring of cells in the maintable according to whether the field is optional/required.
  • We removed a few commands from the right-click menu that are not needed often and thus don't need to be placed that prominently:
    • Print entry preview: available through entry preview
    • All commands related to marking: marking is not yet reimplemented
    • Set/clear/append/rename fields: available through Edit menu
    • Manage keywords: available through Edit menu
    • Copy linked files to folder: available through File menu

Migrated features:

  • Sorting (Shift + click for multi-column sort)
  • Filtering by search and groups
  • Context menu (with linked files) for the file icon
  • Right-click menu
  • Setting special fields like reading status / priority / ... through the main table

I would like to ask all contributors with write-access to complete the lists above (with links to a comment with further details if necessary) with new bugs or missing features as they are discovered.

@koppor koppor changed the title Main table JavaFX migration [WIP] Main table JavaFX migration Jan 9, 2018
CHANGELOG.md Outdated
- We changed one default of [Cleanup entries dialog](http://help.jabref.org/en/CleanupEntries): Per default, the PDF are not moved to the default file directory anymore. [#3619](https://github.com/JabRef/jabref/issues/3619)
- We added a new type of group that shows all items referenced in a given LaTeX file (actually the generated AUX file). [#1664](https://github.com/JabRef/jabref/issues/1664)
Copy link
Member

Choose a reason for hiding this comment

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

This should be kept

CHANGELOG.md Outdated
- We changed one default of [Cleanup entries dialog](http://help.jabref.org/en/CleanupEntries): Per default, the PDF are not moved to the default file directory anymore. [#3619](https://github.com/JabRef/jabref/issues/3619)
- We added a new type of group that shows all items referenced in a given LaTeX file (actually the generated AUX file). [#1664](https://github.com/JabRef/jabref/issues/1664)
- We added the export of the `translator` field to the according MS-Office XML field. [#1750, comment](https://github.com/JabRef/jabref/issues/1750#issuecomment-357350986)
Copy link
Member

Choose a reason for hiding this comment

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

The left side is correct. No double "the".

CHANGELOG.md Outdated
- We changed one default of [Cleanup entries dialog](http://help.jabref.org/en/CleanupEntries): Per default, the PDF are not moved to the default file directory anymore. [#3619](https://github.com/JabRef/jabref/issues/3619)
- We added a new type of group that shows all items referenced in a given LaTeX file (actually the generated AUX file). [#1664](https://github.com/JabRef/jabref/issues/1664)
- We added the export of the `translator` field to the according MS-Office XML field. [#1750, comment](https://github.com/JabRef/jabref/issues/1750#issuecomment-357350986)
- We completely reworked and redesigned the main table.
Copy link
Member

Choose a reason for hiding this comment

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

Remove this line - is already present on line 17

florian-beetz and others added 20 commits May 15, 2018 21:51
* Remove usage of transitive dependency on Apache Commons

(cherry picked from commit 6608b2b)

* Use JavaFX-native SVGPath for logo in About dialog
* Switch to org.postgresql

* fix checkstyle
fix driver setup connection

* convert error message dialog to dialog service
* upstream/master:
  update gradle to 4.7 (#4049)
  Add missing translation for "HTML to Unicode" (#4046)
  New Crowdin translations (#4042)
  Use all-text-fields magic also in BibTeX cleanup. (#4039)
  Shortittle bibtexkeypattern now also discards small words (#4030)
# Conflicts:
#	CHANGELOG.md
#	build.gradle
#	src/main/java/org/jabref/JabRefGUI.java
#	src/main/java/org/jabref/JabRefMain.java
#	src/main/java/org/jabref/gui/BasePanel.java
#	src/main/java/org/jabref/gui/EntryTypeDialog.java
#	src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java
#	src/main/java/org/jabref/gui/actions/CleanupAction.java
#	src/main/java/org/jabref/gui/actions/CopyFilesAction.java
#	src/main/java/org/jabref/gui/collab/ChangeScanner.java
#	src/main/java/org/jabref/gui/entryeditor/EntryEditor.css
#	src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
#	src/main/java/org/jabref/gui/entryeditor/SourceTab.java
#	src/main/java/org/jabref/gui/exporter/ExportAction.java
#	src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
#	src/main/java/org/jabref/gui/externalfiles/DownloadExternalFile.java
#	src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java
#	src/main/java/org/jabref/gui/externalfiles/SynchronizeFileField.java
#	src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
#	src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java
#	src/main/java/org/jabref/gui/openoffice/OpenOfficeSidePanel.java
#	src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java
#	src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
#	src/main/java/org/jabref/gui/search/GlobalSearchBar.java
#	src/main/java/org/jabref/logic/formatter/Formatters.java
#	src/main/java/org/jabref/migrations/PreferencesMigrations.java
#	src/main/java/org/jabref/model/entry/BibtexSingleField.java
#	src/main/java/org/jabref/model/entry/InternalBibtexFields.java
#	src/main/resources/l10n/JabRef_en.properties
#	src/test/java/org/jabref/logic/formatter/FormatterTest.java
* Add VSCode and Cancel icons. Remove lcd antialiasing for buttons.

* Completely remove explicit font aliasing from icons
@tobiasdiez
Copy link
Member Author

So I now fixed the language tests as well as some other failing tests. This is now good to go as our now master branch. @koppor please be so kind and do the git magic!

@JabRef/developers please go through the issues you reported and check whether they still exists in the most recent version and if yes please create a normal issue for them (or immediately fix them).

@koppor
Copy link
Member

koppor commented Jun 3, 2018

Depends on #4015

(Trying out https://github.com/ahmed-taj/dep)

@koppor
Copy link
Member

koppor commented Jun 3, 2018

Since there are conflicts, I did the following:

  1. git fetch origin --prune - to ensure I have the latest commits
  2. git checkout master - to be on the master branch
  3. git pull - to ensure I have the latest updates at the master branch
  4. git merge origin/maintable-beta - to merge this PR
  5. Open IntelliJ
  6. Wait for indexing being finished
  7. VCS -> Git -> Resolve conflicts
    grafik
  8. Double click each file
    grafik
  9. At each file
  10. Apply all non-conflicting changes
    grafik
  11. Resolve conflicts manually

Notes of important things I did during the merge:

  1. Restored ExportAction.java. (But id not wire it into the existing code. Maybe, it can be deleted?)
  1. Kept the deletion of gui/importer/ImportFormats.java
  • I think, the commits 71fcea5, 576588a, and 2f5f2e5 for ImportFormats.java have to be ported to a certain place somehow. One can do git checkout 2f5f2e5bbe2b42319736bd735791b0b3039096f6, then gitk --all src/main/java/org/jabref/gui/importer/ImportFormats.java&, then git checkout master to a) see what changed in that file and b) to continue working
  1. I had to do some compile fixes:

To create the new branch v4.x, I checkout 9b2fedc (git checkout 9b2fedc238d1ba64875c96cf8), created a new branch v4.x (git checkout -b v4.x) and made it known to our GitHub repo: git push --set-upstream origin v4.x.

@koppor koppor merged commit 1d7a253 into master Jun 3, 2018
koppor added a commit that referenced this pull request Jun 3, 2018
Co-authored-by: Tobias Diez <tobiasdiez@gmx.de>
@koppor koppor deleted the maintable-beta branch June 29, 2018 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.