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.

Sign up for GitHub

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

Jump to bottom

Clarify the duplicates resolver dialog actions #9140

Merged
merged 12 commits into from
Sep 14, 2022
Merged

Clarify the duplicates resolver dialog actions #9140

merged 12 commits into from
Sep 14, 2022

Conversation

HoussemNasri
Copy link
Member

@HoussemNasri HoussemNasri commented Sep 6, 2022 •
edited
Loading

Fixes #9056

TODO

  • Add a smaller help button.
  • Handle the Automatically remove exact duplicates button.
  • CHANGELOG.md

Screenshots

ImportEntriesDialog (triggered when importing another library into the current library) and ImportHandler (triggered when pasting an entry from the clipboard)

image

The default DuplicateResolverDialog (triggered by choosing 'Find duplicates' from the menu)

Capture1

Help button and Remove exact duplicates button visible

remove-exact-visible

  • 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.

@HoussemNasri
Don't show the info button when the authors field content is identical
eda8d57
@HoussemNasri
Use enhanced switch expression
1c042d6
@HoussemNasri
Improve duplicate resolver dialog actions
59c7062 
- Renamed the actions.
- Changed their layout; some actions on the left and some on the right.
- Commented out the help action for now.
@HoussemNasri
Move 'Keep old entry' action to the left
81341fc
@HoussemNasri
do something
194e126
@HoussemNasri
Merge remote-tracking branch 'upstream/main' into clarify-find-duplic…
9576ee7 
…ates-actions
@HoussemNasri
Remove DuplicateResolverType#INSPECTION
3dba17f 
- This enum was used by to decide what buttons to add to the duplicate resolver dialog in ImportEntriesDialog. However, both ImportHandler and ImportEntriesDialog have the same buttons. In addition, they share logic too. We should consider merging them at some point.
@HoussemNasri HoussemNasri changed the title Rename the duplicates resolver dialog actions Clarify the duplicates resolver dialog actions Sep 6, 2022
calixtus
calixtus approved these changes Sep 6, 2022
View reviewed changes
Copy link
Member

@calixtus calixtus left a comment

Choose a reason for hiding this comment

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

LGTM except one comment left...

src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java Outdated Show resolved Hide resolved
@HoussemNasri HoussemNasri changed the title Clarify the duplicates resolver dialog actions [WIP] Clarify the duplicates resolver dialog actions Sep 6, 2022
@HoussemNasri HoussemNasri changed the title [WIP] Clarify the duplicates resolver dialog actions Clarify the duplicates resolver dialog actions Sep 11, 2022
@HoussemNasri HoussemNasri added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Sep 11, 2022
@Siedlerchr Siedlerchr merged commit 6a4a4f4 into main Sep 14, 2022
@Siedlerchr Siedlerchr deleted the clarify-find-duplicates-actions branch September 14, 2022 18:10
Siedlerchr added a commit to LIM0000/jabref that referenced this pull request Sep 17, 2022
@Siedlerchr
Merge remote-tracking branch 'upstream/main' into fix-for-issue-8189
5436087 
* upstream/main:
  Update to jfx 19 (JabRef#9155)
  Squashed 'buildres/csl/csl-styles/' changes from 8d69f16..201e022
  Clarify the duplicates resolver dialog actions (JabRef#9140)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@calixtus calixtus calixtus approved these changes

@Siedlerchr Siedlerchr Siedlerchr approved these changes

Assignees
No one assigned
Labels
duplicateFinder status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Clarify button "Import and keep old entry"
3 participants
@HoussemNasri @Siedlerchr @calixtus