diff --git a/CHANGELOG.md b/CHANGELOG.md index 98b3a24c19e..796b20d4f7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,10 +34,11 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve - We improved group expansion arrow that prevent it from activating group when expanding or collapsing. [#7982](https://github.com/JabRef/jabref/issues/7982), [#3176](https://github.com/JabRef/jabref/issues/3176) - When configured SSL certificates changed, JabRef warns the user to restart to apply the configuration. - We improved the appearances and logic of the "Manage field names & content" dialog, and renamed it to "Automatic field editor". [#6536](https://github.com/JabRef/jabref/issues/6536) -- We fixed an issue that caused JabRef to sometimes open multiple instances when "Remote Operation" is enabled. [#8653](https://github.com/JabRef/jabref/issues/8653) +- We moved the preferences option "Warn about duplicates on import" option from the tab "File" to the tab "Import and Export". [kopper#570](https://github.com/koppor/jabref/issues/570) ### Fixed +- We fixed an issue that caused JabRef to sometimes open multiple instances when "Remote Operation" is enabled. [#8653](https://github.com/JabRef/jabref/issues/8653) - We fixed an issue where linked files with the filetype "application/pdf" in an entry were not shown with the correct PDF-Icon in the main table [8930](https://github.com/JabRef/jabref/issues/8930) - We fixed an issue where "open folder" for linked files did not open the folder and did not select the file unter certain Linux desktop environments [#8679](https://github.com/JabRef/jabref/issues/8679), [#8849](https://github.com/JabRef/jabref/issues/8849) - We fixed an issue where the content of a big shared database library is not shown [#8788](https://github.com/JabRef/jabref/issues/8788) diff --git a/src/main/java/org/jabref/gui/preferences/file/FileTab.fxml b/src/main/java/org/jabref/gui/preferences/file/FileTab.fxml index 8666dfd973f..59b1d7f0e90 100644 --- a/src/main/java/org/jabref/gui/preferences/file/FileTab.fxml +++ b/src/main/java/org/jabref/gui/preferences/file/FileTab.fxml @@ -42,5 +42,4 @@ - diff --git a/src/main/java/org/jabref/gui/preferences/file/FileTab.java b/src/main/java/org/jabref/gui/preferences/file/FileTab.java index f91f08650a1..88c3768df07 100644 --- a/src/main/java/org/jabref/gui/preferences/file/FileTab.java +++ b/src/main/java/org/jabref/gui/preferences/file/FileTab.java @@ -25,7 +25,6 @@ public class FileTab extends AbstractPreferenceTabView impleme @FXML private RadioButton resolveStrings; @FXML private TextField resolveStringsForFields; @FXML private CheckBox alwaysReformatBib; - @FXML private CheckBox warnAboutDuplicatesOnImport; @FXML private CheckBox autosaveLocalLibraries; @FXML private Button autosaveLocalLibrariesHelp; @@ -48,7 +47,6 @@ public void initialize() { resolveStringsForFields.disableProperty().bind(doNotResolveStrings.selectedProperty()); alwaysReformatBib.selectedProperty().bindBidirectional(viewModel.alwaysReformatBibProperty()); - warnAboutDuplicatesOnImport.selectedProperty().bindBidirectional(viewModel.warnAboutDuplicatesOnImportProperty()); autosaveLocalLibraries.selectedProperty().bindBidirectional(viewModel.autosaveLocalLibrariesProperty()); ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs()); diff --git a/src/main/java/org/jabref/gui/preferences/file/FileTabViewModel.java b/src/main/java/org/jabref/gui/preferences/file/FileTabViewModel.java index abcefcd1150..3981f4d2c82 100644 --- a/src/main/java/org/jabref/gui/preferences/file/FileTabViewModel.java +++ b/src/main/java/org/jabref/gui/preferences/file/FileTabViewModel.java @@ -16,7 +16,6 @@ public class FileTabViewModel implements PreferenceTabViewModel { private final BooleanProperty resolveStringsProperty = new SimpleBooleanProperty(); private final StringProperty resolveStringsForFieldsProperty = new SimpleStringProperty(""); private final BooleanProperty alwaysReformatBibProperty = new SimpleBooleanProperty(); - private final BooleanProperty warnAboutDuplicatesOnImportProperty = new SimpleBooleanProperty(); private final BooleanProperty autosaveLocalLibraries = new SimpleBooleanProperty(); private final ImportExportPreferences importExportPreferences; @@ -34,7 +33,6 @@ public void setValues() { resolveStringsProperty.setValue(importExportPreferences.resolveStrings()); resolveStringsForFieldsProperty.setValue(importExportPreferences.getResolvableFields()); alwaysReformatBibProperty.setValue(importExportPreferences.shouldAlwaysReformatOnSave()); - warnAboutDuplicatesOnImportProperty.setValue(importExportPreferences.shouldWarnAboutDuplicatesOnImport()); autosaveLocalLibraries.setValue(importExportPreferences.shouldAutoSave()); } @@ -45,7 +43,6 @@ public void storeSettings() { importExportPreferences.setNonWrappableFields(noWrapFilesProperty.getValue().trim()); importExportPreferences.setResolvableFields(resolveStringsForFieldsProperty.getValue().trim()); importExportPreferences.setAlwaysReformatOnSave(alwaysReformatBibProperty.getValue()); - importExportPreferences.setWarnAboutDuplicatesOnImport(warnAboutDuplicatesOnImportProperty.getValue()); importExportPreferences.setAutoSave(autosaveLocalLibraries.getValue()); } @@ -77,10 +74,6 @@ public BooleanProperty alwaysReformatBibProperty() { return alwaysReformatBibProperty; } - public BooleanProperty warnAboutDuplicatesOnImportProperty() { - return warnAboutDuplicatesOnImportProperty; - } - // Autosave public BooleanProperty autosaveLocalLibrariesProperty() { return autosaveLocalLibraries; diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml index 7d3756d1bb0..a1fc3bbb64d 100644 --- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml +++ b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml @@ -16,6 +16,7 @@