diff --git a/CHANGELOG.md b/CHANGELOG.md index 119231147eb5..0e7aa9ba1eda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -117,8 +117,12 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `# - We fixed an issue where the RIS import would overwite the article date with the value of the acessed date [#4816](https://github.com/JabRef/jabref/issues/4816) - We fixed an issue where an NullPointer exception was thrown when a referenced entry in an Open/Libre Office document was no longer present in the library. Now an error message with the reference marker of the missing entry is shown. [#4932](https://github.com/JabRef/jabref/issues/4932) - We fixed an issue where a database exception related to a missing timezone was too big. [#4827](https://github.com/JabRef/jabref/issues/4827) +- We fixed an issue where the IEEE fetcher returned an error if no keywords were present in the result from the IEEE website [#4997](https://github.com/JabRef/jabref/issues/4997) - We fixed an issue where the command line help text had several errors, and arguments and descriptions have been rewritten to simplify and detail them better. [#4932](https://github.com/JabRef/jabref/issues/2016) - We fixed an issue where the same menu for changing entry type had two different sizes and weights. [#4977](https://github.com/JabRef/jabref/issues/4977) +- We fixed an issue where the "Attach file" dialog, in the right-click menu for an entry, started on the working directory instead of the user's main directory. [#4995](https://github.com/JabRef/jabref/issues/4995) +- We fixed an issue where the JabRef Icon in the macOS launchpad was not displayed correctly [#5003](https://github.com/JabRef/jabref/issues/5003) + ### Removed diff --git a/README.md b/README.md index d0a9efc35f71..ac2872cd8b42 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,14 @@ JabRef is an open-source, cross-platform citation and reference management tool Stay on top of your literature: JabRef helps you to collect and organize sources, find the paper you need and discover the latest research. ![main table](https://www.jabref.org/img/JabRef-4-0-MainTable.png) +## Table of Contents + +- [Features](#features) +- [Installation](#installation) +- [Bug Reports, Suggestions, Other Feedback](#bug-reports-suggestions-other-feedback) +- [Contributing](#contributing) +- [Acknowledgements](#acknowledgements) / [License](#license) + ## Features JabRef is a cross-platform application that works on Windows, Linux and Mac OS X. It is available free of charge and is actively developed. diff --git a/build.gradle b/build.gradle index 327443237029..afbf436bfa7a 100644 --- a/build.gradle +++ b/build.gradle @@ -173,7 +173,7 @@ dependencies { testCompile "org.testfx:testfx-core:4.0.+" testCompile "org.testfx:testfx-junit5:4.0.+" - checkstyle 'com.puppycrawl.tools:checkstyle:8.20' + checkstyle 'com.puppycrawl.tools:checkstyle:8.21' xjc 'com.sun.xml.bind:jaxb-xjc:2.2.4-1' jython 'org.python:jython-standalone:2.7.1' } diff --git a/jabref.install4j b/jabref.install4j index 08da26fd0a26..53b83c0d3bce 100644 --- a/jabref.install4j +++ b/jabref.install4j @@ -1,5 +1,5 @@ - + diff --git a/scripts/download-install4j-and-jres.sh b/scripts/download-install4j-and-jres.sh index cdd5aee3b200..4368ef310125 100755 --- a/scripts/download-install4j-and-jres.sh +++ b/scripts/download-install4j-and-jres.sh @@ -5,7 +5,7 @@ if [ ! -d ~/downloads ]; then mkdir ~/downloads fi cd ~/downloads -wget --quiet -nc --show-progress http://download-keycdn.ej-technologies.com/install4j/install4j_unix_7_0_8.tar.gz +wget --quiet -nc --show-progress http://download-keycdn.ej-technologies.com/install4j/install4j_unix_7_0_11.tar.gz # fetch JREs if [ ! -d ~/.install4j7/jres ]; then diff --git a/scripts/extract-install4j.sh b/scripts/extract-install4j.sh index 9e960280b81d..74b703b2981c 100755 --- a/scripts/extract-install4j.sh +++ b/scripts/extract-install4j.sh @@ -1,4 +1,4 @@ #!/bin/bash -tar -xf ~/downloads/install4j_unix_7_0_8.tar.gz +tar -xf ~/downloads/install4j_unix_7_0_11.tar.gz # fix directory name (until install4j 6.1.5 it was install4j6 -mv install4j7.0.8 install4j7 +mv install4j7.0.11 install4j7 diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css index 642fe8dcf887..2db5a049c001 100644 --- a/src/main/java/org/jabref/gui/Base.css +++ b/src/main/java/org/jabref/gui/Base.css @@ -1032,3 +1032,7 @@ We want to have a look that matches our icons in the tool-bar */ -fx-font-size: 1.5em; -fx-padding: 1em 0em 1em 0em; } + +.dialog-pane { + -fx-background-color: -fx-control-inner-background; +} diff --git a/src/main/java/org/jabref/gui/actions/ActionFactory.java b/src/main/java/org/jabref/gui/actions/ActionFactory.java index da982bc62acc..719265be957b 100644 --- a/src/main/java/org/jabref/gui/actions/ActionFactory.java +++ b/src/main/java/org/jabref/gui/actions/ActionFactory.java @@ -4,7 +4,6 @@ import java.lang.reflect.Method; import java.util.Objects; -import javafx.scene.Node; import javafx.scene.control.Button; import javafx.scene.control.ButtonBase; import javafx.scene.control.CheckMenuItem; @@ -157,13 +156,9 @@ public ButtonBase configureIconButton(Action action, Command command, ButtonBase button.getStyleClass().add("icon-button"); // For some reason the graphic is not set correctly, so let's fix this + // ToDO: Find a way to reuse JabRefIconView button.graphicProperty().unbind(); - action.getIcon().ifPresent(icon -> { - // ToDO: Find a way to reuse JabRefIconView - Node graphicNode = icon.getGraphicNode(); - graphicNode.setStyle(String.format("-fx-font-family: %s; -fx-font-size: %s;", icon.fontFamily(), "1em")); - button.setGraphic(graphicNode); - }); + action.getIcon().ifPresent(icon -> button.setGraphic(icon.getGraphicNode())); return button; } diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml index d4cd990c09bc..35fb41daa74b 100644 --- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml +++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml @@ -40,7 +40,14 @@ -