From e18d236f42954efdc1e86e320db2ae7a45c76899 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 26 Jan 2019 20:49:07 +0100
Subject: [PATCH 01/20] [WIP] Convert LibraryProperties to JavaFX

First part of view and viewmodel
---
 .../dbproperties/LibraryPropertiesDialog.fxml | 131 ++++++++++++++++++
 .../LibraryPropertiesDialogView.java          | 112 +++++++++++++++
 .../LibraryPropertiesDialogViewModel.java     |  75 ++++++++++
 3 files changed, 318 insertions(+)
 create mode 100644 src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialog.fxml
 create mode 100644 src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogView.java
 create mode 100644 src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogViewModel.java

diff --git a/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialog.fxml b/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialog.fxml
new file mode 100644
index 00000000000..e344382c505
--- /dev/null
+++ b/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialog.fxml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+
+
+<DialogPane prefHeight="516.0" prefWidth="922.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.dbproperties.LibraryPropertiesDialogView">
+   <content>
+      <VBox fx:id="contentVbox" prefHeight="200.0" prefWidth="100.0">
+         <children>
+            <GridPane>
+              <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="218.0" minWidth="10.0" prefWidth="200.0" />
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="797.0" minWidth="10.0" prefWidth="529.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="797.0" minWidth="10.0" prefWidth="100.0" />
+              </columnConstraints>
+              <rowConstraints>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+              </rowConstraints>
+               <children>
+                  <Label text="Library encoding" />
+                  <ComboBox fx:id="encoding" prefWidth="250.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" />
+                  <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="1">
+                     <children>
+                        <Label alignment="BOTTOM_LEFT" text="Override default file directories" />
+                        <Separator halignment="LEFT" valignment="BOTTOM" HBox.hgrow="ALWAYS">
+                           <opaqueInsets>
+                              <Insets left="10.0" right="10.0" top="10.0" />
+                           </opaqueInsets>
+                           <HBox.margin>
+                              <Insets />
+                           </HBox.margin>
+                           <padding>
+                              <Insets left="10.0" />
+                           </padding>
+                        </Separator>
+                     </children>
+                     <GridPane.margin>
+                        <Insets />
+                     </GridPane.margin>
+                  </HBox>
+                  <Label text="General file directory" GridPane.rowIndex="2" />
+                  <TextField fx:id="generalFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                  <Button fx:id="browseGeneralFileDir" mnemonicParsing="false" onAction="#browseGeneralFileDirectory" text="Browse" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+                  <Label text="User-specific file directory" GridPane.rowIndex="3" />
+                  <TextField fx:id="userSpecificFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                  <Button fx:id="browseUserSpefiicFileDir" mnemonicParsing="false" onAction="#browseUserSpecificFileDirectory" text="Browse" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+               </children>
+            </GridPane>
+            <HBox alignment="CENTER" prefHeight="50.0" prefWidth="200.0">
+               <children>
+                  <Label alignment="BOTTOM_LEFT" text="Save sort order" />
+                  <Separator halignment="LEFT" valignment="BOTTOM" HBox.hgrow="ALWAYS">
+                     <opaqueInsets>
+                        <Insets left="10.0" right="10.0" top="10.0" />
+                     </opaqueInsets>
+                     <HBox.margin>
+                        <Insets />
+                     </HBox.margin>
+                     <padding>
+                        <Insets left="10.0" />
+                     </padding>
+                  </Separator>
+               </children>
+            </HBox>
+            <VBox fx:id="saveOrdervbox">
+             <fx:define>
+              <ToggleGroup fx:id="saveOrderToggleGroup" />
+               </fx:define>
+               <children>
+                  <RadioButton fx:id="saveInOriginalOrder" mnemonicParsing="false" text="Save entries in their original order" toggleGroup="$saveOrderToggleGroup" />
+                  <RadioButton fx:id="saveInSpecifiedOrder" mnemonicParsing="false" text="Save entries ordered as specified" toggleGroup="$saveOrderToggleGroup" />
+               </children>
+            </VBox>
+            <HBox alignment="CENTER" prefHeight="50.0" prefWidth="200.0">
+               <children>
+                  <Label alignment="BOTTOM_LEFT" text="Library protection" />
+                  <Separator halignment="LEFT" valignment="BOTTOM" HBox.hgrow="ALWAYS">
+                     <opaqueInsets>
+                        <Insets left="10.0" right="10.0" top="10.0" />
+                     </opaqueInsets>
+                     <HBox.margin>
+                        <Insets />
+                     </HBox.margin>
+                     <padding>
+                        <Insets left="10.0" />
+                     </padding>
+                  </Separator>
+               </children>
+            </HBox>
+            <CheckBox fx:id="protect" mnemonicParsing="false" text="Refuse to save the library before external changes have been reviewed" />
+            <HBox alignment="CENTER" prefHeight="50.0" prefWidth="200.0">
+               <children>
+                  <Label alignment="BOTTOM_LEFT" text="Save actions" />
+                  <Separator halignment="LEFT" valignment="BOTTOM" HBox.hgrow="ALWAYS">
+                     <opaqueInsets>
+                        <Insets left="10.0" right="10.0" top="10.0" />
+                     </opaqueInsets>
+                     <HBox.margin>
+                        <Insets />
+                     </HBox.margin>
+                     <padding>
+                        <Insets left="10.0" />
+                     </padding>
+                  </Separator>
+               </children>
+            </HBox>
+         </children>
+      </VBox>
+   </content>
+  <buttonTypes>
+    <ButtonType fx:constant="CANCEL" />
+    <ButtonType fx:constant="OK" />
+  </buttonTypes>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogView.java b/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogView.java
new file mode 100644
index 00000000000..d4715b07f99
--- /dev/null
+++ b/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogView.java
@@ -0,0 +1,112 @@
+package org.jabref.gui.dbproperties;
+
+import java.nio.charset.Charset;
+
+import javax.inject.Inject;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.TextField;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.layout.VBox;
+
+import org.jabref.gui.BasePanel;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.SaveOrderConfigDisplay;
+import org.jabref.gui.cleanup.FieldFormatterCleanupsPanel;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.logic.cleanup.Cleanups;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.shared.DatabaseLocation;
+import org.jabref.model.metadata.SaveOrderConfig;
+import org.jabref.preferences.PreferencesService;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class LibraryPropertiesDialogView extends BaseDialog<Void> {
+
+    @FXML private VBox contentVbox;
+    @FXML private ComboBox<Charset> encoding;
+    @FXML private TextField generalFileDirectory;
+    @FXML private Button browseGeneralFileDir;
+    @FXML private TextField userSpecificFileDirectory;
+    @FXML private Button browseUserSpefiicFileDir;
+    @FXML private VBox saveOrdervbox;
+    @FXML private ToggleGroup saveOrderToggleGroup;
+    @FXML private RadioButton saveInOriginalOrder;
+    @FXML private RadioButton saveInSpecifiedOrder;
+    @FXML private CheckBox protect;
+    private SaveOrderConfigDisplay saveOrderPanel;
+    private BasePanel panel;
+    private LibraryPropertiesDialogViewModel viewModel;
+    private final DialogService dialogService;
+    @Inject private PreferencesService preferencesService;
+
+    public LibraryPropertiesDialogView(DialogService dialogService) {
+        this.dialogService = dialogService;
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        setResultConverter(btn -> {
+
+            return null;
+        });
+
+        setTitle(Localization.lang("Library properties"));
+
+    }
+
+    @FXML
+    private void initialize() {
+        viewModel = new LibraryPropertiesDialogViewModel(dialogService, preferencesService.getWorkingDir());
+
+        generalFileDirectory.textProperty().bindBidirectional(viewModel.generalFileDirectoryPropertyProperty());
+        userSpecificFileDirectory.textProperty().bindBidirectional(viewModel.userSpecificFileDirectoryProperty());
+
+        encoding.valueProperty().bind(viewModel.selectedEncodingProperty());
+        saveOrderPanel = new SaveOrderConfigDisplay();
+        saveOrdervbox.getChildren().add(saveOrderPanel.getJFXPanel());
+        FieldFormatterCleanupsPanel fieldFormatterCleanupsPanel = new FieldFormatterCleanupsPanel(Localization.lang("Enable save actions"),
+                                                                                                  Cleanups.DEFAULT_SAVE_ACTIONS);
+
+        contentVbox.getChildren().add(fieldFormatterCleanupsPanel);
+        saveInOriginalOrder.selectedProperty().bindBidirectional(viewModel.saveInOriginalProperty());
+        saveInSpecifiedOrder.selectedProperty().bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
+    }
+
+    public void updateEnableStatus() {
+        DatabaseLocation location = panel.getBibDatabaseContext().getLocation();
+        boolean isShared = (location == DatabaseLocation.SHARED);
+        encoding.setDisable(isShared); // the encoding of shared database is always UTF-8
+        saveInOriginalOrder.setDisable(isShared);
+        saveInSpecifiedOrder.setDisable(isShared);
+        saveOrderPanel.setEnabled(!isShared);
+        protect.setDisable(isShared);
+    }
+
+    private SaveOrderConfig getNewSaveOrderConfig() {
+        SaveOrderConfig saveOrderConfig = null;
+        if (saveInOriginalOrder.isSelected()) {
+            saveOrderConfig = SaveOrderConfig.getDefaultSaveOrder();
+        } else {
+            saveOrderConfig = saveOrderPanel.getSaveOrderConfig();
+            saveOrderConfig.setSaveInSpecifiedOrder();
+        }
+        return saveOrderConfig;
+    }
+
+    @FXML
+    public void browseGeneralFileDirectory(ActionEvent event) {
+        viewModel.browseGeneralDir();
+    }
+
+    @FXML
+    public void browseUserSpecificFileDirectory(ActionEvent event) {
+        viewModel.browseUserDir();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogViewModel.java b/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogViewModel.java
new file mode 100644
index 00000000000..cc0c1f78c13
--- /dev/null
+++ b/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogViewModel.java
@@ -0,0 +1,75 @@
+package org.jabref.gui.dbproperties;
+
+import java.nio.charset.Charset;
+import java.nio.file.Path;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.util.DirectoryDialogConfiguration;
+import org.jabref.logic.l10n.Encodings;
+
+public class LibraryPropertiesDialogViewModel {
+
+    private final StringProperty generalFileDirectoryProperty = new SimpleStringProperty("");
+    private final StringProperty userSpecificFileDirectoryProperty = new SimpleStringProperty("");
+    private final ListProperty<Charset> encodingsProperty = new SimpleListProperty<>(FXCollections.observableArrayList(Encodings.getCharsets()));
+    private final ObjectProperty<Charset> selectedEncodingPropety = new SimpleObjectProperty<>(Encodings.getCharsets().get(0));
+    private final BooleanProperty saveInOriginalProperty = new SimpleBooleanProperty();
+    private final BooleanProperty saveInSpecifiedOrderProperty = new SimpleBooleanProperty();
+
+    private final DialogService dialogService;
+    private final DirectoryDialogConfiguration directoryDialogConfiguration;
+
+    public LibraryPropertiesDialogViewModel(DialogService dialogService, Path workingDir) {
+        this.dialogService = dialogService;
+
+        directoryDialogConfiguration = new DirectoryDialogConfiguration.Builder()
+                                                                                 .withInitialDirectory(workingDir).build();
+    }
+
+    public StringProperty generalFileDirectoryPropertyProperty() {
+        return this.generalFileDirectoryProperty;
+    }
+
+    public StringProperty userSpecificFileDirectoryProperty() {
+        return this.userSpecificFileDirectoryProperty;
+    }
+
+    public ListProperty<Charset> encodingsProperty() {
+        return this.encodingsProperty;
+    }
+
+    public ObjectProperty<Charset> selectedEncodingProperty() {
+        return this.selectedEncodingPropety;
+    }
+
+    public void browseGeneralDir() {
+        dialogService.showDirectorySelectionDialog(directoryDialogConfiguration).ifPresent(dir -> generalFileDirectoryProperty.setValue(dir.toAbsolutePath().toString()));
+    }
+
+    public void browseUserDir() {
+        dialogService.showDirectorySelectionDialog(directoryDialogConfiguration).ifPresent(dir -> userSpecificFileDirectoryProperty.setValue(dir.toAbsolutePath().toString()));
+
+    }
+
+    public BooleanProperty saveInOriginalProperty() {
+        return this.saveInOriginalProperty;
+    }
+
+    public BooleanProperty saveInSpecifiedOrderProperty() {
+        return this.saveInSpecifiedOrderProperty;
+    }
+
+    public void storeSettings() {
+        //TODO
+    }
+}

From c540ff441afd51b3c6fb8299c291d5d33def1886 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 27 Jan 2019 13:18:50 +0100
Subject: [PATCH 02/20] fix l10n and error in fxml convert rest of the dialog
 add some new methods to preferences service

---
 .../dbproperties/LibraryPropertiesDialog.fxml |  19 +--
 .../LibraryPropertiesDialogView.java          | 129 ++++++++++++++++--
 .../LibraryPropertiesDialogViewModel.java     |  52 ++++++-
 .../jabref/preferences/JabRefPreferences.java |   3 +
 .../preferences/PreferencesService.java       |   7 +
 5 files changed, 182 insertions(+), 28 deletions(-)

diff --git a/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialog.fxml b/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialog.fxml
index e344382c505..c2163dc1dda 100644
--- a/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialog.fxml
+++ b/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialog.fxml
@@ -2,6 +2,7 @@
 
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonType?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.DialogPane?>
@@ -38,7 +39,7 @@
                   <ComboBox fx:id="encoding" prefWidth="250.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" />
                   <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="1">
                      <children>
-                        <Label alignment="BOTTOM_LEFT" text="Override default file directories" />
+                        <Label alignment="BOTTOM_LEFT" text="%Override default file directories" />
                         <Separator halignment="LEFT" valignment="BOTTOM" HBox.hgrow="ALWAYS">
                            <opaqueInsets>
                               <Insets left="10.0" right="10.0" top="10.0" />
@@ -57,15 +58,15 @@
                   </HBox>
                   <Label text="General file directory" GridPane.rowIndex="2" />
                   <TextField fx:id="generalFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                  <Button fx:id="browseGeneralFileDir" mnemonicParsing="false" onAction="#browseGeneralFileDirectory" text="Browse" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+                  <Button fx:id="browseGeneralFileDir" mnemonicParsing="false" onAction="#browseGeneralFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="2" />
                   <Label text="User-specific file directory" GridPane.rowIndex="3" />
                   <TextField fx:id="userSpecificFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-                  <Button fx:id="browseUserSpefiicFileDir" mnemonicParsing="false" onAction="#browseUserSpecificFileDirectory" text="Browse" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+                  <Button fx:id="browseUserSpefiicFileDir" mnemonicParsing="false" onAction="#browseUserSpecificFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="3" />
                </children>
             </GridPane>
             <HBox alignment="CENTER" prefHeight="50.0" prefWidth="200.0">
                <children>
-                  <Label alignment="BOTTOM_LEFT" text="Save sort order" />
+                  <Label alignment="BOTTOM_LEFT" text="%Save sort order" />
                   <Separator halignment="LEFT" valignment="BOTTOM" HBox.hgrow="ALWAYS">
                      <opaqueInsets>
                         <Insets left="10.0" right="10.0" top="10.0" />
@@ -84,13 +85,13 @@
               <ToggleGroup fx:id="saveOrderToggleGroup" />
                </fx:define>
                <children>
-                  <RadioButton fx:id="saveInOriginalOrder" mnemonicParsing="false" text="Save entries in their original order" toggleGroup="$saveOrderToggleGroup" />
-                  <RadioButton fx:id="saveInSpecifiedOrder" mnemonicParsing="false" text="Save entries ordered as specified" toggleGroup="$saveOrderToggleGroup" />
+                  <RadioButton fx:id="saveInOriginalOrder" mnemonicParsing="false" text="%Save entries in their original order" toggleGroup="$saveOrderToggleGroup" />
+                  <RadioButton fx:id="saveInSpecifiedOrder" mnemonicParsing="false" text="%Save entries ordered as specified" toggleGroup="$saveOrderToggleGroup" />
                </children>
             </VBox>
             <HBox alignment="CENTER" prefHeight="50.0" prefWidth="200.0">
                <children>
-                  <Label alignment="BOTTOM_LEFT" text="Library protection" />
+                  <Label alignment="BOTTOM_LEFT" text="%Library protection" />
                   <Separator halignment="LEFT" valignment="BOTTOM" HBox.hgrow="ALWAYS">
                      <opaqueInsets>
                         <Insets left="10.0" right="10.0" top="10.0" />
@@ -104,10 +105,10 @@
                   </Separator>
                </children>
             </HBox>
-            <CheckBox fx:id="protect" mnemonicParsing="false" text="Refuse to save the library before external changes have been reviewed" />
+            <CheckBox fx:id="protect" mnemonicParsing="false" text="%Refuse to save the library before external changes have been reviewed" />
             <HBox alignment="CENTER" prefHeight="50.0" prefWidth="200.0">
                <children>
-                  <Label alignment="BOTTOM_LEFT" text="Save actions" />
+                  <Label alignment="BOTTOM_LEFT" text="%Save actions" />
                   <Separator halignment="LEFT" valignment="BOTTOM" HBox.hgrow="ALWAYS">
                      <opaqueInsets>
                         <Insets left="10.0" right="10.0" top="10.0" />
diff --git a/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogView.java b/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogView.java
index d4715b07f99..b91613247dc 100644
--- a/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogView.java
+++ b/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogView.java
@@ -1,12 +1,14 @@
 package org.jabref.gui.dbproperties;
 
 import java.nio.charset.Charset;
+import java.util.Optional;
 
 import javax.inject.Inject;
 
 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;
 import javafx.scene.control.RadioButton;
@@ -22,6 +24,7 @@
 import org.jabref.logic.cleanup.Cleanups;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.shared.DatabaseLocation;
+import org.jabref.model.metadata.MetaData;
 import org.jabref.model.metadata.SaveOrderConfig;
 import org.jabref.preferences.PreferencesService;
 
@@ -45,15 +48,20 @@ public class LibraryPropertiesDialogView extends BaseDialog<Void> {
     private LibraryPropertiesDialogViewModel viewModel;
     private final DialogService dialogService;
     @Inject private PreferencesService preferencesService;
+    private FieldFormatterCleanupsPanel fieldFormatterCleanupsPanel;
+    private Object oldSaveOrderConfig;
 
-    public LibraryPropertiesDialogView(DialogService dialogService) {
+    public LibraryPropertiesDialogView(BasePanel panel, DialogService dialogService) {
         this.dialogService = dialogService;
+        this.panel = panel;
         ViewLoader.view(this)
                   .load()
                   .setAsDialogPane(this);
 
         setResultConverter(btn -> {
-
+            if (btn == ButtonType.OK) {
+                storeSettings();
+            }
             return null;
         });
 
@@ -63,7 +71,7 @@ public LibraryPropertiesDialogView(DialogService dialogService) {
 
     @FXML
     private void initialize() {
-        viewModel = new LibraryPropertiesDialogViewModel(dialogService, preferencesService.getWorkingDir());
+        viewModel = new LibraryPropertiesDialogViewModel(panel, dialogService, preferencesService);
 
         generalFileDirectory.textProperty().bindBidirectional(viewModel.generalFileDirectoryPropertyProperty());
         userSpecificFileDirectory.textProperty().bindBidirectional(viewModel.userSpecificFileDirectoryProperty());
@@ -71,12 +79,45 @@ private void initialize() {
         encoding.valueProperty().bind(viewModel.selectedEncodingProperty());
         saveOrderPanel = new SaveOrderConfigDisplay();
         saveOrdervbox.getChildren().add(saveOrderPanel.getJFXPanel());
-        FieldFormatterCleanupsPanel fieldFormatterCleanupsPanel = new FieldFormatterCleanupsPanel(Localization.lang("Enable save actions"),
-                                                                                                  Cleanups.DEFAULT_SAVE_ACTIONS);
+        fieldFormatterCleanupsPanel = new FieldFormatterCleanupsPanel(Localization.lang("Enable save actions"),
+                                                                      Cleanups.DEFAULT_SAVE_ACTIONS);
 
         contentVbox.getChildren().add(fieldFormatterCleanupsPanel);
         saveInOriginalOrder.selectedProperty().bindBidirectional(viewModel.saveInOriginalProperty());
         saveInSpecifiedOrder.selectedProperty().bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
+
+        protect.selectedProperty().bindBidirectional(viewModel.libraryProtectedProperty());
+        saveOrderPanel.getJFXPanel().disableProperty().bind(viewModel.saveInOriginalProperty());
+
+        setValues();
+        updateEnableStatus();
+    }
+
+    private void setValues() {
+
+        viewModel.setValues();
+        Optional<SaveOrderConfig> storedSaveOrderConfig = panel.getBibDatabaseContext().getMetaData().getSaveOrderConfig();
+        boolean selected;
+        if (!storedSaveOrderConfig.isPresent()) {
+            viewModel.saveInOriginalProperty().setValue(true);
+            oldSaveOrderConfig = SaveOrderConfig.getDefaultSaveOrder();
+            selected = false;
+        } else {
+            SaveOrderConfig saveOrderConfig = storedSaveOrderConfig.get();
+            oldSaveOrderConfig = saveOrderConfig;
+            if (saveOrderConfig.saveInOriginalOrder()) {
+                viewModel.saveInOriginalProperty().setValue(true);
+                selected = false;
+            } else {
+                viewModel.saveInSpecifiedOrderProperty().setValue(true);
+                selected = true;
+            }
+            saveOrderPanel.setSaveOrderConfig(saveOrderConfig);
+
+        }
+        saveOrderPanel.setEnabled(selected);
+
+        fieldFormatterCleanupsPanel.setValues(panel.getBibDatabaseContext().getMetaData());
     }
 
     public void updateEnableStatus() {
@@ -89,6 +130,75 @@ public void updateEnableStatus() {
         protect.setDisable(isShared);
     }
 
+    @FXML
+    public void browseGeneralFileDirectory(ActionEvent event) {
+        viewModel.browseGeneralDir();
+    }
+
+    @FXML
+    public void browseUserSpecificFileDirectory(ActionEvent event) {
+        viewModel.browseUserDir();
+    }
+
+    private void storeSettings() {
+        MetaData metaData = panel.getBibDatabaseContext().getMetaData();
+        Charset oldEncoding = metaData.getEncoding()
+                                      .orElse(preferencesService.getDefaultEncoding());
+        Charset newEncoding = viewModel.selectedEncodingProperty().getValue();
+        metaData.setEncoding(newEncoding);
+
+        String text = viewModel.generalFileDirectoryPropertyProperty().getValue().trim();
+        if (text.isEmpty()) {
+            metaData.clearDefaultFileDirectory();
+        } else {
+            metaData.setDefaultFileDirectory(text);
+        }
+        // Repeat for individual file dir - reuse 'text' and 'dir' vars
+        text = viewModel.userSpecificFileDirectoryProperty().getValue();
+        if (text.isEmpty()) {
+            metaData.clearUserFileDirectory(preferencesService.getUser());
+        } else {
+            metaData.setUserFileDirectory(preferencesService.getUser(), text);
+        }
+
+        if (viewModel.libraryProtectedProperty().getValue()) {
+            metaData.markAsProtected();
+        } else {
+            metaData.markAsNotProtected();
+        }
+
+        SaveOrderConfig newSaveOrderConfig = getNewSaveOrderConfig();
+
+        boolean saveOrderConfigChanged = !getNewSaveOrderConfig().equals(oldSaveOrderConfig);
+
+        // See if any of the values have been modified:
+        if (saveOrderConfigChanged) {
+            if (newSaveOrderConfig.equals(SaveOrderConfig.getDefaultSaveOrder())) {
+                metaData.clearSaveOrderConfig();
+            } else {
+                metaData.setSaveOrderConfig(newSaveOrderConfig);
+            }
+        }
+
+        boolean saveActionsChanged = fieldFormatterCleanupsPanel.hasChanged();
+        if (saveActionsChanged) {
+            if (fieldFormatterCleanupsPanel.isDefaultSaveActions()) {
+                metaData.clearSaveActions();
+            } else {
+                fieldFormatterCleanupsPanel.storeSettings(metaData);
+            }
+        }
+
+        boolean changed = saveOrderConfigChanged || !newEncoding.equals(oldEncoding)
+                          || viewModel.generalFileDirChanged() || viewModel.userFileDirChanged()
+                          || viewModel.protectedValueChanged() || saveActionsChanged;
+        // ... if so, mark base changed. Prevent the Undo button from removing
+        // change marking:
+        if (changed) {
+            panel.markNonUndoableBaseChanged();
+        }
+    }
+
     private SaveOrderConfig getNewSaveOrderConfig() {
         SaveOrderConfig saveOrderConfig = null;
         if (saveInOriginalOrder.isSelected()) {
@@ -100,13 +210,4 @@ private SaveOrderConfig getNewSaveOrderConfig() {
         return saveOrderConfig;
     }
 
-    @FXML
-    public void browseGeneralFileDirectory(ActionEvent event) {
-        viewModel.browseGeneralDir();
-    }
-
-    @FXML
-    public void browseUserSpecificFileDirectory(ActionEvent event) {
-        viewModel.browseUserDir();
-    }
 }
diff --git a/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogViewModel.java b/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogViewModel.java
index cc0c1f78c13..fc857de9d0e 100644
--- a/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogViewModel.java
@@ -1,7 +1,7 @@
 package org.jabref.gui.dbproperties;
 
 import java.nio.charset.Charset;
-import java.nio.file.Path;
+import java.util.Optional;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -13,9 +13,12 @@
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 
+import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.logic.l10n.Encodings;
+import org.jabref.model.metadata.MetaData;
+import org.jabref.preferences.PreferencesService;
 
 public class LibraryPropertiesDialogViewModel {
 
@@ -25,15 +28,25 @@ public class LibraryPropertiesDialogViewModel {
     private final ObjectProperty<Charset> selectedEncodingPropety = new SimpleObjectProperty<>(Encodings.getCharsets().get(0));
     private final BooleanProperty saveInOriginalProperty = new SimpleBooleanProperty();
     private final BooleanProperty saveInSpecifiedOrderProperty = new SimpleBooleanProperty();
+    private final BooleanProperty libraryProtectedProperty = new SimpleBooleanProperty();
 
     private final DialogService dialogService;
     private final DirectoryDialogConfiguration directoryDialogConfiguration;
+    private final MetaData metaData;
+    private final PreferencesService preferencesService;
 
-    public LibraryPropertiesDialogViewModel(DialogService dialogService, Path workingDir) {
+    private String oldUserSpecificFileDir;
+    private String oldGeneralFileDir;
+    private boolean oldLibraryProtected;
+
+    public LibraryPropertiesDialogViewModel(BasePanel panel, DialogService dialogService, PreferencesService preferencesService) {
         this.dialogService = dialogService;
+        this.metaData = panel.getBibDatabaseContext().getMetaData();
+        this.preferencesService = preferencesService;
 
         directoryDialogConfiguration = new DirectoryDialogConfiguration.Builder()
-                                                                                 .withInitialDirectory(workingDir).build();
+                                                                                 .withInitialDirectory(preferencesService.getWorkingDir()).build();
+
     }
 
     public StringProperty generalFileDirectoryPropertyProperty() {
@@ -69,7 +82,36 @@ public BooleanProperty saveInSpecifiedOrderProperty() {
         return this.saveInSpecifiedOrderProperty;
     }
 
-    public void storeSettings() {
-        //TODO
+    public BooleanProperty libraryProtectedProperty() {
+        return this.libraryProtectedProperty;
+    }
+
+    public void setValues() {
+        Optional<Charset> charset = metaData.getEncoding();
+        selectedEncodingPropety.setValue(charset.orElse(preferencesService.getDefaultEncoding()));
+
+        Optional<String> fileD = metaData.getDefaultFileDirectory();
+        fileD.ifPresent(path -> generalFileDirectoryProperty.setValue(path.trim()));
+
+        Optional<String> fileDI = metaData.getUserFileDirectory(preferencesService.getUser());
+        fileDI.ifPresent(userSpecificFileDirectoryProperty::setValue);
+
+        oldUserSpecificFileDir = generalFileDirectoryProperty.getValue();
+        oldGeneralFileDir = userSpecificFileDirectoryProperty.getValue();
+
+        libraryProtectedProperty.setValue(metaData.isProtected());
+        oldLibraryProtected = libraryProtectedProperty.getValue();
+    }
+
+    public boolean generalFileDirChanged() {
+        return !oldGeneralFileDir.equals(generalFileDirectoryProperty.getValue());
+    }
+
+    public boolean userFileDirChanged() {
+        return !oldUserSpecificFileDir.equals(userSpecificFileDirectoryProperty.getValue());
+    }
+
+    public boolean protectedValueChanged() {
+        return !oldLibraryProtected == libraryProtectedProperty.getValue();
     }
 }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index e7320ee4d95..34fb19c9754 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -932,6 +932,7 @@ public Map<SidePaneType, Integer> getSidePanePreferredPositions() {
         return preferredPositions;
     }
 
+    @Override
     public String getUser() {
         try {
             return get(DEFAULT_OWNER) + '-' + InetAddress.getLocalHost().getHostName();
@@ -1415,10 +1416,12 @@ public String getWrappedUsername() {
         return '[' + get(DEFAULT_OWNER) + ']';
     }
 
+    @Override
     public Charset getDefaultEncoding() {
         return Charset.forName(get(DEFAULT_ENCODING));
     }
 
+    @Override
     public void setDefaultEncoding(Charset encoding) {
         put(DEFAULT_ENCODING, encoding.name());
     }
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index 46c208a12f4..bd72de227a8 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -1,5 +1,6 @@
 package org.jabref.preferences;
 
+import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
@@ -58,4 +59,10 @@ public interface PreferencesService {
     void setExportWorkingDirectory(String layoutFileDirString);
 
     String getExportWorkingDirectory();
+
+    Charset getDefaultEncoding();
+
+    void setDefaultEncoding(Charset encoding);
+
+    String getUser();
 }

From e82abdd9d0ab3fcaa27f05594f09d29d2943c9b5 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 28 Jan 2019 18:46:15 +0100
Subject: [PATCH 03/20] Convert db properties to javafx Rename to
 libraryproperties change separator width to make it visible

Remove small font setting on save order config
---
 src/main/java/org/jabref/gui/Base.css         |   2 +-
 src/main/java/org/jabref/gui/JabRefFrame.java |   4 +-
 .../jabref/gui/SaveOrderConfigDisplay.java    |   5 -
 .../gui/actions/DatabasePropertiesAction.java |  21 --
 .../gui/actions/LibraryPropertiesAction.java  |  24 ++
 .../DatabasePropertiesDialog.java             | 330 ------------------
 .../LibraryPropertiesDialog.fxml              |  52 +--
 .../LibraryPropertiesDialogView.java          |   5 +-
 .../LibraryPropertiesDialogViewModel.java     |   2 +-
 9 files changed, 47 insertions(+), 398 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/actions/DatabasePropertiesAction.java
 create mode 100644 src/main/java/org/jabref/gui/actions/LibraryPropertiesAction.java
 delete mode 100644 src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java
 rename src/main/java/org/jabref/gui/{dbproperties => libraryproperties}/LibraryPropertiesDialog.fxml (76%)
 rename src/main/java/org/jabref/gui/{dbproperties => libraryproperties}/LibraryPropertiesDialogView.java (97%)
 rename src/main/java/org/jabref/gui/{dbproperties => libraryproperties}/LibraryPropertiesDialogViewModel.java (99%)

diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index ec78513a06b..f5fa9c4ece4 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -818,7 +818,7 @@
 
 .separator:horizontal .line {
     -fx-border-color: -jr-separator;
-    -fx-border-width: 0;
+    -fx-border-width: 0.5;
     -fx-border-insets: 1 0 0 0;
 }
 
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index b1872641c36..59f9f1ccb01 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -60,7 +60,7 @@
 import org.jabref.gui.actions.CopyFilesAction;
 import org.jabref.gui.actions.CustomizeEntryAction;
 import org.jabref.gui.actions.CustomizeKeyBindingAction;
-import org.jabref.gui.actions.DatabasePropertiesAction;
+import org.jabref.gui.actions.LibraryPropertiesAction;
 import org.jabref.gui.actions.EditExternalFileTypesAction;
 import org.jabref.gui.actions.ErrorConsoleAction;
 import org.jabref.gui.actions.LookupIdentifierAction;
@@ -846,7 +846,7 @@ private MenuBar createMenu() {
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.LIBRARY_PROPERTIES, new DatabasePropertiesAction(this)),
+                                  factory.createMenuItem(StandardActions.LIBRARY_PROPERTIES, new LibraryPropertiesAction(this, dialogService)),
                 factory.createMenuItem(StandardActions.EDIT_PREAMBLE, new PreambleEditor(this)),
                 factory.createMenuItem(StandardActions.EDIT_STRINGS, new OldDatabaseCommandWrapper(Actions.EDIT_STRINGS, this, Globals.stateManager))
         );
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java
index 5103fba8d29..3093585f3e8 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java
@@ -11,7 +11,6 @@
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
 import javafx.scene.layout.GridPane;
-import javafx.scene.text.Font;
 
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
@@ -49,22 +48,18 @@ private void init() {
         saveSecDesc = new CheckBox(Localization.lang("Descending"));
         saveTerDesc = new CheckBox(Localization.lang("Descending"));
 
-        Font font = new Font(10);
         GridPane builder = new GridPane();
         Label primarySortCriterion = new Label(Localization.lang("Primary sort criterion"));
-        primarySortCriterion.setFont(font);
         builder.add(primarySortCriterion, 1, 1);
         builder.add(savePriSort, 2, 1);
         builder.add(savePriDesc, 3, 1);
 
         Label secondarySortCriterion = new Label(Localization.lang("Secondary sort criterion"));
-        secondarySortCriterion.setFont(font);
         builder.add(secondarySortCriterion, 1, 2);
         builder.add(saveSecSort, 2, 2);
         builder.add(saveSecDesc, 3, 2);
 
         Label tertiarySortCriterion = new Label(Localization.lang("Tertiary sort criterion"));
-        tertiarySortCriterion.setFont(font);
         builder.add(tertiarySortCriterion, 1, 3);
         builder.add(saveTerSort, 2, 3);
         builder.add(saveTerDesc, 3, 3);
diff --git a/src/main/java/org/jabref/gui/actions/DatabasePropertiesAction.java b/src/main/java/org/jabref/gui/actions/DatabasePropertiesAction.java
deleted file mode 100644
index 564b6c5cc2f..00000000000
--- a/src/main/java/org/jabref/gui/actions/DatabasePropertiesAction.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.jabref.gui.actions;
-
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.dbproperties.DatabasePropertiesDialog;
-
-public class DatabasePropertiesAction extends SimpleCommand {
-
-    private final JabRefFrame frame;
-
-    public DatabasePropertiesAction(JabRefFrame frame) {
-        this.frame = frame;
-    }
-
-    @Override
-    public void execute() {
-        DatabasePropertiesDialog propertiesDialog = new DatabasePropertiesDialog(frame.getCurrentBasePanel());
-        propertiesDialog.updateEnableStatus();
-        propertiesDialog.setVisible(true);
-    }
-
-}
diff --git a/src/main/java/org/jabref/gui/actions/LibraryPropertiesAction.java b/src/main/java/org/jabref/gui/actions/LibraryPropertiesAction.java
new file mode 100644
index 00000000000..1b2299e3f06
--- /dev/null
+++ b/src/main/java/org/jabref/gui/actions/LibraryPropertiesAction.java
@@ -0,0 +1,24 @@
+package org.jabref.gui.actions;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.libraryproperties.LibraryPropertiesDialogView;
+
+public class LibraryPropertiesAction extends SimpleCommand {
+
+    private final JabRefFrame frame;
+    private final DialogService dialogService;
+
+    public LibraryPropertiesAction(JabRefFrame frame, DialogService dialogService) {
+        this.frame = frame;
+        this.dialogService = dialogService;
+    }
+
+    @Override
+    public void execute() {
+        LibraryPropertiesDialogView propertiesDialog = new LibraryPropertiesDialogView(frame.getCurrentBasePanel(), dialogService);
+        propertiesDialog.showAndWait();
+
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java b/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java
deleted file mode 100644
index f1a58b0be7c..00000000000
--- a/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java
+++ /dev/null
@@ -1,330 +0,0 @@
-package org.jabref.gui.dbproperties;
-
-import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.nio.charset.Charset;
-import java.util.Optional;
-
-import javax.swing.AbstractAction;
-import javax.swing.ActionMap;
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.InputMap;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
-
-import javafx.embed.swing.JFXPanel;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
-
-import org.jabref.Globals;
-import org.jabref.gui.BasePanel;
-import org.jabref.gui.DialogService;
-import org.jabref.gui.FXDialogService;
-import org.jabref.gui.JabRefDialog;
-import org.jabref.gui.SaveOrderConfigDisplay;
-import org.jabref.gui.cleanup.FieldFormatterCleanupsPanel;
-import org.jabref.gui.customjfx.CustomJFXPanel;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.gui.util.DefaultTaskExecutor;
-import org.jabref.gui.util.DirectoryDialogConfiguration;
-import org.jabref.logic.cleanup.Cleanups;
-import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.l10n.Encodings;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.shared.DatabaseLocation;
-import org.jabref.model.metadata.MetaData;
-import org.jabref.model.metadata.SaveOrderConfig;
-import org.jabref.preferences.JabRefPreferences;
-
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-import com.jgoodies.forms.builder.FormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-
-public class DatabasePropertiesDialog extends JabRefDialog {
-
-    private final MetaData metaData;
-    private final BasePanel panel;
-    private final JComboBox<Charset> encoding;
-    private final JButton ok;
-    private final JButton cancel;
-    private final JTextField fileDir = new JTextField(40);
-    private final JTextField fileDirIndv = new JTextField(40);
-    private String oldFileVal = "";
-    private String oldFileIndvVal = "";
-    private SaveOrderConfig oldSaveOrderConfig;
-
-    /* The code for "Save sort order" is copied from ExportSortingPrefsTab and slightly updated to fit storing at metadata */
-    private JRadioButton saveInOriginalOrder;
-
-    private JRadioButton saveInSpecifiedOrder;
-
-    private final JCheckBox protect = new JCheckBox(
-            Localization.lang("Refuse to save the library before external changes have been reviewed."));
-    private boolean oldProtectVal;
-    private SaveOrderConfigDisplay saveOrderPanel;
-
-    private FieldFormatterCleanupsPanel fieldFormatterCleanupsPanel;
-
-    public DatabasePropertiesDialog(BasePanel panel) {
-        super(Localization.lang("Library properties"), true, DatabasePropertiesDialog.class);
-        encoding = new JComboBox<>();
-        encoding.setModel(new DefaultComboBoxModel<>(Encodings.ENCODINGS));
-        ok = new JButton(Localization.lang("OK"));
-        cancel = new JButton(Localization.lang("Cancel"));
-        this.panel = panel;
-        this.metaData = panel.getBibDatabaseContext().getMetaData();
-        init();
-    }
-
-    public void updateEnableStatus() {
-        DatabaseLocation location = panel.getBibDatabaseContext().getLocation();
-        boolean isShared = (location == DatabaseLocation.SHARED);
-        encoding.setEnabled(!isShared); // the encoding of shared database is always UTF-8
-        saveInOriginalOrder.setEnabled(!isShared);
-        saveInSpecifiedOrder.setEnabled(!isShared);
-        saveOrderPanel.setEnabled(!isShared);
-        protect.setEnabled(!isShared);
-    }
-
-    private void init() {
-
-        DirectoryDialogConfiguration directoryDialogConfiguration = new DirectoryDialogConfiguration.Builder()
-                .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY)).build();
-        DialogService ds = new FXDialogService();
-
-        JButton browseFile = new JButton(Localization.lang("Browse"));
-        JButton browseFileIndv = new JButton(Localization.lang("Browse"));
-
-        browseFile.addActionListener(e -> DefaultTaskExecutor
-                .runInJavaFXThread(() -> ds.showDirectorySelectionDialog(directoryDialogConfiguration))
-                .ifPresent(f -> fileDir.setText(f.toAbsolutePath().toString())));
-        browseFileIndv.addActionListener(e -> DefaultTaskExecutor
-                .runInJavaFXThread(() -> ds.showDirectorySelectionDialog(directoryDialogConfiguration))
-                .ifPresent(f -> fileDirIndv.setText(f.toAbsolutePath().toString())));
-
-        setupSortOrderConfiguration();
-        FormLayout form = new FormLayout("left:pref, 4dlu, pref:grow, 4dlu, pref:grow, 4dlu, pref",
-                "pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, fill:pref:grow, 180dlu, fill:pref:grow,");
-        FormBuilder builder = FormBuilder.create().layout(form);
-        builder.getPanel().setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-
-        builder.add(Localization.lang("Library encoding")).xy(1, 1);
-        builder.add(encoding).xy(3, 1);
-
-        builder.addSeparator(Localization.lang("Override default file directories")).xyw(1, 3, 5);
-        builder.add(Localization.lang("General file directory")).xy(1, 5);
-        builder.add(fileDir).xy(3, 5);
-        builder.add(browseFile).xy(5, 5);
-        builder.add(Localization.lang("User-specific file directory")).xy(1, 7);
-        builder.add(fileDirIndv).xy(3, 7);
-        builder.add(browseFileIndv).xy(5, 7);
-
-        builder.addSeparator(Localization.lang("Save sort order")).xyw(1, 13, 5);
-        builder.add(saveInOriginalOrder).xyw(1, 15, 5);
-        builder.add(saveInSpecifiedOrder).xyw(1, 17, 5);
-
-        saveOrderPanel = new SaveOrderConfigDisplay();
-        JFXPanel panel = CustomJFXPanel.wrap(new Scene((Parent) saveOrderPanel.getJFXPanel()));
-        builder.add(panel).xyw(1, 21, 5);
-
-        builder.addSeparator(Localization.lang("Library protection")).xyw(1, 23, 5);
-        builder.add(protect).xyw(1, 25, 5);
-
-        fieldFormatterCleanupsPanel = new FieldFormatterCleanupsPanel(Localization.lang("Enable save actions"),
-                Cleanups.DEFAULT_SAVE_ACTIONS);
-        builder.addSeparator(Localization.lang("Save actions")).xyw(1, 27, 5);
-        builder.add(CustomJFXPanel.wrap(new Scene(fieldFormatterCleanupsPanel))).xyw(1, 29, 5);
-
-        ButtonBarBuilder bb = new ButtonBarBuilder();
-        bb.addGlue();
-        bb.addButton(ok);
-        bb.addButton(cancel);
-        bb.addRelatedGap();
-        bb.addButton(new HelpAction(HelpFile.DATABASE_PROPERTIES).getHelpButton());
-        bb.addGlue();
-        bb.getPanel().setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-
-        getContentPane().add(builder.getPanel(), BorderLayout.CENTER);
-        getContentPane().add(bb.getPanel(), BorderLayout.SOUTH);
-        pack();
-
-        AbstractAction closeAction = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                dispose();
-            }
-        };
-        ActionMap am = builder.getPanel().getActionMap();
-        InputMap im = builder.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-        am.put("close", closeAction);
-
-        ok.addActionListener(e -> {
-            if (propertiesChanged()) {
-                storeSettings();
-            }
-            dispose();
-        });
-
-        cancel.addActionListener(e -> dispose());
-    }
-
-    private boolean propertiesChanged() {
-        Charset oldEncoding = panel.getBibDatabaseContext().getMetaData().getEncoding()
-                .orElse(Globals.prefs.getDefaultEncoding());
-        Charset newEncoding = (Charset) encoding.getSelectedItem();
-        boolean saveActionsChanged = fieldFormatterCleanupsPanel.hasChanged();
-        boolean saveOrderConfigChanged = !getNewSaveOrderConfig().equals(oldSaveOrderConfig);
-        boolean changed = saveOrderConfigChanged || !newEncoding.equals(oldEncoding)
-                || !oldFileVal.equals(fileDir.getText()) || !oldFileIndvVal.equals(fileDirIndv.getText())
-                || (oldProtectVal != protect.isSelected()) || saveActionsChanged;
-        return changed;
-    }
-
-    private SaveOrderConfig getNewSaveOrderConfig() {
-        SaveOrderConfig saveOrderConfig = null;
-        if (saveInOriginalOrder.isSelected()) {
-            saveOrderConfig = SaveOrderConfig.getDefaultSaveOrder();
-        } else {
-            saveOrderConfig = saveOrderPanel.getSaveOrderConfig();
-            saveOrderConfig.setSaveInSpecifiedOrder();
-        }
-        return saveOrderConfig;
-    }
-
-    private void setupSortOrderConfiguration() {
-        saveInOriginalOrder = new JRadioButton(Localization.lang("Save entries in their original order"));
-        saveInSpecifiedOrder = new JRadioButton(Localization.lang("Save entries ordered as specified"));
-
-        ButtonGroup bg = new ButtonGroup();
-        bg.add(saveInOriginalOrder);
-        bg.add(saveInSpecifiedOrder);
-        ActionListener listener = e -> {
-            boolean selected = e.getSource() == saveInSpecifiedOrder;
-            saveOrderPanel.setEnabled(selected);
-        };
-
-        saveInOriginalOrder.addActionListener(listener);
-        saveInSpecifiedOrder.addActionListener(listener);
-    }
-
-    @Override
-    public void setVisible(boolean visible) {
-        if (visible) {
-            setValues();
-        }
-        super.setVisible(visible);
-    }
-
-    private void setValues() {
-        Optional<Charset> charset = panel.getBibDatabaseContext().getMetaData().getEncoding();
-        encoding.setSelectedItem(charset.orElse(Globals.prefs.getDefaultEncoding()));
-
-        Optional<SaveOrderConfig> storedSaveOrderConfig = metaData.getSaveOrderConfig();
-        boolean selected;
-        if (!storedSaveOrderConfig.isPresent()) {
-            saveInOriginalOrder.setSelected(true);
-            oldSaveOrderConfig = SaveOrderConfig.getDefaultSaveOrder();
-            selected = false;
-        } else {
-            SaveOrderConfig saveOrderConfig = storedSaveOrderConfig.get();
-            oldSaveOrderConfig = saveOrderConfig;
-            if (saveOrderConfig.saveInOriginalOrder()) {
-                saveInOriginalOrder.setSelected(true);
-                selected = false;
-            } else {
-                saveInSpecifiedOrder.setSelected(true);
-                selected = true;
-            }
-            saveOrderPanel.setSaveOrderConfig(saveOrderConfig);
-        }
-        saveOrderPanel.setEnabled(selected);
-
-        Optional<String> fileD = metaData.getDefaultFileDirectory();
-        if (fileD.isPresent()) {
-            fileDir.setText(fileD.get().trim());
-        } else {
-            fileDir.setText("");
-        }
-
-        String fileDI = metaData.getUserFileDirectory(Globals.prefs.getUser()).orElse(""); // File dir setting
-        fileDirIndv.setText(fileDI);
-        oldFileIndvVal = fileDirIndv.getText();
-
-        protect.setSelected(metaData.isProtected());
-
-        // Store original values to see if they get changed:
-        oldFileVal = fileDir.getText();
-        oldProtectVal = protect.isSelected();
-
-        //set save actions
-        fieldFormatterCleanupsPanel.setValues(metaData);
-    }
-
-    private void storeSettings() {
-        Charset oldEncoding = panel.getBibDatabaseContext().getMetaData().getEncoding()
-                .orElse(Globals.prefs.getDefaultEncoding());
-        Charset newEncoding = (Charset) encoding.getSelectedItem();
-        panel.getBibDatabaseContext().getMetaData().setEncoding(newEncoding);
-
-        String text = fileDir.getText().trim();
-        if (text.isEmpty()) {
-            metaData.clearDefaultFileDirectory();
-        } else {
-            metaData.setDefaultFileDirectory(text);
-        }
-        // Repeat for individual file dir - reuse 'text' and 'dir' vars
-        text = fileDirIndv.getText();
-        if (text.isEmpty()) {
-            metaData.clearUserFileDirectory(Globals.prefs.getUser());
-        } else {
-            metaData.setUserFileDirectory(Globals.prefs.getUser(), text);
-        }
-
-        if (protect.isSelected()) {
-            metaData.markAsProtected();
-        } else {
-            metaData.markAsNotProtected();
-        }
-
-        SaveOrderConfig newSaveOrderConfig = getNewSaveOrderConfig();
-
-        boolean saveOrderConfigChanged = !getNewSaveOrderConfig().equals(oldSaveOrderConfig);
-
-        // See if any of the values have been modified:
-        if (saveOrderConfigChanged) {
-            if (newSaveOrderConfig.equals(SaveOrderConfig.getDefaultSaveOrder())) {
-                metaData.clearSaveOrderConfig();
-            } else {
-                metaData.setSaveOrderConfig(newSaveOrderConfig);
-            }
-        }
-
-        boolean saveActionsChanged = fieldFormatterCleanupsPanel.hasChanged();
-        if (saveActionsChanged) {
-            if (fieldFormatterCleanupsPanel.isDefaultSaveActions()) {
-                metaData.clearSaveActions();
-            } else {
-                fieldFormatterCleanupsPanel.storeSettings(metaData);
-            }
-        }
-
-        boolean changed = saveOrderConfigChanged || !newEncoding.equals(oldEncoding)
-                || !oldFileVal.equals(fileDir.getText()) || !oldFileIndvVal.equals(fileDirIndv.getText())
-                || (oldProtectVal != protect.isSelected()) || saveActionsChanged;
-        // ... if so, mark base changed. Prevent the Undo button from removing
-        // change marking:
-        if (changed) {
-            panel.markNonUndoableBaseChanged();
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialog.fxml b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
similarity index 76%
rename from src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialog.fxml
rename to src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
index c2163dc1dda..c78f39dac2e 100644
--- a/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialog.fxml
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
@@ -17,12 +17,11 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 
-
-<DialogPane prefHeight="516.0" prefWidth="922.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.dbproperties.LibraryPropertiesDialogView">
+<DialogPane minHeight="-Infinity" prefHeight="784.0" prefWidth="921.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.dbproperties.LibraryPropertiesDialogView">
    <content>
-      <VBox fx:id="contentVbox" prefHeight="200.0" prefWidth="100.0">
+      <VBox fx:id="contentVbox" minHeight="-Infinity" prefHeight="200.0" prefWidth="100.0">
          <children>
-            <GridPane>
+            <GridPane minHeight="-Infinity">
               <columnConstraints>
                 <ColumnConstraints hgrow="SOMETIMES" maxWidth="218.0" minWidth="10.0" prefWidth="200.0" />
                 <ColumnConstraints hgrow="SOMETIMES" maxWidth="797.0" minWidth="10.0" prefWidth="529.0" />
@@ -37,9 +36,15 @@
                <children>
                   <Label text="Library encoding" />
                   <ComboBox fx:id="encoding" prefWidth="250.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" />
-                  <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="1">
+                  <Label text="General file directory" GridPane.rowIndex="2" />
+                  <TextField fx:id="generalFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                  <Button fx:id="browseGeneralFileDir" mnemonicParsing="false" onAction="#browseGeneralFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+                  <Label text="User-specific file directory" GridPane.rowIndex="3" />
+                  <TextField fx:id="userSpecificFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                  <Button fx:id="browseUserSpefiicFileDir" mnemonicParsing="false" onAction="#browseUserSpecificFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+                  <HBox alignment="CENTER" prefHeight="50.0" prefWidth="200.0" GridPane.columnSpan="3" GridPane.rowIndex="1">
                      <children>
-                        <Label alignment="BOTTOM_LEFT" text="%Override default file directories" />
+                        <Label alignment="TOP_LEFT" text="%Override default file directories" />
                         <Separator halignment="LEFT" valignment="BOTTOM" HBox.hgrow="ALWAYS">
                            <opaqueInsets>
                               <Insets left="10.0" right="10.0" top="10.0" />
@@ -52,37 +57,12 @@
                            </padding>
                         </Separator>
                      </children>
-                     <GridPane.margin>
-                        <Insets />
-                     </GridPane.margin>
                   </HBox>
-                  <Label text="General file directory" GridPane.rowIndex="2" />
-                  <TextField fx:id="generalFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                  <Button fx:id="browseGeneralFileDir" mnemonicParsing="false" onAction="#browseGeneralFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="2" />
-                  <Label text="User-specific file directory" GridPane.rowIndex="3" />
-                  <TextField fx:id="userSpecificFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-                  <Button fx:id="browseUserSpefiicFileDir" mnemonicParsing="false" onAction="#browseUserSpecificFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="3" />
                </children>
             </GridPane>
-            <HBox alignment="CENTER" prefHeight="50.0" prefWidth="200.0">
-               <children>
-                  <Label alignment="BOTTOM_LEFT" text="%Save sort order" />
-                  <Separator halignment="LEFT" valignment="BOTTOM" HBox.hgrow="ALWAYS">
-                     <opaqueInsets>
-                        <Insets left="10.0" right="10.0" top="10.0" />
-                     </opaqueInsets>
-                     <HBox.margin>
-                        <Insets />
-                     </HBox.margin>
-                     <padding>
-                        <Insets left="10.0" />
-                     </padding>
-                  </Separator>
-               </children>
-            </HBox>
-            <VBox fx:id="saveOrdervbox">
-             <fx:define>
-              <ToggleGroup fx:id="saveOrderToggleGroup" />
+            <VBox fx:id="saveOrdervbox" minHeight="-Infinity">
+               <fx:define>
+                 <ToggleGroup fx:id="saveOrderToggleGroup" />
                </fx:define>
                <children>
                   <RadioButton fx:id="saveInOriginalOrder" mnemonicParsing="false" text="%Save entries in their original order" toggleGroup="$saveOrderToggleGroup" />
@@ -91,7 +71,7 @@
             </VBox>
             <HBox alignment="CENTER" prefHeight="50.0" prefWidth="200.0">
                <children>
-                  <Label alignment="BOTTOM_LEFT" text="%Library protection" />
+                  <Label alignment="TOP_LEFT" text="%Library protection" />
                   <Separator halignment="LEFT" valignment="BOTTOM" HBox.hgrow="ALWAYS">
                      <opaqueInsets>
                         <Insets left="10.0" right="10.0" top="10.0" />
@@ -108,7 +88,7 @@
             <CheckBox fx:id="protect" mnemonicParsing="false" text="%Refuse to save the library before external changes have been reviewed" />
             <HBox alignment="CENTER" prefHeight="50.0" prefWidth="200.0">
                <children>
-                  <Label alignment="BOTTOM_LEFT" text="%Save actions" />
+                  <Label alignment="TOP_LEFT" text="%Save actions" />
                   <Separator halignment="LEFT" valignment="BOTTOM" HBox.hgrow="ALWAYS">
                      <opaqueInsets>
                         <Insets left="10.0" right="10.0" top="10.0" />
diff --git a/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogView.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
similarity index 97%
rename from src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogView.java
rename to src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
index b91613247dc..d6a8796466c 100644
--- a/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.dbproperties;
+package org.jabref.gui.libraryproperties;
 
 import java.nio.charset.Charset;
 import java.util.Optional;
@@ -76,7 +76,8 @@ private void initialize() {
         generalFileDirectory.textProperty().bindBidirectional(viewModel.generalFileDirectoryPropertyProperty());
         userSpecificFileDirectory.textProperty().bindBidirectional(viewModel.userSpecificFileDirectoryProperty());
 
-        encoding.valueProperty().bind(viewModel.selectedEncodingProperty());
+        encoding.itemsProperty().bind(viewModel.encodingsProperty());
+        encoding.valueProperty().bindBidirectional(viewModel.selectedEncodingProperty());
         saveOrderPanel = new SaveOrderConfigDisplay();
         saveOrdervbox.getChildren().add(saveOrderPanel.getJFXPanel());
         fieldFormatterCleanupsPanel = new FieldFormatterCleanupsPanel(Localization.lang("Enable save actions"),
diff --git a/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
similarity index 99%
rename from src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogViewModel.java
rename to src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
index fc857de9d0e..b51d688aff6 100644
--- a/src/main/java/org/jabref/gui/dbproperties/LibraryPropertiesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.dbproperties;
+package org.jabref.gui.libraryproperties;
 
 import java.nio.charset.Charset;
 import java.util.Optional;

From d246d37ef330230d6b25b6028de54663bb665602 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 28 Jan 2019 19:06:26 +0100
Subject: [PATCH 04/20] fix checkstyle and l10n

---
 src/main/java/org/jabref/gui/JabRefFrame.java             | 2 +-
 .../gui/libraryproperties/LibraryPropertiesDialog.fxml    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 59f9f1ccb01..82ef76ff085 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -60,9 +60,9 @@
 import org.jabref.gui.actions.CopyFilesAction;
 import org.jabref.gui.actions.CustomizeEntryAction;
 import org.jabref.gui.actions.CustomizeKeyBindingAction;
-import org.jabref.gui.actions.LibraryPropertiesAction;
 import org.jabref.gui.actions.EditExternalFileTypesAction;
 import org.jabref.gui.actions.ErrorConsoleAction;
+import org.jabref.gui.actions.LibraryPropertiesAction;
 import org.jabref.gui.actions.LookupIdentifierAction;
 import org.jabref.gui.actions.ManageCustomExportsAction;
 import org.jabref.gui.actions.ManageCustomImportsAction;
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
index c78f39dac2e..6913c862d78 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
@@ -34,12 +34,12 @@
                   <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
               </rowConstraints>
                <children>
-                  <Label text="Library encoding" />
+                  <Label text="%Library encoding" />
                   <ComboBox fx:id="encoding" prefWidth="250.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" />
-                  <Label text="General file directory" GridPane.rowIndex="2" />
+                  <Label text="%General file directory" GridPane.rowIndex="2" />
                   <TextField fx:id="generalFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="2" />
                   <Button fx:id="browseGeneralFileDir" mnemonicParsing="false" onAction="#browseGeneralFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="2" />
-                  <Label text="User-specific file directory" GridPane.rowIndex="3" />
+                  <Label text="%User-specific file directory" GridPane.rowIndex="3" />
                   <TextField fx:id="userSpecificFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="3" />
                   <Button fx:id="browseUserSpefiicFileDir" mnemonicParsing="false" onAction="#browseUserSpecificFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="3" />
                   <HBox alignment="CENTER" prefHeight="50.0" prefWidth="200.0" GridPane.columnSpan="3" GridPane.rowIndex="1">
@@ -85,7 +85,7 @@
                   </Separator>
                </children>
             </HBox>
-            <CheckBox fx:id="protect" mnemonicParsing="false" text="%Refuse to save the library before external changes have been reviewed" />
+            <CheckBox fx:id="protect" mnemonicParsing="false" text="%Refuse to save the library before external changes have been reviewed." />
             <HBox alignment="CENTER" prefHeight="50.0" prefWidth="200.0">
                <children>
                   <Label alignment="TOP_LEFT" text="%Save actions" />

From 06ed9ec5cf221630ef7a1e88f7a3aba99a54c6aa Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 18 Feb 2019 15:56:36 +0100
Subject: [PATCH 05/20] fix package error move setValues method to constructor
 create fxml draft for save order config

---
 .../jabref/gui/SaveOrderConfigDisplay.fxml    | 40 +++++++++++++++++++
 .../gui/SaveOrderConfigDisplayViewModel.java  |  6 +++
 .../LibraryPropertiesDialog.fxml              |  2 +-
 .../LibraryPropertiesDialogView.java          |  1 -
 .../LibraryPropertiesDialogViewModel.java     | 36 ++++++++---------
 5 files changed, 64 insertions(+), 21 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
 create mode 100644 src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java

diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
new file mode 100644
index 00000000000..db0e2b2ed37
--- /dev/null
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+
+
+<GridPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1">
+  <columnConstraints>
+    <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" prefWidth="100.0" />
+    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+  </columnConstraints>
+  <rowConstraints>
+    <RowConstraints minHeight="-Infinity" prefHeight="30.0" />
+    <RowConstraints minHeight="-Infinity" prefHeight="30.0" />
+      <RowConstraints minHeight="-Infinity" prefHeight="30.0" />
+      <RowConstraints minHeight="-Infinity" prefHeight="30.0" />
+      <RowConstraints minHeight="-Infinity" prefHeight="30.0" />
+      <RowConstraints minHeight="-Infinity" prefHeight="30.0" />
+  </rowConstraints>s
+   <children>
+      <ComboBox fx:id="savePriSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+      <ComboBox fx:id="saveSecSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+      <RadioButton fx:id="exportInSpecifiedOrder" mnemonicParsing="false" prefHeight="5.0" prefWidth="206.0" text="Export entries ordered as specified" GridPane.columnSpan="3" GridPane.rowIndex="2" />
+      <RadioButton fx:id="exportInTableOrder" mnemonicParsing="false" text="Export in current table sort order" GridPane.columnSpan="3" GridPane.rowIndex="1" />
+      <RadioButton fx:id="exportInOriginalOrder" mnemonicParsing="false" text="Export entries in their original order" GridPane.columnSpan="3" />
+      <ComboBox fx:id="saveTerSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+      <CheckBox fx:id="savePriDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+      <CheckBox fx:id="saveSecDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+      <CheckBox fx:id="saveTerDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+      <Label text="Primary sort criterion" GridPane.rowIndex="3" />
+      <Label text="Secondary sort criterion" GridPane.rowIndex="4" />
+      <Label text="Tertiary sort criterion" GridPane.rowIndex="5" />
+   </children>
+</GridPane>
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
new file mode 100644
index 00000000000..b1aec9486e8
--- /dev/null
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
@@ -0,0 +1,6 @@
+package org.jabref.gui;
+
+
+public class SaveOrderConfigDisplayViewModel {
+
+}
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
index 6913c862d78..d69795354af 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
@@ -17,7 +17,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 
-<DialogPane minHeight="-Infinity" prefHeight="784.0" prefWidth="921.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.dbproperties.LibraryPropertiesDialogView">
+<DialogPane minHeight="-Infinity" prefHeight="784.0" prefWidth="921.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.libraryproperties.LibraryPropertiesDialogView">
    <content>
       <VBox fx:id="contentVbox" minHeight="-Infinity" prefHeight="200.0" prefWidth="100.0">
          <children>
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
index d6a8796466c..e14bf7b6f49 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
@@ -96,7 +96,6 @@ private void initialize() {
 
     private void setValues() {
 
-        viewModel.setValues();
         Optional<SaveOrderConfig> storedSaveOrderConfig = panel.getBibDatabaseContext().getMetaData().getSaveOrderConfig();
         boolean selected;
         if (!storedSaveOrderConfig.isPresent()) {
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
index b51d688aff6..d63dca01b96 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
@@ -35,9 +35,9 @@ public class LibraryPropertiesDialogViewModel {
     private final MetaData metaData;
     private final PreferencesService preferencesService;
 
-    private String oldUserSpecificFileDir;
-    private String oldGeneralFileDir;
-    private boolean oldLibraryProtected;
+    private final String oldUserSpecificFileDir;
+    private final String oldGeneralFileDir;
+    private final boolean oldLibraryProtected;
 
     public LibraryPropertiesDialogViewModel(BasePanel panel, DialogService dialogService, PreferencesService preferencesService) {
         this.dialogService = dialogService;
@@ -47,6 +47,20 @@ public LibraryPropertiesDialogViewModel(BasePanel panel, DialogService dialogSer
         directoryDialogConfiguration = new DirectoryDialogConfiguration.Builder()
                                                                                  .withInitialDirectory(preferencesService.getWorkingDir()).build();
 
+        Optional<Charset> charset = metaData.getEncoding();
+        selectedEncodingPropety.setValue(charset.orElse(preferencesService.getDefaultEncoding()));
+
+        Optional<String> fileD = metaData.getDefaultFileDirectory();
+        fileD.ifPresent(path -> generalFileDirectoryProperty.setValue(path.trim()));
+
+        Optional<String> fileDI = metaData.getUserFileDirectory(preferencesService.getUser());
+        fileDI.ifPresent(userSpecificFileDirectoryProperty::setValue);
+
+        oldUserSpecificFileDir = generalFileDirectoryProperty.getValue();
+        oldGeneralFileDir = userSpecificFileDirectoryProperty.getValue();
+
+        libraryProtectedProperty.setValue(metaData.isProtected());
+        oldLibraryProtected = libraryProtectedProperty.getValue();
     }
 
     public StringProperty generalFileDirectoryPropertyProperty() {
@@ -86,22 +100,6 @@ public BooleanProperty libraryProtectedProperty() {
         return this.libraryProtectedProperty;
     }
 
-    public void setValues() {
-        Optional<Charset> charset = metaData.getEncoding();
-        selectedEncodingPropety.setValue(charset.orElse(preferencesService.getDefaultEncoding()));
-
-        Optional<String> fileD = metaData.getDefaultFileDirectory();
-        fileD.ifPresent(path -> generalFileDirectoryProperty.setValue(path.trim()));
-
-        Optional<String> fileDI = metaData.getUserFileDirectory(preferencesService.getUser());
-        fileDI.ifPresent(userSpecificFileDirectoryProperty::setValue);
-
-        oldUserSpecificFileDir = generalFileDirectoryProperty.getValue();
-        oldGeneralFileDir = userSpecificFileDirectoryProperty.getValue();
-
-        libraryProtectedProperty.setValue(metaData.isProtected());
-        oldLibraryProtected = libraryProtectedProperty.getValue();
-    }
 
     public boolean generalFileDirChanged() {
         return !oldGeneralFileDir.equals(generalFileDirectoryProperty.getValue());

From 49e3600f094beef6508f5ec8b2f5057d5820fcf4 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Tue, 19 Feb 2019 16:40:39 +0100
Subject: [PATCH 06/20] add new fxml

---
 .../jabref/gui/SaveOrderConfigDisplay.fxml    | 25 ++++++++++--------
 .../gui/SaveOrderConfigDisplayController.java | 26 +++++++++++++++++++
 .../gui/SaveOrderConfigDisplayViewModel.java  |  1 +
 3 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/SaveOrderConfigDisplayController.java

diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
index db0e2b2ed37..78ce75cfc6e 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
@@ -4,11 +4,11 @@
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.ToggleGroup?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 
-
 <GridPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" prefWidth="100.0" />
@@ -22,19 +22,22 @@
       <RowConstraints minHeight="-Infinity" prefHeight="30.0" />
       <RowConstraints minHeight="-Infinity" prefHeight="30.0" />
       <RowConstraints minHeight="-Infinity" prefHeight="30.0" />
-  </rowConstraints>s
+  </rowConstraints>
+     <fx:define>
+       <ToggleGroup fx:id="saveOrderToggleGroup" />
+     </fx:define>
    <children>
       <ComboBox fx:id="savePriSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
       <ComboBox fx:id="saveSecSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-      <RadioButton fx:id="exportInSpecifiedOrder" mnemonicParsing="false" prefHeight="5.0" prefWidth="206.0" text="Export entries ordered as specified" GridPane.columnSpan="3" GridPane.rowIndex="2" />
-      <RadioButton fx:id="exportInTableOrder" mnemonicParsing="false" text="Export in current table sort order" GridPane.columnSpan="3" GridPane.rowIndex="1" />
-      <RadioButton fx:id="exportInOriginalOrder" mnemonicParsing="false" text="Export entries in their original order" GridPane.columnSpan="3" />
       <ComboBox fx:id="saveTerSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="5" />
-      <CheckBox fx:id="savePriDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-      <CheckBox fx:id="saveSecDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="4" />
-      <CheckBox fx:id="saveTerDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="5" />
-      <Label text="Primary sort criterion" GridPane.rowIndex="3" />
-      <Label text="Secondary sort criterion" GridPane.rowIndex="4" />
-      <Label text="Tertiary sort criterion" GridPane.rowIndex="5" />
+      <RadioButton fx:id="exportInSpecifiedOrder" mnemonicParsing="false" prefHeight="5.0" prefWidth="206.0" text="%Export entries ordered as specified" GridPane.columnSpan="3" GridPane.rowIndex="2" />
+      <RadioButton fx:id="exportInTableOrder" mnemonicParsing="false" text="%Export in current table sort order" GridPane.columnSpan="3" GridPane.rowIndex="1" />
+      <RadioButton fx:id="exportInOriginalOrder" mnemonicParsing="false" text="%Export entries in their original order" GridPane.columnSpan="3"/>
+      <CheckBox fx:id="savePriDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="3" enabled="${exportInSpecifiedOrder.selected}"/>
+      <CheckBox fx:id="saveSecDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="4 "enabled="${exportInSpecifiedOrder.selected}" />
+      <CheckBox fx:id="saveTerDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="5" enabled="${exportInSpecifiedOrder.selected}" />
+      <Label text="Primary sort criterion" GridPane.rowIndex="3" enabled="${exportInSpecifiedOrder.selected}" />
+      <Label text="Secondary sort criterion" GridPane.rowIndex="4" enabled="${exportInSpecifiedOrder.selected}" />
+      <Label text="Tertiary sort criterion" GridPane.rowIndex="5" enabled="${exportInSpecifiedOrder.selected}"/>
    </children>
 </GridPane>
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayController.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayController.java
new file mode 100644
index 00000000000..03d209dc3e0
--- /dev/null
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayController.java
@@ -0,0 +1,26 @@
+package org.jabref.gui;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.ToggleGroup;
+
+public class SaveOrderConfigDisplayController {
+
+    @FXML private ToggleGroup saveOrderToggleGroup;
+    @FXML private ComboBox<String> savePriSort;
+    @FXML private ComboBox<String> saveSecSort;
+    @FXML private ComboBox<String> saveTerSort;
+    @FXML private RadioButton exportInSpecifiedOrder;
+    @FXML private RadioButton exportInTableOrder;
+    @FXML private RadioButton exportInOriginalOrder;
+    @FXML private CheckBox savePriDesc;
+    @FXML private CheckBox saveSecDesc;
+    @FXML private CheckBox saveTerDesc;
+
+    public void init() {
+
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
index b1aec9486e8..35fdabbc674 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
@@ -3,4 +3,5 @@
 
 public class SaveOrderConfigDisplayViewModel {
 
+
 }

From 5657fed6eefe24c2f018315689779057f460efde Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Thu, 21 Feb 2019 19:17:36 +0100
Subject: [PATCH 07/20] Create properties in view Model for SaveOrderConfig Use
 Expressions in fxml code for enabling/disabling

---
 .../jabref/gui/SaveOrderConfigDisplay.fxml    |  12 +-
 .../gui/SaveOrderConfigDisplayController.java |  26 ----
 .../gui/SaveOrderConfigDisplayView.java       |  56 ++++++++
 .../gui/SaveOrderConfigDisplayViewModel.java  | 129 ++++++++++++++++++
 4 files changed, 191 insertions(+), 32 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/SaveOrderConfigDisplayController.java
 create mode 100644 src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java

diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
index 78ce75cfc6e..ed8a74897cd 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
@@ -33,11 +33,11 @@
       <RadioButton fx:id="exportInSpecifiedOrder" mnemonicParsing="false" prefHeight="5.0" prefWidth="206.0" text="%Export entries ordered as specified" GridPane.columnSpan="3" GridPane.rowIndex="2" />
       <RadioButton fx:id="exportInTableOrder" mnemonicParsing="false" text="%Export in current table sort order" GridPane.columnSpan="3" GridPane.rowIndex="1" />
       <RadioButton fx:id="exportInOriginalOrder" mnemonicParsing="false" text="%Export entries in their original order" GridPane.columnSpan="3"/>
-      <CheckBox fx:id="savePriDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="3" enabled="${exportInSpecifiedOrder.selected}"/>
-      <CheckBox fx:id="saveSecDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="4 "enabled="${exportInSpecifiedOrder.selected}" />
-      <CheckBox fx:id="saveTerDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="5" enabled="${exportInSpecifiedOrder.selected}" />
-      <Label text="Primary sort criterion" GridPane.rowIndex="3" enabled="${exportInSpecifiedOrder.selected}" />
-      <Label text="Secondary sort criterion" GridPane.rowIndex="4" enabled="${exportInSpecifiedOrder.selected}" />
-      <Label text="Tertiary sort criterion" GridPane.rowIndex="5" enabled="${exportInSpecifiedOrder.selected}"/>
+      <CheckBox fx:id="savePriDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="3" disabled="${!exportInSpecifiedOrder.selected}"/>
+      <CheckBox fx:id="saveSecDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="4" disabled="${!exportInSpecifiedOrder.selected}" />
+      <CheckBox fx:id="saveTerDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="5" disabled="${!exportInSpecifiedOrder.selected}" />
+      <Label text="Primary sort criterion" GridPane.rowIndex="3" disabled="${!exportInSpecifiedOrder.selected}" />
+      <Label text="Secondary sort criterion" GridPane.rowIndex="4" disabled="${!exportInSpecifiedOrder.selected}" />
+      <Label text="Tertiary sort criterion" GridPane.rowIndex="5" disabled="${!exportInSpecifiedOrder.selected}"/>
    </children>
 </GridPane>
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayController.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayController.java
deleted file mode 100644
index 03d209dc3e0..00000000000
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayController.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.jabref.gui;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.ToggleGroup;
-
-public class SaveOrderConfigDisplayController {
-
-    @FXML private ToggleGroup saveOrderToggleGroup;
-    @FXML private ComboBox<String> savePriSort;
-    @FXML private ComboBox<String> saveSecSort;
-    @FXML private ComboBox<String> saveTerSort;
-    @FXML private RadioButton exportInSpecifiedOrder;
-    @FXML private RadioButton exportInTableOrder;
-    @FXML private RadioButton exportInOriginalOrder;
-    @FXML private CheckBox savePriDesc;
-    @FXML private CheckBox saveSecDesc;
-    @FXML private CheckBox saveTerDesc;
-
-    public void init() {
-
-    }
-
-}
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java
new file mode 100644
index 00000000000..e0a389d8c56
--- /dev/null
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java
@@ -0,0 +1,56 @@
+package org.jabref.gui;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.ToggleGroup;
+
+import org.jabref.model.metadata.MetaData;
+
+public class SaveOrderConfigDisplayView {
+
+    @FXML private ToggleGroup saveOrderToggleGroup;
+    @FXML private ComboBox<String> savePriSort;
+    @FXML private ComboBox<String> saveSecSort;
+    @FXML private ComboBox<String> saveTerSort;
+    @FXML private RadioButton exportInSpecifiedOrder;
+    @FXML private RadioButton exportInTableOrder;
+    @FXML private RadioButton exportInOriginalOrder;
+    @FXML private CheckBox savePriDesc;
+    @FXML private CheckBox saveSecDesc;
+    @FXML private CheckBox saveTerDesc;
+    private SaveOrderConfigDisplayViewModel viewModel;
+    private final MetaData metadata;
+
+    public SaveOrderConfigDisplayView(MetaData metadata) {
+        this.metadata = metadata;
+    }
+
+    @FXML
+    private void initialize() {
+
+        viewModel = new SaveOrderConfigDisplayViewModel(metadata);
+
+        exportInSpecifiedOrder.selectedProperty().bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
+        exportInTableOrder.selectedProperty().bindBidirectional(viewModel.saveInTableOrderProperty());
+        exportInOriginalOrder.selectedProperty().bindBidirectional(viewModel.saveInOriginalProperty());
+
+        savePriSort.itemsProperty().bindBidirectional(viewModel.priSortFieldsProperty());
+        saveSecSort.itemsProperty().bindBidirectional(viewModel.secSortFieldsProperty());
+        saveTerSort.itemsProperty().bindBidirectional(viewModel.terSortFieldsProperty());
+
+        savePriSort.valueProperty().bindBidirectional(viewModel.savePriSortSelectedValueProperty());
+        saveSecSort.valueProperty().bindBidirectional(viewModel.saveSecSortSelectedValueProperty());
+        saveTerSort.valueProperty().bindBidirectional(viewModel.saveTerSortSelectedValueProperty());
+
+        savePriDesc.selectedProperty().bindBidirectional(viewModel.savePriDescPropertySelected());
+        saveSecDesc.selectedProperty().bindBidirectional(viewModel.saveSecDescPropertySelected());
+        saveTerDesc.selectedProperty().bindBidirectional(viewModel.saveTerDescPropertySelected());
+
+    }
+
+    public void storeConfig() {
+        viewModel.storeConfig();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
index 35fdabbc674..8ef3135afd3 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
@@ -1,7 +1,136 @@
 package org.jabref.gui;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Optional;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.InternalBibtexFields;
+import org.jabref.model.metadata.MetaData;
+import org.jabref.model.metadata.SaveOrderConfig;
+import org.jabref.model.metadata.SaveOrderConfig.SortCriterion;
 
 public class SaveOrderConfigDisplayViewModel {
 
+    private final ListProperty<String> priSortFieldsProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<String> secSortFieldsProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<String> terSortFieldsProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
+
+    private final BooleanProperty savePriDescPropertySelected = new SimpleBooleanProperty();
+    private final BooleanProperty saveSecDescPropertySelected = new SimpleBooleanProperty();
+    private final BooleanProperty saveTerDescPropertySelected = new SimpleBooleanProperty();
+
+    private final StringProperty savePriSortSelectedValueProperty = new SimpleStringProperty("");
+    private final StringProperty saveSecSortSelectedValueProperty = new SimpleStringProperty("");
+    private final StringProperty saveTerSortSelectedValueProperty = new SimpleStringProperty("");
+
+    private final BooleanProperty saveInOriginalProperty = new SimpleBooleanProperty();
+    private final BooleanProperty saveInTableOrderProperty = new SimpleBooleanProperty();
+    private final BooleanProperty saveInSpecifiedOrderProperty = new SimpleBooleanProperty();
+
+    private final MetaData metadata;
+
+    public SaveOrderConfigDisplayViewModel(MetaData metaData) {
+        this.metadata = metaData;
+
+        Optional<SaveOrderConfig> storedSaveOrderConfig = metaData.getSaveOrderConfig();
+
+        List<String> fieldNames = InternalBibtexFields.getAllPublicFieldNames();
+        fieldNames.add(BibEntry.KEY_FIELD);
+        Collections.sort(fieldNames);
+
+        priSortFieldsProperty.addAll(fieldNames);
+        secSortFieldsProperty.addAll(fieldNames);
+        terSortFieldsProperty.addAll(fieldNames);
+    }
+
+    public ListProperty<String> priSortFieldsProperty() {
+        return priSortFieldsProperty;
+    }
+
+    public ListProperty<String> secSortFieldsProperty() {
+        return secSortFieldsProperty;
+    }
+
+    public ListProperty<String> terSortFieldsProperty() {
+        return terSortFieldsProperty;
+    }
+
+    public SaveOrderConfig getSaveOrderConfig() {
+        SaveOrderConfig saveOrderConfig = new SaveOrderConfig();
+        SortCriterion primary = new SortCriterion(getSelectedItemAsLowerCaseTrim(savePriSortSelectedValueProperty), savePriDescPropertySelected.getValue());
+        saveOrderConfig.getSortCriteria().add(primary);
+        SortCriterion secondary = new SortCriterion(getSelectedItemAsLowerCaseTrim(saveSecSortSelectedValueProperty), saveSecDescPropertySelected.getValue());
+        saveOrderConfig.getSortCriteria().add(secondary);
+        SortCriterion tertiary = new SortCriterion(getSelectedItemAsLowerCaseTrim(saveTerSortSelectedValueProperty), saveTerDescPropertySelected.getValue());
+        saveOrderConfig.getSortCriteria().add(tertiary);
+
+        return saveOrderConfig;
+    }
+
+    public void setSaveOrderConfig(SaveOrderConfig saveOrderConfig) {
+        Objects.requireNonNull(saveOrderConfig);
+
+        savePriSortSelectedValueProperty.setValue(saveOrderConfig.getSortCriteria().get(0).field);
+        savePriDescPropertySelected.setValue(saveOrderConfig.getSortCriteria().get(0).descending);
+        saveSecSortSelectedValueProperty.setValue(saveOrderConfig.getSortCriteria().get(1).field);
+        saveSecDescPropertySelected.setValue(saveOrderConfig.getSortCriteria().get(1).descending);
+        saveTerSortSelectedValueProperty.setValue(saveOrderConfig.getSortCriteria().get(2).field);
+        saveTerDescPropertySelected.setValue(saveOrderConfig.getSortCriteria().get(2).descending);
+    }
+
+    private String getSelectedItemAsLowerCaseTrim(StringProperty string) {
+        return string.getValue().toLowerCase(Locale.ROOT).trim();
+    }
+
+    public BooleanProperty savePriDescPropertySelected() {
+        return savePriDescPropertySelected;
+    }
+
+    public BooleanProperty saveSecDescPropertySelected() {
+        return saveSecDescPropertySelected;
+    }
+
+    public BooleanProperty saveTerDescPropertySelected() {
+        return saveTerDescPropertySelected;
+    }
+
+    public StringProperty savePriSortSelectedValueProperty() {
+        return savePriSortSelectedValueProperty;
+    }
+
+    public StringProperty saveSecSortSelectedValueProperty() {
+        return saveSecSortSelectedValueProperty;
+    }
+
+    public StringProperty saveTerSortSelectedValueProperty() {
+        return saveTerSortSelectedValueProperty;
+    }
+
+    public void storeConfig() {
+        metadata.setSaveOrderConfig(this.getSaveOrderConfig());
+    }
+
+    public BooleanProperty saveInOriginalProperty() {
+        return saveInOriginalProperty;
+    }
+
+    public BooleanProperty saveInTableOrderProperty() {
+        return saveInTableOrderProperty;
+    }
+
+    public BooleanProperty saveInSpecifiedOrderProperty() {
+        return this.saveInSpecifiedOrderProperty;
+    }
 
 }

From 159c48aa27c699bd49798057db2c1aac9752b15e Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 24 Feb 2019 20:17:54 +0100
Subject: [PATCH 08/20] create empty dialog pane for preferences dialog to make
 root components work

move old save order config to the new class
add toggle group

TODO: Find out why initialize is not called
---
 .../jabref/gui/SaveOrderConfigDisplay.fxml    | 10 ++--
 .../gui/SaveOrderConfigDisplayView.java       | 31 ++++++++--
 .../gui/SaveOrderConfigDisplayViewModel.java  | 39 +++++++++----
 .../preferences/ExportSortingPrefsTab.java    | 43 ++------------
 .../gui/preferences/PreferencesDialog.fxml    |  6 ++
 .../gui/preferences/PreferencesDialog.java    | 57 ++++++++++++-------
 .../model/metadata/SaveOrderConfig.java       | 14 +++--
 .../jabref/preferences/JabRefPreferences.java |  2 +
 .../preferences/PreferencesService.java       |  5 ++
 9 files changed, 119 insertions(+), 88 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml

diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
index ed8a74897cd..f05d16e55ef 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<GridPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1">
+<fx:root type="javafx.scene.layout.GridPane" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" prefWidth="100.0" />
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -30,9 +30,9 @@
       <ComboBox fx:id="savePriSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
       <ComboBox fx:id="saveSecSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="4" />
       <ComboBox fx:id="saveTerSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="5" />
-      <RadioButton fx:id="exportInSpecifiedOrder" mnemonicParsing="false" prefHeight="5.0" prefWidth="206.0" text="%Export entries ordered as specified" GridPane.columnSpan="3" GridPane.rowIndex="2" />
-      <RadioButton fx:id="exportInTableOrder" mnemonicParsing="false" text="%Export in current table sort order" GridPane.columnSpan="3" GridPane.rowIndex="1" />
-      <RadioButton fx:id="exportInOriginalOrder" mnemonicParsing="false" text="%Export entries in their original order" GridPane.columnSpan="3"/>
+      <RadioButton fx:id="exportInSpecifiedOrder" mnemonicParsing="false" prefHeight="5.0" prefWidth="206.0" text="%Export entries ordered as specified" GridPane.columnSpan="3" GridPane.rowIndex="2" toggleGroup="$saveOrderToggleGroup"/>
+      <RadioButton fx:id="exportInTableOrder" mnemonicParsing="false" text="%Export in current table sort order" GridPane.columnSpan="3" GridPane.rowIndex="1" toggleGroup="$saveOrderToggleGroup"/>
+      <RadioButton fx:id="exportInOriginalOrder" mnemonicParsing="false" text="%Export entries in their original order" GridPane.columnSpan="3" toggleGroup="$saveOrderToggleGroup"/>
       <CheckBox fx:id="savePriDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="3" disabled="${!exportInSpecifiedOrder.selected}"/>
       <CheckBox fx:id="saveSecDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="4" disabled="${!exportInSpecifiedOrder.selected}" />
       <CheckBox fx:id="saveTerDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="5" disabled="${!exportInSpecifiedOrder.selected}" />
@@ -40,4 +40,4 @@
       <Label text="Secondary sort criterion" GridPane.rowIndex="4" disabled="${!exportInSpecifiedOrder.selected}" />
       <Label text="Tertiary sort criterion" GridPane.rowIndex="5" disabled="${!exportInSpecifiedOrder.selected}"/>
    </children>
-</GridPane>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java
index e0a389d8c56..769a468f314 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java
@@ -1,14 +1,23 @@
 package org.jabref.gui;
 
+import javax.inject.Inject;
+
 import javafx.fxml.FXML;
+import javafx.scene.Node;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.ToggleGroup;
+import javafx.scene.layout.GridPane;
+
+import org.jabref.model.metadata.SaveOrderConfig;
+import org.jabref.preferences.PreferencesService;
 
-import org.jabref.model.metadata.MetaData;
+import com.airhacks.afterburner.views.ViewLoader;
 
-public class SaveOrderConfigDisplayView {
+public class SaveOrderConfigDisplayView extends GridPane {
+
+    private final SaveOrderConfig config;
 
     @FXML private ToggleGroup saveOrderToggleGroup;
     @FXML private ComboBox<String> savePriSort;
@@ -20,17 +29,23 @@ public class SaveOrderConfigDisplayView {
     @FXML private CheckBox savePriDesc;
     @FXML private CheckBox saveSecDesc;
     @FXML private CheckBox saveTerDesc;
+    @Inject private PreferencesService preferencesService;
+
     private SaveOrderConfigDisplayViewModel viewModel;
-    private final MetaData metadata;
 
-    public SaveOrderConfigDisplayView(MetaData metadata) {
-        this.metadata = metadata;
+    public SaveOrderConfigDisplayView(SaveOrderConfig config) {
+        this.config = config;
+
+        ViewLoader.view(this)
+                  .root(this)
+                  .controller(this)
+                  .load();
     }
 
     @FXML
     private void initialize() {
 
-        viewModel = new SaveOrderConfigDisplayViewModel(metadata);
+        viewModel = new SaveOrderConfigDisplayViewModel(config, preferencesService);
 
         exportInSpecifiedOrder.selectedProperty().bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
         exportInTableOrder.selectedProperty().bindBidirectional(viewModel.saveInTableOrderProperty());
@@ -53,4 +68,8 @@ private void initialize() {
     public void storeConfig() {
         viewModel.storeConfig();
     }
+
+    public Node getJFXPanel() {
+        return this;
+    }
 }
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
index 8ef3135afd3..1d251e78ba6 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
-import java.util.Optional;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -16,9 +15,9 @@
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.InternalBibtexFields;
-import org.jabref.model.metadata.MetaData;
 import org.jabref.model.metadata.SaveOrderConfig;
 import org.jabref.model.metadata.SaveOrderConfig.SortCriterion;
+import org.jabref.preferences.PreferencesService;
 
 public class SaveOrderConfigDisplayViewModel {
 
@@ -38,13 +37,14 @@ public class SaveOrderConfigDisplayViewModel {
     private final BooleanProperty saveInTableOrderProperty = new SimpleBooleanProperty();
     private final BooleanProperty saveInSpecifiedOrderProperty = new SimpleBooleanProperty();
 
-    private final MetaData metadata;
+    private final SaveOrderConfig config;
+    private final PreferencesService prefs;
 
-    public SaveOrderConfigDisplayViewModel(MetaData metaData) {
-        this.metadata = metaData;
-
-        Optional<SaveOrderConfig> storedSaveOrderConfig = metaData.getSaveOrderConfig();
+    public SaveOrderConfigDisplayViewModel(SaveOrderConfig config, PreferencesService prefs) {
+        this.config = config;
+        this.prefs = prefs;
 
+        SaveOrderConfig storedSaveOrderConfig = config;
         List<String> fieldNames = InternalBibtexFields.getAllPublicFieldNames();
         fieldNames.add(BibEntry.KEY_FIELD);
         Collections.sort(fieldNames);
@@ -52,6 +52,16 @@ public SaveOrderConfigDisplayViewModel(MetaData metaData) {
         priSortFieldsProperty.addAll(fieldNames);
         secSortFieldsProperty.addAll(fieldNames);
         terSortFieldsProperty.addAll(fieldNames);
+
+        if (config.saveInOriginalOrder()) {
+            saveInOriginalProperty.setValue(true);
+        } else if (config.saveInSpecifiedOrder()) {
+            saveInSpecifiedOrderProperty.setValue(true);
+        } else {
+            saveInTableOrderProperty.setValue(true);
+        }
+        setSaveOrderConfig(config);
+
     }
 
     public ListProperty<String> priSortFieldsProperty() {
@@ -67,13 +77,12 @@ public ListProperty<String> terSortFieldsProperty() {
     }
 
     public SaveOrderConfig getSaveOrderConfig() {
-        SaveOrderConfig saveOrderConfig = new SaveOrderConfig();
+
         SortCriterion primary = new SortCriterion(getSelectedItemAsLowerCaseTrim(savePriSortSelectedValueProperty), savePriDescPropertySelected.getValue());
-        saveOrderConfig.getSortCriteria().add(primary);
         SortCriterion secondary = new SortCriterion(getSelectedItemAsLowerCaseTrim(saveSecSortSelectedValueProperty), saveSecDescPropertySelected.getValue());
-        saveOrderConfig.getSortCriteria().add(secondary);
         SortCriterion tertiary = new SortCriterion(getSelectedItemAsLowerCaseTrim(saveTerSortSelectedValueProperty), saveTerDescPropertySelected.getValue());
-        saveOrderConfig.getSortCriteria().add(tertiary);
+
+        SaveOrderConfig saveOrderConfig = new SaveOrderConfig(saveInOriginalProperty.getValue(), primary, secondary, tertiary);
 
         return saveOrderConfig;
     }
@@ -87,6 +96,12 @@ public void setSaveOrderConfig(SaveOrderConfig saveOrderConfig) {
         saveSecDescPropertySelected.setValue(saveOrderConfig.getSortCriteria().get(1).descending);
         saveTerSortSelectedValueProperty.setValue(saveOrderConfig.getSortCriteria().get(2).field);
         saveTerDescPropertySelected.setValue(saveOrderConfig.getSortCriteria().get(2).descending);
+
+        if (saveInOriginalProperty.getValue()) {
+            saveOrderConfig.setSaveInOriginalOrder();
+        } else {
+            saveOrderConfig.setSaveInSpecifiedOrder();
+        }
     }
 
     private String getSelectedItemAsLowerCaseTrim(StringProperty string) {
@@ -118,7 +133,7 @@ public StringProperty saveTerSortSelectedValueProperty() {
     }
 
     public void storeConfig() {
-        metadata.setSaveOrderConfig(this.getSaveOrderConfig());
+        prefs.storeExportSaveOrder(this.getSaveOrderConfig());
     }
 
     public BooleanProperty saveInOriginalProperty() {
diff --git a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
index c567619ee61..f67fda34e81 100644
--- a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
@@ -1,17 +1,14 @@
 package org.jabref.gui.preferences;
 
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.RadioButton;
-import javafx.scene.control.Separator;
 import javafx.scene.control.ToggleGroup;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.shape.Line;
 
-import org.jabref.gui.SaveOrderConfigDisplay;
+import org.jabref.gui.SaveOrderConfigDisplayView;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
 
@@ -25,7 +22,7 @@ class ExportSortingPrefsTab extends Pane implements PrefsTab {
     private final RadioButton exportInOriginalOrder;
     private final RadioButton exportInTableOrder;
     private final RadioButton exportInSpecifiedOrder;
-    private final SaveOrderConfigDisplay exportOrderPanel;
+    private final SaveOrderConfigDisplayView exportOrderPanel;
     private final GridPane builder = new GridPane();
 
     public ExportSortingPrefsTab(JabRefPreferences prefs) {
@@ -41,28 +38,11 @@ public ExportSortingPrefsTab(JabRefPreferences prefs) {
         exportInTableOrder.setToggleGroup(group);
         exportInSpecifiedOrder.setToggleGroup(group);
 
-        exportOrderPanel = new SaveOrderConfigDisplay();
-
-        EventHandler<ActionEvent> listener = (event) -> {
-            boolean selected = event.getSource() == exportInSpecifiedOrder;
-            exportOrderPanel.setEnabled(selected);
-        };
-
-        exportInOriginalOrder.setOnAction(listener);
-        exportInTableOrder.setOnAction(listener);
-        exportInSpecifiedOrder.setOnAction(listener);
+        exportOrderPanel = new SaveOrderConfigDisplayView(prefs.loadExportSaveOrder());
 
         Label exportSortOrder = new Label(Localization.lang("Export sort order"));
         exportSortOrder.getStyleClass().add("sectionHeader");
         // create GUI
-        builder.add(exportSortOrder, 1, 1);
-        builder.add(new Separator(), 2, 1);
-        builder.add(exportInOriginalOrder, 1, 2);
-        builder.add(new Line(), 2, 3);
-        builder.add(exportInTableOrder, 1, 4);
-        builder.add(new Line(), 2, 5);
-        builder.add(exportInSpecifiedOrder, 1, 6);
-        builder.add(new Line(), 2, 7);
 
         builder.add(exportOrderPanel.getJFXPanel(), 1, 8);
         builder.add(new Line(), 2, 9);
@@ -76,25 +56,12 @@ public Node getBuilder() {
 
     @Override
     public void setValues() {
-        if (prefs.getBoolean(JabRefPreferences.EXPORT_IN_ORIGINAL_ORDER)) {
-            exportInOriginalOrder.setSelected(true);
-        } else if (prefs.getBoolean(JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER)) {
-            exportInSpecifiedOrder.setSelected(true);
-        } else {
-            exportInTableOrder.setSelected(true);
-        }
-
-        boolean selected = prefs.getBoolean(JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER);
-        exportOrderPanel.setEnabled(selected);
-        exportOrderPanel.setSaveOrderConfig(prefs.loadExportSaveOrder());
+
     }
 
     @Override
     public void storeSettings() {
-        prefs.putBoolean(JabRefPreferences.EXPORT_IN_ORIGINAL_ORDER, exportInOriginalOrder.isSelected());
-        prefs.putBoolean(JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER, exportInSpecifiedOrder.isSelected());
-
-        prefs.storeExportSaveOrder(exportOrderPanel.getSaveOrderConfig());
+        exportOrderPanel.storeConfig();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
new file mode 100644
index 00000000000..2e41e88e6c2
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.DialogPane?>
+
+
+<DialogPane prefHeight="514.0" prefWidth="818.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.PreferencesDialog" />
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
index 8881f6af654..1727658b210 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
@@ -5,6 +5,7 @@
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBar.ButtonData;
@@ -37,6 +38,7 @@
 import org.jabref.preferences.JabRefPreferences;
 import org.jabref.preferences.JabRefPreferencesFilter;
 
+import com.airhacks.afterburner.views.ViewLoader;
 import org.fxmisc.easybind.EasyBind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -62,6 +64,10 @@ public PreferencesDialog(JabRefFrame parent, TaskExecutor taskExecutor) {
         setTitle(Localization.lang("JabRef preferences"));
         getDialogPane().getScene().getStylesheets().add(this.getClass().getResource("PreferencesDialog.css").toExternalForm());
 
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
         ButtonType save = new ButtonType(Localization.lang("Save"), ButtonData.OK_DONE);
         getDialogPane().getButtonTypes().addAll(save, ButtonType.CANCEL);
         ControlHelper.setAction(save, getDialogPane(), event -> {
@@ -93,9 +99,15 @@ public PreferencesDialog(JabRefFrame parent, TaskExecutor taskExecutor) {
 
         container = new BorderPane();
         getDialogPane().setContent(container);
+
         construct();
     }
 
+    @FXML
+    private void initalize() {
+
+    }
+
     private void construct() {
         VBox vBox = new VBox();
         vBox.setPrefWidth(160);
@@ -112,8 +124,8 @@ private void construct() {
         });
         tabsList.getSelectionModel().selectFirst();
         new ViewModelListCellFactory<PrefsTab>()
-                .withText(PrefsTab::getTabName)
-                .install(tabsList);
+                                                .withText(PrefsTab::getTabName)
+                                                .install(tabsList);
 
         VBox buttonContainer = new VBox();
         buttonContainer.setAlignment(Pos.BOTTOM_LEFT);
@@ -133,37 +145,38 @@ private void construct() {
         resetPreferences.setOnAction(e -> resetPreferences());
         resetPreferences.setMaxWidth(Double.MAX_VALUE);
         buttonContainer.getChildren().addAll(
-                importPreferences,
-                exportPreferences,
-                showPreferences,
-                resetPreferences);
+                                             importPreferences,
+                                             exportPreferences,
+                                             showPreferences,
+                                             resetPreferences);
 
         VBox spacer = new VBox();
         spacer.setPrefHeight(10.0);
         VBox.setVgrow(tabsList, Priority.ALWAYS);
         VBox.setVgrow(spacer, Priority.SOMETIMES);
         vBox.getChildren().addAll(
-                tabsList,
-                spacer,
-                buttonContainer);
+                                  tabsList,
+                                  spacer,
+                                  buttonContainer);
 
         container.setLeft(vBox);
 
         setValues();
+
     }
 
     private void resetPreferences() {
         boolean resetPreferencesConfirmed = dialogService.showConfirmationDialogAndWait(
-                Localization.lang("Reset preferences"),
-                Localization.lang("Are you sure you want to reset all settings to default values?"),
-                Localization.lang("Reset preferences"),
-                Localization.lang("Cancel"));
+                                                                                        Localization.lang("Reset preferences"),
+                                                                                        Localization.lang("Are you sure you want to reset all settings to default values?"),
+                                                                                        Localization.lang("Reset preferences"),
+                                                                                        Localization.lang("Cancel"));
         if (resetPreferencesConfirmed) {
             try {
                 prefs.clear();
 
                 dialogService.showWarningDialogAndWait(Localization.lang("Reset preferences"),
-                        Localization.lang("You must restart JabRef for this to come into effect."));
+                                                       Localization.lang("You must restart JabRef for this to come into effect."));
             } catch (BackingStoreException ex) {
                 LOGGER.error("Error while resetting preferences", ex);
                 dialogService.showErrorDialogAndWait(Localization.lang("Reset preferences"), ex);
@@ -174,9 +187,9 @@ private void resetPreferences() {
 
     private void importPreferences() {
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.XML)
-                .withDefaultExtension(StandardFileType.XML)
-                .withInitialDirectory(prefs.setLastPreferencesExportPath()).build();
+                                                                                               .addExtensionFilter(StandardFileType.XML)
+                                                                                               .withDefaultExtension(StandardFileType.XML)
+                                                                                               .withInitialDirectory(prefs.setLastPreferencesExportPath()).build();
 
         dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> {
             try {
@@ -184,7 +197,7 @@ private void importPreferences() {
                 updateAfterPreferenceChanges();
 
                 dialogService.showWarningDialogAndWait(Localization.lang("Import preferences"),
-                        Localization.lang("You must restart JabRef for this to come into effect."));
+                                                       Localization.lang("You must restart JabRef for this to come into effect."));
             } catch (JabRefException ex) {
                 LOGGER.error("Error while importing preferences", ex);
                 dialogService.showErrorDialogAndWait(Localization.lang("Import preferences"), ex);
@@ -229,10 +242,10 @@ public void setValues() {
 
     private void exportPreferences() {
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.XML)
-                .withDefaultExtension(StandardFileType.XML)
-                .withInitialDirectory(prefs.setLastPreferencesExportPath())
-                .build();
+                                                                                               .addExtensionFilter(StandardFileType.XML)
+                                                                                               .withDefaultExtension(StandardFileType.XML)
+                                                                                               .withInitialDirectory(prefs.setLastPreferencesExportPath())
+                                                                                               .build();
 
         dialogService.showFileSaveDialog(fileDialogConfiguration)
                      .ifPresent(exportFile -> {
diff --git a/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java b/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java
index 63b43eb4d45..59fbfaa2d42 100644
--- a/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java
+++ b/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java
@@ -61,6 +61,10 @@ public boolean saveInOriginalOrder() {
         return saveInOriginalOrder;
     }
 
+    public boolean saveInSpecifiedOrder() {
+        return !saveInOriginalOrder;
+    }
+
     public LinkedList<SortCriterion> getSortCriteria() {
         return sortCriteria;
     }
@@ -85,8 +89,8 @@ public int hashCode() {
     @Override
     public String toString() {
         return "SaveOrderConfig{" + "saveInOriginalOrder=" + saveInOriginalOrder +
-                ", sortCriteria=" + sortCriteria +
-                '}';
+               ", sortCriteria=" + sortCriteria +
+               '}';
     }
 
     public void setSaveInOriginalOrder() {
@@ -139,8 +143,8 @@ public SortCriterion() {
         @Override
         public String toString() {
             return "SortCriterion{" + "field='" + field + '\'' +
-                    ", descending=" + descending +
-                    '}';
+                   ", descending=" + descending +
+                   '}';
         }
 
         @Override
@@ -153,7 +157,7 @@ public boolean equals(Object o) {
             }
             SortCriterion that = (SortCriterion) o;
             return Objects.equals(descending, that.descending) &&
-                    Objects.equals(field, that.field);
+                   Objects.equals(field, that.field);
         }
 
         @Override
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index b1235fabb37..3fa8e4f50b5 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -1706,6 +1706,7 @@ public void setRemotePreferences(RemotePreferences remotePreferences) {
         putBoolean(USE_REMOTE_SERVER, remotePreferences.useRemoteServer());
     }
 
+    @Override
     public void storeExportSaveOrder(SaveOrderConfig config) {
         putBoolean(EXPORT_PRIMARY_SORT_DESCENDING, config.getSortCriteria().get(0).descending);
         putBoolean(EXPORT_SECONDARY_SORT_DESCENDING, config.getSortCriteria().get(1).descending);
@@ -1728,6 +1729,7 @@ private SaveOrderConfig loadTableSaveOrder() {
         return config;
     }
 
+    @Override
     public SaveOrderConfig loadExportSaveOrder() {
         return new SaveOrderConfig(true,
                 new SaveOrderConfig.SortCriterion(get(EXPORT_PRIMARY_SORT_FIELD), getBoolean(EXPORT_PRIMARY_SORT_DESCENDING)),
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index 9f835c1b12c..e75f51f05f5 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -13,6 +13,7 @@
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.openoffice.OpenOfficePreferences;
 import org.jabref.model.metadata.FilePreferences;
+import org.jabref.model.metadata.SaveOrderConfig;
 
 public interface PreferencesService {
 
@@ -65,4 +66,8 @@ public interface PreferencesService {
     String getUser();
 
     void setExportWorkingDirectory(String layoutFileDirString);
+
+    SaveOrderConfig loadExportSaveOrder();
+
+    void storeExportSaveOrder(SaveOrderConfig config);
 }

From 20d6c05efa2fcbbeb19ec8acc2cf55e9bc73048a Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 25 Feb 2019 12:02:51 +0100
Subject: [PATCH 09/20] fix checkstyle

---
 .../gui/libraryproperties/LibraryPropertiesDialogViewModel.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
index d63dca01b96..2a5d538389c 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
@@ -85,7 +85,6 @@ public void browseGeneralDir() {
 
     public void browseUserDir() {
         dialogService.showDirectorySelectionDialog(directoryDialogConfiguration).ifPresent(dir -> userSpecificFileDirectoryProperty.setValue(dir.toAbsolutePath().toString()));
-
     }
 
     public BooleanProperty saveInOriginalProperty() {
@@ -100,7 +99,6 @@ public BooleanProperty libraryProtectedProperty() {
         return this.libraryProtectedProperty;
     }
 
-
     public boolean generalFileDirChanged() {
         return !oldGeneralFileDir.equals(generalFileDirectoryProperty.getValue());
     }

From 8db78c289922292cf0c8310c9dc99a772f1b66b4 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Wed, 27 Feb 2019 15:44:17 +0100
Subject: [PATCH 10/20] add missing controller and fix disable property

---
 src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
index f05d16e55ef..0bd01d6e05c 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<fx:root type="javafx.scene.layout.GridPane" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1">
+<fx:root type="javafx.scene.layout.GridPane" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.SaveOrderConfigDisplayView">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" prefWidth="100.0" />
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -33,9 +33,9 @@
       <RadioButton fx:id="exportInSpecifiedOrder" mnemonicParsing="false" prefHeight="5.0" prefWidth="206.0" text="%Export entries ordered as specified" GridPane.columnSpan="3" GridPane.rowIndex="2" toggleGroup="$saveOrderToggleGroup"/>
       <RadioButton fx:id="exportInTableOrder" mnemonicParsing="false" text="%Export in current table sort order" GridPane.columnSpan="3" GridPane.rowIndex="1" toggleGroup="$saveOrderToggleGroup"/>
       <RadioButton fx:id="exportInOriginalOrder" mnemonicParsing="false" text="%Export entries in their original order" GridPane.columnSpan="3" toggleGroup="$saveOrderToggleGroup"/>
-      <CheckBox fx:id="savePriDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="3" disabled="${!exportInSpecifiedOrder.selected}"/>
-      <CheckBox fx:id="saveSecDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="4" disabled="${!exportInSpecifiedOrder.selected}" />
-      <CheckBox fx:id="saveTerDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="5" disabled="${!exportInSpecifiedOrder.selected}" />
+      <CheckBox fx:id="savePriDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="3" disable="${!exportInSpecifiedOrder.selected}"/>
+      <CheckBox fx:id="saveSecDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="4" disable="${!exportInSpecifiedOrder.selected}" />
+      <CheckBox fx:id="saveTerDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="5" disable="${!exportInSpecifiedOrder.selected}" />
       <Label text="Primary sort criterion" GridPane.rowIndex="3" disabled="${!exportInSpecifiedOrder.selected}" />
       <Label text="Secondary sort criterion" GridPane.rowIndex="4" disabled="${!exportInSpecifiedOrder.selected}" />
       <Label text="Tertiary sort criterion" GridPane.rowIndex="5" disabled="${!exportInSpecifiedOrder.selected}"/>

From 760a6c29ed207fbd41ef96cc3f0ee2eff80ad795 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Fri, 1 Mar 2019 15:33:22 +0100
Subject: [PATCH 11/20] remove old save order config display replace library
 properties save order config by custom component refactor

---
 .../jabref/gui/SaveOrderConfigDisplay.java    | 108 ------------------
 .../gui/SaveOrderConfigDisplayView.java       |   6 +-
 .../gui/SaveOrderConfigDisplayViewModel.java  |   4 +-
 .../LibraryPropertiesDialog.fxml              |  13 +--
 .../LibraryPropertiesDialogView.java          |  87 ++++----------
 .../LibraryPropertiesDialogViewModel.java     |  28 +++--
 .../preferences/ExportSortingPrefsTab.java    |   3 -
 7 files changed, 45 insertions(+), 204 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java

diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java
deleted file mode 100644
index 3093585f3e8..00000000000
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.jabref.gui;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-
-import javafx.collections.FXCollections;
-import javafx.scene.Node;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.Label;
-import javafx.scene.layout.GridPane;
-
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.InternalBibtexFields;
-import org.jabref.model.metadata.SaveOrderConfig;
-import org.jabref.model.metadata.SaveOrderConfig.SortCriterion;
-
-public class SaveOrderConfigDisplay {
-
-    private GridPane panel;
-    private ComboBox<String> savePriSort;
-    private ComboBox<String> saveSecSort;
-    private ComboBox<String> saveTerSort;
-    private CheckBox savePriDesc;
-    private CheckBox saveSecDesc;
-    private CheckBox saveTerDesc;
-
-
-    public SaveOrderConfigDisplay() {
-        init();
-    }
-
-    private void init() {
-        List<String> fieldNames = InternalBibtexFields.getAllPublicFieldNames();
-        fieldNames.add(BibEntry.KEY_FIELD);
-        Collections.sort(fieldNames);
-        savePriSort = new ComboBox<>(FXCollections.observableArrayList(fieldNames));
-        savePriSort.setEditable(true);
-        saveSecSort = new ComboBox<>(FXCollections.observableArrayList(fieldNames));
-        saveSecSort.setEditable(true);
-        saveTerSort = new ComboBox<>(FXCollections.observableArrayList(fieldNames));
-        saveTerSort.setEditable(true);
-
-        savePriDesc = new CheckBox(Localization.lang("Descending"));
-        saveSecDesc = new CheckBox(Localization.lang("Descending"));
-        saveTerDesc = new CheckBox(Localization.lang("Descending"));
-
-        GridPane builder = new GridPane();
-        Label primarySortCriterion = new Label(Localization.lang("Primary sort criterion"));
-        builder.add(primarySortCriterion, 1, 1);
-        builder.add(savePriSort, 2, 1);
-        builder.add(savePriDesc, 3, 1);
-
-        Label secondarySortCriterion = new Label(Localization.lang("Secondary sort criterion"));
-        builder.add(secondarySortCriterion, 1, 2);
-        builder.add(saveSecSort, 2, 2);
-        builder.add(saveSecDesc, 3, 2);
-
-        Label tertiarySortCriterion = new Label(Localization.lang("Tertiary sort criterion"));
-        builder.add(tertiarySortCriterion, 1, 3);
-        builder.add(saveTerSort, 2, 3);
-        builder.add(saveTerDesc, 3, 3);
-        panel = builder;
-    }
-
-    public Node getJFXPanel() {
-        return panel;
-    }
-
-    public void setEnabled(boolean enabled) {
-        savePriSort.setDisable(!enabled);
-        savePriDesc.setDisable(!enabled);
-        saveSecSort.setDisable(!enabled);
-        saveSecDesc.setDisable(!enabled);
-        saveTerSort.setDisable(!enabled);
-        saveTerDesc.setDisable(!enabled);
-    }
-
-    public SaveOrderConfig getSaveOrderConfig() {
-        SaveOrderConfig saveOrderConfig = new SaveOrderConfig();
-        SortCriterion primary = new SortCriterion(getSelectedItemAsLowerCaseTrim(savePriSort), savePriDesc.isSelected());
-        saveOrderConfig.getSortCriteria().add(primary);
-        SortCriterion secondary = new SortCriterion(getSelectedItemAsLowerCaseTrim(saveSecSort), saveSecDesc.isSelected());
-        saveOrderConfig.getSortCriteria().add(secondary);
-        SortCriterion tertiary = new SortCriterion(getSelectedItemAsLowerCaseTrim(saveTerSort), saveTerDesc.isSelected());
-        saveOrderConfig.getSortCriteria().add(tertiary);
-
-        return saveOrderConfig;
-    }
-
-    public void setSaveOrderConfig(SaveOrderConfig saveOrderConfig) {
-        Objects.requireNonNull(saveOrderConfig);
-
-        savePriSort.setValue(saveOrderConfig.getSortCriteria().get(0).field);
-        savePriDesc.setSelected(saveOrderConfig.getSortCriteria().get(0).descending);
-        saveSecSort.setValue(saveOrderConfig.getSortCriteria().get(1).field);
-        saveSecDesc.setSelected(saveOrderConfig.getSortCriteria().get(1).descending);
-        saveTerSort.setValue(saveOrderConfig.getSortCriteria().get(2).field);
-        saveTerDesc.setSelected(saveOrderConfig.getSortCriteria().get(2).descending);
-    }
-
-    private String getSelectedItemAsLowerCaseTrim(ComboBox<String> sortBox) {
-        return sortBox.getValue().toLowerCase(Locale.ROOT).trim();
-    }
-}
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java
index 769a468f314..2f0e36ca318 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java
@@ -66,7 +66,11 @@ private void initialize() {
     }
 
     public void storeConfig() {
-        viewModel.storeConfig();
+        viewModel.storeConfigInPrefs();
+    }
+
+    public SaveOrderConfig getSaveOrderConfig() {
+        return viewModel.getSaveOrderConfig();
     }
 
     public Node getJFXPanel() {
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
index 1d251e78ba6..08e9db6df75 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
@@ -44,7 +44,6 @@ public SaveOrderConfigDisplayViewModel(SaveOrderConfig config, PreferencesServic
         this.config = config;
         this.prefs = prefs;
 
-        SaveOrderConfig storedSaveOrderConfig = config;
         List<String> fieldNames = InternalBibtexFields.getAllPublicFieldNames();
         fieldNames.add(BibEntry.KEY_FIELD);
         Collections.sort(fieldNames);
@@ -132,7 +131,7 @@ public StringProperty saveTerSortSelectedValueProperty() {
         return saveTerSortSelectedValueProperty;
     }
 
-    public void storeConfig() {
+    public void storeConfigInPrefs() {
         prefs.storeExportSaveOrder(this.getSaveOrderConfig());
     }
 
@@ -147,5 +146,4 @@ public BooleanProperty saveInTableOrderProperty() {
     public BooleanProperty saveInSpecifiedOrderProperty() {
         return this.saveInSpecifiedOrderProperty;
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
index d69795354af..f4db88618a9 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
@@ -7,10 +7,8 @@
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.DialogPane?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.RadioButton?>
 <?import javafx.scene.control.Separator?>
 <?import javafx.scene.control.TextField?>
-<?import javafx.scene.control.ToggleGroup?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
@@ -19,7 +17,7 @@
 
 <DialogPane minHeight="-Infinity" prefHeight="784.0" prefWidth="921.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.libraryproperties.LibraryPropertiesDialogView">
    <content>
-      <VBox fx:id="contentVbox" minHeight="-Infinity" prefHeight="200.0" prefWidth="100.0">
+      <VBox fx:id="contentVbox" prefHeight="200.0" prefWidth="100.0">
          <children>
             <GridPane minHeight="-Infinity">
               <columnConstraints>
@@ -60,15 +58,6 @@
                   </HBox>
                </children>
             </GridPane>
-            <VBox fx:id="saveOrdervbox" minHeight="-Infinity">
-               <fx:define>
-                 <ToggleGroup fx:id="saveOrderToggleGroup" />
-               </fx:define>
-               <children>
-                  <RadioButton fx:id="saveInOriginalOrder" mnemonicParsing="false" text="%Save entries in their original order" toggleGroup="$saveOrderToggleGroup" />
-                  <RadioButton fx:id="saveInSpecifiedOrder" mnemonicParsing="false" text="%Save entries ordered as specified" toggleGroup="$saveOrderToggleGroup" />
-               </children>
-            </VBox>
             <HBox alignment="CENTER" prefHeight="50.0" prefWidth="200.0">
                <children>
                   <Label alignment="TOP_LEFT" text="%Library protection" />
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
index e14bf7b6f49..55dd64e57c6 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
@@ -11,19 +11,16 @@
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
-import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
-import javafx.scene.control.ToggleGroup;
 import javafx.scene.layout.VBox;
 
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
-import org.jabref.gui.SaveOrderConfigDisplay;
+import org.jabref.gui.SaveOrderConfigDisplayView;
 import org.jabref.gui.cleanup.FieldFormatterCleanupsPanel;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.logic.cleanup.Cleanups;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.shared.DatabaseLocation;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.metadata.SaveOrderConfig;
 import org.jabref.preferences.PreferencesService;
@@ -38,18 +35,15 @@ public class LibraryPropertiesDialogView extends BaseDialog<Void> {
     @FXML private Button browseGeneralFileDir;
     @FXML private TextField userSpecificFileDirectory;
     @FXML private Button browseUserSpefiicFileDir;
-    @FXML private VBox saveOrdervbox;
-    @FXML private ToggleGroup saveOrderToggleGroup;
-    @FXML private RadioButton saveInOriginalOrder;
-    @FXML private RadioButton saveInSpecifiedOrder;
     @FXML private CheckBox protect;
-    private SaveOrderConfigDisplay saveOrderPanel;
+    @Inject private PreferencesService preferencesService;
+
     private BasePanel panel;
     private LibraryPropertiesDialogViewModel viewModel;
     private final DialogService dialogService;
-    @Inject private PreferencesService preferencesService;
     private FieldFormatterCleanupsPanel fieldFormatterCleanupsPanel;
-    private Object oldSaveOrderConfig;
+    private SaveOrderConfigDisplayView saveOrderConfigDisplayView;
+    private SaveOrderConfig oldSaveOrderConfig;
 
     public LibraryPropertiesDialogView(BasePanel panel, DialogService dialogService) {
         this.dialogService = dialogService;
@@ -78,58 +72,31 @@ private void initialize() {
 
         encoding.itemsProperty().bind(viewModel.encodingsProperty());
         encoding.valueProperty().bindBidirectional(viewModel.selectedEncodingProperty());
-        saveOrderPanel = new SaveOrderConfigDisplay();
-        saveOrdervbox.getChildren().add(saveOrderPanel.getJFXPanel());
+        encoding.disableProperty().bind(viewModel.encodingDisableProperty());
+        protect.disableProperty().bind(viewModel.protectDisableProperty());
+
+        Optional<SaveOrderConfig> storedSaveOrderConfig = panel.getBibDatabaseContext().getMetaData().getSaveOrderConfig();
+        if (storedSaveOrderConfig.isPresent()) {
+            saveOrderConfigDisplayView = new SaveOrderConfigDisplayView(storedSaveOrderConfig.get());
+            oldSaveOrderConfig = storedSaveOrderConfig.get();
+        } else {
+            oldSaveOrderConfig = preferencesService.loadExportSaveOrder();
+            saveOrderConfigDisplayView = new SaveOrderConfigDisplayView(preferencesService.loadExportSaveOrder());
+        }
+
         fieldFormatterCleanupsPanel = new FieldFormatterCleanupsPanel(Localization.lang("Enable save actions"),
                                                                       Cleanups.DEFAULT_SAVE_ACTIONS);
-
-        contentVbox.getChildren().add(fieldFormatterCleanupsPanel);
-        saveInOriginalOrder.selectedProperty().bindBidirectional(viewModel.saveInOriginalProperty());
-        saveInSpecifiedOrder.selectedProperty().bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
+        contentVbox.getChildren().addAll(saveOrderConfigDisplayView, fieldFormatterCleanupsPanel);
 
         protect.selectedProperty().bindBidirectional(viewModel.libraryProtectedProperty());
-        saveOrderPanel.getJFXPanel().disableProperty().bind(viewModel.saveInOriginalProperty());
 
         setValues();
-        updateEnableStatus();
     }
 
     private void setValues() {
-
-        Optional<SaveOrderConfig> storedSaveOrderConfig = panel.getBibDatabaseContext().getMetaData().getSaveOrderConfig();
-        boolean selected;
-        if (!storedSaveOrderConfig.isPresent()) {
-            viewModel.saveInOriginalProperty().setValue(true);
-            oldSaveOrderConfig = SaveOrderConfig.getDefaultSaveOrder();
-            selected = false;
-        } else {
-            SaveOrderConfig saveOrderConfig = storedSaveOrderConfig.get();
-            oldSaveOrderConfig = saveOrderConfig;
-            if (saveOrderConfig.saveInOriginalOrder()) {
-                viewModel.saveInOriginalProperty().setValue(true);
-                selected = false;
-            } else {
-                viewModel.saveInSpecifiedOrderProperty().setValue(true);
-                selected = true;
-            }
-            saveOrderPanel.setSaveOrderConfig(saveOrderConfig);
-
-        }
-        saveOrderPanel.setEnabled(selected);
-
         fieldFormatterCleanupsPanel.setValues(panel.getBibDatabaseContext().getMetaData());
     }
 
-    public void updateEnableStatus() {
-        DatabaseLocation location = panel.getBibDatabaseContext().getLocation();
-        boolean isShared = (location == DatabaseLocation.SHARED);
-        encoding.setDisable(isShared); // the encoding of shared database is always UTF-8
-        saveInOriginalOrder.setDisable(isShared);
-        saveInSpecifiedOrder.setDisable(isShared);
-        saveOrderPanel.setEnabled(!isShared);
-        protect.setDisable(isShared);
-    }
-
     @FXML
     public void browseGeneralFileDirectory(ActionEvent event) {
         viewModel.browseGeneralDir();
@@ -167,9 +134,9 @@ private void storeSettings() {
             metaData.markAsNotProtected();
         }
 
-        SaveOrderConfig newSaveOrderConfig = getNewSaveOrderConfig();
+        SaveOrderConfig newSaveOrderConfig = saveOrderConfigDisplayView.getSaveOrderConfig();
 
-        boolean saveOrderConfigChanged = !getNewSaveOrderConfig().equals(oldSaveOrderConfig);
+        boolean saveOrderConfigChanged = !newSaveOrderConfig.equals(oldSaveOrderConfig);
 
         // See if any of the values have been modified:
         if (saveOrderConfigChanged) {
@@ -188,8 +155,9 @@ private void storeSettings() {
                 fieldFormatterCleanupsPanel.storeSettings(metaData);
             }
         }
+        boolean encodingChanged = !newEncoding.equals(oldEncoding);
 
-        boolean changed = saveOrderConfigChanged || !newEncoding.equals(oldEncoding)
+        boolean changed = saveOrderConfigChanged || encodingChanged
                           || viewModel.generalFileDirChanged() || viewModel.userFileDirChanged()
                           || viewModel.protectedValueChanged() || saveActionsChanged;
         // ... if so, mark base changed. Prevent the Undo button from removing
@@ -199,15 +167,4 @@ private void storeSettings() {
         }
     }
 
-    private SaveOrderConfig getNewSaveOrderConfig() {
-        SaveOrderConfig saveOrderConfig = null;
-        if (saveInOriginalOrder.isSelected()) {
-            saveOrderConfig = SaveOrderConfig.getDefaultSaveOrder();
-        } else {
-            saveOrderConfig = saveOrderPanel.getSaveOrderConfig();
-            saveOrderConfig.setSaveInSpecifiedOrder();
-        }
-        return saveOrderConfig;
-    }
-
 }
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
index 2a5d538389c..03aa19a1714 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
@@ -17,6 +17,7 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.logic.l10n.Encodings;
+import org.jabref.model.database.shared.DatabaseLocation;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.PreferencesService;
 
@@ -26,14 +27,13 @@ public class LibraryPropertiesDialogViewModel {
     private final StringProperty userSpecificFileDirectoryProperty = new SimpleStringProperty("");
     private final ListProperty<Charset> encodingsProperty = new SimpleListProperty<>(FXCollections.observableArrayList(Encodings.getCharsets()));
     private final ObjectProperty<Charset> selectedEncodingPropety = new SimpleObjectProperty<>(Encodings.getCharsets().get(0));
-    private final BooleanProperty saveInOriginalProperty = new SimpleBooleanProperty();
-    private final BooleanProperty saveInSpecifiedOrderProperty = new SimpleBooleanProperty();
     private final BooleanProperty libraryProtectedProperty = new SimpleBooleanProperty();
+    private final BooleanProperty encodingDisableProperty = new SimpleBooleanProperty();
+    private final BooleanProperty protectDisableProperty = new SimpleBooleanProperty();
 
     private final DialogService dialogService;
     private final DirectoryDialogConfiguration directoryDialogConfiguration;
     private final MetaData metaData;
-    private final PreferencesService preferencesService;
 
     private final String oldUserSpecificFileDir;
     private final String oldGeneralFileDir;
@@ -42,7 +42,11 @@ public class LibraryPropertiesDialogViewModel {
     public LibraryPropertiesDialogViewModel(BasePanel panel, DialogService dialogService, PreferencesService preferencesService) {
         this.dialogService = dialogService;
         this.metaData = panel.getBibDatabaseContext().getMetaData();
-        this.preferencesService = preferencesService;
+
+        DatabaseLocation location = panel.getBibDatabaseContext().getLocation();
+        boolean isShared = (location == DatabaseLocation.SHARED);
+        encodingDisableProperty.setValue(isShared); // the encoding of shared database is always UTF-8
+        protectDisableProperty.setValue(isShared);
 
         directoryDialogConfiguration = new DirectoryDialogConfiguration.Builder()
                                                                                  .withInitialDirectory(preferencesService.getWorkingDir()).build();
@@ -87,14 +91,6 @@ public void browseUserDir() {
         dialogService.showDirectorySelectionDialog(directoryDialogConfiguration).ifPresent(dir -> userSpecificFileDirectoryProperty.setValue(dir.toAbsolutePath().toString()));
     }
 
-    public BooleanProperty saveInOriginalProperty() {
-        return this.saveInOriginalProperty;
-    }
-
-    public BooleanProperty saveInSpecifiedOrderProperty() {
-        return this.saveInSpecifiedOrderProperty;
-    }
-
     public BooleanProperty libraryProtectedProperty() {
         return this.libraryProtectedProperty;
     }
@@ -110,4 +106,12 @@ public boolean userFileDirChanged() {
     public boolean protectedValueChanged() {
         return !oldLibraryProtected == libraryProtectedProperty.getValue();
     }
+
+    public BooleanProperty encodingDisableProperty() {
+        return encodingDisableProperty;
+    }
+
+    public BooleanProperty protectDisableProperty() {
+        return protectDisableProperty;
+    }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
index f67fda34e81..0b466334ea0 100644
--- a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
@@ -17,8 +17,6 @@
  */
 class ExportSortingPrefsTab extends Pane implements PrefsTab {
 
-    private final JabRefPreferences prefs;
-
     private final RadioButton exportInOriginalOrder;
     private final RadioButton exportInTableOrder;
     private final RadioButton exportInSpecifiedOrder;
@@ -26,7 +24,6 @@ class ExportSortingPrefsTab extends Pane implements PrefsTab {
     private final GridPane builder = new GridPane();
 
     public ExportSortingPrefsTab(JabRefPreferences prefs) {
-        this.prefs = prefs;
         // EXPORT SORT ORDER
         // create Components
         exportInOriginalOrder = new RadioButton(Localization.lang("Export entries in their original order"));

From 28d3f56e022d7d0cc55590bdeba7e23682280d4b Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Fri, 1 Mar 2019 17:38:25 +0100
Subject: [PATCH 12/20] some layout stuff add css section header remove some
 old stuff

---
 src/main/java/org/jabref/gui/Base.css         |  2 +-
 .../jabref/gui/SaveOrderConfigDisplay.fxml    | 12 ++--
 .../LibraryPropertiesDialog.css               |  4 ++
 .../LibraryPropertiesDialog.fxml              | 65 +++----------------
 .../LibraryPropertiesDialogView.java          |  6 +-
 .../preferences/ExportSortingPrefsTab.java    | 22 -------
 6 files changed, 26 insertions(+), 85 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.css

diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index 831b549f943..ab4097899cc 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -818,7 +818,7 @@
 
 .separator:horizontal .line {
     -fx-border-color: -jr-separator;
-    -fx-border-width: 0.5;
+    -fx-border-width: 0;
     -fx-border-insets: 1 0 0 0;
 }
 
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
index 0bd01d6e05c..b54c0564a5e 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
@@ -33,11 +33,11 @@
       <RadioButton fx:id="exportInSpecifiedOrder" mnemonicParsing="false" prefHeight="5.0" prefWidth="206.0" text="%Export entries ordered as specified" GridPane.columnSpan="3" GridPane.rowIndex="2" toggleGroup="$saveOrderToggleGroup"/>
       <RadioButton fx:id="exportInTableOrder" mnemonicParsing="false" text="%Export in current table sort order" GridPane.columnSpan="3" GridPane.rowIndex="1" toggleGroup="$saveOrderToggleGroup"/>
       <RadioButton fx:id="exportInOriginalOrder" mnemonicParsing="false" text="%Export entries in their original order" GridPane.columnSpan="3" toggleGroup="$saveOrderToggleGroup"/>
-      <CheckBox fx:id="savePriDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="3" disable="${!exportInSpecifiedOrder.selected}"/>
-      <CheckBox fx:id="saveSecDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="4" disable="${!exportInSpecifiedOrder.selected}" />
-      <CheckBox fx:id="saveTerDesc" mnemonicParsing="false" text="Descending" GridPane.columnIndex="2" GridPane.rowIndex="5" disable="${!exportInSpecifiedOrder.selected}" />
-      <Label text="Primary sort criterion" GridPane.rowIndex="3" disabled="${!exportInSpecifiedOrder.selected}" />
-      <Label text="Secondary sort criterion" GridPane.rowIndex="4" disabled="${!exportInSpecifiedOrder.selected}" />
-      <Label text="Tertiary sort criterion" GridPane.rowIndex="5" disabled="${!exportInSpecifiedOrder.selected}"/>
+      <CheckBox fx:id="savePriDesc" mnemonicParsing="false" text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="3" disable="${!exportInSpecifiedOrder.selected}"/>
+      <CheckBox fx:id="saveSecDesc" mnemonicParsing="false" text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="4" disable="${!exportInSpecifiedOrder.selected}" />
+      <CheckBox fx:id="saveTerDesc" mnemonicParsing="false" text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="5" disable="${!exportInSpecifiedOrder.selected}" />
+      <Label text="%Primary sort criterion" GridPane.rowIndex="3" disabled="${!exportInSpecifiedOrder.selected}" />
+      <Label text="%Secondary sort criterion" GridPane.rowIndex="4" disabled="${!exportInSpecifiedOrder.selected}" />
+      <Label text="%Tertiary sort criterion" GridPane.rowIndex="5" disabled="${!exportInSpecifiedOrder.selected}"/>
    </children>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.css b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.css
new file mode 100644
index 00000000000..6377d4e01ba
--- /dev/null
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.css
@@ -0,0 +1,4 @@
+.sectionHeader {
+    -fx-font-size: 1.5em;
+    -fx-padding: 1em 0em 1em 0em;
+}
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
index f4db88618a9..980e13f0560 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonType?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.DialogPane?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Separator?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 
 <DialogPane minHeight="-Infinity" prefHeight="784.0" prefWidth="921.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.libraryproperties.LibraryPropertiesDialogView">
    <content>
-      <VBox fx:id="contentVbox" prefHeight="200.0" prefWidth="100.0">
+      <VBox fx:id="contentVbox" minHeight="-Infinity" prefHeight="200.0" prefWidth="100.0">
          <children>
             <GridPane minHeight="-Infinity">
               <columnConstraints>
@@ -27,9 +24,12 @@
               </columnConstraints>
               <rowConstraints>
                 <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="-Infinity" prefHeight="50.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="ALWAYS" />
                   <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="-Infinity" prefHeight="50.0" vgrow="ALWAYS" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="-Infinity" prefHeight="50.0" vgrow="SOMETIMES" />
               </rowConstraints>
                <children>
                   <Label text="%Library encoding" />
@@ -40,57 +40,12 @@
                   <Label text="%User-specific file directory" GridPane.rowIndex="3" />
                   <TextField fx:id="userSpecificFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="3" />
                   <Button fx:id="browseUserSpefiicFileDir" mnemonicParsing="false" onAction="#browseUserSpecificFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-                  <HBox alignment="CENTER" prefHeight="50.0" prefWidth="200.0" GridPane.columnSpan="3" GridPane.rowIndex="1">
-                     <children>
-                        <Label alignment="TOP_LEFT" text="%Override default file directories" />
-                        <Separator halignment="LEFT" valignment="BOTTOM" HBox.hgrow="ALWAYS">
-                           <opaqueInsets>
-                              <Insets left="10.0" right="10.0" top="10.0" />
-                           </opaqueInsets>
-                           <HBox.margin>
-                              <Insets />
-                           </HBox.margin>
-                           <padding>
-                              <Insets left="10.0" />
-                           </padding>
-                        </Separator>
-                     </children>
-                  </HBox>
+                  <Label alignment="TOP_LEFT" styleClass="sectionHeader" text="%Override default file directories" GridPane.columnSpan="3" GridPane.rowIndex="1" />
+                  <Label alignment="TOP_LEFT" styleClass="sectionHeader" text="%Library protection" GridPane.columnSpan="3" GridPane.rowIndex="4" />
+                  <CheckBox fx:id="protect" mnemonicParsing="false" text="%Refuse to save the library before external changes have been reviewed." GridPane.columnSpan="3" GridPane.rowIndex="5" />
+                  <Label styleClass="sectionHeader" text="%Export sort order" GridPane.rowIndex="6" />
                </children>
             </GridPane>
-            <HBox alignment="CENTER" prefHeight="50.0" prefWidth="200.0">
-               <children>
-                  <Label alignment="TOP_LEFT" text="%Library protection" />
-                  <Separator halignment="LEFT" valignment="BOTTOM" HBox.hgrow="ALWAYS">
-                     <opaqueInsets>
-                        <Insets left="10.0" right="10.0" top="10.0" />
-                     </opaqueInsets>
-                     <HBox.margin>
-                        <Insets />
-                     </HBox.margin>
-                     <padding>
-                        <Insets left="10.0" />
-                     </padding>
-                  </Separator>
-               </children>
-            </HBox>
-            <CheckBox fx:id="protect" mnemonicParsing="false" text="%Refuse to save the library before external changes have been reviewed." />
-            <HBox alignment="CENTER" prefHeight="50.0" prefWidth="200.0">
-               <children>
-                  <Label alignment="TOP_LEFT" text="%Save actions" />
-                  <Separator halignment="LEFT" valignment="BOTTOM" HBox.hgrow="ALWAYS">
-                     <opaqueInsets>
-                        <Insets left="10.0" right="10.0" top="10.0" />
-                     </opaqueInsets>
-                     <HBox.margin>
-                        <Insets />
-                     </HBox.margin>
-                     <padding>
-                        <Insets left="10.0" />
-                     </padding>
-                  </Separator>
-               </children>
-            </HBox>
          </children>
       </VBox>
    </content>
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
index 55dd64e57c6..9f241d4409d 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
@@ -11,6 +11,7 @@
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.VBox;
 
@@ -86,7 +87,10 @@ private void initialize() {
 
         fieldFormatterCleanupsPanel = new FieldFormatterCleanupsPanel(Localization.lang("Enable save actions"),
                                                                       Cleanups.DEFAULT_SAVE_ACTIONS);
-        contentVbox.getChildren().addAll(saveOrderConfigDisplayView, fieldFormatterCleanupsPanel);
+        Label saveActions = new Label(Localization.lang("Save actions"));
+        saveActions.getStyleClass().add("sectionHeader");
+
+        contentVbox.getChildren().addAll(saveOrderConfigDisplayView, saveActions, fieldFormatterCleanupsPanel);
 
         protect.selectedProperty().bindBidirectional(viewModel.libraryProtectedProperty());
 
diff --git a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
index 0b466334ea0..d6482f567ce 100644
--- a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
@@ -1,9 +1,6 @@
 package org.jabref.gui.preferences;
 
 import javafx.scene.Node;
-import javafx.scene.control.Label;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.ToggleGroup;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.shape.Line;
@@ -17,33 +14,14 @@
  */
 class ExportSortingPrefsTab extends Pane implements PrefsTab {
 
-    private final RadioButton exportInOriginalOrder;
-    private final RadioButton exportInTableOrder;
-    private final RadioButton exportInSpecifiedOrder;
     private final SaveOrderConfigDisplayView exportOrderPanel;
     private final GridPane builder = new GridPane();
 
     public ExportSortingPrefsTab(JabRefPreferences prefs) {
-        // EXPORT SORT ORDER
-        // create Components
-        exportInOriginalOrder = new RadioButton(Localization.lang("Export entries in their original order"));
-        exportInTableOrder = new RadioButton(Localization.lang("Export in current table sort order"));
-        exportInSpecifiedOrder = new RadioButton(Localization.lang("Export entries ordered as specified"));
-
-        final ToggleGroup group = new ToggleGroup();
-        exportInOriginalOrder.setToggleGroup(group);
-        exportInTableOrder.setToggleGroup(group);
-        exportInSpecifiedOrder.setToggleGroup(group);
-
         exportOrderPanel = new SaveOrderConfigDisplayView(prefs.loadExportSaveOrder());
 
-        Label exportSortOrder = new Label(Localization.lang("Export sort order"));
-        exportSortOrder.getStyleClass().add("sectionHeader");
-        // create GUI
-
         builder.add(exportOrderPanel.getJFXPanel(), 1, 8);
         builder.add(new Line(), 2, 9);
-
     }
 
     @Override

From 1a05b8fb3d110b27b9c87e10fb99948ba7f9bc52 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Fri, 1 Mar 2019 17:49:55 +0100
Subject: [PATCH 13/20] reduce sizes still no effect

---
 .../jabref/gui/SaveOrderConfigDisplay.fxml    | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
index b54c0564a5e..13832fb7b0d 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
@@ -9,19 +9,19 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<fx:root type="javafx.scene.layout.GridPane" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.SaveOrderConfigDisplayView">
+<fx:root prefHeight="200.0" prefWidth="600.0" type="javafx.scene.layout.GridPane" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.SaveOrderConfigDisplayView">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" prefWidth="100.0" />
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
       <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
   </columnConstraints>
   <rowConstraints>
-    <RowConstraints minHeight="-Infinity" prefHeight="30.0" />
-    <RowConstraints minHeight="-Infinity" prefHeight="30.0" />
-      <RowConstraints minHeight="-Infinity" prefHeight="30.0" />
-      <RowConstraints minHeight="-Infinity" prefHeight="30.0" />
-      <RowConstraints minHeight="-Infinity" prefHeight="30.0" />
-      <RowConstraints minHeight="-Infinity" prefHeight="30.0" />
+    <RowConstraints prefHeight="30.0" />
+    <RowConstraints prefHeight="30.0" />
+      <RowConstraints prefHeight="30.0" />
+      <RowConstraints prefHeight="30.0" />
+      <RowConstraints prefHeight="30.0" />
+      <RowConstraints prefHeight="30.0" />
   </rowConstraints>
      <fx:define>
        <ToggleGroup fx:id="saveOrderToggleGroup" />
@@ -30,14 +30,17 @@
       <ComboBox fx:id="savePriSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
       <ComboBox fx:id="saveSecSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="4" />
       <ComboBox fx:id="saveTerSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="5" />
-      <RadioButton fx:id="exportInSpecifiedOrder" mnemonicParsing="false" prefHeight="5.0" prefWidth="206.0" text="%Export entries ordered as specified" GridPane.columnSpan="3" GridPane.rowIndex="2" toggleGroup="$saveOrderToggleGroup"/>
-      <RadioButton fx:id="exportInTableOrder" mnemonicParsing="false" text="%Export in current table sort order" GridPane.columnSpan="3" GridPane.rowIndex="1" toggleGroup="$saveOrderToggleGroup"/>
-      <RadioButton fx:id="exportInOriginalOrder" mnemonicParsing="false" text="%Export entries in their original order" GridPane.columnSpan="3" toggleGroup="$saveOrderToggleGroup"/>
-      <CheckBox fx:id="savePriDesc" mnemonicParsing="false" text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="3" disable="${!exportInSpecifiedOrder.selected}"/>
-      <CheckBox fx:id="saveSecDesc" mnemonicParsing="false" text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="4" disable="${!exportInSpecifiedOrder.selected}" />
-      <CheckBox fx:id="saveTerDesc" mnemonicParsing="false" text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="5" disable="${!exportInSpecifiedOrder.selected}" />
-      <Label text="%Primary sort criterion" GridPane.rowIndex="3" disabled="${!exportInSpecifiedOrder.selected}" />
-      <Label text="%Secondary sort criterion" GridPane.rowIndex="4" disabled="${!exportInSpecifiedOrder.selected}" />
-      <Label text="%Tertiary sort criterion" GridPane.rowIndex="5" disabled="${!exportInSpecifiedOrder.selected}"/>
+      <RadioButton fx:id="exportInSpecifiedOrder" mnemonicParsing="false" prefHeight="5.0" prefWidth="206.0" text="%Export entries ordered as specified" GridPane.columnSpan="3" GridPane.rowIndex="2">
+         <toggleGroup>
+            <ToggleGroup fx:id="saveOrderToggleGroup" />
+         </toggleGroup></RadioButton>
+      <RadioButton fx:id="exportInTableOrder" mnemonicParsing="false" text="%Export in current table sort order" toggleGroup="$saveOrderToggleGroup" GridPane.columnSpan="3" GridPane.rowIndex="1" />
+      <RadioButton fx:id="exportInOriginalOrder" mnemonicParsing="false" text="%Export entries in their original order" toggleGroup="$saveOrderToggleGroup" GridPane.columnSpan="3" />
+      <CheckBox fx:id="savePriDesc" disable="${!exportInSpecifiedOrder.selected}" mnemonicParsing="false" text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+      <CheckBox fx:id="saveSecDesc" disable="${!exportInSpecifiedOrder.selected}" mnemonicParsing="false" text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+      <CheckBox fx:id="saveTerDesc" disable="${!exportInSpecifiedOrder.selected}" mnemonicParsing="false" text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+      <Label disabled="${!exportInSpecifiedOrder.selected}" text="%Primary sort criterion" GridPane.rowIndex="3" />
+      <Label disabled="${!exportInSpecifiedOrder.selected}" text="%Secondary sort criterion" GridPane.rowIndex="4" />
+      <Label disabled="${!exportInSpecifiedOrder.selected}" text="%Tertiary sort criterion" GridPane.rowIndex="5" />
    </children>
 </fx:root>

From 0cf3c87dafa232d47727cf2d8c747034339277dd Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Fri, 1 Mar 2019 18:08:00 +0100
Subject: [PATCH 14/20] add method for changing the radio button texts to save
 fix l10n

---
 .../java/org/jabref/gui/SaveOrderConfigDisplayView.java    | 7 +++++++
 .../gui/libraryproperties/LibraryPropertiesDialogView.java | 1 +
 src/main/resources/l10n/JabRef_en.properties               | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java
index 2f0e36ca318..3f7e253f231 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java
@@ -10,6 +10,7 @@
 import javafx.scene.control.ToggleGroup;
 import javafx.scene.layout.GridPane;
 
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.metadata.SaveOrderConfig;
 import org.jabref.preferences.PreferencesService;
 
@@ -65,6 +66,12 @@ private void initialize() {
 
     }
 
+    public void changeExportDescriptionToSave() {
+        exportInOriginalOrder.setText(Localization.lang("Save entries in their original order"));
+        exportInSpecifiedOrder.setText(Localization.lang("Save entries ordered as specified"));
+        exportInTableOrder.setText(Localization.lang("Save in current table sort order"));
+    }
+
     public void storeConfig() {
         viewModel.storeConfigInPrefs();
     }
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
index 9f241d4409d..9cbeaf2a637 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
@@ -85,6 +85,7 @@ private void initialize() {
             saveOrderConfigDisplayView = new SaveOrderConfigDisplayView(preferencesService.loadExportSaveOrder());
         }
 
+        saveOrderConfigDisplayView.changeExportDescriptionToSave();
         fieldFormatterCleanupsPanel = new FieldFormatterCleanupsPanel(Localization.lang("Enable save actions"),
                                                                       Cleanups.DEFAULT_SAVE_ACTIONS);
         Label saveActions = new Label(Localization.lang("Save actions"));
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index e38d7c151da..1aa6a98b4f0 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1456,8 +1456,8 @@ Export\ sort\ order=Export sort order
 Export\ sorting=Export sorting
 Newline\ separator=Newline separator
 
+Save\ in\ current\ table\ sort\ order=Save in current table sort order
 Save\ entries\ ordered\ as\ specified=Save entries ordered as specified
-Save\ sort\ order=Save sort order
 Show\ extra\ columns=Show extra columns
 Parsing\ error=Parsing error
 illegal\ backslash\ expression=illegal backslash expression

From 9e9450fa8ab4fbb5a7e3f17d7ea5f2f6cb0be02a Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 2 Mar 2019 17:31:55 +0100
Subject: [PATCH 15/20] move radio button toggle group back as property remove
 unused variables

---
 src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml     | 5 +----
 .../java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java | 4 ----
 .../libraryproperties/LibraryPropertiesDialogViewModel.java  | 3 +--
 .../java/org/jabref/gui/preferences/PreferencesDialog.java   | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
index 13832fb7b0d..b3b286c7f92 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
@@ -30,10 +30,7 @@
       <ComboBox fx:id="savePriSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
       <ComboBox fx:id="saveSecSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="4" />
       <ComboBox fx:id="saveTerSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="5" />
-      <RadioButton fx:id="exportInSpecifiedOrder" mnemonicParsing="false" prefHeight="5.0" prefWidth="206.0" text="%Export entries ordered as specified" GridPane.columnSpan="3" GridPane.rowIndex="2">
-         <toggleGroup>
-            <ToggleGroup fx:id="saveOrderToggleGroup" />
-         </toggleGroup></RadioButton>
+      <RadioButton fx:id="exportInSpecifiedOrder" mnemonicParsing="false" prefHeight="5.0" prefWidth="206.0" text="%Export entries ordered as specified" toggleGroup="$saveOrderToggleGroup" GridPane.columnSpan="3" GridPane.rowIndex="2">
       <RadioButton fx:id="exportInTableOrder" mnemonicParsing="false" text="%Export in current table sort order" toggleGroup="$saveOrderToggleGroup" GridPane.columnSpan="3" GridPane.rowIndex="1" />
       <RadioButton fx:id="exportInOriginalOrder" mnemonicParsing="false" text="%Export entries in their original order" toggleGroup="$saveOrderToggleGroup" GridPane.columnSpan="3" />
       <CheckBox fx:id="savePriDesc" disable="${!exportInSpecifiedOrder.selected}" mnemonicParsing="false" text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="3" />
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
index 08e9db6df75..36ec54a7fcd 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
@@ -37,11 +37,9 @@ public class SaveOrderConfigDisplayViewModel {
     private final BooleanProperty saveInTableOrderProperty = new SimpleBooleanProperty();
     private final BooleanProperty saveInSpecifiedOrderProperty = new SimpleBooleanProperty();
 
-    private final SaveOrderConfig config;
     private final PreferencesService prefs;
 
     public SaveOrderConfigDisplayViewModel(SaveOrderConfig config, PreferencesService prefs) {
-        this.config = config;
         this.prefs = prefs;
 
         List<String> fieldNames = InternalBibtexFields.getAllPublicFieldNames();
@@ -60,7 +58,6 @@ public SaveOrderConfigDisplayViewModel(SaveOrderConfig config, PreferencesServic
             saveInTableOrderProperty.setValue(true);
         }
         setSaveOrderConfig(config);
-
     }
 
     public ListProperty<String> priSortFieldsProperty() {
@@ -76,7 +73,6 @@ public ListProperty<String> terSortFieldsProperty() {
     }
 
     public SaveOrderConfig getSaveOrderConfig() {
-
         SortCriterion primary = new SortCriterion(getSelectedItemAsLowerCaseTrim(savePriSortSelectedValueProperty), savePriDescPropertySelected.getValue());
         SortCriterion secondary = new SortCriterion(getSelectedItemAsLowerCaseTrim(saveSecSortSelectedValueProperty), saveSecDescPropertySelected.getValue());
         SortCriterion tertiary = new SortCriterion(getSelectedItemAsLowerCaseTrim(saveTerSortSelectedValueProperty), saveTerDescPropertySelected.getValue());
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
index 03aa19a1714..05f3982d7e0 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
@@ -33,7 +33,6 @@ public class LibraryPropertiesDialogViewModel {
 
     private final DialogService dialogService;
     private final DirectoryDialogConfiguration directoryDialogConfiguration;
-    private final MetaData metaData;
 
     private final String oldUserSpecificFileDir;
     private final String oldGeneralFileDir;
@@ -41,7 +40,7 @@ public class LibraryPropertiesDialogViewModel {
 
     public LibraryPropertiesDialogViewModel(BasePanel panel, DialogService dialogService, PreferencesService preferencesService) {
         this.dialogService = dialogService;
-        this.metaData = panel.getBibDatabaseContext().getMetaData();
+        MetaData metaData = panel.getBibDatabaseContext().getMetaData();
 
         DatabaseLocation location = panel.getBibDatabaseContext().getLocation();
         boolean isShared = (location == DatabaseLocation.SHARED);
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
index 1727658b210..e966cd2eb66 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
@@ -105,7 +105,7 @@ public PreferencesDialog(JabRefFrame parent, TaskExecutor taskExecutor) {
 
     @FXML
     private void initalize() {
-
+        //FIXME: Model whole dialog as fxml
     }
 
     private void construct() {

From 028cbc189d5b13cbeb932245fad497761e6e355c Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 3 Mar 2019 12:28:25 +0100
Subject: [PATCH 16/20] store values for sort order radio box

---
 .../org/jabref/gui/SaveOrderConfigDisplay.fxml   |  2 +-
 .../gui/SaveOrderConfigDisplayViewModel.java     | 16 ++++++----------
 .../jabref/preferences/JabRefPreferences.java    |  4 +++-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
index b3b286c7f92..6fab26dcfd1 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
@@ -30,7 +30,7 @@
       <ComboBox fx:id="savePriSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
       <ComboBox fx:id="saveSecSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="4" />
       <ComboBox fx:id="saveTerSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="5" />
-      <RadioButton fx:id="exportInSpecifiedOrder" mnemonicParsing="false" prefHeight="5.0" prefWidth="206.0" text="%Export entries ordered as specified" toggleGroup="$saveOrderToggleGroup" GridPane.columnSpan="3" GridPane.rowIndex="2">
+      <RadioButton fx:id="exportInSpecifiedOrder" mnemonicParsing="false" prefHeight="5.0" prefWidth="206.0" text="%Export entries ordered as specified" toggleGroup="$saveOrderToggleGroup" GridPane.columnSpan="3" GridPane.rowIndex="2"/>
       <RadioButton fx:id="exportInTableOrder" mnemonicParsing="false" text="%Export in current table sort order" toggleGroup="$saveOrderToggleGroup" GridPane.columnSpan="3" GridPane.rowIndex="1" />
       <RadioButton fx:id="exportInOriginalOrder" mnemonicParsing="false" text="%Export entries in their original order" toggleGroup="$saveOrderToggleGroup" GridPane.columnSpan="3" />
       <CheckBox fx:id="savePriDesc" disable="${!exportInSpecifiedOrder.selected}" mnemonicParsing="false" text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="3" />
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
index 36ec54a7fcd..a653a10e319 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
@@ -50,13 +50,6 @@ public SaveOrderConfigDisplayViewModel(SaveOrderConfig config, PreferencesServic
         secSortFieldsProperty.addAll(fieldNames);
         terSortFieldsProperty.addAll(fieldNames);
 
-        if (config.saveInOriginalOrder()) {
-            saveInOriginalProperty.setValue(true);
-        } else if (config.saveInSpecifiedOrder()) {
-            saveInSpecifiedOrderProperty.setValue(true);
-        } else {
-            saveInTableOrderProperty.setValue(true);
-        }
         setSaveOrderConfig(config);
     }
 
@@ -92,11 +85,14 @@ public void setSaveOrderConfig(SaveOrderConfig saveOrderConfig) {
         saveTerSortSelectedValueProperty.setValue(saveOrderConfig.getSortCriteria().get(2).field);
         saveTerDescPropertySelected.setValue(saveOrderConfig.getSortCriteria().get(2).descending);
 
-        if (saveInOriginalProperty.getValue()) {
-            saveOrderConfig.setSaveInOriginalOrder();
+        if (saveOrderConfig.saveInOriginalOrder()) {
+            saveInOriginalProperty.setValue(true);
+        } else if (saveOrderConfig.saveInSpecifiedOrder()) {
+            saveInSpecifiedOrderProperty.setValue(true);
         } else {
-            saveOrderConfig.setSaveInSpecifiedOrder();
+            saveInTableOrderProperty.setValue(true);
         }
+
     }
 
     private String getSelectedItemAsLowerCaseTrim(StringProperty string) {
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 3fa8e4f50b5..83fb0c7ac6c 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -1711,6 +1711,8 @@ public void storeExportSaveOrder(SaveOrderConfig config) {
         putBoolean(EXPORT_PRIMARY_SORT_DESCENDING, config.getSortCriteria().get(0).descending);
         putBoolean(EXPORT_SECONDARY_SORT_DESCENDING, config.getSortCriteria().get(1).descending);
         putBoolean(EXPORT_TERTIARY_SORT_DESCENDING, config.getSortCriteria().get(2).descending);
+        putBoolean(EXPORT_IN_ORIGINAL_ORDER, config.saveInOriginalOrder());
+        putBoolean(EXPORT_IN_SPECIFIED_ORDER, config.saveInSpecifiedOrder());
 
         put(EXPORT_PRIMARY_SORT_FIELD, config.getSortCriteria().get(0).field);
         put(EXPORT_SECONDARY_SORT_FIELD, config.getSortCriteria().get(1).field);
@@ -1731,7 +1733,7 @@ private SaveOrderConfig loadTableSaveOrder() {
 
     @Override
     public SaveOrderConfig loadExportSaveOrder() {
-        return new SaveOrderConfig(true,
+        return new SaveOrderConfig(getBoolean(EXPORT_IN_ORIGINAL_ORDER),
                 new SaveOrderConfig.SortCriterion(get(EXPORT_PRIMARY_SORT_FIELD), getBoolean(EXPORT_PRIMARY_SORT_DESCENDING)),
                 new SaveOrderConfig.SortCriterion(get(EXPORT_SECONDARY_SORT_FIELD), getBoolean(EXPORT_SECONDARY_SORT_DESCENDING)),
                 new SaveOrderConfig.SortCriterion(get(EXPORT_TERTIARY_SORT_FIELD), getBoolean(EXPORT_TERTIARY_SORT_DESCENDING))

From 5ce22f2e0d2e7a567dddc91846a5d036dbdd858b Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Fri, 8 Mar 2019 15:44:44 +0100
Subject: [PATCH 17/20] move css rule to base.css add comemnt fix indencation

---
 src/main/java/org/jabref/gui/Base.css                       | 5 +++++
 src/main/java/org/jabref/gui/JabRefFrame.java               | 6 +++---
 .../gui/libraryproperties/LibraryPropertiesDialog.css       | 4 ----
 .../gui/libraryproperties/LibraryPropertiesDialogView.java  | 2 +-
 .../java/org/jabref/gui/preferences/PreferencesDialog.css   | 5 -----
 5 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.css

diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index 14c7861eb45..f2d02b9cc95 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -993,3 +993,8 @@ We want to have a look that matches our icons in the tool-bar */
 .tooltip-error {
     -fx-background-color: -jr-error;
 }
+
+.sectionHeader {
+    -fx-font-size: 1.5em;
+    -fx-padding: 1em 0em 1em 0em;
+}
\ No newline at end of file
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 1946c40461e..c09d09561f9 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -818,7 +818,7 @@ private MenuBar createMenu() {
                 edit.getItems().add(new SeparatorMenuItem());
             }
         }
-
+        //@formatter:off
         library.getItems().addAll(
                 factory.createMenuItem(StandardActions.NEW_ENTRY, new NewEntryAction(this, dialogService, Globals.prefs)),
                 factory.createMenuItem(StandardActions.NEW_ENTRY_FROM_PLAINTEX, new NewEntryFromPlainTextAction(this, Globals.prefs.getUpdateFieldPreferences(), dialogService, Globals.prefs)),
@@ -826,7 +826,7 @@ private MenuBar createMenu() {
 
                 new SeparatorMenuItem(),
 
-                                  factory.createMenuItem(StandardActions.LIBRARY_PROPERTIES, new LibraryPropertiesAction(this, dialogService)),
+                factory.createMenuItem(StandardActions.LIBRARY_PROPERTIES, new LibraryPropertiesAction(this, dialogService)),
                 factory.createMenuItem(StandardActions.EDIT_PREAMBLE, new PreambleEditor(this)),
                 factory.createMenuItem(StandardActions.EDIT_STRINGS, new BibtexStringEditorAction(this)),
                 factory.createMenuItem(StandardActions.MASS_SET_FIELDS, new MassSetFieldsAction(this))
@@ -838,7 +838,7 @@ private MenuBar createMenu() {
             lookupIdentifiers.getItems().add(factory.createMenuItem(identifierAction.getAction(), identifierAction));
         }
 
-        //@formatter:off
+
         quality.getItems().addAll(
                 factory.createMenuItem(StandardActions.FIND_DUPLICATES, new DuplicateSearch(this, dialogService)),
                 factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(this)),
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.css b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.css
deleted file mode 100644
index 6377d4e01ba..00000000000
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.sectionHeader {
-    -fx-font-size: 1.5em;
-    -fx-padding: 1em 0em 1em 0em;
-}
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
index 9cbeaf2a637..8ed238faf8a 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
@@ -113,6 +113,7 @@ public void browseUserSpecificFileDirectory(ActionEvent event) {
     }
 
     private void storeSettings() {
+        //FIXME: Move to viewModel until fieldFormatterCleanupsPanel is property implemented
         MetaData metaData = panel.getBibDatabaseContext().getMetaData();
         Charset oldEncoding = metaData.getEncoding()
                                       .orElse(preferencesService.getDefaultEncoding());
@@ -171,5 +172,4 @@ private void storeSettings() {
             panel.markNonUndoableBaseChanged();
         }
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
index 2b2d8c34859..f79bfba706e 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
@@ -12,8 +12,3 @@
 .preferencePaneContainer {
     -fx-padding: 0em 1em 0em 3em;
 }
-
-.sectionHeader {
-    -fx-font-size: 1.5em;
-    -fx-padding: 1em 0em 1em 0em;
-}

From e214240379289b458dafd2e26f222afcf3f5ae25 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 9 Mar 2019 12:47:06 +0100
Subject: [PATCH 18/20] fix css

---
 src/main/java/org/jabref/gui/Base.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index f2d02b9cc95..dba1545c494 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -997,4 +997,4 @@ We want to have a look that matches our icons in the tool-bar */
 .sectionHeader {
     -fx-font-size: 1.5em;
     -fx-padding: 1em 0em 1em 0em;
-}
\ No newline at end of file
+}

From 28d46fd95a3f98ac60046436bb08a941ecc91207 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 9 Mar 2019 13:47:06 +0100
Subject: [PATCH 19/20] introduce second boolean for export in specified order
 to reflect table order adjust tests format fxml

---
 .../jabref/gui/SaveOrderConfigDisplay.fxml    | 60 +++++++-------
 .../gui/SaveOrderConfigDisplayView.java       |  5 --
 .../gui/SaveOrderConfigDisplayViewModel.java  |  2 +-
 .../LibraryPropertiesDialog.fxml              | 80 +++++++++----------
 .../preferences/ExportSortingPrefsTab.java    |  4 +-
 .../model/metadata/SaveOrderConfig.java       | 14 ++--
 .../jabref/preferences/JabRefPreferences.java |  2 +-
 .../exporter/BibtexDatabaseWriterTest.java    |  4 +-
 .../importer/fileformat/BibtexParserTest.java |  4 +-
 9 files changed, 87 insertions(+), 88 deletions(-)

diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
index 6fab26dcfd1..4bee6851ab0 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
@@ -10,34 +10,34 @@
 <?import javafx.scene.layout.RowConstraints?>
 
 <fx:root prefHeight="200.0" prefWidth="600.0" type="javafx.scene.layout.GridPane" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.SaveOrderConfigDisplayView">
-  <columnConstraints>
-    <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" prefWidth="100.0" />
-    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-  </columnConstraints>
-  <rowConstraints>
-    <RowConstraints prefHeight="30.0" />
-    <RowConstraints prefHeight="30.0" />
-      <RowConstraints prefHeight="30.0" />
-      <RowConstraints prefHeight="30.0" />
-      <RowConstraints prefHeight="30.0" />
-      <RowConstraints prefHeight="30.0" />
-  </rowConstraints>
-     <fx:define>
-       <ToggleGroup fx:id="saveOrderToggleGroup" />
-     </fx:define>
-   <children>
-      <ComboBox fx:id="savePriSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-      <ComboBox fx:id="saveSecSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-      <ComboBox fx:id="saveTerSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="5" />
-      <RadioButton fx:id="exportInSpecifiedOrder" mnemonicParsing="false" prefHeight="5.0" prefWidth="206.0" text="%Export entries ordered as specified" toggleGroup="$saveOrderToggleGroup" GridPane.columnSpan="3" GridPane.rowIndex="2"/>
-      <RadioButton fx:id="exportInTableOrder" mnemonicParsing="false" text="%Export in current table sort order" toggleGroup="$saveOrderToggleGroup" GridPane.columnSpan="3" GridPane.rowIndex="1" />
-      <RadioButton fx:id="exportInOriginalOrder" mnemonicParsing="false" text="%Export entries in their original order" toggleGroup="$saveOrderToggleGroup" GridPane.columnSpan="3" />
-      <CheckBox fx:id="savePriDesc" disable="${!exportInSpecifiedOrder.selected}" mnemonicParsing="false" text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-      <CheckBox fx:id="saveSecDesc" disable="${!exportInSpecifiedOrder.selected}" mnemonicParsing="false" text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="4" />
-      <CheckBox fx:id="saveTerDesc" disable="${!exportInSpecifiedOrder.selected}" mnemonicParsing="false" text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="5" />
-      <Label disabled="${!exportInSpecifiedOrder.selected}" text="%Primary sort criterion" GridPane.rowIndex="3" />
-      <Label disabled="${!exportInSpecifiedOrder.selected}" text="%Secondary sort criterion" GridPane.rowIndex="4" />
-      <Label disabled="${!exportInSpecifiedOrder.selected}" text="%Tertiary sort criterion" GridPane.rowIndex="5" />
-   </children>
+    <columnConstraints>
+        <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" prefWidth="100.0" />
+        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+    </columnConstraints>
+    <rowConstraints>
+        <RowConstraints prefHeight="30.0" />
+        <RowConstraints prefHeight="30.0" />
+        <RowConstraints prefHeight="30.0" />
+        <RowConstraints prefHeight="30.0" />
+        <RowConstraints prefHeight="30.0" />
+        <RowConstraints prefHeight="30.0" />
+    </rowConstraints>
+    <fx:define>
+        <ToggleGroup fx:id="saveOrderToggleGroup" />
+    </fx:define>
+    <children>
+        <ComboBox fx:id="savePriSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+        <ComboBox fx:id="saveSecSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+        <ComboBox fx:id="saveTerSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+        <RadioButton fx:id="exportInSpecifiedOrder" mnemonicParsing="false" prefHeight="5.0" prefWidth="206.0" text="%Export entries ordered as specified" toggleGroup="$saveOrderToggleGroup" GridPane.columnSpan="3" GridPane.rowIndex="2" />
+        <RadioButton fx:id="exportInTableOrder" mnemonicParsing="false" text="%Export in current table sort order" toggleGroup="$saveOrderToggleGroup" GridPane.columnSpan="3" GridPane.rowIndex="1" />
+        <RadioButton fx:id="exportInOriginalOrder" mnemonicParsing="false" text="%Export entries in their original order" toggleGroup="$saveOrderToggleGroup" GridPane.columnSpan="3" />
+        <CheckBox fx:id="savePriDesc" disable="${!exportInSpecifiedOrder.selected}" mnemonicParsing="false" text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+        <CheckBox fx:id="saveSecDesc" disable="${!exportInSpecifiedOrder.selected}" mnemonicParsing="false" text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+        <CheckBox fx:id="saveTerDesc" disable="${!exportInSpecifiedOrder.selected}" mnemonicParsing="false" text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+        <Label disabled="${!exportInSpecifiedOrder.selected}" text="%Primary sort criterion" GridPane.rowIndex="3" />
+        <Label disabled="${!exportInSpecifiedOrder.selected}" text="%Secondary sort criterion" GridPane.rowIndex="4" />
+        <Label disabled="${!exportInSpecifiedOrder.selected}" text="%Tertiary sort criterion" GridPane.rowIndex="5" />
+    </children>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java
index 3f7e253f231..aeca6f4ddad 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java
@@ -3,7 +3,6 @@
 import javax.inject.Inject;
 
 import javafx.fxml.FXML;
-import javafx.scene.Node;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.RadioButton;
@@ -39,7 +38,6 @@ public SaveOrderConfigDisplayView(SaveOrderConfig config) {
 
         ViewLoader.view(this)
                   .root(this)
-                  .controller(this)
                   .load();
     }
 
@@ -80,7 +78,4 @@ public SaveOrderConfig getSaveOrderConfig() {
         return viewModel.getSaveOrderConfig();
     }
 
-    public Node getJFXPanel() {
-        return this;
-    }
 }
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
index a653a10e319..0846ee4866c 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
@@ -70,7 +70,7 @@ public SaveOrderConfig getSaveOrderConfig() {
         SortCriterion secondary = new SortCriterion(getSelectedItemAsLowerCaseTrim(saveSecSortSelectedValueProperty), saveSecDescPropertySelected.getValue());
         SortCriterion tertiary = new SortCriterion(getSelectedItemAsLowerCaseTrim(saveTerSortSelectedValueProperty), saveTerDescPropertySelected.getValue());
 
-        SaveOrderConfig saveOrderConfig = new SaveOrderConfig(saveInOriginalProperty.getValue(), primary, secondary, tertiary);
+        SaveOrderConfig saveOrderConfig = new SaveOrderConfig(saveInOriginalProperty.getValue(), saveInSpecifiedOrderProperty.getValue(), primary, secondary, tertiary);
 
         return saveOrderConfig;
     }
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
index 980e13f0560..126d9e959b6 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
@@ -13,44 +13,44 @@
 <?import javafx.scene.layout.VBox?>
 
 <DialogPane minHeight="-Infinity" prefHeight="784.0" prefWidth="921.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.libraryproperties.LibraryPropertiesDialogView">
-   <content>
-      <VBox fx:id="contentVbox" minHeight="-Infinity" prefHeight="200.0" prefWidth="100.0">
-         <children>
-            <GridPane minHeight="-Infinity">
-              <columnConstraints>
-                <ColumnConstraints hgrow="SOMETIMES" maxWidth="218.0" minWidth="10.0" prefWidth="200.0" />
-                <ColumnConstraints hgrow="SOMETIMES" maxWidth="797.0" minWidth="10.0" prefWidth="529.0" />
-                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="797.0" minWidth="10.0" prefWidth="100.0" />
-              </columnConstraints>
-              <rowConstraints>
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="-Infinity" prefHeight="50.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="ALWAYS" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="-Infinity" prefHeight="50.0" vgrow="ALWAYS" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="-Infinity" prefHeight="50.0" vgrow="SOMETIMES" />
-              </rowConstraints>
-               <children>
-                  <Label text="%Library encoding" />
-                  <ComboBox fx:id="encoding" prefWidth="250.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" />
-                  <Label text="%General file directory" GridPane.rowIndex="2" />
-                  <TextField fx:id="generalFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                  <Button fx:id="browseGeneralFileDir" mnemonicParsing="false" onAction="#browseGeneralFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="2" />
-                  <Label text="%User-specific file directory" GridPane.rowIndex="3" />
-                  <TextField fx:id="userSpecificFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-                  <Button fx:id="browseUserSpefiicFileDir" mnemonicParsing="false" onAction="#browseUserSpecificFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-                  <Label alignment="TOP_LEFT" styleClass="sectionHeader" text="%Override default file directories" GridPane.columnSpan="3" GridPane.rowIndex="1" />
-                  <Label alignment="TOP_LEFT" styleClass="sectionHeader" text="%Library protection" GridPane.columnSpan="3" GridPane.rowIndex="4" />
-                  <CheckBox fx:id="protect" mnemonicParsing="false" text="%Refuse to save the library before external changes have been reviewed." GridPane.columnSpan="3" GridPane.rowIndex="5" />
-                  <Label styleClass="sectionHeader" text="%Export sort order" GridPane.rowIndex="6" />
-               </children>
-            </GridPane>
-         </children>
-      </VBox>
-   </content>
-  <buttonTypes>
-    <ButtonType fx:constant="CANCEL" />
-    <ButtonType fx:constant="OK" />
-  </buttonTypes>
+    <content>
+        <VBox fx:id="contentVbox" minHeight="-Infinity" prefHeight="200.0" prefWidth="100.0">
+            <children>
+                <GridPane minHeight="-Infinity">
+                    <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="218.0" minWidth="10.0" prefWidth="200.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="797.0" minWidth="10.0" prefWidth="529.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="797.0" minWidth="10.0" prefWidth="100.0" />
+                    </columnConstraints>
+                    <rowConstraints>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                        <RowConstraints minHeight="-Infinity" prefHeight="50.0" vgrow="SOMETIMES" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="ALWAYS" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                        <RowConstraints minHeight="-Infinity" prefHeight="50.0" vgrow="ALWAYS" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                        <RowConstraints minHeight="-Infinity" prefHeight="50.0" vgrow="SOMETIMES" />
+                    </rowConstraints>
+                    <children>
+                        <Label text="%Library encoding" />
+                        <ComboBox fx:id="encoding" prefWidth="250.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" />
+                        <Label text="%General file directory" GridPane.rowIndex="2" />
+                        <TextField fx:id="generalFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                        <Button fx:id="browseGeneralFileDir" mnemonicParsing="false" onAction="#browseGeneralFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+                        <Label text="%User-specific file directory" GridPane.rowIndex="3" />
+                        <TextField fx:id="userSpecificFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                        <Button fx:id="browseUserSpefiicFileDir" mnemonicParsing="false" onAction="#browseUserSpecificFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+                        <Label alignment="TOP_LEFT" styleClass="sectionHeader" text="%Override default file directories" GridPane.columnSpan="3" GridPane.rowIndex="1" />
+                        <Label alignment="TOP_LEFT" styleClass="sectionHeader" text="%Library protection" GridPane.columnSpan="3" GridPane.rowIndex="4" />
+                        <CheckBox fx:id="protect" mnemonicParsing="false" text="%Refuse to save the library before external changes have been reviewed." GridPane.columnSpan="3" GridPane.rowIndex="5" />
+                        <Label styleClass="sectionHeader" text="%Export sort order" GridPane.rowIndex="6" />
+                    </children>
+                </GridPane>
+            </children>
+        </VBox>
+    </content>
+    <buttonTypes>
+        <ButtonType fx:constant="CANCEL" />
+        <ButtonType fx:constant="OK" />
+    </buttonTypes>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
index d6482f567ce..000f2bd8053 100644
--- a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
@@ -20,7 +20,7 @@ class ExportSortingPrefsTab extends Pane implements PrefsTab {
     public ExportSortingPrefsTab(JabRefPreferences prefs) {
         exportOrderPanel = new SaveOrderConfigDisplayView(prefs.loadExportSaveOrder());
 
-        builder.add(exportOrderPanel.getJFXPanel(), 1, 8);
+        builder.add(exportOrderPanel, 1, 8);
         builder.add(new Line(), 2, 9);
     }
 
@@ -31,7 +31,7 @@ public Node getBuilder() {
 
     @Override
     public void setValues() {
-
+        //empty
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java b/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java
index 59fbfaa2d42..8bc318987a3 100644
--- a/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java
+++ b/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java
@@ -16,13 +16,15 @@ public class SaveOrderConfig {
     private static final String SPECIFIED = "specified";
     private final LinkedList<SortCriterion> sortCriteria = new LinkedList<>();
     private boolean saveInOriginalOrder;
+    private boolean saveInSpecifiedOrder;
 
     public SaveOrderConfig() {
         setSaveInOriginalOrder();
     }
 
-    public SaveOrderConfig(boolean saveInOriginalOrder, SortCriterion first, SortCriterion second, SortCriterion third) {
+    public SaveOrderConfig(boolean saveInOriginalOrder, boolean saveInSpecifiedOrder, SortCriterion first, SortCriterion second, SortCriterion third) {
         this.saveInOriginalOrder = saveInOriginalOrder;
+        this.saveInSpecifiedOrder = saveInSpecifiedOrder;
         sortCriteria.add(first);
         sortCriteria.add(second);
         sortCriteria.add(third);
@@ -62,7 +64,7 @@ public boolean saveInOriginalOrder() {
     }
 
     public boolean saveInSpecifiedOrder() {
-        return !saveInOriginalOrder;
+        return saveInSpecifiedOrder;
     }
 
     public LinkedList<SortCriterion> getSortCriteria() {
@@ -83,13 +85,14 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(saveInOriginalOrder, sortCriteria);
+        return Objects.hash(saveInOriginalOrder, saveInSpecifiedOrder, sortCriteria);
     }
 
     @Override
     public String toString() {
-        return "SaveOrderConfig{" + "saveInOriginalOrder=" + saveInOriginalOrder +
-               ", sortCriteria=" + sortCriteria +
+        return "SaveOrderConfig{" + "saveInOriginalOrder=" + saveInOriginalOrder
+               + "saveInSpecifiedOrder =" + saveInSpecifiedOrder
+               + ", sortCriteria=" + sortCriteria +
                '}';
     }
 
@@ -99,6 +102,7 @@ public void setSaveInOriginalOrder() {
 
     public void setSaveInSpecifiedOrder() {
         this.saveInOriginalOrder = false;
+        this.saveInSpecifiedOrder = true;
     }
 
     /**
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index d088a64fa86..88eae71f20a 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -1722,7 +1722,7 @@ private SaveOrderConfig loadTableSaveOrder() {
 
     @Override
     public SaveOrderConfig loadExportSaveOrder() {
-        return new SaveOrderConfig(getBoolean(EXPORT_IN_ORIGINAL_ORDER),
+        return new SaveOrderConfig(getBoolean(EXPORT_IN_ORIGINAL_ORDER), getBoolean(EXPORT_IN_SPECIFIED_ORDER),
                 new SaveOrderConfig.SortCriterion(get(EXPORT_PRIMARY_SORT_FIELD), getBoolean(EXPORT_PRIMARY_SORT_DESCENDING)),
                 new SaveOrderConfig.SortCriterion(get(EXPORT_SECONDARY_SORT_FIELD), getBoolean(EXPORT_SECONDARY_SORT_DESCENDING)),
                 new SaveOrderConfig.SortCriterion(get(EXPORT_TERTIARY_SORT_FIELD), getBoolean(EXPORT_TERTIARY_SORT_DESCENDING))
diff --git a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
index e30ecf77ca8..a7f2ef36a4c 100644
--- a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
@@ -435,7 +435,7 @@ void writeSaveActions() throws Exception {
 
     @Test
     void writeSaveOrderConfig() throws Exception {
-        SaveOrderConfig saveOrderConfig = new SaveOrderConfig(false, new SaveOrderConfig.SortCriterion("author", false),
+        SaveOrderConfig saveOrderConfig = new SaveOrderConfig(false, true, new SaveOrderConfig.SortCriterion("author", false),
                 new SaveOrderConfig.SortCriterion("year", true),
                 new SaveOrderConfig.SortCriterion("abstract", false));
         metaData.setSaveOrderConfig(saveOrderConfig);
@@ -495,7 +495,7 @@ void writeFileDirectories() throws Exception {
 
     @Test
     void writeEntriesSorted() throws Exception {
-        SaveOrderConfig saveOrderConfig = new SaveOrderConfig(false,
+        SaveOrderConfig saveOrderConfig = new SaveOrderConfig(false, true,
                 new SaveOrderConfig.SortCriterion("author", false),
                 new SaveOrderConfig.SortCriterion("year", true),
                 new SaveOrderConfig.SortCriterion("abstract", false));
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
index 59e5d7d250e..116cfd198aa 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
@@ -57,7 +57,7 @@ class BibtexParserTest {
 
     private ImportFormatPreferences importFormatPreferences;
     private BibtexParser parser;
-    private FileUpdateMonitor fileMonitor = new DummyFileUpdateMonitor();
+    private final FileUpdateMonitor fileMonitor = new DummyFileUpdateMonitor();
 
     @BeforeEach
     void setUp() {
@@ -1338,7 +1338,7 @@ void integrationTestSaveOrderConfig() throws IOException {
 
         Optional<SaveOrderConfig> saveOrderConfig = result.getMetaData().getSaveOrderConfig();
 
-        assertEquals(new SaveOrderConfig(false, new SaveOrderConfig.SortCriterion("author", false),
+        assertEquals(new SaveOrderConfig(false, true, new SaveOrderConfig.SortCriterion("author", false),
                         new SaveOrderConfig.SortCriterion("year", true), new SaveOrderConfig.SortCriterion("abstract", false)),
                 saveOrderConfig.get());
     }

From ab9de54d17814ad6488b4d5c60c15f30608a907b Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 9 Mar 2019 13:54:26 +0100
Subject: [PATCH 20/20] remove empty line

---
 src/main/java/org/jabref/gui/JabRefFrame.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 5f3d0624937..ffdeb573738 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -838,7 +838,6 @@ private MenuBar createMenu() {
             lookupIdentifiers.getItems().add(factory.createMenuItem(identifierAction.getAction(), identifierAction));
         }
 
-
         quality.getItems().addAll(
                 factory.createMenuItem(StandardActions.FIND_DUPLICATES, new DuplicateSearch(this, dialogService)),
                 factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(this)),