From b18b4d30e59db91f654728b4efcbac72746b1aa8 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Wed, 19 Feb 2020 10:09:47 +0100
Subject: [PATCH] Added MenuButtons to IntegrityCheckDialog (#5955)
---
CHANGELOG.md | 16 ++---
.../gui/integrity/IntegrityCheckDialog.fxml | 36 ++++++----
.../gui/integrity/IntegrityCheckDialog.java | 72 ++++++++++++++++++-
src/main/resources/l10n/JabRef_en.properties | 4 ++
4 files changed, 103 insertions(+), 25 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcbcb4953df..ae9e8816e5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,13 +12,13 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
## [Unreleased]
### Changed
-- we changed the open office panel to show buttons in rows of three instead of going straight down to save space as the button expanded out to take up unnecessary horizontal space [#5479] (https://github.com/JabRef/jabref/issues/5479)
+- We changed the open office panel to show buttons in rows of three instead of going straight down to save space as the button expanded out to take up unnecessary horizontal space. [#5479](https://github.com/JabRef/jabref/issues/5479)
- We cleaned up the group add/edit dialog. [#5826](https://github.com/JabRef/jabref/pull/5826)
- We reintroduced the index column. [#5844](https://github.com/JabRef/jabref/pull/5844)
+- Filenames of external files can no longer contain curly braces. [#5926](https://github.com/JabRef/jabref/pull/5926)
+- We made the filters more easily accessible in the integrity check dialog. [#5955](https://github.com/JabRef/jabref/pull/5955)
- We reimplemented and improved the dialog "Customize entry types" [#4719](https://github.com/JabRef/jabref/issues/4719)
-- Filenames of external files can no longer contain curly braces
-
### Fixed
@@ -26,7 +26,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
- We fixed an issue where the Medline fetcher was only working when JabRef was running from source. [#5645](https://github.com/JabRef/jabref/issues/5645)
- We fixed some visual issues in the dark theme. [#5764](https://github.com/JabRef/jabref/pull/5764) [#5753](https://github.com/JabRef/jabref/issues/5753)
- We fixed an issue where non-default previews didn't handle unicode characters. [#5779](https://github.com/JabRef/jabref/issues/5779)
-- We improved the performance, especially changing field values in the entry should feel smoother now.
+- We improved the performance, especially changing field values in the entry should feel smoother now. [#5843](https://github.com/JabRef/jabref/issues/5843)
- We fixed an issue where the ampersand character wasn't rendering correctly on previews. [#3840](https://github.com/JabRef/jabref/issues/3840)
- We fixed an issue where an erroneous "The library has been modified by another program" message was shown when saving. [#4877](https://github.com/JabRef/jabref/issues/4877)
- We fixed an issue where the file extension was missing after downloading a file (we now fall-back to pdf). [#5816](https://github.com/JabRef/jabref/issues/5816)
@@ -35,12 +35,12 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
- We fixed several issues concerning managing external file types: Now everything is usable and fully functional. Previously, there were problems with the radio buttons, with saving the settings and with loading an input field value. Furthermore, different behavior for Windows and other operating systems was given, which was unified as well. [#5846](https://github.com/JabRef/jabref/issues/5846)
- We fixed an issue where entries containing Unicode charaters were not parsed correctly [#5899](https://github.com/JabRef/jabref/issues/5899)
- We fixed an issue where an entry containing an external filename with curly braces could not be saved. Curly braces are now longer allowed in filenames. [#5899](https://github.com/JabRef/jabref/issues/5899)
-- We fixed an issue where changing the type of an entry did not update the main table [#5906](https://github.com/JabRef/jabref/issues/5906)
-- We fixed an issue where opening a library from the recent libraries menu was not possible [#5939](https://github.com/JabRef/jabref/issues/5939)
-
+- We fixed an issue where changing the type of an entry did not update the main table. [#5906](https://github.com/JabRef/jabref/issues/5906)
+- We fixed an issue where opening a library from the recent libraries menu was not possible. [#5939](https://github.com/JabRef/jabref/issues/5939)
### Removed
-- Ampersands are no longer escaped by default in the `bib` file. If you want to keep the current behaviour, you can use the new "Escape Ampersands" formatter as a save action.
+
+- Ampersands are no longer escaped by default in the `bib` file. If you want to keep the current behaviour, you can use the new "Escape Ampersands" formatter as a save action. [#5869](https://github.com/JabRef/jabref/issues/5869)
## [5.0-beta] – 2019-12-15
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
index e3eb9580ce0..23693196dba 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
@@ -1,26 +1,32 @@
+
-
+
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index a6357dc8cce..3901c37006a 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -5,8 +5,11 @@
import javafx.beans.property.ReadOnlyStringWrapper;
import javafx.collections.ListChangeListener;
import javafx.fxml.FXML;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuButton;
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView;
+import javafx.scene.input.MouseButton;
import javafx.stage.Modality;
import org.jabref.gui.BasePanel;
@@ -25,7 +28,11 @@ public class IntegrityCheckDialog extends BaseDialog {
@FXML private TableColumn keyColumn;
@FXML private TableColumn fieldColumn;
@FXML private TableColumn messageColumn;
+ @FXML private MenuButton keyFilterButton;
+ @FXML private MenuButton fieldFilterButton;
+ @FXML private MenuButton messageFilterButton;
private IntegrityCheckDialogViewModel viewModel;
+ private TableFilter tableFilter;
public IntegrityCheckDialog(List messages, BasePanel basePanel) {
this.messages = messages;
@@ -59,7 +66,68 @@ private void initialize() {
fieldColumn.setCellValueFactory(row -> new ReadOnlyStringWrapper(row.getValue().getField().getDisplayName()));
messageColumn.setCellValueFactory(row -> new ReadOnlyStringWrapper(row.getValue().getMessage()));
- TableFilter.forTableView(messagesTable)
- .apply();
+ tableFilter = TableFilter.forTableView(messagesTable)
+ .apply();
+
+ tableFilter.getColumnFilter(keyColumn).ifPresent(columnFilter -> {
+ ContextMenu keyContextMenu = keyColumn.getContextMenu();
+ if (keyContextMenu != null) {
+ keyFilterButton.setContextMenu(keyContextMenu);
+ keyFilterButton.setOnMouseClicked(event -> {
+ if (event.getButton() == MouseButton.PRIMARY) {
+ if (keyContextMenu.isShowing()) {
+ keyContextMenu.setX(event.getScreenX());
+ keyContextMenu.setY(event.getScreenY());
+ } else {
+ keyContextMenu.show(keyFilterButton, event.getScreenX(), event.getScreenY());
+ }
+ }
+ });
+ }
+ });
+
+ tableFilter.getColumnFilter(fieldColumn).ifPresent(columnFilter -> {
+ ContextMenu fieldContextMenu = fieldColumn.getContextMenu();
+ if (fieldContextMenu != null) {
+ fieldFilterButton.setContextMenu(fieldContextMenu);
+ fieldFilterButton.setOnMouseClicked(event -> {
+ if (event.getButton() == MouseButton.PRIMARY) {
+ if (fieldContextMenu.isShowing()) {
+ fieldContextMenu.setX(event.getScreenX());
+ fieldContextMenu.setY(event.getScreenY());
+ } else {
+ fieldContextMenu.show(fieldFilterButton, event.getScreenX(), event.getScreenY());
+ }
+ }
+ });
+ }
+ });
+
+ tableFilter.getColumnFilter(messageColumn).ifPresent(columnFilter -> {
+ ContextMenu messageContextMenu = messageColumn.getContextMenu();
+ if (messageContextMenu != null) {
+ messageFilterButton.setContextMenu(messageContextMenu);
+ messageFilterButton.setOnMouseClicked(event -> {
+ if (event.getButton() == MouseButton.PRIMARY) {
+ if (messageContextMenu.isShowing()) {
+ messageContextMenu.setX(event.getScreenX());
+ messageContextMenu.setY(event.getScreenY());
+ } else {
+ messageContextMenu.show(messageFilterButton, event.getScreenX(), event.getScreenY());
+ }
+ }
+ });
+ }
+ });
+ }
+
+ public void clearFilters() {
+ if (tableFilter != null) {
+ tableFilter.resetFilter();
+ messagesTable.getColumns().forEach(column -> {
+ tableFilter.selectAllValues(column);
+ column.setGraphic(null);
+ });
+ }
}
}
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 19746dff860..9bf9cbac5c9 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2097,6 +2097,10 @@ Keyword\ delimiter=Keyword delimiter
Hierarchical\ keyword\ delimiter=Hierarchical keyword delimiter
Escape\ ampersands=Escape ampersands
+BibTeX\ key\ filters=BibTeX key filters
+Field\ filters=Field filters
+Message\ filters=Message filters
+Clear\ filters=Clear filters
Add\ new\ Field=Add new Field
Add\ new\ entry\ type=Add new entry type