diff --git a/CHANGELOG.md b/CHANGELOG.md
index e443c7ae84d..bedc270b236 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
### Changed
+- we deleted the `Default bibliography mode` in the Preference/General tab since it is a redundant setting. [#6470](https://github.com/JabRef/jabref/issues/6470)
- We improved the arXiv fetcher. Now it should find entries even more reliably and does no longer include the version (e.g `v1`) in the `eprint` field. [forum#1941](https://discourse.jabref.org/t/remove-version-in-arxiv-import/1941)
- We moved the group search bar and the button "New group" from bottom to top position to make it more prominent. [#6112](https://github.com/JabRef/jabref/pull/6112)
- When JabRef finds a `.sav` file without changes, there is no dialog asking for acceptance of changes anymore.
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml b/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
index 86dfee7fdf9..3e1f9240ad3 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
@@ -29,8 +29,6 @@
-
-
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTabView.java b/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
index 3d0fdf2cffa..863912b0ae0 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
@@ -19,7 +19,6 @@
import org.jabref.logic.help.HelpFile;
import org.jabref.logic.l10n.Language;
import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseMode;
import org.jabref.preferences.JabRefPreferences;
import com.airhacks.afterburner.views.ViewLoader;
@@ -29,7 +28,6 @@ public class GeneralTabView extends AbstractPreferenceTabView language;
@FXML private ComboBox defaultEncoding;
- @FXML private ComboBox biblatexMode;
@FXML private CheckBox inspectionWarningDuplicate;
@FXML private CheckBox confirmDelete;
@FXML private CheckBox allowIntegerEdition;
@@ -79,12 +77,6 @@ public void initialize() {
defaultEncoding.itemsProperty().bind(viewModel.encodingsListProperty());
defaultEncoding.valueProperty().bindBidirectional(viewModel.selectedEncodingProperty());
- new ViewModelListCellFactory()
- .withText(BibDatabaseMode::getFormattedName)
- .install(biblatexMode);
- biblatexMode.itemsProperty().bind(viewModel.biblatexModeListProperty());
- biblatexMode.valueProperty().bindBidirectional(viewModel.selectedBiblatexModeProperty());
-
inspectionWarningDuplicate.selectedProperty().bindBidirectional(viewModel.inspectionWarningDuplicateProperty());
confirmDelete.selectedProperty().bindBidirectional(viewModel.confirmDeleteProperty());
allowIntegerEdition.selectedProperty().bindBidirectional(viewModel.allowIntegerEditionProperty());
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java b/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
index c5f166f66e1..890568a879f 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
@@ -24,6 +24,7 @@
import org.jabref.model.database.BibDatabaseMode;
import org.jabref.model.entry.field.FieldFactory;
import org.jabref.preferences.GeneralPreferences;
+import org.jabref.preferences.JabRefPreferences;
import org.jabref.preferences.PreferencesService;
import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
@@ -36,8 +37,6 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
private final ObjectProperty selectedLanguageProperty = new SimpleObjectProperty<>();
private final ListProperty encodingsListProperty = new SimpleListProperty<>();
private final ObjectProperty selectedEncodingProperty = new SimpleObjectProperty<>();
- private final ListProperty bibliographyModeListProperty = new SimpleListProperty<>();
- private final ObjectProperty selectedBiblatexModeProperty = new SimpleObjectProperty<>();
private final BooleanProperty inspectionWarningDuplicateProperty = new SimpleBooleanProperty();
private final BooleanProperty confirmDeleteProperty = new SimpleBooleanProperty();
@@ -99,9 +98,6 @@ public void setValues() {
encodingsListProperty.setValue(FXCollections.observableArrayList(Encodings.getCharsets()));
selectedEncodingProperty.setValue(initialGeneralPreferences.getDefaultEncoding());
- bibliographyModeListProperty.setValue(FXCollections.observableArrayList(BibDatabaseMode.values()));
- selectedBiblatexModeProperty.setValue(initialGeneralPreferences.getDefaultBibDatabaseMode());
-
inspectionWarningDuplicateProperty.setValue(initialGeneralPreferences.isWarnAboutDuplicatesInInspection());
confirmDeleteProperty.setValue(initialGeneralPreferences.isConfirmDelete());
allowIntegerEditionProperty.setValue(initialGeneralPreferences.isAllowIntegerEditionBibtex());
@@ -136,7 +132,7 @@ public void storeSettings() {
preferencesService.storeGeneralPreferences(new GeneralPreferences(
selectedEncodingProperty.getValue(),
- selectedBiblatexModeProperty.getValue(),
+ ((JabRefPreferences) preferencesService).getBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE) ? BibDatabaseMode.BIBLATEX : BibDatabaseMode.BIBTEX,
inspectionWarningDuplicateProperty.getValue(),
confirmDeleteProperty.getValue(),
allowIntegerEditionProperty.getValue(),
@@ -194,14 +190,6 @@ public ObjectProperty selectedEncodingProperty() {
return this.selectedEncodingProperty;
}
- public ListProperty biblatexModeListProperty() {
- return this.bibliographyModeListProperty;
- }
-
- public ObjectProperty selectedBiblatexModeProperty() {
- return this.selectedBiblatexModeProperty;
- }
-
public BooleanProperty inspectionWarningDuplicateProperty() {
return this.inspectionWarningDuplicateProperty;
}