Skip to content

JournalAbbreviation search feature #7804

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

Merged
merged 22 commits into from
Jun 15, 2021
Merged

JournalAbbreviation search feature #7804

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
90cbc2f
Initial draf of abbreviation search feature
btut Jun 7, 2021
18a5a3c
Changed to FilteredList
btut Jun 7, 2021
ca95022
Checkstyle
btut Jun 7, 2021
bdb2f92
Removed unnecessary listeners
btut Jun 7, 2021
4f97d03
Added changelog entry
btut Jun 8, 2021
b9c981e
Changed contains to containsLowerCase
btut Jun 8, 2021
0e4179b
Added test
btut Jun 8, 2021
f1606d2
Verbose variables and Locale lower-case
btut Jun 9, 2021
2e7112b
Code-style improvements
btut Jun 9, 2021
1c4dce3
Parameterized test
btut Jun 9, 2021
8a8f01f
Checkstyle
btut Jun 9, 2021
4f92125
Code-style improvements suggested by @Siedlerchr
btut Jun 9, 2021
52ec371
Merge branch 'main' into feature/abbreviationsSearch
btut Jun 9, 2021
24846d0
Clear abbrev search when user adds new (empty ) abbrev
btut Jun 9, 2021
94561f0
Moved and refactored tests
btut Jun 9, 2021
5e0c4c1
Merge branch 'feature/abbreviationsSearch' of github.com:btut/jabref …
btut Jun 10, 2021
03bbb36
Added visual feedback of invalidated search
btut Jun 11, 2021
68481d5
Merge branch 'main' into feature/abbreviationsSearch
calixtus Jun 11, 2021
15ab667
Moved rgba-string conversion to ColorUtil
btut Jun 11, 2021
66c7b12
Only change background color, not border
btut Jun 12, 2021
add2d44
Select name column when new abbreviation is added
btut Jun 12, 2021
4cf14b7
Do abbreviation actions after invalidating search
btut Jun 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 50 additions & 1 deletion src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

import javax.inject.Inject;

import javafx.animation.Interpolator;
import javafx.animation.KeyFrame;
import javafx.animation.KeyValue;
import javafx.animation.Timeline;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.collections.transformation.FilteredList;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
Expand All @@ -11,6 +19,8 @@
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView;
import javafx.scene.control.cell.TextFieldTableCell;
import javafx.scene.paint.Color;
import javafx.util.Duration;

import org.jabref.gui.icon.IconTheme;
import org.jabref.gui.preferences.AbstractPreferenceTabView;
Expand Down Expand Up @@ -48,6 +58,10 @@ public class JournalAbbreviationsTab extends AbstractPreferenceTabView<JournalAb
@Inject private TaskExecutor taskExecutor;
@Inject private JournalAbbreviationRepository abbreviationRepository;

private Timeline invalidateSearch;
private ObjectProperty<Color> flashingColor;
private StringProperty flashingColorStringProperty;

public JournalAbbreviationsTab() {
ViewLoader.view(this)
.root(this)
Expand All @@ -63,6 +77,7 @@ private void initialize() {
setButtonStyles();
setUpTable();
setBindings();
setAnimations();

searchBox.setPromptText(Localization.lang("Search") + "...");
searchBox.setLeft(IconTheme.JabRefIcons.SEARCH.getGraphicNode());
Expand Down Expand Up @@ -114,6 +129,20 @@ private void setBindings() {
});
}

private void setAnimations() {
flashingColor = new SimpleObjectProperty<>(Color.TRANSPARENT);
flashingColorStringProperty = createFlashingColorStringProperty(flashingColor);
searchBox.styleProperty().bind(
new SimpleStringProperty("-fx-background-color: ").concat(flashingColorStringProperty).concat(";")
);
invalidateSearch = new Timeline(
new KeyFrame(Duration.seconds(0), new KeyValue(flashingColor, Color.TRANSPARENT, Interpolator.LINEAR)),
new KeyFrame(Duration.seconds(0.25), new KeyValue(flashingColor, Color.RED, Interpolator.LINEAR)),
new KeyFrame(Duration.seconds(0.25), new KeyValue(searchBox.textProperty(), "", Interpolator.DISCRETE)),
new KeyFrame(Duration.seconds(0.5), new KeyValue(flashingColor, Color.TRANSPARENT, Interpolator.LINEAR))
);
}

@FXML
private void addList() {
viewModel.addNewFile();
Expand All @@ -132,11 +161,31 @@ private void removeList() {
@FXML
private void addAbbreviation() {
viewModel.addAbbreviation();
searchBox.textProperty().set("");
if (!searchBox.getText().isEmpty()) {
invalidateSearch.play();
}
selectNewAbbreviation();
editAbbreviation();
}

private static StringProperty createFlashingColorStringProperty(final ObjectProperty<Color> flashingColor) {
final StringProperty flashingColorStringProperty = new SimpleStringProperty();
setColorStringFromColor(flashingColorStringProperty, flashingColor);
flashingColor.addListener((observable, oldValue, newValue) -> setColorStringFromColor(flashingColorStringProperty, flashingColor));
return flashingColorStringProperty;
}

private static void setColorStringFromColor(StringProperty colorStringProperty, ObjectProperty<Color> color) {
colorStringProperty.set(
"rgba(" +
((int) (color.get().getRed() * 255)) + "," +
((int) (color.get().getGreen() * 255)) + "," +
((int) (color.get().getBlue() * 255)) + "," +
color.get().getOpacity() +
")"
);
}

@FXML
private void editAbbreviation() {
journalAbbreviationsTable.edit(
Expand Down