Merge branch 'main' into tryToCreateMergedTrustStore

* main:
  prepare adding cite key delimiter and start end chars

src/main/java/org/jabref/gui/preferences/external/ExternalTab.fxml

@@ -12,6 +12,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.icon.JabRefIconView?>
+<?import javafx.scene.text.Text?>
 <fx:root spacing="10.0" type="VBox"
          xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
          fx:controller="org.jabref.gui.preferences.external.ExternalTab">
@@ -56,6 +57,11 @@
             <Label text="%Cite command" GridPane.rowIndex="2"/>
             <TextField fx:id="citeCommand"
                        prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
+            <Label text="%Start and end character for cite command" GridPane.rowIndex="3"/>
+            <TextField fx:id="startCharacter" prefWidth="50.0" GridPane.columnIndex="1" GridPane.rowIndex="3"/>
+            <TextField fx:id="endCharacter" prefWidth="50.0" GridPane.columnIndex="1" GridPane.rowIndex="4"/>
+            <Label text="%Delimiter" GridPane.rowIndex="4"/>
+            <TextField fx:id="delimiter" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="5"/>
         </GridPane>
     </HBox>
 

src/main/java/org/jabref/gui/preferences/external/ExternalTab.java

@@ -23,6 +23,10 @@ public class ExternalTab extends AbstractPreferenceTabView<ExternalTabViewModel>
     @FXML private CheckBox autoOpenAttachedFolders;
     @FXML private ComboBox<PushToApplication> pushToApplicationCombo;
     @FXML private TextField citeCommand;
+    @FXML private TextField endCharacter;
+    @FXML private TextField startCharacter;
+    @FXML private TextField delimiter;
+
     @FXML private CheckBox useCustomTerminal;
     @FXML private TextField customTerminalCommand;
     @FXML private Button customTerminalBrowse;
@@ -58,6 +62,9 @@ public void initialize() {
         pushToApplicationCombo.itemsProperty().bind(viewModel.pushToApplicationsListProperty());
         pushToApplicationCombo.valueProperty().bindBidirectional(viewModel.selectedPushToApplication());
         citeCommand.textProperty().bindBidirectional(viewModel.citeCommandProperty());
+        startCharacter.textProperty().bindBidirectional(viewModel.startCharacterProperty());
+        endCharacter.textProperty().bindBidirectional(viewModel.endCharacterProperty());
+        delimiter.textProperty().bindBidirectional(viewModel.delimiterProperty());
 
         useCustomTerminal.selectedProperty().bindBidirectional(viewModel.useCustomTerminalProperty());
         customTerminalCommand.textProperty().bindBidirectional(viewModel.customTerminalCommandProperty());

src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java

@@ -5,6 +5,7 @@
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.Property;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -40,6 +41,9 @@ public class ExternalTabViewModel implements PreferenceTabViewModel {
     private final ListProperty<PushToApplication> pushToApplicationsListProperty = new SimpleListProperty<>();
     private final ObjectProperty<PushToApplication> selectedPushToApplicationProperty = new SimpleObjectProperty<>();
     private final StringProperty citeCommandProperty = new SimpleStringProperty("");
+    private final StringProperty startCharacterProperty = new SimpleStringProperty("");
+    private final StringProperty endCharacterProperty = new SimpleStringProperty("");
+    private final StringProperty delimiter = new SimpleStringProperty("");
     private final BooleanProperty useCustomTerminalProperty = new SimpleBooleanProperty();
     private final StringProperty customTerminalCommandProperty = new SimpleStringProperty("");
     private final BooleanProperty useCustomFileBrowserProperty = new SimpleBooleanProperty();
@@ -210,7 +214,17 @@ public StringProperty citeCommandProperty() {
         return this.citeCommandProperty;
     }
 
-    // Open console
+    public StringProperty startCharacterProperty() {
+        return this.endCharacterProperty;
+    }
+
+    public StringProperty endCharacterProperty() {
+        return this.endCharacterProperty;
+    }
+
+    public StringProperty delimiterProperty() {
+        return this.delimiter;
+    }
 
     public BooleanProperty useCustomTerminalProperty() {
         return this.useCustomTerminalProperty;
@@ -229,4 +243,5 @@ public BooleanProperty useCustomFileBrowserProperty() {
     public StringProperty customFileBrowserCommandProperty() {
         return this.customFileBrowserCommandProperty;
     }
+
 }