From 59ac5ddbde23d2ef54f62022849787e6c27af10b Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Fri, 21 Feb 2020 00:43:21 +0100
Subject: [PATCH] Refactored subtile changes to optics of library properties
(#5969)
---
CHANGELOG.md | 4 +
.../jabref/gui/SaveOrderConfigDisplay.fxml | 39 +++---
.../cleanup/FieldFormatterCleanupsPanel.java | 5 +
.../LibraryPropertiesDialog.fxml | 130 ++++++++++--------
.../LibraryPropertiesDialogView.java | 3 -
5 files changed, 101 insertions(+), 80 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88539afa5ac..a07c9c99065 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,10 @@ 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 in the optics of the library properties, that cropped the dialog on scaled displays. [#5969](https://github.com/JabRef/jabref/issues/5969)
+
- 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)
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
index 64fac7cdc94..17e458f2e81 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
@@ -24,37 +24,38 @@
-
+
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+ text="%Descending" GridPane.columnIndex="3" GridPane.rowIndex="0"/>
+ text="%Descending" GridPane.columnIndex="3" GridPane.rowIndex="1"/>
+ text="%Descending" GridPane.columnIndex="3" GridPane.rowIndex="2"/>
diff --git a/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java b/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java
index 7ef6dfc4d56..f75e08b9761 100644
--- a/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java
+++ b/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java
@@ -78,6 +78,9 @@ public void setValues(FieldFormatterCleanups formatterCleanups) {
}
private void buildLayout() {
+ setHgap(10.0);
+ setVgap(4.0);
+
ColumnConstraints first = new ColumnConstraints();
first.setPrefWidth(25);
ColumnConstraints second = new ColumnConstraints();
@@ -101,6 +104,7 @@ private void buildLayout() {
add(cleanupEnabled, 0, 0, 4, 1);
actionsList = new ListView<>(actions);
+ actionsList.setMinHeight(100.0);
actionsList.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
new ViewModelListCellFactory()
.withText(action -> action.getField().getDisplayName() + ": " + action.getFormatter().getName())
@@ -161,6 +165,7 @@ private void updateDescription() {
*/
private GridPane getSelectorPanel() {
GridPane builder = new GridPane();
+ builder.setHgap(10.0);
Set fields = FieldFactory.getCommonFields();
fields.add(InternalField.KEY_FIELD);
Set fieldsString = fields.stream().map(Field::getDisplayName).sorted().collect(Collectors.toCollection(TreeSet::new));
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
index 12f7febeb96..7d43bd84e46 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
@@ -1,69 +1,83 @@
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
-
-
-
+
+
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
index 36966cad156..ccd7051f26e 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
@@ -8,7 +8,6 @@
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
-import javafx.scene.control.Button;
import javafx.scene.control.ButtonType;
import javafx.scene.control.CheckBox;
import javafx.scene.control.ComboBox;
@@ -35,9 +34,7 @@ public class LibraryPropertiesDialogView extends BaseDialog {
@FXML private ComboBox encoding;
@FXML private ComboBox databaseMode;
@FXML private TextField generalFileDirectory;
- @FXML private Button browseGeneralFileDir;
@FXML private TextField userSpecificFileDirectory;
- @FXML private Button browseUserSpefiicFileDir;
@FXML private TextField laTexFileDirectory;
@FXML private CheckBox protect;
@Inject private PreferencesService preferencesService;