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

Add group coloring in maintable as replacement for marked entries #3769

Merged
merged 7 commits into from
Mar 5, 2018

Conversation

tobiasdiez
Copy link
Member

@tobiasdiez tobiasdiez commented Feb 23, 2018

Instead of "marking entries" to highlight them, the entries in the maintable now have a small colored bar in front of them whose color comes from the first group that matches them (see picture below). For migration, a group is created for every value of the __markedentry field and the entry is added to this group.

image

Further changes:

  • Change default icon for groups from label-outline-1 to a circle because a colored version of the old icon was hard to distinguish from its black counterpart.
  • Fixed an issue where the default icon of a group was not colored correctly.

  • 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?)

@tobiasdiez tobiasdiez changed the base branch from master to maintable-beta February 24, 2018 11:50
@tobiasdiez tobiasdiez changed the title [WIP] Add group color as replacement for marked entries Add group coloring in maintable as replacement for marked entries Feb 25, 2018
@tobiasdiez tobiasdiez added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Feb 25, 2018
@tobiasdiez
Copy link
Member Author

This PR is now ready for review.

Copy link
Member

@Siedlerchr Siedlerchr left a comment

Choose a reason for hiding this comment

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

Lgtm code wise. Not yet tested

@tobiasdiez
Copy link
Member Author

I'll merge this PR now since it already has one positive review and is finished for over a week.

@tobiasdiez tobiasdiez merged commit 9c6bd69 into maintable-beta Mar 5, 2018
@tobiasdiez tobiasdiez deleted the maintableGroupsColor branch March 5, 2018 11:11
Siedlerchr added a commit that referenced this pull request Mar 5, 2018
…javafx

* upstream/maintable-beta:
  Remove unused import
  Add group coloring in maintable as replacement for marked entries (#3769)

# Conflicts:
#	src/main/resources/l10n/JabRef_en.properties
Siedlerchr added a commit that referenced this pull request Mar 9, 2018
…drop

* upstream/maintable-beta: (24 commits)
  Fixes #3796: Pretend that we have every translation for every key (#3820)
  adjust line wrapping on column
  replace open office install selection dialog with choice dialog Wrap error messages in fx executor (because abstract worker is swing thread)
  Convert swing error dialog in save db action to custom fx dialog
  Replace swing export dialog in ExportToClipboardAction with fx choices dlg
  run find fulltext dialog in fx thread
  fix cut, copy & paste action from toolbar
  Set resizable for custom dialog with dialog pane convert merge entries dlg to javafx and make action working again
  checkstyle argh!
  Update test order -> Execute checkstyle first (#3807)
  embed cleanup dialog in javafx
  Fix some non FX Thread issues Main drawback: Cleanup panel is in backgroung due to swing thread)
  Allow search field to be smaller
  Fix Codacy Unused Params, Fields (#3753)
  Dialogstojavafx (#3801)
  Remove unused import
  Add group coloring in maintable as replacement for marked entries (#3769)
  Enable travis build for maintable-beta (#3804)
  Remove setting of tooltip manually
  Change open last edited dialgo to javafx (#3800)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/maintable/MainTable.java
Siedlerchr added a commit that referenced this pull request Mar 10, 2018
…tomjfx

* upstream/maintable-beta: (28 commits)
  Fixes #3796: Pretend that we have every translation for every key (#3820)
  adjust line wrapping on column
  replace open office install selection dialog with choice dialog Wrap error messages in fx executor (because abstract worker is swing thread)
  Convert swing error dialog in save db action to custom fx dialog
  Replace swing export dialog in ExportToClipboardAction with fx choices dlg
  run find fulltext dialog in fx thread
  fix cut, copy & paste action from toolbar
  Set resizable for custom dialog with dialog pane convert merge entries dlg to javafx and make action working again
  checkstyle argh!
  Update test order -> Execute checkstyle first (#3807)
  embed cleanup dialog in javafx
  Fix some non FX Thread issues Main drawback: Cleanup panel is in backgroung due to swing thread)
  Allow search field to be smaller
  Fix Codacy Unused Params, Fields (#3753)
  Dialogstojavafx (#3801)
  Remove unused import
  Add group coloring in maintable as replacement for marked entries (#3769)
  Enable travis build for maintable-beta (#3804)
  Remove setting of tooltip manually
  Change open last edited dialgo to javafx (#3800)
  ...
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.

2 participants