Moved default library to EntryTab

src/main/java/org/jabref/gui/preferences/entry/EntryTab.fxml

@@ -3,21 +3,32 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.control.Tooltip?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <fx:root spacing="10.0" type="VBox"
          xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
          fx:controller="org.jabref.gui.preferences.entry.EntryTab">
     <Label styleClass="titleHeader" text="%Entry"/>
+    <GridPane hgap="10.0" vgap="4.0">
+    <columnConstraints>
+        <ColumnConstraints hgrow="SOMETIMES" percentWidth="30.0"/>
+        <ColumnConstraints hgrow="SOMETIMES"/>
+    </columnConstraints>
+        <Label text="%Default library mode" GridPane.rowIndex="0"/>
+        <ComboBox fx:id="biblatexMode" prefWidth="200.0" GridPane.rowIndex="0" GridPane.columnIndex="1"/>
 
-    <Label styleClass="sectionHeader" text="%Field"/>
-    <HBox spacing="4" alignment="CENTER_LEFT">
-        <Label text="%Keyword separator"/>
-        <TextField fx:id="keywordSeparator" minWidth="30.0" maxWidth="30.0" alignment="CENTER"/>
-    </HBox>
+        <Label styleClass="sectionHeader" text="%Field" GridPane.rowIndex="1" GridPane.columnSpan="2"/>
+
+        <Label text="%Keyword separator" GridPane.rowIndex="2"/>
+        <TextField fx:id="keywordSeparator" minWidth="30.0" maxWidth="30.0" alignment="CENTER"
+            GridPane.rowIndex="2" GridPane.columnIndex="1"/>
+    </GridPane>
 
     <CheckBox fx:id="resolveStrings" text="%Resolve BibTeX strings"/>
     <HBox alignment="CENTER_LEFT" spacing="10.0">

src/main/java/org/jabref/gui/preferences/entry/EntryTab.java

@@ -3,6 +3,7 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
 import javafx.scene.control.TextField;
 
 import org.jabref.gui.actions.ActionFactory;
@@ -11,14 +12,18 @@
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
+import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseMode;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import jakarta.inject.Inject;
 
 public class EntryTab extends AbstractPreferenceTabView<EntryTabViewModel> implements PreferencesTab {
 
+    @FXML private ComboBox<BibDatabaseMode> biblatexMode;
+
     @FXML private TextField keywordSeparator;
 
     @FXML private CheckBox resolveStrings;
@@ -44,6 +49,12 @@ public EntryTab() {
     public void initialize() {
         this.viewModel = new EntryTabViewModel(preferencesService);
 
+        new ViewModelListCellFactory<BibDatabaseMode>()
+                .withText(BibDatabaseMode::getFormattedName)
+                .install(biblatexMode);
+        biblatexMode.itemsProperty().bind(viewModel.biblatexModeListProperty());
+        biblatexMode.valueProperty().bindBidirectional(viewModel.selectedBiblatexModeProperty());
+
         keywordSeparator.textProperty().bindBidirectional(viewModel.keywordSeparatorProperty());
 
         resolveStrings.selectedProperty().bindBidirectional(viewModel.resolveStringsProperty());

src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java

@@ -1,19 +1,29 @@
 package org.jabref.gui.preferences.entry;
 
 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.preferences.PreferenceTabViewModel;
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.preferences.OwnerPreferences;
 import org.jabref.logic.preferences.TimestampPreferences;
+import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.preferences.BibEntryPreferences;
+import org.jabref.preferences.GeneralPreferences;
 import org.jabref.preferences.PreferencesService;
 
 public class EntryTabViewModel implements PreferenceTabViewModel {
+    private final ListProperty<BibDatabaseMode> bibliographyModeListProperty = new SimpleListProperty<>();
+    private final ObjectProperty<BibDatabaseMode> selectedBiblatexModeProperty = new SimpleObjectProperty<>();
+
     private final StringProperty keywordSeparatorProperty = new SimpleStringProperty("");
 
     private final BooleanProperty resolveStringsProperty = new SimpleBooleanProperty();
@@ -30,16 +40,21 @@ public class EntryTabViewModel implements PreferenceTabViewModel {
     private final BibEntryPreferences bibEntryPreferences;
     private final OwnerPreferences ownerPreferences;
     private final TimestampPreferences timestampPreferences;
+    private final GeneralPreferences generalPreferences;
 
     public EntryTabViewModel(PreferencesService preferencesService) {
         this.bibEntryPreferences = preferencesService.getBibEntryPreferences();
         this.fieldPreferences = preferencesService.getFieldPreferences();
         this.ownerPreferences = preferencesService.getOwnerPreferences();
         this.timestampPreferences = preferencesService.getTimestampPreferences();
+        this.generalPreferences = preferencesService.getGeneralPreferences();
     }
 
     @Override
     public void setValues() {
+        bibliographyModeListProperty.setValue(FXCollections.observableArrayList(BibDatabaseMode.values()));
+        selectedBiblatexModeProperty.setValue(generalPreferences.getDefaultBibDatabaseMode());
+
         keywordSeparatorProperty.setValue(bibEntryPreferences.getKeywordSeparator().toString());
 
         resolveStringsProperty.setValue(fieldPreferences.shouldResolveStrings());
@@ -56,6 +71,8 @@ public void setValues() {
 
     @Override
     public void storeSettings() {
+        generalPreferences.setDefaultBibDatabaseMode(selectedBiblatexModeProperty.getValue());
+
         bibEntryPreferences.keywordSeparatorProperty().setValue(keywordSeparatorProperty.getValue().charAt(0));
 
         fieldPreferences.setResolveStrings(resolveStringsProperty.getValue());
@@ -70,6 +87,14 @@ public void storeSettings() {
         timestampPreferences.setAddModificationDate(addModificationDateProperty.getValue());
     }
 
+    public ListProperty<BibDatabaseMode> biblatexModeListProperty() {
+        return this.bibliographyModeListProperty;
+    }
+
+    public ObjectProperty<BibDatabaseMode> selectedBiblatexModeProperty() {
+        return this.selectedBiblatexModeProperty;
+    }
+
     public StringProperty keywordSeparatorProperty() {
         return keywordSeparatorProperty;
     }

src/main/java/org/jabref/gui/preferences/library/LibraryTab.fxml

@@ -1,30 +1,13 @@
 <?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.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <fx:root spacing="10.0" type="VBox"
          xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
          fx:controller="org.jabref.gui.preferences.library.LibraryTab">
     <Label styleClass="titleHeader" text="%General"/>
-    <GridPane hgap="10.0" vgap="4.0">
-        <columnConstraints>
-            <ColumnConstraints hgrow="SOMETIMES" percentWidth="30.0"/>
-            <ColumnConstraints hgrow="SOMETIMES"/>
-        </columnConstraints>
-        <rowConstraints>
-            <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
-            <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
-            <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
-        </rowConstraints>
 
-        <Label text="%Default library mode" GridPane.rowIndex="2"/>
-        <ComboBox fx:id="biblatexMode" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
-    </GridPane>
     <CheckBox fx:id="collectTelemetry" text="%Collect and share telemetry data to help improve JabRef"/>
 
 </fx:root>

src/main/java/org/jabref/gui/preferences/library/LibraryTab.java

@@ -2,19 +2,15 @@
 
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
-import javafx.scene.control.ComboBox;
 
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
-import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseMode;
 
 import com.airhacks.afterburner.views.ViewLoader;
 
 public class LibraryTab extends AbstractPreferenceTabView<LibraryTabViewModel> implements PreferencesTab {
 
-    @FXML private ComboBox<BibDatabaseMode> biblatexMode;
     @FXML private CheckBox collectTelemetry;
 
     public LibraryTab() {
@@ -31,12 +27,6 @@ public String getTabName() {
     public void initialize() {
         this.viewModel = new LibraryTabViewModel(dialogService, preferencesService.getGeneralPreferences(), preferencesService.getTelemetryPreferences());
 
-        new ViewModelListCellFactory<BibDatabaseMode>()
-                .withText(BibDatabaseMode::getFormattedName)
-                .install(biblatexMode);
-        biblatexMode.itemsProperty().bind(viewModel.biblatexModeListProperty());
-        biblatexMode.valueProperty().bindBidirectional(viewModel.selectedBiblatexModeProperty());
-
         collectTelemetry.selectedProperty().bindBidirectional(viewModel.collectTelemetryProperty());
     }
 }

src/main/java/org/jabref/gui/preferences/library/LibraryTabViewModel.java

@@ -1,22 +1,14 @@
 package org.jabref.gui.preferences.library;
 
 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.collections.FXCollections;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
-import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.preferences.GeneralPreferences;
 import org.jabref.preferences.TelemetryPreferences;
 
 public class LibraryTabViewModel implements PreferenceTabViewModel {
-    private final ListProperty<BibDatabaseMode> bibliographyModeListProperty = new SimpleListProperty<>();
-    private final ObjectProperty<BibDatabaseMode> selectedBiblatexModeProperty = new SimpleObjectProperty<>();
 
     private final BooleanProperty collectTelemetryProperty = new SimpleBooleanProperty();
 
@@ -32,25 +24,13 @@ public LibraryTabViewModel(DialogService dialogService, GeneralPreferences gener
     }
 
     public void setValues() {
-        bibliographyModeListProperty.setValue(FXCollections.observableArrayList(BibDatabaseMode.values()));
-        selectedBiblatexModeProperty.setValue(generalPreferences.getDefaultBibDatabaseMode());
-
         collectTelemetryProperty.setValue(telemetryPreferences.shouldCollectTelemetry());
     }
 
     public void storeSettings() {
-        generalPreferences.setDefaultBibDatabaseMode(selectedBiblatexModeProperty.getValue());
         telemetryPreferences.setCollectTelemetry(collectTelemetryProperty.getValue());
     }
 
-    public ListProperty<BibDatabaseMode> biblatexModeListProperty() {
-        return this.bibliographyModeListProperty;
-    }
-
-    public ObjectProperty<BibDatabaseMode> selectedBiblatexModeProperty() {
-        return this.selectedBiblatexModeProperty;
-    }
-
     public BooleanProperty collectTelemetryProperty() {
         return this.collectTelemetryProperty;
     }