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

Create a better solution for define multi line fields #9456

Merged
merged 28 commits into from
Jan 2, 2023

Conversation

Freeman6475
Copy link
Contributor

@Freeman6475 Freeman6475 commented Dec 15, 2022

Fixes #6448

grafik

  • Change in CHANGELOG.md described in a way that is understandable for the average user (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (for UI changes)
  • Checked developer's documentation: Is the information available and up to date? If not, I outlined it in this pull request.
  • Checked documentation: Is the information available and up to date? If not, I created an issue at https://github.com/JabRef/user-documentation/issues or, even better, I submitted a pull request to the documentation repository.

@ThiloteE
Copy link
Member

To ease organizational workflows I have linked the pull-request to the issue with syntax as described in https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue

Linking a pull request to an issue using a keyword

You can link a pull request to an issue by using a supported keyword in the pull request's description or in a commit message. The pull request must be on the default branch.

  • close
  • closes
  • closed
  • fix
  • fixes
  • fixed
  • resolve
  • resolves
  • resolved

If you use a keyword to reference a pull request comment in another pull request, the pull requests will be linked. Merging the referencing pull request also closes the referenced pull request.

The syntax for closing keywords depends on whether the issue is in the same repository as the pull request.

@Siedlerchr
Copy link
Member

As we talked about this, I summarize this here again for the others:

Next steps:
create a checkbox column for the multiline check

see for an example how it is implemented

databaseEnabledColumn.setCellFactory(CheckBoxTableCell.forTableColumn(databaseEnabledColumn));

@Siedlerchr Siedlerchr added the status: changes required Pull requests that are not yet complete label Dec 21, 2022
* upstream/main: (120 commits)
  Enable groups drag'n'drop to new library (JabRef#9460)
  Update MacOS jabrefHost.py to find local installs (JabRef#9487)
  Fix remember last open valid library with empty new one (JabRef#9489)
  Observable Preferences R (CitationKeyPatternPreferences) (JabRef#9486)
  Fixed ZBMathTest and extracted keyWordSeparator (JabRef#9485)
  New Crowdin updates (JabRef#9483)
  Add log for ignored excepton (JabRef#9302)
  Select Library to import into (JabRef#9402)
  Bump org.eclipse.jgit from 6.3.0.202209071007-r to 6.4.0.202211300538-r (JabRef#9476)
  Bump com.github.andygoossens.modernizer from 1.6.2 to 1.7.0 (JabRef#9478)
  Bump mockito-core from 4.9.0 to 4.10.0 (JabRef#9479)
  Bump checkstyle from 10.4 to 10.5.0 (JabRef#9477)
  Bump slf4j-api from 2.0.5 to 2.0.6 in /buildSrc (JabRef#9480)
  Bibtex month not deprecated (JabRef#9404)
  Show development information\n\n+semver: major
  Release v5.8
  Update external libraries add afterburner fx jabref add jakarta inject
  fix display name for artifact store
  Prepare CHANGELOG for release
  Also trigger on branch arm64mac-release
  ...
todo map property of field
* upstream/main:
  Observable Preferences S (LastExportPath and Cleanups in JabRefPreferences and Globals) (JabRef#9493)
@Siedlerchr
Copy link
Member

TODO: How to adjust the serializer/parser to recognize the field properties. Store it in prefs as is?

* upstream/main:
  Bump classgraph from 4.8.152 to 4.8.153 (JabRef#9502)
  Bump slf4j-api from 2.0.5 to 2.0.6 (JabRef#9501)
  Bump org.beryx.jlink from 2.25.0 to 2.26.0 (JabRef#9500)
  Bump lucene-queries from 9.4.1 to 9.4.2 (JabRef#9499)
  Add double click on preview style to add/remove from the selected list (JabRef#9498)
  Fix no context menu with sorting on all entries group (JabRef#9497)
@Siedlerchr
Copy link
Member

NON_WRAPPABLE_FIELDS:
FieldContentFormatterPreferences extract to BibEntryPreferences
Custom Entry types: move to preferences

Call with Carl: Still use the existing hack

fix checkstyle
@Siedlerchr
Copy link
Member

I will create a follow up PR for moving the CustomEntryType to the preference tab

@Siedlerchr Siedlerchr marked this pull request as ready for review December 27, 2022 21:36
@Siedlerchr Siedlerchr added status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers and removed status: changes required Pull requests that are not yet complete labels Dec 28, 2022
Comment on lines 66 to 72
minWidth="150.0" prefWidth="-1.0" text="%Field"/>
minWidth="120.0" prefWidth="-1.0" text="%Field"/>
<TableColumn fx:id="fieldTypeColumn"
minWidth="100.0" prefWidth="100.0" text="%Field type"/>
minWidth="130.0" prefWidth="150.0" text="%Field type"/>
<TableColumn fx:id="fieldTypeActionColumn"
maxWidth="40.0" minWidth="40.0" resizable="false"/>
<TableColumn fx:id="fieldTypeMultilineColumn" text="%Multiline"
prefWidth="60.0" minWidth="50.0" resizable="true"/>
Copy link
Member

Choose a reason for hiding this comment

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

Not so happy with the arrangement of the checkboxes and buttons.
The remove button should be the most right aligned button. the checkbox-column is too wide. Maybe rotate the label of the TableColumn 90 degrees to display it vertically? (https://stackoverflow.com/questions/27666087/vertical-column-text-in-tableview)

Copy link
Member

Choose a reason for hiding this comment

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

I found a different solution for vertical alignment https://stackoverflow.com/a/74863464
In general this looks good, however, there seems to be some padding or margin missing.. Unfortunately I could not get scenic view to run on mac :(
grafik

Copy link
Member

Choose a reason for hiding this comment

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

I will take a look

Copy link
Member

Choose a reason for hiding this comment

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

can you commit your changes?

Copy link
Member

Choose a reason for hiding this comment

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

Pushed to the wrong repo^^

Copy link
Member

Choose a reason for hiding this comment

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

Fixed it now
grafik

Copy link
Member

Choose a reason for hiding this comment

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

I'll look into it tomorrow. There are some UI tweaks I'm thinking of. 🤔

* upstream/main:
  Fix spaces
  Add missing dots
  Squashed 'buildres/csl/csl-styles/' changes from 84dba23..43566f2
  try to repack deb file (JabRef#9506)
  Fix date parser for year/month (JabRef#9507)

# Conflicts:
#	CHANGELOG.md
@calixtus
Copy link
Member

calixtus commented Jan 1, 2023

grafik

Siedlerchr
Siedlerchr previously approved these changes Jan 1, 2023
@@ -11,12 +11,15 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve

### Added


Copy link
Member

Choose a reason for hiding this comment

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

Duplicate changelog entry

@Siedlerchr Siedlerchr merged commit fd37cd3 into JabRef:main Jan 2, 2023
Siedlerchr added a commit to NiD133/jabref that referenced this pull request Jan 4, 2023
* upstream/main: (29 commits)
  Use Set instead of List for custom journal abbreviations (JabRef#9515)
  Delete snap.yml (JabRef#9526)
  New Crowdin updates (JabRef#9523)
  Fix not on fx thread error when downloading file (JabRef#9522)
  Fix downloading in case of circular redirect (JabRef#9519)
  Typo: sucess -> success (JabRef#9520)
  New Crowdin updates (JabRef#9517)
  Add CHANGELOG.md entry for 9472
  Fix journal abbbrev checker for curly braces (JabRef#9504)
  Remove journal_abbreviations_ieee_strings.csv from journal lists (JabRef#9511)
  Bump mockito-core from 4.10.0 to 4.11.0 (JabRef#9513)
  Bump lucene-core from 9.4.1 to 9.4.2 (JabRef#9512)
  Bump checkstyle from 10.5.0 to 10.6.0 (JabRef#9514)
  Create a better solution for define multi line fields (JabRef#9456)
  Check links once a month
  Really ignore CHANGELOG.md in link check
  Fix spaces
  Add missing dots
  Squashed 'buildres/csl/csl-styles/' changes from 84dba23..43566f2
  try to repack deb file (JabRef#9506)
  ...

# Conflicts:
#	CHANGELOG.md
#	src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
Siedlerchr added a commit to JabRef/jabref-koppor that referenced this pull request Jan 5, 2023
* upstream/main: (244 commits)
  Use Set instead of List for custom journal abbreviations (JabRef#9515)
  Delete snap.yml (JabRef#9526)
  New Crowdin updates (JabRef#9523)
  Fix not on fx thread error when downloading file (JabRef#9522)
  Fix downloading in case of circular redirect (JabRef#9519)
  Typo: sucess -> success (JabRef#9520)
  New Crowdin updates (JabRef#9517)
  Add CHANGELOG.md entry for 9472
  Fix journal abbbrev checker for curly braces (JabRef#9504)
  Remove journal_abbreviations_ieee_strings.csv from journal lists (JabRef#9511)
  Bump mockito-core from 4.10.0 to 4.11.0 (JabRef#9513)
  Bump lucene-core from 9.4.1 to 9.4.2 (JabRef#9512)
  Bump checkstyle from 10.5.0 to 10.6.0 (JabRef#9514)
  Create a better solution for define multi line fields (JabRef#9456)
  Check links once a month
  Really ignore CHANGELOG.md in link check
  Fix spaces
  Add missing dots
  Squashed 'buildres/csl/csl-styles/' changes from 84dba23..43566f2
  try to repack deb file (JabRef#9506)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
entry-editor 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.

Create a better solution for defining multiline fields
5 participants