From 7236581748d15f6189f5d44dda6eadd4f12f5124 Mon Sep 17 00:00:00 2001
From: Kai Takac <kai.takac@gmail.com>
Date: Wed, 13 Nov 2019 19:43:07 +0100
Subject: [PATCH] =?UTF-8?q?Add=20switch=20to=20change=20from=20biblatex=20?=
 =?UTF-8?q?to=20bibtex=20and=20vice=20versa=20(fi=E2=80=A6=20(#5565)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  2 +
 .../gui/cleanup/CleanupPresetPanel.java       |  3 +-
 .../cleanup/FieldFormatterCleanupsPanel.java  | 28 ++++++-------
 .../LibraryPropertiesDialog.fxml              | 40 ++++++++++++-------
 .../LibraryPropertiesDialogView.java          | 12 ++++--
 .../LibraryPropertiesDialogViewModel.java     | 17 ++++++++
 .../org/jabref/model/metadata/MetaData.java   |  4 ++
 src/main/resources/l10n/JabRef_en.properties  |  8 ++--
 8 files changed, 75 insertions(+), 39 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17873d43bf5..9ba3e1109e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,8 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - The entry editor is now open by default when JabRef starts up. [#5460](https://github.com/JabRef/jabref/issues/5460)
 - We added a new ADS fetcher to use the new ADS API [#4949](https://github.com/JabRef/jabref/issues/4949)
 - We added support of the [X11 primary selection](https://unix.stackexchange.com/a/139193/18033) [#2389](https://github.com/JabRef/jabref/issues/2389)
+- We added support to switch between biblatex and bibtex library types. [#5550](https://github.com/JabRef/jabref/issues/5550)
+- We changed the save action buttons to be easier to understand. [#5565](https://github.com/JabRef/jabref/issues/5565)
 - We made the columns for groups, files and uri in the main table reorderable and merged the clickable icon columns for uri, url, doi and eprint. [#5544](https://github.com/JabRef/jabref/pull/5544)
 
 ### Fixed
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
index 719c11bc267..563fb7ac9e4 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
@@ -12,7 +12,6 @@
 import javafx.scene.layout.VBox;
 
 import org.jabref.logic.cleanup.CleanupPreset;
-import org.jabref.logic.cleanup.Cleanups;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.field.StandardField;
@@ -64,7 +63,7 @@ private void init(CleanupPreset cleanupPreset, FilePreferences filePreferences)
 
         cleanUpUpgradeExternalLinks.setText(Localization.lang("Upgrade external PDF/PS links to use the '%0' field.", StandardField.FILE.getDisplayName()));
 
-        cleanUpFormatters = new FieldFormatterCleanupsPanel(Localization.lang("Run field formatter:"), Cleanups.DEFAULT_SAVE_ACTIONS);
+        cleanUpFormatters = new FieldFormatterCleanupsPanel(Localization.lang("Run field formatter:"));
         formatterContainer.getChildren().setAll(cleanUpFormatters);
 
         String currentPattern = Localization.lang("Filename format pattern")
diff --git a/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java b/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java
index 23917990ebe..7ef6dfc4d56 100644
--- a/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java
+++ b/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java
@@ -42,7 +42,6 @@ public class FieldFormatterCleanupsPanel extends GridPane {
 
     private static final String DESCRIPTION = Localization.lang("Description") + ": ";
     private final CheckBox cleanupEnabled;
-    private final FieldFormatterCleanups defaultFormatters;
     private final List<Formatter> availableFormatters;
     private FieldFormatterCleanups fieldFormatterCleanups;
     private ListView<FieldFormatterCleanup> actionsList;
@@ -50,13 +49,12 @@ public class FieldFormatterCleanupsPanel extends GridPane {
     private ComboBox<String> selectFieldCombobox;
     private Button addButton;
     private Label descriptionAreaText;
-    private Button removeButton;
-    private Button resetButton;
+    private Button removeSelectedButton;
+    private Button removeAllButton;
     private Button recommendButton;
     private ObservableList<FieldFormatterCleanup> actions;
 
-    public FieldFormatterCleanupsPanel(String description, FieldFormatterCleanups defaultFormatters) {
-        this.defaultFormatters = Objects.requireNonNull(defaultFormatters);
+    public FieldFormatterCleanupsPanel(String description) {
         cleanupEnabled = new CheckBox(description);
         availableFormatters = Cleanups.getBuiltInFormatters();
         availableFormatters.add(new ProtectTermsFormatter(Globals.protectedTermsLoader));
@@ -110,12 +108,12 @@ private void buildLayout() {
                 .install(actionsList);
         add(actionsList, 1, 1, 3, 1);
 
-        resetButton = new Button(Localization.lang("Reset"));
-        resetButton.setOnAction(e -> actions.setAll(defaultFormatters.getConfiguredActions()));
+        removeAllButton = new Button(Localization.lang("Remove all"));
+        removeAllButton.setOnAction(e -> actions.clear());
 
         BibDatabaseContext databaseContext = JabRefGUI.getMainFrame().getCurrentBasePanel().getBibDatabaseContext();
 
-        recommendButton = new Button(Localization.lang("Recommended for %0", databaseContext.getMode().getFormattedName()));
+        recommendButton = new Button(Localization.lang("Reset to recommended"));
         boolean isBiblatex = databaseContext.isBiblatexMode();
 
         recommendButton.setOnAction(e -> {
@@ -126,14 +124,14 @@ private void buildLayout() {
             }
         });
 
-        removeButton = new Button(Localization.lang("Remove selected"));
-        removeButton.setOnAction(e -> actions.remove(actionsList.getSelectionModel().getSelectedItem()));
+        removeSelectedButton = new Button(Localization.lang("Remove selected"));
+        removeSelectedButton.setOnAction(e -> actions.remove(actionsList.getSelectionModel().getSelectedItem()));
         descriptionAreaText = new Label(DESCRIPTION);
         descriptionAreaText.setWrapText(true);
 
-        add(removeButton, 3, 2, 1, 1);
-        add(resetButton, 1, 2, 1, 1);
-        add(recommendButton, 2, 2, 1, 1);
+        add(recommendButton, 1, 2, 1, 1);
+        add(removeSelectedButton, 2, 2, 1, 1);
+        add(removeAllButton, 3, 2, 1, 1);
         add(getSelectorPanel(), 1, 3, 3, 1);
         add(descriptionAreaText, 1, 4, 3, 1);
 
@@ -234,8 +232,8 @@ private void setStatus(boolean status) {
             selectFieldCombobox.setDisable(!status);
             formattersCombobox.setDisable(!status);
             addButton.setDisable(!status);
-            removeButton.setDisable(!status);
-            resetButton.setDisable(!status);
+            removeSelectedButton.setDisable(!status);
+            removeAllButton.setDisable(!status);
             recommendButton.setDisable(!status);
         }
 
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
index 76aa87d595c..12f7febeb96 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
@@ -1,17 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?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.TextField?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?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">
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<DialogPane minHeight="-Infinity" prefHeight="784.0" prefWidth="921.0" xmlns="http://javafx.com/javafx/10.0.2-internal" 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>
@@ -22,7 +14,7 @@
                         <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="25.0" prefHeight="65.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="ALWAYS" />
@@ -32,8 +24,26 @@
                         <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" />
+                        <GridPane vgap="5.0" GridPane.columnSpan="3" GridPane.hgrow="ALWAYS">
+                            <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>
+                            <Label text="%Library encoding" />
+                            <ComboBox fx:id="encoding" prefWidth="250.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" />
+                            <Label text="%Library mode" GridPane.rowIndex="2" />
+                            <ComboBox fx:id="databaseMode" prefWidth="250.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2" />
+                     <columnConstraints>
+                        <ColumnConstraints />
+                        <ColumnConstraints />
+                     </columnConstraints>
+                     <rowConstraints>
+                        <RowConstraints />
+                        <RowConstraints />
+                        <RowConstraints />
+                     </rowConstraints>
+                        </GridPane>
                         <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" />
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
index 42197cbc5a0..36966cad156 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
@@ -21,8 +21,8 @@
 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.BibDatabaseMode;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.metadata.SaveOrderConfig;
 import org.jabref.preferences.PreferencesService;
@@ -33,6 +33,7 @@ public class LibraryPropertiesDialogView extends BaseDialog<Void> {
 
     @FXML private VBox contentVbox;
     @FXML private ComboBox<Charset> encoding;
+    @FXML private ComboBox<String> databaseMode;
     @FXML private TextField generalFileDirectory;
     @FXML private Button browseGeneralFileDir;
     @FXML private TextField userSpecificFileDirectory;
@@ -79,13 +80,15 @@ private void initialize() {
         encoding.disableProperty().bind(viewModel.encodingDisableProperty());
         protect.disableProperty().bind(viewModel.protectDisableProperty());
 
+        databaseMode.itemsProperty().bind(viewModel.databaseModesProperty());
+        databaseMode.valueProperty().bindBidirectional(viewModel.selectedDatabaseModeProperty());
+
         saveOrderConfigDisplayView = new SaveOrderConfigDisplayView();
         Optional<SaveOrderConfig> storedSaveOrderConfig = panel.getBibDatabaseContext().getMetaData().getSaveOrderConfig();
         oldSaveOrderConfig = storedSaveOrderConfig.orElseGet(preferencesService::loadExportSaveOrder);
 
         saveOrderConfigDisplayView.changeExportDescriptionToSave();
-        fieldFormatterCleanupsPanel = new FieldFormatterCleanupsPanel(Localization.lang("Enable save actions"),
-                                                                      Cleanups.DEFAULT_SAVE_ACTIONS);
+        fieldFormatterCleanupsPanel = new FieldFormatterCleanupsPanel(Localization.lang("Enable save actions"));
         Label saveActions = new Label(Localization.lang("Save actions"));
         saveActions.getStyleClass().add("sectionHeader");
 
@@ -124,6 +127,9 @@ private void storeSettings() {
         Charset newEncoding = viewModel.selectedEncodingProperty().getValue();
         metaData.setEncoding(newEncoding);
 
+        BibDatabaseMode newMode = BibDatabaseMode.parse(viewModel.selectedDatabaseModeProperty().getValue());
+        metaData.setMode(newMode);
+
         String text = viewModel.generalFileDirectoryPropertyProperty().getValue().trim();
         if (text.isEmpty()) {
             metaData.clearDefaultFileDirectory();
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
index 3206b98be9c..8d4dccd9c54 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
@@ -2,7 +2,9 @@
 
 import java.nio.charset.Charset;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -18,6 +20,7 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.logic.l10n.Encodings;
+import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.database.shared.DatabaseLocation;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.PreferencesService;
@@ -29,6 +32,7 @@ public class LibraryPropertiesDialogViewModel {
     private final StringProperty laTexFileDirectoryProperty = 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 SimpleStringProperty selectedDatabaseModeProperty = new SimpleStringProperty(BibDatabaseMode.BIBLATEX.getFormattedName());
     private final BooleanProperty libraryProtectedProperty = new SimpleBooleanProperty();
     private final BooleanProperty encodingDisableProperty = new SimpleBooleanProperty();
     private final BooleanProperty protectDisableProperty = new SimpleBooleanProperty();
@@ -55,6 +59,7 @@ public LibraryPropertiesDialogViewModel(BasePanel panel, DialogService dialogSer
 
         Optional<Charset> charset = metaData.getEncoding();
         selectedEncodingPropety.setValue(charset.orElse(preferencesService.getDefaultEncoding()));
+        selectedDatabaseModeProperty.setValue(metaData.getMode().orElse(BibDatabaseMode.BIBLATEX).getFormattedName());
 
         Optional<String> fileD = metaData.getDefaultFileDirectory();
         fileD.ifPresent(path -> generalFileDirectoryProperty.setValue(path.trim()));
@@ -88,6 +93,18 @@ public ListProperty<Charset> encodingsProperty() {
         return this.encodingsProperty;
     }
 
+    public ListProperty<String> databaseModesProperty() {
+        return new SimpleListProperty<>(FXCollections.observableArrayList(
+                Arrays.stream(BibDatabaseMode.values())
+                        .map(BibDatabaseMode::getFormattedName)
+                        .collect(Collectors.toList())
+        ));
+    }
+
+    public SimpleStringProperty selectedDatabaseModeProperty() {
+        return this.selectedDatabaseModeProperty;
+    }
+
     public ObjectProperty<Charset> selectedEncodingProperty() {
         return this.selectedEncodingPropety;
     }
diff --git a/src/main/java/org/jabref/model/metadata/MetaData.java b/src/main/java/org/jabref/model/metadata/MetaData.java
index cc998f373d9..ef6d9767195 100644
--- a/src/main/java/org/jabref/model/metadata/MetaData.java
+++ b/src/main/java/org/jabref/model/metadata/MetaData.java
@@ -149,6 +149,10 @@ public Optional<BibDatabaseMode> getMode() {
     }
 
     public void setMode(BibDatabaseMode mode) {
+        if (mode == this.mode) {
+            return;
+        }
+
         this.mode = Objects.requireNonNull(mode);
         postChange();
     }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 0a656074d5c..36a9c345cb4 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -997,8 +997,6 @@ MIME\ type=MIME type
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=This feature lets new files be opened or imported into an already running instance of JabRef instead of opening a new instance. For instance, this is useful when you open a file in JabRef from your web browser. Note that this will prevent you from running more than one instance of JabRef at a time.
 Run\ fetcher=Run fetcher
 
-Reset=Reset
-
 Use\ IEEE\ LaTeX\ abbreviations=Use IEEE LaTeX abbreviations
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=When opening file link, search for matching file if no link is defined
@@ -1770,7 +1768,6 @@ A\ backup\ file\ for\ '%0'\ was\ found.=A backup file for '%0' was found.
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=This could indicate that JabRef did not shut down cleanly last time the file was used.
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Do you want to recover the library from the backup file?
 
-Recommended\ for\ %0=Recommended for %0
 Show\ 'Related\ Articles'\ tab=Show 'Related Articles' tab
 This\ might\ be\ caused\ by\ reaching\ the\ traffic\ limitation\ of\ Google\ Scholar\ (see\ 'Help'\ for\ details).=This might be caused by reaching the traffic limitation of Google Scholar (see 'Help' for details).
 
@@ -2096,7 +2093,10 @@ Start\ on\ second\ duplicate\ key\ with\ letter\ B\ (b,\ c,\ ...)=Start on secon
 Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Always add letter (a, b, ...) to generated keys
 Default\ pattern=Default pattern
 Reset\ %s\ to\ default\ value=Reset %s to default value
-
+Library\ mode=Library mode
+Reset\ to\ recommended=Reset to recommended
+Remove\ all=Remove all
 Column\ type\ %0\ is\ unknown.=Column type %0 is unknown.
 Linked\ identifiers=Linked identifiers
 Special\ field\ type\ %0\ is\ unknown.\ Using\ normal\ column\ type.=Special field type %0 is unknown. Using normal column type.
+