From 25409d98fedfdf319edc9bb3b194e9de0fad5561 Mon Sep 17 00:00:00 2001
From: DiamondMyK <1094933454@qq.com>
Date: Sun, 29 Oct 2023 23:57:20 +0800
Subject: [PATCH 01/11] Fix issue #9306: Move "Open only one instance of
 JabRef" preference option to somewhere else

---
 CHANGELOG.md                                  |   1 +
 issue#9306.patch                              | 590 ++++++++++++++++++
 .../gui/preferences/general/GeneralTab.fxml   |  11 +-
 .../gui/preferences/general/GeneralTab.java   |  19 +-
 .../general/GeneralTabViewModel.java          | 106 +++-
 .../gui/preferences/network/NetworkTab.fxml   |   8 -
 .../gui/preferences/network/NetworkTab.java   |  27 +-
 .../network/NetworkTabViewModel.java          |  69 +-
 8 files changed, 723 insertions(+), 108 deletions(-)
 create mode 100644 issue#9306.patch

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e5a7853897..b7136d76891 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 
 ### Changed
 
+- We changed the location of the 'Open only one instance of JabRef' preference option.[#9306](https://github.com/JabRef/jabref/issues/9306)
 - We changed the setting of the keyword separator to accept a single character only. [#177](https://github.com/koppor/jabref/issues/177)
 
 ### Fixed
diff --git a/issue#9306.patch b/issue#9306.patch
new file mode 100644
index 00000000000..a64684f996c
--- /dev/null
+++ b/issue#9306.patch
@@ -0,0 +1,590 @@
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index 6e5a785389..b7136d7689 100644
+--- a/CHANGELOG.md
++++ b/CHANGELOG.md
+@@ -15,6 +15,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
+ 
+ ### Changed
+ 
++- We changed the location of the 'Open only one instance of JabRef' preference option.[#9306](https://github.com/JabRef/jabref/issues/9306)
+ - We changed the setting of the keyword separator to accept a single character only. [#177](https://github.com/koppor/jabref/issues/177)
+ 
+ ### Fixed
+diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml
+index 4d8d3c265b..81406cdb1f 100644
+--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml
++++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml
+@@ -4,6 +4,7 @@
+ <?import javafx.scene.control.Button?>
+ <?import javafx.scene.control.CheckBox?>
+ <?import javafx.scene.control.ComboBox?>
++<?import javafx.scene.control.Hyperlink?>
+ <?import javafx.scene.control.Label?>
+ <?import javafx.scene.control.Spinner?>
+ <?import javafx.scene.control.TextField?>
+@@ -13,7 +14,6 @@
+ <?import javafx.scene.layout.HBox?>
+ <?import javafx.scene.layout.VBox?>
+ <?import org.jabref.gui.icon.JabRefIconView?>
+-<?import javafx.scene.control.Hyperlink?>
+ <fx:root spacing="10.0" type="VBox"
+          xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+          fx:controller="org.jabref.gui.preferences.general.GeneralTab">
+@@ -52,7 +52,7 @@
+ 
+         <CheckBox fx:id="fontOverride" text="%Override default font settings"
+                   GridPane.rowIndex="4" GridPane.columnIndex="0"/>
+-        <HBox alignment="CENTER_LEFT" spacing="4.0" disable="${!fontOverride.selected}"
++        <HBox alignment="CENTER_LEFT" spacing="4.0"
+               GridPane.rowIndex="4" GridPane.columnIndex="1">
+             <Label text="%Size"/>
+             <Spinner fx:id="fontSize" styleClass="fontsizeSpinner" editable="true"/>
+@@ -70,6 +70,13 @@
+     <CheckBox fx:id="confirmDelete" text="%Show confirmation dialog when deleting entries"/>
+     <CheckBox fx:id="collectTelemetry" text="%Collect and share telemetry data to help improve JabRef"/>
+ 
++    <Label styleClass="sectionHeader" text="%Single instance" />
++    <HBox alignment="CENTER_LEFT" spacing="10.0">
++        <CheckBox fx:id="remoteServer" text="%Enforce single JabRef instance (and allow remote operations) using port" />
++        <TextField fx:id="remotePort" maxWidth="100.0" HBox.hgrow="ALWAYS" />
++        <Button fx:id="remoteHelp" prefWidth="20.0" />
++    </HBox>
++
+     <Label styleClass="sectionHeader" text="%Libraries"/>
+     <GridPane hgap="10.0" vgap="4.0">
+         <columnConstraints>
+diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
+index ecd70a04d0..44f4526ef3 100644
+--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
++++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
+@@ -13,6 +13,7 @@ import javafx.scene.control.TextField;
+ import javafx.scene.control.TextFormatter;
+ import javafx.util.converter.IntegerStringConverter;
+ 
++import org.jabref.gui.Globals;
+ import org.jabref.gui.actions.ActionFactory;
+ import org.jabref.gui.actions.StandardActions;
+ import org.jabref.gui.help.HelpAction;
+@@ -25,10 +26,14 @@ 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.model.util.FileUpdateMonitor;
+ 
+ import com.airhacks.afterburner.views.ViewLoader;
+ import com.tobiasdiez.easybind.EasyBind;
+ import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
++import jakarta.inject.Inject;
++
++import static org.jabref.gui.Globals.entryTypesManager;
+ 
+ public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> implements PreferencesTab {
+ 
+@@ -49,6 +54,10 @@ public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> i
+     @FXML private Button autosaveLocalLibrariesHelp;
+     @FXML private CheckBox createBackup;
+     @FXML private TextField backupDirectory;
++    @FXML private CheckBox remoteServer;
++    @FXML private TextField remotePort;
++    @FXML private Button remoteHelp;
++    @Inject private FileUpdateMonitor fileUpdateMonitor;
+ 
+     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
+ 
+@@ -74,7 +83,7 @@ public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> i
+     }
+ 
+     public void initialize() {
+-        this.viewModel = new GeneralTabViewModel(dialogService, preferencesService);
++        this.viewModel = new GeneralTabViewModel(dialogService, preferencesService, fileUpdateMonitor, entryTypesManager);
+ 
+         new ViewModelListCellFactory<Language>()
+                 .withText(Language::getDisplayName)
+@@ -127,10 +136,18 @@ public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> i
+         backupDirectory.textProperty().bindBidirectional(viewModel.backupDirectoryProperty());
+         backupDirectory.disableProperty().bind(viewModel.createBackupProperty().not());
+ 
++        ActionFactory actionFactory1 = new ActionFactory(Globals.getKeyPrefs());
++        actionFactory1.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.REMOTE, dialogService, preferencesService.getFilePreferences()), remoteHelp);
++
+         Platform.runLater(() -> {
++            validationVisualizer.initVisualization(viewModel.remotePortValidationStatus(), remotePort);
+             validationVisualizer.initVisualization(viewModel.fontSizeValidationStatus(), fontSize);
+             validationVisualizer.initVisualization(viewModel.customPathToThemeValidationStatus(), customThemePath);
+         });
++
++        remoteServer.selectedProperty().bindBidirectional(viewModel.remoteServerProperty());
++        remotePort.textProperty().bindBidirectional(viewModel.remotePortProperty());
++        remotePort.disableProperty().bind(remoteServer.selectedProperty().not());
+     }
+ 
+     @FXML
+diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
+index 3747072250..e8228dfadd 100644
+--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
++++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
+@@ -4,6 +4,7 @@ import java.io.IOException;
+ import java.nio.file.Path;
+ import java.util.ArrayList;
+ import java.util.List;
++import java.util.Optional;
+ 
+ import javafx.beans.property.BooleanProperty;
+ import javafx.beans.property.ListProperty;
+@@ -19,18 +20,26 @@ import javafx.collections.FXCollections;
+ import javafx.scene.control.SpinnerValueFactory;
+ 
+ import org.jabref.gui.DialogService;
++import org.jabref.gui.Globals;
+ import org.jabref.gui.desktop.JabRefDesktop;
+ import org.jabref.gui.preferences.PreferenceTabViewModel;
++import org.jabref.gui.remote.CLIMessageHandler;
+ import org.jabref.gui.theme.Theme;
+ import org.jabref.gui.theme.ThemeTypes;
+ import org.jabref.gui.util.DirectoryDialogConfiguration;
+ import org.jabref.gui.util.FileDialogConfiguration;
+ import org.jabref.logic.l10n.Language;
+ import org.jabref.logic.l10n.Localization;
++import org.jabref.logic.net.ssl.TrustStoreManager;
++import org.jabref.logic.remote.RemotePreferences;
++import org.jabref.logic.remote.RemoteUtil;
+ import org.jabref.logic.util.StandardFileType;
+ import org.jabref.model.database.BibDatabaseMode;
++import org.jabref.model.entry.BibEntryTypesManager;
+ import org.jabref.model.strings.StringUtil;
++import org.jabref.model.util.FileUpdateMonitor;
+ import org.jabref.preferences.FilePreferences;
++import org.jabref.preferences.InternalPreferences;
+ import org.jabref.preferences.LibraryPreferences;
+ import org.jabref.preferences.PreferencesService;
+ import org.jabref.preferences.TelemetryPreferences;
+@@ -81,19 +90,32 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
+     private final TelemetryPreferences telemetryPreferences;
+     private final LibraryPreferences libraryPreferences;
+     private final FilePreferences filePreferences;
++    private final RemotePreferences remotePreferences;
+ 
+     private final Validator fontSizeValidator;
+     private final Validator customPathToThemeValidator;
+ 
+     private final List<String> restartWarning = new ArrayList<>();
+-
+-    public GeneralTabViewModel(DialogService dialogService, PreferencesService preferences) {
++    private final BooleanProperty remoteServerProperty = new SimpleBooleanProperty();
++    private final StringProperty remotePortProperty = new SimpleStringProperty("");
++    private final Validator remotePortValidator;
++    private final InternalPreferences internalPreferences;
++    private final BooleanProperty versionCheckProperty = new SimpleBooleanProperty();
++    private final FileUpdateMonitor fileUpdateMonitor;
++    private final BibEntryTypesManager entryTypesManager;
++    private TrustStoreManager trustStoreManager;
++    public GeneralTabViewModel(DialogService dialogService, PreferencesService preferences, FileUpdateMonitor fileUpdateMonitor, BibEntryTypesManager entryTypesManager) {
+         this.dialogService = dialogService;
+         this.preferences = preferences;
+         this.workspacePreferences = preferences.getWorkspacePreferences();
+         this.telemetryPreferences = preferences.getTelemetryPreferences();
+         this.libraryPreferences = preferences.getLibraryPreferences();
+         this.filePreferences = preferences.getFilePreferences();
++        this.remotePreferences = preferences.getRemotePreferences();
++        this.internalPreferences = preferences.getInternalPreferences();
++        this.fileUpdateMonitor = fileUpdateMonitor;
++        this.entryTypesManager = entryTypesManager;
++        this.trustStoreManager = trustStoreManager;
+ 
+         fontSizeValidator = new FunctionBasedValidator<>(
+                 fontSizeProperty,
+@@ -116,6 +138,25 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
+                         Localization.lang("General"),
+                         Localization.lang("Visual theme"),
+                         Localization.lang("Please specify a css theme file."))));
++
++        remotePortValidator = new FunctionBasedValidator<>(
++                remotePortProperty,
++                input -> {
++                    try {
++                        int portNumber = Integer.parseInt(remotePortProperty().getValue());
++                        return RemoteUtil.isUserPort(portNumber);
++                    } catch (NumberFormatException ex) {
++                        return false;
++                    }
++                },
++                ValidationMessage.error(String.format("%s > %s %n %n %s",
++                        Localization.lang("Network"),
++                        Localization.lang("Remote operation"),
++                        Localization.lang("You must enter an integer value in the interval 1025-65535"))));
++    }
++
++    public ValidationStatus remotePortValidationStatus() {
++        return remotePortValidator.getValidationStatus();
+     }
+ 
+     @Override
+@@ -125,8 +166,10 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
+         // The light theme is in fact the absence of any theme modifying 'base.css'. Another embedded theme like
+         // 'dark.css', stored in the classpath, can be introduced in {@link org.jabref.gui.theme.Theme}.
+         switch (workspacePreferences.getTheme().getType()) {
+-            case DEFAULT -> selectedThemeProperty.setValue(ThemeTypes.LIGHT);
+-            case EMBEDDED -> selectedThemeProperty.setValue(ThemeTypes.DARK);
++            case DEFAULT ->
++                    selectedThemeProperty.setValue(ThemeTypes.LIGHT);
++            case EMBEDDED ->
++                    selectedThemeProperty.setValue(ThemeTypes.DARK);
+             case CUSTOM -> {
+                 selectedThemeProperty.setValue(ThemeTypes.CUSTOM);
+                 customPathToThemeProperty.setValue(workspacePreferences.getTheme().getName());
+@@ -151,6 +194,9 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
+ 
+         createBackupProperty.setValue(filePreferences.shouldCreateBackup());
+         backupDirectoryProperty.setValue(filePreferences.getBackupDirectory().toString());
++
++        remoteServerProperty.setValue(remotePreferences.useRemoteServer());
++        remotePortProperty.setValue(String.valueOf(remotePreferences.getPort()));
+     }
+ 
+     @Override
+@@ -185,6 +231,38 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
+ 
+         filePreferences.createBackupProperty().setValue(createBackupProperty.getValue());
+         filePreferences.backupDirectoryProperty().setValue(Path.of(backupDirectoryProperty.getValue()));
++
++        getPortAsInt(remotePortProperty.getValue()).ifPresent(newPort -> {
++            if (remotePreferences.isDifferentPort(newPort)) {
++                remotePreferences.setPort(newPort);
++            }
++        });
++
++        internalPreferences.setVersionCheckEnabled(versionCheckProperty.getValue());
++
++        getPortAsInt(remotePortProperty.getValue()).ifPresent(newPort -> {
++            if (remotePreferences.isDifferentPort(newPort)) {
++                remotePreferences.setPort(newPort);
++            }
++        });
++
++        if (remoteServerProperty.getValue()) {
++            remotePreferences.setUseRemoteServer(true);
++            Globals.REMOTE_LISTENER.openAndStart(new CLIMessageHandler(preferences, fileUpdateMonitor, entryTypesManager), remotePreferences.getPort());
++        } else {
++            remotePreferences.setUseRemoteServer(false);
++            Globals.REMOTE_LISTENER.stop();
++        }
++        trustStoreManager.flush();
++
++        if (remoteServerProperty.getValue()) {
++            remotePreferences.setUseRemoteServer(true);
++            Globals.REMOTE_LISTENER.openAndStart(new CLIMessageHandler(preferences, fileUpdateMonitor, entryTypesManager), remotePreferences.getPort());
++        } else {
++            remotePreferences.setUseRemoteServer(false);
++            Globals.REMOTE_LISTENER.stop();
++        }
++        trustStoreManager.flush();
+     }
+ 
+     public ValidationStatus fontSizeValidationStatus() {
+@@ -199,6 +277,10 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
+     public boolean validateSettings() {
+         CompositeValidator validator = new CompositeValidator();
+ 
++        if (remoteServerProperty.getValue()) {
++            validator.addValidators(remotePortValidator);
++        }
++
+         if (fontOverrideProperty.getValue()) {
+             validator.addValidators(fontSizeValidator);
+         }
+@@ -310,6 +392,14 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
+                      .ifPresent(dir -> backupDirectoryProperty.setValue(dir.toString()));
+     }
+ 
++    public BooleanProperty remoteServerProperty() {
++        return remoteServerProperty;
++    }
++
++    public StringProperty remotePortProperty() {
++        return remotePortProperty;
++    }
++
+     public void openBrowser() {
+         String url = "https://themes.jabref.org";
+         try {
+@@ -318,4 +408,12 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
+             dialogService.showErrorDialogAndWait(Localization.lang("Could not open website."), e);
+         }
+     }
++
++    private Optional<Integer> getPortAsInt(String value) {
++        try {
++            return Optional.of(Integer.parseInt(value));
++        } catch (NumberFormatException ex) {
++            return Optional.empty();
++        }
++    }
+ }
+diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
+index 41e0349772..0cbe89e75a 100644
+--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
++++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
+@@ -10,7 +10,6 @@
+ <?import javafx.scene.control.TextField?>
+ <?import javafx.scene.layout.ColumnConstraints?>
+ <?import javafx.scene.layout.GridPane?>
+-<?import javafx.scene.layout.HBox?>
+ <?import javafx.scene.layout.RowConstraints?>
+ <?import javafx.scene.layout.VBox?>
+ <?import org.jabref.gui.icon.JabRefIconView?>
+@@ -19,13 +18,6 @@
+     <Label styleClass="titleHeader" text="%Network" />
+     <CheckBox fx:id="versionCheck" text="%Check for latest version online"/>
+     <Label text="%If you encounter an issue or a bug, please check the latest version, whether the issue is still present." wrapText="true"/>
+-    <Label styleClass="sectionHeader" text="%Remote operation" />
+-    <Label fx:id="remoteLabel" text="%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." textOverrun="CLIP" wrapText="true" />
+-    <HBox alignment="CENTER_LEFT" spacing="10.0">
+-        <CheckBox fx:id="remoteServer" text="%Listen for remote operation on port" />
+-        <TextField fx:id="remotePort" maxWidth="100.0" HBox.hgrow="ALWAYS" />
+-        <Button fx:id="remoteHelp" prefWidth="20.0" />
+-    </HBox>
+ 
+     <Label styleClass="sectionHeader" text="%Proxy configuration" />
+     <GridPane hgap="10.0" vgap="10.0">
+diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
+index 71e70e5b1f..2b1294f01a 100644
+--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
++++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
+@@ -17,33 +17,20 @@ import javafx.scene.control.TextField;
+ import javafx.scene.control.Tooltip;
+ import javafx.scene.input.MouseEvent;
+ 
+-import org.jabref.gui.Globals;
+-import org.jabref.gui.actions.ActionFactory;
+-import org.jabref.gui.actions.StandardActions;
+-import org.jabref.gui.help.HelpAction;
+ import org.jabref.gui.icon.IconTheme;
+ import org.jabref.gui.preferences.AbstractPreferenceTabView;
+ import org.jabref.gui.preferences.PreferencesTab;
+ import org.jabref.gui.util.IconValidationDecorator;
+ import org.jabref.gui.util.ValueTableCellFactory;
+-import org.jabref.logic.help.HelpFile;
+ import org.jabref.logic.l10n.Localization;
+-import org.jabref.model.entry.BibEntryTypesManager;
+-import org.jabref.model.util.FileUpdateMonitor;
+ 
+ import com.airhacks.afterburner.views.ViewLoader;
+ import com.tobiasdiez.easybind.EasyBind;
+ import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+-import jakarta.inject.Inject;
+ import org.controlsfx.control.textfield.CustomPasswordField;
+ 
+ public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> implements PreferencesTab {
+-    @FXML private Label remoteLabel;
+     @FXML private CheckBox versionCheck;
+-    @FXML private CheckBox remoteServer;
+-    @FXML private TextField remotePort;
+-    @FXML private Button remoteHelp;
+-
+     @FXML private CheckBox proxyUse;
+     @FXML private Label proxyHostnameLabel;
+     @FXML private TextField proxyHostname;
+@@ -67,9 +54,6 @@ public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> i
+     @FXML private TableColumn<CustomCertificateViewModel, String> certVersion;
+     @FXML private TableColumn<CustomCertificateViewModel, String> actionsColumn;
+ 
+-    @Inject private FileUpdateMonitor fileUpdateMonitor;
+-    @Inject private BibEntryTypesManager entryTypesManager;
+-
+     private String proxyPasswordText = "";
+     private int proxyPasswordCaretPosition = 0;
+ 
+@@ -87,15 +71,10 @@ public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> i
+     }
+ 
+     public void initialize() {
+-        this.viewModel = new NetworkTabViewModel(dialogService, preferencesService, fileUpdateMonitor, entryTypesManager);
++        this.viewModel = new NetworkTabViewModel(dialogService, preferencesService);
+ 
+         versionCheck.selectedProperty().bindBidirectional(viewModel.versionCheckProperty());
+ 
+-        remoteLabel.setVisible(preferencesService.getWorkspacePreferences().shouldShowAdvancedHints());
+-        remoteServer.selectedProperty().bindBidirectional(viewModel.remoteServerProperty());
+-        remotePort.textProperty().bindBidirectional(viewModel.remotePortProperty());
+-        remotePort.disableProperty().bind(remoteServer.selectedProperty().not());
+-
+         proxyUse.selectedProperty().bindBidirectional(viewModel.proxyUseProperty());
+         proxyHostnameLabel.disableProperty().bind(proxyUse.selectedProperty().not());
+         proxyHostname.textProperty().bindBidirectional(viewModel.proxyHostnameProperty());
+@@ -129,12 +108,8 @@ public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> i
+         proxyPassword.getRight().addEventFilter(MouseEvent.MOUSE_RELEASED, this::proxyPasswordMask);
+         proxyPassword.getRight().addEventFilter(MouseEvent.MOUSE_EXITED, this::proxyPasswordMask);
+ 
+-        ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
+-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.REMOTE, dialogService, preferencesService.getFilePreferences()), remoteHelp);
+-
+         validationVisualizer.setDecoration(new IconValidationDecorator());
+         Platform.runLater(() -> {
+-            validationVisualizer.initVisualization(viewModel.remotePortValidationStatus(), remotePort);
+             validationVisualizer.initVisualization(viewModel.proxyHostnameValidationStatus(), proxyHostname);
+             validationVisualizer.initVisualization(viewModel.proxyPortValidationStatus(), proxyPort);
+             validationVisualizer.initVisualization(viewModel.proxyUsernameValidationStatus(), proxyUsername);
+diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
+index 7991e86493..9b5d646c7c 100644
+--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
++++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
+@@ -19,9 +19,7 @@ import javafx.collections.ListChangeListener;
+ import javafx.stage.FileChooser;
+ 
+ import org.jabref.gui.DialogService;
+-import org.jabref.gui.Globals;
+ import org.jabref.gui.preferences.PreferenceTabViewModel;
+-import org.jabref.gui.remote.CLIMessageHandler;
+ import org.jabref.gui.util.FileDialogConfiguration;
+ import org.jabref.logic.l10n.Localization;
+ import org.jabref.logic.net.ProxyPreferences;
+@@ -29,13 +27,9 @@ import org.jabref.logic.net.ProxyRegisterer;
+ import org.jabref.logic.net.URLDownload;
+ import org.jabref.logic.net.ssl.SSLCertificate;
+ import org.jabref.logic.net.ssl.TrustStoreManager;
+-import org.jabref.logic.remote.RemotePreferences;
+-import org.jabref.logic.remote.RemoteUtil;
+ import org.jabref.logic.util.OS;
+ import org.jabref.logic.util.StandardFileType;
+-import org.jabref.model.entry.BibEntryTypesManager;
+ import org.jabref.model.strings.StringUtil;
+-import org.jabref.model.util.FileUpdateMonitor;
+ import org.jabref.preferences.InternalPreferences;
+ import org.jabref.preferences.PreferencesService;
+ 
+@@ -48,8 +42,6 @@ import kong.unirest.UnirestException;
+ 
+ public class NetworkTabViewModel implements PreferenceTabViewModel {
+     private final BooleanProperty versionCheckProperty = new SimpleBooleanProperty();
+-    private final BooleanProperty remoteServerProperty = new SimpleBooleanProperty();
+-    private final StringProperty remotePortProperty = new SimpleStringProperty("");
+     private final BooleanProperty proxyUseProperty = new SimpleBooleanProperty();
+     private final StringProperty proxyHostnameProperty = new SimpleStringProperty("");
+     private final StringProperty proxyPortProperty = new SimpleStringProperty("");
+@@ -60,7 +52,6 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
+     private final BooleanProperty passwordPersistAvailable = new SimpleBooleanProperty();
+     private final ListProperty<CustomCertificateViewModel> customCertificateListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
+ 
+-    private final Validator remotePortValidator;
+     private final Validator proxyHostnameValidator;
+     private final Validator proxyPortValidator;
+     private final Validator proxyUsernameValidator;
+@@ -68,10 +59,8 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
+ 
+     private final DialogService dialogService;
+     private final PreferencesService preferences;
+-    private final FileUpdateMonitor fileUpdateMonitor;
+-    private final BibEntryTypesManager entryTypesManager;
+ 
+-    private final RemotePreferences remotePreferences;
++
+     private final ProxyPreferences proxyPreferences;
+     private final ProxyPreferences backupProxyPreferences;
+     private final InternalPreferences internalPreferences;
+@@ -81,14 +70,9 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
+     private final AtomicBoolean sslCertificatesChanged = new AtomicBoolean(false);
+ 
+     public NetworkTabViewModel(DialogService dialogService,
+-                               PreferencesService preferences,
+-                               FileUpdateMonitor fileUpdateMonitor,
+-                               BibEntryTypesManager entryTypesManager) {
++                               PreferencesService preferences) {
+         this.dialogService = dialogService;
+         this.preferences = preferences;
+-        this.fileUpdateMonitor = fileUpdateMonitor;
+-        this.entryTypesManager = entryTypesManager;
+-        this.remotePreferences = preferences.getRemotePreferences();
+         this.proxyPreferences = preferences.getProxyPreferences();
+         this.internalPreferences = preferences.getInternalPreferences();
+ 
+@@ -101,21 +85,6 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
+                 proxyPreferences.getPassword(),
+                 proxyPreferences.shouldPersistPassword());
+ 
+-        remotePortValidator = new FunctionBasedValidator<>(
+-                remotePortProperty,
+-                input -> {
+-                    try {
+-                        int portNumber = Integer.parseInt(remotePortProperty().getValue());
+-                        return RemoteUtil.isUserPort(portNumber);
+-                    } catch (NumberFormatException ex) {
+-                        return false;
+-                    }
+-                },
+-                ValidationMessage.error(String.format("%s > %s %n %n %s",
+-                        Localization.lang("Network"),
+-                        Localization.lang("Remote operation"),
+-                        Localization.lang("You must enter an integer value in the interval 1025-65535"))));
+-
+         proxyHostnameValidator = new FunctionBasedValidator<>(
+                 proxyHostnameProperty,
+                 input -> !StringUtil.isNullOrEmpty(input),
+@@ -154,8 +123,6 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
+     @Override
+     public void setValues() {
+         versionCheckProperty.setValue(internalPreferences.isVersionCheckEnabled());
+-        remoteServerProperty.setValue(remotePreferences.useRemoteServer());
+-        remotePortProperty.setValue(String.valueOf(remotePreferences.getPort()));
+ 
+         setProxyValues();
+         setSSLValues();
+@@ -192,22 +159,6 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
+ 
+     @Override
+     public void storeSettings() {
+-        internalPreferences.setVersionCheckEnabled(versionCheckProperty.getValue());
+-
+-        getPortAsInt(remotePortProperty.getValue()).ifPresent(newPort -> {
+-            if (remotePreferences.isDifferentPort(newPort)) {
+-                remotePreferences.setPort(newPort);
+-            }
+-        });
+-
+-        if (remoteServerProperty.getValue()) {
+-            remotePreferences.setUseRemoteServer(true);
+-            Globals.REMOTE_LISTENER.openAndStart(new CLIMessageHandler(preferences, fileUpdateMonitor, entryTypesManager), remotePreferences.getPort());
+-        } else {
+-            remotePreferences.setUseRemoteServer(false);
+-            Globals.REMOTE_LISTENER.stop();
+-        }
+-
+         proxyPreferences.setUseProxy(proxyUseProperty.getValue());
+         proxyPreferences.setHostname(proxyHostnameProperty.getValue().trim());
+         proxyPreferences.setPort(proxyPortProperty.getValue().trim());
+@@ -228,10 +179,6 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
+         }
+     }
+ 
+-    public ValidationStatus remotePortValidationStatus() {
+-        return remotePortValidator.getValidationStatus();
+-    }
+-
+     public ValidationStatus proxyHostnameValidationStatus() {
+         return proxyHostnameValidator.getValidationStatus();
+     }
+@@ -252,10 +199,6 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
+     public boolean validateSettings() {
+         CompositeValidator validator = new CompositeValidator();
+ 
+-        if (remoteServerProperty.getValue()) {
+-            validator.addValidators(remotePortValidator);
+-        }
+-
+         if (proxyUseProperty.getValue()) {
+             validator.addValidators(proxyHostnameValidator);
+             validator.addValidators(proxyPortValidator);
+@@ -325,14 +268,6 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
+         return versionCheckProperty;
+     }
+ 
+-    public BooleanProperty remoteServerProperty() {
+-        return remoteServerProperty;
+-    }
+-
+-    public StringProperty remotePortProperty() {
+-        return remotePortProperty;
+-    }
+-
+     public BooleanProperty proxyUseProperty() {
+         return proxyUseProperty;
+     }
diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml
index 4d8d3c265b4..81406cdb1f0 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml
@@ -4,6 +4,7 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Spinner?>
 <?import javafx.scene.control.TextField?>
@@ -13,7 +14,6 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.icon.JabRefIconView?>
-<?import javafx.scene.control.Hyperlink?>
 <fx:root spacing="10.0" type="VBox"
          xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
          fx:controller="org.jabref.gui.preferences.general.GeneralTab">
@@ -52,7 +52,7 @@
 
         <CheckBox fx:id="fontOverride" text="%Override default font settings"
                   GridPane.rowIndex="4" GridPane.columnIndex="0"/>
-        <HBox alignment="CENTER_LEFT" spacing="4.0" disable="${!fontOverride.selected}"
+        <HBox alignment="CENTER_LEFT" spacing="4.0"
               GridPane.rowIndex="4" GridPane.columnIndex="1">
             <Label text="%Size"/>
             <Spinner fx:id="fontSize" styleClass="fontsizeSpinner" editable="true"/>
@@ -70,6 +70,13 @@
     <CheckBox fx:id="confirmDelete" text="%Show confirmation dialog when deleting entries"/>
     <CheckBox fx:id="collectTelemetry" text="%Collect and share telemetry data to help improve JabRef"/>
 
+    <Label styleClass="sectionHeader" text="%Single instance" />
+    <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <CheckBox fx:id="remoteServer" text="%Enforce single JabRef instance (and allow remote operations) using port" />
+        <TextField fx:id="remotePort" maxWidth="100.0" HBox.hgrow="ALWAYS" />
+        <Button fx:id="remoteHelp" prefWidth="20.0" />
+    </HBox>
+
     <Label styleClass="sectionHeader" text="%Libraries"/>
     <GridPane hgap="10.0" vgap="4.0">
         <columnConstraints>
diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
index ecd70a04d0c..44f4526ef30 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
@@ -13,6 +13,7 @@
 import javafx.scene.control.TextFormatter;
 import javafx.util.converter.IntegerStringConverter;
 
+import org.jabref.gui.Globals;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.help.HelpAction;
@@ -25,10 +26,14 @@
 import org.jabref.logic.l10n.Language;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseMode;
+import org.jabref.model.util.FileUpdateMonitor;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+import jakarta.inject.Inject;
+
+import static org.jabref.gui.Globals.entryTypesManager;
 
 public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> implements PreferencesTab {
 
@@ -49,6 +54,10 @@ public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> i
     @FXML private Button autosaveLocalLibrariesHelp;
     @FXML private CheckBox createBackup;
     @FXML private TextField backupDirectory;
+    @FXML private CheckBox remoteServer;
+    @FXML private TextField remotePort;
+    @FXML private Button remoteHelp;
+    @Inject private FileUpdateMonitor fileUpdateMonitor;
 
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
@@ -74,7 +83,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new GeneralTabViewModel(dialogService, preferencesService);
+        this.viewModel = new GeneralTabViewModel(dialogService, preferencesService, fileUpdateMonitor, entryTypesManager);
 
         new ViewModelListCellFactory<Language>()
                 .withText(Language::getDisplayName)
@@ -127,10 +136,18 @@ public void initialize() {
         backupDirectory.textProperty().bindBidirectional(viewModel.backupDirectoryProperty());
         backupDirectory.disableProperty().bind(viewModel.createBackupProperty().not());
 
+        ActionFactory actionFactory1 = new ActionFactory(Globals.getKeyPrefs());
+        actionFactory1.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.REMOTE, dialogService, preferencesService.getFilePreferences()), remoteHelp);
+
         Platform.runLater(() -> {
+            validationVisualizer.initVisualization(viewModel.remotePortValidationStatus(), remotePort);
             validationVisualizer.initVisualization(viewModel.fontSizeValidationStatus(), fontSize);
             validationVisualizer.initVisualization(viewModel.customPathToThemeValidationStatus(), customThemePath);
         });
+
+        remoteServer.selectedProperty().bindBidirectional(viewModel.remoteServerProperty());
+        remotePort.textProperty().bindBidirectional(viewModel.remotePortProperty());
+        remotePort.disableProperty().bind(remoteServer.selectedProperty().not());
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
index 37470722501..e8228dfaddd 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
@@ -4,6 +4,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -19,18 +20,26 @@
 import javafx.scene.control.SpinnerValueFactory;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.Globals;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
+import org.jabref.gui.remote.CLIMessageHandler;
 import org.jabref.gui.theme.Theme;
 import org.jabref.gui.theme.ThemeTypes;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.l10n.Language;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.net.ssl.TrustStoreManager;
+import org.jabref.logic.remote.RemotePreferences;
+import org.jabref.logic.remote.RemoteUtil;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseMode;
+import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.strings.StringUtil;
+import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.FilePreferences;
+import org.jabref.preferences.InternalPreferences;
 import org.jabref.preferences.LibraryPreferences;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.TelemetryPreferences;
@@ -81,19 +90,32 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
     private final TelemetryPreferences telemetryPreferences;
     private final LibraryPreferences libraryPreferences;
     private final FilePreferences filePreferences;
+    private final RemotePreferences remotePreferences;
 
     private final Validator fontSizeValidator;
     private final Validator customPathToThemeValidator;
 
     private final List<String> restartWarning = new ArrayList<>();
-
-    public GeneralTabViewModel(DialogService dialogService, PreferencesService preferences) {
+    private final BooleanProperty remoteServerProperty = new SimpleBooleanProperty();
+    private final StringProperty remotePortProperty = new SimpleStringProperty("");
+    private final Validator remotePortValidator;
+    private final InternalPreferences internalPreferences;
+    private final BooleanProperty versionCheckProperty = new SimpleBooleanProperty();
+    private final FileUpdateMonitor fileUpdateMonitor;
+    private final BibEntryTypesManager entryTypesManager;
+    private TrustStoreManager trustStoreManager;
+    public GeneralTabViewModel(DialogService dialogService, PreferencesService preferences, FileUpdateMonitor fileUpdateMonitor, BibEntryTypesManager entryTypesManager) {
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.workspacePreferences = preferences.getWorkspacePreferences();
         this.telemetryPreferences = preferences.getTelemetryPreferences();
         this.libraryPreferences = preferences.getLibraryPreferences();
         this.filePreferences = preferences.getFilePreferences();
+        this.remotePreferences = preferences.getRemotePreferences();
+        this.internalPreferences = preferences.getInternalPreferences();
+        this.fileUpdateMonitor = fileUpdateMonitor;
+        this.entryTypesManager = entryTypesManager;
+        this.trustStoreManager = trustStoreManager;
 
         fontSizeValidator = new FunctionBasedValidator<>(
                 fontSizeProperty,
@@ -116,6 +138,25 @@ public GeneralTabViewModel(DialogService dialogService, PreferencesService prefe
                         Localization.lang("General"),
                         Localization.lang("Visual theme"),
                         Localization.lang("Please specify a css theme file."))));
+
+        remotePortValidator = new FunctionBasedValidator<>(
+                remotePortProperty,
+                input -> {
+                    try {
+                        int portNumber = Integer.parseInt(remotePortProperty().getValue());
+                        return RemoteUtil.isUserPort(portNumber);
+                    } catch (NumberFormatException ex) {
+                        return false;
+                    }
+                },
+                ValidationMessage.error(String.format("%s > %s %n %n %s",
+                        Localization.lang("Network"),
+                        Localization.lang("Remote operation"),
+                        Localization.lang("You must enter an integer value in the interval 1025-65535"))));
+    }
+
+    public ValidationStatus remotePortValidationStatus() {
+        return remotePortValidator.getValidationStatus();
     }
 
     @Override
@@ -125,8 +166,10 @@ public void setValues() {
         // The light theme is in fact the absence of any theme modifying 'base.css'. Another embedded theme like
         // 'dark.css', stored in the classpath, can be introduced in {@link org.jabref.gui.theme.Theme}.
         switch (workspacePreferences.getTheme().getType()) {
-            case DEFAULT -> selectedThemeProperty.setValue(ThemeTypes.LIGHT);
-            case EMBEDDED -> selectedThemeProperty.setValue(ThemeTypes.DARK);
+            case DEFAULT ->
+                    selectedThemeProperty.setValue(ThemeTypes.LIGHT);
+            case EMBEDDED ->
+                    selectedThemeProperty.setValue(ThemeTypes.DARK);
             case CUSTOM -> {
                 selectedThemeProperty.setValue(ThemeTypes.CUSTOM);
                 customPathToThemeProperty.setValue(workspacePreferences.getTheme().getName());
@@ -151,6 +194,9 @@ public void setValues() {
 
         createBackupProperty.setValue(filePreferences.shouldCreateBackup());
         backupDirectoryProperty.setValue(filePreferences.getBackupDirectory().toString());
+
+        remoteServerProperty.setValue(remotePreferences.useRemoteServer());
+        remotePortProperty.setValue(String.valueOf(remotePreferences.getPort()));
     }
 
     @Override
@@ -185,6 +231,38 @@ public void storeSettings() {
 
         filePreferences.createBackupProperty().setValue(createBackupProperty.getValue());
         filePreferences.backupDirectoryProperty().setValue(Path.of(backupDirectoryProperty.getValue()));
+
+        getPortAsInt(remotePortProperty.getValue()).ifPresent(newPort -> {
+            if (remotePreferences.isDifferentPort(newPort)) {
+                remotePreferences.setPort(newPort);
+            }
+        });
+
+        internalPreferences.setVersionCheckEnabled(versionCheckProperty.getValue());
+
+        getPortAsInt(remotePortProperty.getValue()).ifPresent(newPort -> {
+            if (remotePreferences.isDifferentPort(newPort)) {
+                remotePreferences.setPort(newPort);
+            }
+        });
+
+        if (remoteServerProperty.getValue()) {
+            remotePreferences.setUseRemoteServer(true);
+            Globals.REMOTE_LISTENER.openAndStart(new CLIMessageHandler(preferences, fileUpdateMonitor, entryTypesManager), remotePreferences.getPort());
+        } else {
+            remotePreferences.setUseRemoteServer(false);
+            Globals.REMOTE_LISTENER.stop();
+        }
+        trustStoreManager.flush();
+
+        if (remoteServerProperty.getValue()) {
+            remotePreferences.setUseRemoteServer(true);
+            Globals.REMOTE_LISTENER.openAndStart(new CLIMessageHandler(preferences, fileUpdateMonitor, entryTypesManager), remotePreferences.getPort());
+        } else {
+            remotePreferences.setUseRemoteServer(false);
+            Globals.REMOTE_LISTENER.stop();
+        }
+        trustStoreManager.flush();
     }
 
     public ValidationStatus fontSizeValidationStatus() {
@@ -199,6 +277,10 @@ public ValidationStatus customPathToThemeValidationStatus() {
     public boolean validateSettings() {
         CompositeValidator validator = new CompositeValidator();
 
+        if (remoteServerProperty.getValue()) {
+            validator.addValidators(remotePortValidator);
+        }
+
         if (fontOverrideProperty.getValue()) {
             validator.addValidators(fontSizeValidator);
         }
@@ -310,6 +392,14 @@ public void backupFileDirBrowse() {
                      .ifPresent(dir -> backupDirectoryProperty.setValue(dir.toString()));
     }
 
+    public BooleanProperty remoteServerProperty() {
+        return remoteServerProperty;
+    }
+
+    public StringProperty remotePortProperty() {
+        return remotePortProperty;
+    }
+
     public void openBrowser() {
         String url = "https://themes.jabref.org";
         try {
@@ -318,4 +408,12 @@ public void openBrowser() {
             dialogService.showErrorDialogAndWait(Localization.lang("Could not open website."), e);
         }
     }
+
+    private Optional<Integer> getPortAsInt(String value) {
+        try {
+            return Optional.of(Integer.parseInt(value));
+        } catch (NumberFormatException ex) {
+            return Optional.empty();
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
index 41e03497727..0cbe89e75a8 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
@@ -10,7 +10,6 @@
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.icon.JabRefIconView?>
@@ -19,13 +18,6 @@
     <Label styleClass="titleHeader" text="%Network" />
     <CheckBox fx:id="versionCheck" text="%Check for latest version online"/>
     <Label text="%If you encounter an issue or a bug, please check the latest version, whether the issue is still present." wrapText="true"/>
-    <Label styleClass="sectionHeader" text="%Remote operation" />
-    <Label fx:id="remoteLabel" text="%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." textOverrun="CLIP" wrapText="true" />
-    <HBox alignment="CENTER_LEFT" spacing="10.0">
-        <CheckBox fx:id="remoteServer" text="%Listen for remote operation on port" />
-        <TextField fx:id="remotePort" maxWidth="100.0" HBox.hgrow="ALWAYS" />
-        <Button fx:id="remoteHelp" prefWidth="20.0" />
-    </HBox>
 
     <Label styleClass="sectionHeader" text="%Proxy configuration" />
     <GridPane hgap="10.0" vgap="10.0">
diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
index 71e70e5b1f0..2b1294f01a0 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
@@ -17,33 +17,20 @@
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.MouseEvent;
 
-import org.jabref.gui.Globals;
-import org.jabref.gui.actions.ActionFactory;
-import org.jabref.gui.actions.StandardActions;
-import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.gui.util.ValueTableCellFactory;
-import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.BibEntryTypesManager;
-import org.jabref.model.util.FileUpdateMonitor;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-import jakarta.inject.Inject;
 import org.controlsfx.control.textfield.CustomPasswordField;
 
 public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> implements PreferencesTab {
-    @FXML private Label remoteLabel;
     @FXML private CheckBox versionCheck;
-    @FXML private CheckBox remoteServer;
-    @FXML private TextField remotePort;
-    @FXML private Button remoteHelp;
-
     @FXML private CheckBox proxyUse;
     @FXML private Label proxyHostnameLabel;
     @FXML private TextField proxyHostname;
@@ -67,9 +54,6 @@ public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> i
     @FXML private TableColumn<CustomCertificateViewModel, String> certVersion;
     @FXML private TableColumn<CustomCertificateViewModel, String> actionsColumn;
 
-    @Inject private FileUpdateMonitor fileUpdateMonitor;
-    @Inject private BibEntryTypesManager entryTypesManager;
-
     private String proxyPasswordText = "";
     private int proxyPasswordCaretPosition = 0;
 
@@ -87,15 +71,10 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new NetworkTabViewModel(dialogService, preferencesService, fileUpdateMonitor, entryTypesManager);
+        this.viewModel = new NetworkTabViewModel(dialogService, preferencesService);
 
         versionCheck.selectedProperty().bindBidirectional(viewModel.versionCheckProperty());
 
-        remoteLabel.setVisible(preferencesService.getWorkspacePreferences().shouldShowAdvancedHints());
-        remoteServer.selectedProperty().bindBidirectional(viewModel.remoteServerProperty());
-        remotePort.textProperty().bindBidirectional(viewModel.remotePortProperty());
-        remotePort.disableProperty().bind(remoteServer.selectedProperty().not());
-
         proxyUse.selectedProperty().bindBidirectional(viewModel.proxyUseProperty());
         proxyHostnameLabel.disableProperty().bind(proxyUse.selectedProperty().not());
         proxyHostname.textProperty().bindBidirectional(viewModel.proxyHostnameProperty());
@@ -129,12 +108,8 @@ public void initialize() {
         proxyPassword.getRight().addEventFilter(MouseEvent.MOUSE_RELEASED, this::proxyPasswordMask);
         proxyPassword.getRight().addEventFilter(MouseEvent.MOUSE_EXITED, this::proxyPasswordMask);
 
-        ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.REMOTE, dialogService, preferencesService.getFilePreferences()), remoteHelp);
-
         validationVisualizer.setDecoration(new IconValidationDecorator());
         Platform.runLater(() -> {
-            validationVisualizer.initVisualization(viewModel.remotePortValidationStatus(), remotePort);
             validationVisualizer.initVisualization(viewModel.proxyHostnameValidationStatus(), proxyHostname);
             validationVisualizer.initVisualization(viewModel.proxyPortValidationStatus(), proxyPort);
             validationVisualizer.initVisualization(viewModel.proxyUsernameValidationStatus(), proxyUsername);
diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
index 7991e86493e..9b5d646c7c6 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
@@ -19,9 +19,7 @@
 import javafx.stage.FileChooser;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.Globals;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
-import org.jabref.gui.remote.CLIMessageHandler;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.net.ProxyPreferences;
@@ -29,13 +27,9 @@
 import org.jabref.logic.net.URLDownload;
 import org.jabref.logic.net.ssl.SSLCertificate;
 import org.jabref.logic.net.ssl.TrustStoreManager;
-import org.jabref.logic.remote.RemotePreferences;
-import org.jabref.logic.remote.RemoteUtil;
 import org.jabref.logic.util.OS;
 import org.jabref.logic.util.StandardFileType;
-import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.strings.StringUtil;
-import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.InternalPreferences;
 import org.jabref.preferences.PreferencesService;
 
@@ -48,8 +42,6 @@
 
 public class NetworkTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty versionCheckProperty = new SimpleBooleanProperty();
-    private final BooleanProperty remoteServerProperty = new SimpleBooleanProperty();
-    private final StringProperty remotePortProperty = new SimpleStringProperty("");
     private final BooleanProperty proxyUseProperty = new SimpleBooleanProperty();
     private final StringProperty proxyHostnameProperty = new SimpleStringProperty("");
     private final StringProperty proxyPortProperty = new SimpleStringProperty("");
@@ -60,7 +52,6 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty passwordPersistAvailable = new SimpleBooleanProperty();
     private final ListProperty<CustomCertificateViewModel> customCertificateListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
 
-    private final Validator remotePortValidator;
     private final Validator proxyHostnameValidator;
     private final Validator proxyPortValidator;
     private final Validator proxyUsernameValidator;
@@ -68,10 +59,8 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
 
     private final DialogService dialogService;
     private final PreferencesService preferences;
-    private final FileUpdateMonitor fileUpdateMonitor;
-    private final BibEntryTypesManager entryTypesManager;
 
-    private final RemotePreferences remotePreferences;
+
     private final ProxyPreferences proxyPreferences;
     private final ProxyPreferences backupProxyPreferences;
     private final InternalPreferences internalPreferences;
@@ -81,14 +70,9 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
     private final AtomicBoolean sslCertificatesChanged = new AtomicBoolean(false);
 
     public NetworkTabViewModel(DialogService dialogService,
-                               PreferencesService preferences,
-                               FileUpdateMonitor fileUpdateMonitor,
-                               BibEntryTypesManager entryTypesManager) {
+                               PreferencesService preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
-        this.fileUpdateMonitor = fileUpdateMonitor;
-        this.entryTypesManager = entryTypesManager;
-        this.remotePreferences = preferences.getRemotePreferences();
         this.proxyPreferences = preferences.getProxyPreferences();
         this.internalPreferences = preferences.getInternalPreferences();
 
@@ -101,21 +85,6 @@ public NetworkTabViewModel(DialogService dialogService,
                 proxyPreferences.getPassword(),
                 proxyPreferences.shouldPersistPassword());
 
-        remotePortValidator = new FunctionBasedValidator<>(
-                remotePortProperty,
-                input -> {
-                    try {
-                        int portNumber = Integer.parseInt(remotePortProperty().getValue());
-                        return RemoteUtil.isUserPort(portNumber);
-                    } catch (NumberFormatException ex) {
-                        return false;
-                    }
-                },
-                ValidationMessage.error(String.format("%s > %s %n %n %s",
-                        Localization.lang("Network"),
-                        Localization.lang("Remote operation"),
-                        Localization.lang("You must enter an integer value in the interval 1025-65535"))));
-
         proxyHostnameValidator = new FunctionBasedValidator<>(
                 proxyHostnameProperty,
                 input -> !StringUtil.isNullOrEmpty(input),
@@ -154,8 +123,6 @@ public NetworkTabViewModel(DialogService dialogService,
     @Override
     public void setValues() {
         versionCheckProperty.setValue(internalPreferences.isVersionCheckEnabled());
-        remoteServerProperty.setValue(remotePreferences.useRemoteServer());
-        remotePortProperty.setValue(String.valueOf(remotePreferences.getPort()));
 
         setProxyValues();
         setSSLValues();
@@ -192,22 +159,6 @@ private void setSSLValues() {
 
     @Override
     public void storeSettings() {
-        internalPreferences.setVersionCheckEnabled(versionCheckProperty.getValue());
-
-        getPortAsInt(remotePortProperty.getValue()).ifPresent(newPort -> {
-            if (remotePreferences.isDifferentPort(newPort)) {
-                remotePreferences.setPort(newPort);
-            }
-        });
-
-        if (remoteServerProperty.getValue()) {
-            remotePreferences.setUseRemoteServer(true);
-            Globals.REMOTE_LISTENER.openAndStart(new CLIMessageHandler(preferences, fileUpdateMonitor, entryTypesManager), remotePreferences.getPort());
-        } else {
-            remotePreferences.setUseRemoteServer(false);
-            Globals.REMOTE_LISTENER.stop();
-        }
-
         proxyPreferences.setUseProxy(proxyUseProperty.getValue());
         proxyPreferences.setHostname(proxyHostnameProperty.getValue().trim());
         proxyPreferences.setPort(proxyPortProperty.getValue().trim());
@@ -228,10 +179,6 @@ private Optional<Integer> getPortAsInt(String value) {
         }
     }
 
-    public ValidationStatus remotePortValidationStatus() {
-        return remotePortValidator.getValidationStatus();
-    }
-
     public ValidationStatus proxyHostnameValidationStatus() {
         return proxyHostnameValidator.getValidationStatus();
     }
@@ -252,10 +199,6 @@ public ValidationStatus proxyPasswordValidationStatus() {
     public boolean validateSettings() {
         CompositeValidator validator = new CompositeValidator();
 
-        if (remoteServerProperty.getValue()) {
-            validator.addValidators(remotePortValidator);
-        }
-
         if (proxyUseProperty.getValue()) {
             validator.addValidators(proxyHostnameValidator);
             validator.addValidators(proxyPortValidator);
@@ -325,14 +268,6 @@ public BooleanProperty versionCheckProperty() {
         return versionCheckProperty;
     }
 
-    public BooleanProperty remoteServerProperty() {
-        return remoteServerProperty;
-    }
-
-    public StringProperty remotePortProperty() {
-        return remotePortProperty;
-    }
-
     public BooleanProperty proxyUseProperty() {
         return proxyUseProperty;
     }

From 1590aee6646e385b978a9c09f6f45730bcdf3ac6 Mon Sep 17 00:00:00 2001
From: DiamondMyK <1094933454@qq.com>
Date: Mon, 30 Oct 2023 00:59:04 +0800
Subject: [PATCH 02/11] edit issue#9306

---
 issue#9306.patch                              | 590 ------------------
 .../gui/preferences/general/GeneralTab.java   |   4 +-
 .../general/GeneralTabViewModel.java          |   1 +
 3 files changed, 3 insertions(+), 592 deletions(-)
 delete mode 100644 issue#9306.patch

diff --git a/issue#9306.patch b/issue#9306.patch
deleted file mode 100644
index a64684f996c..00000000000
--- a/issue#9306.patch
+++ /dev/null
@@ -1,590 +0,0 @@
-diff --git a/CHANGELOG.md b/CHANGELOG.md
-index 6e5a785389..b7136d7689 100644
---- a/CHANGELOG.md
-+++ b/CHANGELOG.md
-@@ -15,6 +15,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
- 
- ### Changed
- 
-+- We changed the location of the 'Open only one instance of JabRef' preference option.[#9306](https://github.com/JabRef/jabref/issues/9306)
- - We changed the setting of the keyword separator to accept a single character only. [#177](https://github.com/koppor/jabref/issues/177)
- 
- ### Fixed
-diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml
-index 4d8d3c265b..81406cdb1f 100644
---- a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml
-+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml
-@@ -4,6 +4,7 @@
- <?import javafx.scene.control.Button?>
- <?import javafx.scene.control.CheckBox?>
- <?import javafx.scene.control.ComboBox?>
-+<?import javafx.scene.control.Hyperlink?>
- <?import javafx.scene.control.Label?>
- <?import javafx.scene.control.Spinner?>
- <?import javafx.scene.control.TextField?>
-@@ -13,7 +14,6 @@
- <?import javafx.scene.layout.HBox?>
- <?import javafx.scene.layout.VBox?>
- <?import org.jabref.gui.icon.JabRefIconView?>
--<?import javafx.scene.control.Hyperlink?>
- <fx:root spacing="10.0" type="VBox"
-          xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
-          fx:controller="org.jabref.gui.preferences.general.GeneralTab">
-@@ -52,7 +52,7 @@
- 
-         <CheckBox fx:id="fontOverride" text="%Override default font settings"
-                   GridPane.rowIndex="4" GridPane.columnIndex="0"/>
--        <HBox alignment="CENTER_LEFT" spacing="4.0" disable="${!fontOverride.selected}"
-+        <HBox alignment="CENTER_LEFT" spacing="4.0"
-               GridPane.rowIndex="4" GridPane.columnIndex="1">
-             <Label text="%Size"/>
-             <Spinner fx:id="fontSize" styleClass="fontsizeSpinner" editable="true"/>
-@@ -70,6 +70,13 @@
-     <CheckBox fx:id="confirmDelete" text="%Show confirmation dialog when deleting entries"/>
-     <CheckBox fx:id="collectTelemetry" text="%Collect and share telemetry data to help improve JabRef"/>
- 
-+    <Label styleClass="sectionHeader" text="%Single instance" />
-+    <HBox alignment="CENTER_LEFT" spacing="10.0">
-+        <CheckBox fx:id="remoteServer" text="%Enforce single JabRef instance (and allow remote operations) using port" />
-+        <TextField fx:id="remotePort" maxWidth="100.0" HBox.hgrow="ALWAYS" />
-+        <Button fx:id="remoteHelp" prefWidth="20.0" />
-+    </HBox>
-+
-     <Label styleClass="sectionHeader" text="%Libraries"/>
-     <GridPane hgap="10.0" vgap="4.0">
-         <columnConstraints>
-diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
-index ecd70a04d0..44f4526ef3 100644
---- a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
-+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
-@@ -13,6 +13,7 @@ import javafx.scene.control.TextField;
- import javafx.scene.control.TextFormatter;
- import javafx.util.converter.IntegerStringConverter;
- 
-+import org.jabref.gui.Globals;
- import org.jabref.gui.actions.ActionFactory;
- import org.jabref.gui.actions.StandardActions;
- import org.jabref.gui.help.HelpAction;
-@@ -25,10 +26,14 @@ 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.model.util.FileUpdateMonitor;
- 
- import com.airhacks.afterburner.views.ViewLoader;
- import com.tobiasdiez.easybind.EasyBind;
- import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-+import jakarta.inject.Inject;
-+
-+import static org.jabref.gui.Globals.entryTypesManager;
- 
- public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> implements PreferencesTab {
- 
-@@ -49,6 +54,10 @@ public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> i
-     @FXML private Button autosaveLocalLibrariesHelp;
-     @FXML private CheckBox createBackup;
-     @FXML private TextField backupDirectory;
-+    @FXML private CheckBox remoteServer;
-+    @FXML private TextField remotePort;
-+    @FXML private Button remoteHelp;
-+    @Inject private FileUpdateMonitor fileUpdateMonitor;
- 
-     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
- 
-@@ -74,7 +83,7 @@ public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> i
-     }
- 
-     public void initialize() {
--        this.viewModel = new GeneralTabViewModel(dialogService, preferencesService);
-+        this.viewModel = new GeneralTabViewModel(dialogService, preferencesService, fileUpdateMonitor, entryTypesManager);
- 
-         new ViewModelListCellFactory<Language>()
-                 .withText(Language::getDisplayName)
-@@ -127,10 +136,18 @@ public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> i
-         backupDirectory.textProperty().bindBidirectional(viewModel.backupDirectoryProperty());
-         backupDirectory.disableProperty().bind(viewModel.createBackupProperty().not());
- 
-+        ActionFactory actionFactory1 = new ActionFactory(Globals.getKeyPrefs());
-+        actionFactory1.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.REMOTE, dialogService, preferencesService.getFilePreferences()), remoteHelp);
-+
-         Platform.runLater(() -> {
-+            validationVisualizer.initVisualization(viewModel.remotePortValidationStatus(), remotePort);
-             validationVisualizer.initVisualization(viewModel.fontSizeValidationStatus(), fontSize);
-             validationVisualizer.initVisualization(viewModel.customPathToThemeValidationStatus(), customThemePath);
-         });
-+
-+        remoteServer.selectedProperty().bindBidirectional(viewModel.remoteServerProperty());
-+        remotePort.textProperty().bindBidirectional(viewModel.remotePortProperty());
-+        remotePort.disableProperty().bind(remoteServer.selectedProperty().not());
-     }
- 
-     @FXML
-diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
-index 3747072250..e8228dfadd 100644
---- a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
-+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
-@@ -4,6 +4,7 @@ import java.io.IOException;
- import java.nio.file.Path;
- import java.util.ArrayList;
- import java.util.List;
-+import java.util.Optional;
- 
- import javafx.beans.property.BooleanProperty;
- import javafx.beans.property.ListProperty;
-@@ -19,18 +20,26 @@ import javafx.collections.FXCollections;
- import javafx.scene.control.SpinnerValueFactory;
- 
- import org.jabref.gui.DialogService;
-+import org.jabref.gui.Globals;
- import org.jabref.gui.desktop.JabRefDesktop;
- import org.jabref.gui.preferences.PreferenceTabViewModel;
-+import org.jabref.gui.remote.CLIMessageHandler;
- import org.jabref.gui.theme.Theme;
- import org.jabref.gui.theme.ThemeTypes;
- import org.jabref.gui.util.DirectoryDialogConfiguration;
- import org.jabref.gui.util.FileDialogConfiguration;
- import org.jabref.logic.l10n.Language;
- import org.jabref.logic.l10n.Localization;
-+import org.jabref.logic.net.ssl.TrustStoreManager;
-+import org.jabref.logic.remote.RemotePreferences;
-+import org.jabref.logic.remote.RemoteUtil;
- import org.jabref.logic.util.StandardFileType;
- import org.jabref.model.database.BibDatabaseMode;
-+import org.jabref.model.entry.BibEntryTypesManager;
- import org.jabref.model.strings.StringUtil;
-+import org.jabref.model.util.FileUpdateMonitor;
- import org.jabref.preferences.FilePreferences;
-+import org.jabref.preferences.InternalPreferences;
- import org.jabref.preferences.LibraryPreferences;
- import org.jabref.preferences.PreferencesService;
- import org.jabref.preferences.TelemetryPreferences;
-@@ -81,19 +90,32 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
-     private final TelemetryPreferences telemetryPreferences;
-     private final LibraryPreferences libraryPreferences;
-     private final FilePreferences filePreferences;
-+    private final RemotePreferences remotePreferences;
- 
-     private final Validator fontSizeValidator;
-     private final Validator customPathToThemeValidator;
- 
-     private final List<String> restartWarning = new ArrayList<>();
--
--    public GeneralTabViewModel(DialogService dialogService, PreferencesService preferences) {
-+    private final BooleanProperty remoteServerProperty = new SimpleBooleanProperty();
-+    private final StringProperty remotePortProperty = new SimpleStringProperty("");
-+    private final Validator remotePortValidator;
-+    private final InternalPreferences internalPreferences;
-+    private final BooleanProperty versionCheckProperty = new SimpleBooleanProperty();
-+    private final FileUpdateMonitor fileUpdateMonitor;
-+    private final BibEntryTypesManager entryTypesManager;
-+    private TrustStoreManager trustStoreManager;
-+    public GeneralTabViewModel(DialogService dialogService, PreferencesService preferences, FileUpdateMonitor fileUpdateMonitor, BibEntryTypesManager entryTypesManager) {
-         this.dialogService = dialogService;
-         this.preferences = preferences;
-         this.workspacePreferences = preferences.getWorkspacePreferences();
-         this.telemetryPreferences = preferences.getTelemetryPreferences();
-         this.libraryPreferences = preferences.getLibraryPreferences();
-         this.filePreferences = preferences.getFilePreferences();
-+        this.remotePreferences = preferences.getRemotePreferences();
-+        this.internalPreferences = preferences.getInternalPreferences();
-+        this.fileUpdateMonitor = fileUpdateMonitor;
-+        this.entryTypesManager = entryTypesManager;
-+        this.trustStoreManager = trustStoreManager;
- 
-         fontSizeValidator = new FunctionBasedValidator<>(
-                 fontSizeProperty,
-@@ -116,6 +138,25 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
-                         Localization.lang("General"),
-                         Localization.lang("Visual theme"),
-                         Localization.lang("Please specify a css theme file."))));
-+
-+        remotePortValidator = new FunctionBasedValidator<>(
-+                remotePortProperty,
-+                input -> {
-+                    try {
-+                        int portNumber = Integer.parseInt(remotePortProperty().getValue());
-+                        return RemoteUtil.isUserPort(portNumber);
-+                    } catch (NumberFormatException ex) {
-+                        return false;
-+                    }
-+                },
-+                ValidationMessage.error(String.format("%s > %s %n %n %s",
-+                        Localization.lang("Network"),
-+                        Localization.lang("Remote operation"),
-+                        Localization.lang("You must enter an integer value in the interval 1025-65535"))));
-+    }
-+
-+    public ValidationStatus remotePortValidationStatus() {
-+        return remotePortValidator.getValidationStatus();
-     }
- 
-     @Override
-@@ -125,8 +166,10 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
-         // The light theme is in fact the absence of any theme modifying 'base.css'. Another embedded theme like
-         // 'dark.css', stored in the classpath, can be introduced in {@link org.jabref.gui.theme.Theme}.
-         switch (workspacePreferences.getTheme().getType()) {
--            case DEFAULT -> selectedThemeProperty.setValue(ThemeTypes.LIGHT);
--            case EMBEDDED -> selectedThemeProperty.setValue(ThemeTypes.DARK);
-+            case DEFAULT ->
-+                    selectedThemeProperty.setValue(ThemeTypes.LIGHT);
-+            case EMBEDDED ->
-+                    selectedThemeProperty.setValue(ThemeTypes.DARK);
-             case CUSTOM -> {
-                 selectedThemeProperty.setValue(ThemeTypes.CUSTOM);
-                 customPathToThemeProperty.setValue(workspacePreferences.getTheme().getName());
-@@ -151,6 +194,9 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
- 
-         createBackupProperty.setValue(filePreferences.shouldCreateBackup());
-         backupDirectoryProperty.setValue(filePreferences.getBackupDirectory().toString());
-+
-+        remoteServerProperty.setValue(remotePreferences.useRemoteServer());
-+        remotePortProperty.setValue(String.valueOf(remotePreferences.getPort()));
-     }
- 
-     @Override
-@@ -185,6 +231,38 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
- 
-         filePreferences.createBackupProperty().setValue(createBackupProperty.getValue());
-         filePreferences.backupDirectoryProperty().setValue(Path.of(backupDirectoryProperty.getValue()));
-+
-+        getPortAsInt(remotePortProperty.getValue()).ifPresent(newPort -> {
-+            if (remotePreferences.isDifferentPort(newPort)) {
-+                remotePreferences.setPort(newPort);
-+            }
-+        });
-+
-+        internalPreferences.setVersionCheckEnabled(versionCheckProperty.getValue());
-+
-+        getPortAsInt(remotePortProperty.getValue()).ifPresent(newPort -> {
-+            if (remotePreferences.isDifferentPort(newPort)) {
-+                remotePreferences.setPort(newPort);
-+            }
-+        });
-+
-+        if (remoteServerProperty.getValue()) {
-+            remotePreferences.setUseRemoteServer(true);
-+            Globals.REMOTE_LISTENER.openAndStart(new CLIMessageHandler(preferences, fileUpdateMonitor, entryTypesManager), remotePreferences.getPort());
-+        } else {
-+            remotePreferences.setUseRemoteServer(false);
-+            Globals.REMOTE_LISTENER.stop();
-+        }
-+        trustStoreManager.flush();
-+
-+        if (remoteServerProperty.getValue()) {
-+            remotePreferences.setUseRemoteServer(true);
-+            Globals.REMOTE_LISTENER.openAndStart(new CLIMessageHandler(preferences, fileUpdateMonitor, entryTypesManager), remotePreferences.getPort());
-+        } else {
-+            remotePreferences.setUseRemoteServer(false);
-+            Globals.REMOTE_LISTENER.stop();
-+        }
-+        trustStoreManager.flush();
-     }
- 
-     public ValidationStatus fontSizeValidationStatus() {
-@@ -199,6 +277,10 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
-     public boolean validateSettings() {
-         CompositeValidator validator = new CompositeValidator();
- 
-+        if (remoteServerProperty.getValue()) {
-+            validator.addValidators(remotePortValidator);
-+        }
-+
-         if (fontOverrideProperty.getValue()) {
-             validator.addValidators(fontSizeValidator);
-         }
-@@ -310,6 +392,14 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
-                      .ifPresent(dir -> backupDirectoryProperty.setValue(dir.toString()));
-     }
- 
-+    public BooleanProperty remoteServerProperty() {
-+        return remoteServerProperty;
-+    }
-+
-+    public StringProperty remotePortProperty() {
-+        return remotePortProperty;
-+    }
-+
-     public void openBrowser() {
-         String url = "https://themes.jabref.org";
-         try {
-@@ -318,4 +408,12 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
-             dialogService.showErrorDialogAndWait(Localization.lang("Could not open website."), e);
-         }
-     }
-+
-+    private Optional<Integer> getPortAsInt(String value) {
-+        try {
-+            return Optional.of(Integer.parseInt(value));
-+        } catch (NumberFormatException ex) {
-+            return Optional.empty();
-+        }
-+    }
- }
-diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
-index 41e0349772..0cbe89e75a 100644
---- a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
-+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
-@@ -10,7 +10,6 @@
- <?import javafx.scene.control.TextField?>
- <?import javafx.scene.layout.ColumnConstraints?>
- <?import javafx.scene.layout.GridPane?>
--<?import javafx.scene.layout.HBox?>
- <?import javafx.scene.layout.RowConstraints?>
- <?import javafx.scene.layout.VBox?>
- <?import org.jabref.gui.icon.JabRefIconView?>
-@@ -19,13 +18,6 @@
-     <Label styleClass="titleHeader" text="%Network" />
-     <CheckBox fx:id="versionCheck" text="%Check for latest version online"/>
-     <Label text="%If you encounter an issue or a bug, please check the latest version, whether the issue is still present." wrapText="true"/>
--    <Label styleClass="sectionHeader" text="%Remote operation" />
--    <Label fx:id="remoteLabel" text="%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." textOverrun="CLIP" wrapText="true" />
--    <HBox alignment="CENTER_LEFT" spacing="10.0">
--        <CheckBox fx:id="remoteServer" text="%Listen for remote operation on port" />
--        <TextField fx:id="remotePort" maxWidth="100.0" HBox.hgrow="ALWAYS" />
--        <Button fx:id="remoteHelp" prefWidth="20.0" />
--    </HBox>
- 
-     <Label styleClass="sectionHeader" text="%Proxy configuration" />
-     <GridPane hgap="10.0" vgap="10.0">
-diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
-index 71e70e5b1f..2b1294f01a 100644
---- a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
-+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
-@@ -17,33 +17,20 @@ import javafx.scene.control.TextField;
- import javafx.scene.control.Tooltip;
- import javafx.scene.input.MouseEvent;
- 
--import org.jabref.gui.Globals;
--import org.jabref.gui.actions.ActionFactory;
--import org.jabref.gui.actions.StandardActions;
--import org.jabref.gui.help.HelpAction;
- import org.jabref.gui.icon.IconTheme;
- import org.jabref.gui.preferences.AbstractPreferenceTabView;
- import org.jabref.gui.preferences.PreferencesTab;
- import org.jabref.gui.util.IconValidationDecorator;
- import org.jabref.gui.util.ValueTableCellFactory;
--import org.jabref.logic.help.HelpFile;
- import org.jabref.logic.l10n.Localization;
--import org.jabref.model.entry.BibEntryTypesManager;
--import org.jabref.model.util.FileUpdateMonitor;
- 
- import com.airhacks.afterburner.views.ViewLoader;
- import com.tobiasdiez.easybind.EasyBind;
- import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
--import jakarta.inject.Inject;
- import org.controlsfx.control.textfield.CustomPasswordField;
- 
- public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> implements PreferencesTab {
--    @FXML private Label remoteLabel;
-     @FXML private CheckBox versionCheck;
--    @FXML private CheckBox remoteServer;
--    @FXML private TextField remotePort;
--    @FXML private Button remoteHelp;
--
-     @FXML private CheckBox proxyUse;
-     @FXML private Label proxyHostnameLabel;
-     @FXML private TextField proxyHostname;
-@@ -67,9 +54,6 @@ public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> i
-     @FXML private TableColumn<CustomCertificateViewModel, String> certVersion;
-     @FXML private TableColumn<CustomCertificateViewModel, String> actionsColumn;
- 
--    @Inject private FileUpdateMonitor fileUpdateMonitor;
--    @Inject private BibEntryTypesManager entryTypesManager;
--
-     private String proxyPasswordText = "";
-     private int proxyPasswordCaretPosition = 0;
- 
-@@ -87,15 +71,10 @@ public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> i
-     }
- 
-     public void initialize() {
--        this.viewModel = new NetworkTabViewModel(dialogService, preferencesService, fileUpdateMonitor, entryTypesManager);
-+        this.viewModel = new NetworkTabViewModel(dialogService, preferencesService);
- 
-         versionCheck.selectedProperty().bindBidirectional(viewModel.versionCheckProperty());
- 
--        remoteLabel.setVisible(preferencesService.getWorkspacePreferences().shouldShowAdvancedHints());
--        remoteServer.selectedProperty().bindBidirectional(viewModel.remoteServerProperty());
--        remotePort.textProperty().bindBidirectional(viewModel.remotePortProperty());
--        remotePort.disableProperty().bind(remoteServer.selectedProperty().not());
--
-         proxyUse.selectedProperty().bindBidirectional(viewModel.proxyUseProperty());
-         proxyHostnameLabel.disableProperty().bind(proxyUse.selectedProperty().not());
-         proxyHostname.textProperty().bindBidirectional(viewModel.proxyHostnameProperty());
-@@ -129,12 +108,8 @@ public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> i
-         proxyPassword.getRight().addEventFilter(MouseEvent.MOUSE_RELEASED, this::proxyPasswordMask);
-         proxyPassword.getRight().addEventFilter(MouseEvent.MOUSE_EXITED, this::proxyPasswordMask);
- 
--        ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
--        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.REMOTE, dialogService, preferencesService.getFilePreferences()), remoteHelp);
--
-         validationVisualizer.setDecoration(new IconValidationDecorator());
-         Platform.runLater(() -> {
--            validationVisualizer.initVisualization(viewModel.remotePortValidationStatus(), remotePort);
-             validationVisualizer.initVisualization(viewModel.proxyHostnameValidationStatus(), proxyHostname);
-             validationVisualizer.initVisualization(viewModel.proxyPortValidationStatus(), proxyPort);
-             validationVisualizer.initVisualization(viewModel.proxyUsernameValidationStatus(), proxyUsername);
-diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
-index 7991e86493..9b5d646c7c 100644
---- a/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
-+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
-@@ -19,9 +19,7 @@ import javafx.collections.ListChangeListener;
- import javafx.stage.FileChooser;
- 
- import org.jabref.gui.DialogService;
--import org.jabref.gui.Globals;
- import org.jabref.gui.preferences.PreferenceTabViewModel;
--import org.jabref.gui.remote.CLIMessageHandler;
- import org.jabref.gui.util.FileDialogConfiguration;
- import org.jabref.logic.l10n.Localization;
- import org.jabref.logic.net.ProxyPreferences;
-@@ -29,13 +27,9 @@ import org.jabref.logic.net.ProxyRegisterer;
- import org.jabref.logic.net.URLDownload;
- import org.jabref.logic.net.ssl.SSLCertificate;
- import org.jabref.logic.net.ssl.TrustStoreManager;
--import org.jabref.logic.remote.RemotePreferences;
--import org.jabref.logic.remote.RemoteUtil;
- import org.jabref.logic.util.OS;
- import org.jabref.logic.util.StandardFileType;
--import org.jabref.model.entry.BibEntryTypesManager;
- import org.jabref.model.strings.StringUtil;
--import org.jabref.model.util.FileUpdateMonitor;
- import org.jabref.preferences.InternalPreferences;
- import org.jabref.preferences.PreferencesService;
- 
-@@ -48,8 +42,6 @@ import kong.unirest.UnirestException;
- 
- public class NetworkTabViewModel implements PreferenceTabViewModel {
-     private final BooleanProperty versionCheckProperty = new SimpleBooleanProperty();
--    private final BooleanProperty remoteServerProperty = new SimpleBooleanProperty();
--    private final StringProperty remotePortProperty = new SimpleStringProperty("");
-     private final BooleanProperty proxyUseProperty = new SimpleBooleanProperty();
-     private final StringProperty proxyHostnameProperty = new SimpleStringProperty("");
-     private final StringProperty proxyPortProperty = new SimpleStringProperty("");
-@@ -60,7 +52,6 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
-     private final BooleanProperty passwordPersistAvailable = new SimpleBooleanProperty();
-     private final ListProperty<CustomCertificateViewModel> customCertificateListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
- 
--    private final Validator remotePortValidator;
-     private final Validator proxyHostnameValidator;
-     private final Validator proxyPortValidator;
-     private final Validator proxyUsernameValidator;
-@@ -68,10 +59,8 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
- 
-     private final DialogService dialogService;
-     private final PreferencesService preferences;
--    private final FileUpdateMonitor fileUpdateMonitor;
--    private final BibEntryTypesManager entryTypesManager;
- 
--    private final RemotePreferences remotePreferences;
-+
-     private final ProxyPreferences proxyPreferences;
-     private final ProxyPreferences backupProxyPreferences;
-     private final InternalPreferences internalPreferences;
-@@ -81,14 +70,9 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
-     private final AtomicBoolean sslCertificatesChanged = new AtomicBoolean(false);
- 
-     public NetworkTabViewModel(DialogService dialogService,
--                               PreferencesService preferences,
--                               FileUpdateMonitor fileUpdateMonitor,
--                               BibEntryTypesManager entryTypesManager) {
-+                               PreferencesService preferences) {
-         this.dialogService = dialogService;
-         this.preferences = preferences;
--        this.fileUpdateMonitor = fileUpdateMonitor;
--        this.entryTypesManager = entryTypesManager;
--        this.remotePreferences = preferences.getRemotePreferences();
-         this.proxyPreferences = preferences.getProxyPreferences();
-         this.internalPreferences = preferences.getInternalPreferences();
- 
-@@ -101,21 +85,6 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
-                 proxyPreferences.getPassword(),
-                 proxyPreferences.shouldPersistPassword());
- 
--        remotePortValidator = new FunctionBasedValidator<>(
--                remotePortProperty,
--                input -> {
--                    try {
--                        int portNumber = Integer.parseInt(remotePortProperty().getValue());
--                        return RemoteUtil.isUserPort(portNumber);
--                    } catch (NumberFormatException ex) {
--                        return false;
--                    }
--                },
--                ValidationMessage.error(String.format("%s > %s %n %n %s",
--                        Localization.lang("Network"),
--                        Localization.lang("Remote operation"),
--                        Localization.lang("You must enter an integer value in the interval 1025-65535"))));
--
-         proxyHostnameValidator = new FunctionBasedValidator<>(
-                 proxyHostnameProperty,
-                 input -> !StringUtil.isNullOrEmpty(input),
-@@ -154,8 +123,6 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
-     @Override
-     public void setValues() {
-         versionCheckProperty.setValue(internalPreferences.isVersionCheckEnabled());
--        remoteServerProperty.setValue(remotePreferences.useRemoteServer());
--        remotePortProperty.setValue(String.valueOf(remotePreferences.getPort()));
- 
-         setProxyValues();
-         setSSLValues();
-@@ -192,22 +159,6 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
- 
-     @Override
-     public void storeSettings() {
--        internalPreferences.setVersionCheckEnabled(versionCheckProperty.getValue());
--
--        getPortAsInt(remotePortProperty.getValue()).ifPresent(newPort -> {
--            if (remotePreferences.isDifferentPort(newPort)) {
--                remotePreferences.setPort(newPort);
--            }
--        });
--
--        if (remoteServerProperty.getValue()) {
--            remotePreferences.setUseRemoteServer(true);
--            Globals.REMOTE_LISTENER.openAndStart(new CLIMessageHandler(preferences, fileUpdateMonitor, entryTypesManager), remotePreferences.getPort());
--        } else {
--            remotePreferences.setUseRemoteServer(false);
--            Globals.REMOTE_LISTENER.stop();
--        }
--
-         proxyPreferences.setUseProxy(proxyUseProperty.getValue());
-         proxyPreferences.setHostname(proxyHostnameProperty.getValue().trim());
-         proxyPreferences.setPort(proxyPortProperty.getValue().trim());
-@@ -228,10 +179,6 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
-         }
-     }
- 
--    public ValidationStatus remotePortValidationStatus() {
--        return remotePortValidator.getValidationStatus();
--    }
--
-     public ValidationStatus proxyHostnameValidationStatus() {
-         return proxyHostnameValidator.getValidationStatus();
-     }
-@@ -252,10 +199,6 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
-     public boolean validateSettings() {
-         CompositeValidator validator = new CompositeValidator();
- 
--        if (remoteServerProperty.getValue()) {
--            validator.addValidators(remotePortValidator);
--        }
--
-         if (proxyUseProperty.getValue()) {
-             validator.addValidators(proxyHostnameValidator);
-             validator.addValidators(proxyPortValidator);
-@@ -325,14 +268,6 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
-         return versionCheckProperty;
-     }
- 
--    public BooleanProperty remoteServerProperty() {
--        return remoteServerProperty;
--    }
--
--    public StringProperty remotePortProperty() {
--        return remotePortProperty;
--    }
--
-     public BooleanProperty proxyUseProperty() {
-         return proxyUseProperty;
-     }
diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
index 44f4526ef30..86ac681ed46 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
@@ -26,6 +26,7 @@
 import org.jabref.logic.l10n.Language;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseMode;
+import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
 
 import com.airhacks.afterburner.views.ViewLoader;
@@ -33,8 +34,6 @@
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 import jakarta.inject.Inject;
 
-import static org.jabref.gui.Globals.entryTypesManager;
-
 public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> implements PreferencesTab {
 
     @FXML private ComboBox<Language> language;
@@ -58,6 +57,7 @@ public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> i
     @FXML private TextField remotePort;
     @FXML private Button remoteHelp;
     @Inject private FileUpdateMonitor fileUpdateMonitor;
+    @Inject private BibEntryTypesManager entryTypesManager;
 
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
index e8228dfaddd..eb142fde8e6 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
@@ -104,6 +104,7 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
     private final FileUpdateMonitor fileUpdateMonitor;
     private final BibEntryTypesManager entryTypesManager;
     private TrustStoreManager trustStoreManager;
+
     public GeneralTabViewModel(DialogService dialogService, PreferencesService preferences, FileUpdateMonitor fileUpdateMonitor, BibEntryTypesManager entryTypesManager) {
         this.dialogService = dialogService;
         this.preferences = preferences;

From cc086b1fbc22a96cd2a815f8a31225752d23cfd0 Mon Sep 17 00:00:00 2001
From: DiamondMyK <1094933454@qq.com>
Date: Mon, 30 Oct 2023 01:10:29 +0800
Subject: [PATCH 03/11] edit

---
 .../java/org/jabref/gui/preferences/general/GeneralTab.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
index 86ac681ed46..5e977919702 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
@@ -13,7 +13,6 @@
 import javafx.scene.control.TextFormatter;
 import javafx.util.converter.IntegerStringConverter;
 
-import org.jabref.gui.Globals;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.help.HelpAction;
@@ -136,8 +135,7 @@ public void initialize() {
         backupDirectory.textProperty().bindBidirectional(viewModel.backupDirectoryProperty());
         backupDirectory.disableProperty().bind(viewModel.createBackupProperty().not());
 
-        ActionFactory actionFactory1 = new ActionFactory(Globals.getKeyPrefs());
-        actionFactory1.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.REMOTE, dialogService, preferencesService.getFilePreferences()), remoteHelp);
+        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.REMOTE, dialogService, preferencesService.getFilePreferences()), remoteHelp);
 
         Platform.runLater(() -> {
             validationVisualizer.initVisualization(viewModel.remotePortValidationStatus(), remotePort);

From 2a80d396db4f28d4a509401cd64bc074bdae7b9d Mon Sep 17 00:00:00 2001
From: DiamondMyK <1094933454@qq.com>
Date: Mon, 30 Oct 2023 01:19:04 +0800
Subject: [PATCH 04/11] edit

---
 CHANGELOG.md                                                    | 2 +-
 .../java/org/jabref/gui/preferences/general/GeneralTab.fxml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e884e430ec..921e7fbf437 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 
 ### Changed
 
-- We changed the location of the 'Open only one instance of JabRef' preference option.[#9306](https://github.com/JabRef/jabref/issues/9306)
+- We move the location of the 'Open only one instance of JabRef' preference option from "Network" to "General" .[#9306](https://github.com/JabRef/jabref/issues/9306)
 - The two previews in the change resolver dialog now have their scrollbars synchronized [#9576](https://github.com/JabRef/jabref/issues/9576).
 - We changed the setting of the keyword separator to accept a single character only. [#177](https://github.com/koppor/jabref/issues/177)
 
diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml
index 81406cdb1f0..870886f8e5f 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml
@@ -52,7 +52,7 @@
 
         <CheckBox fx:id="fontOverride" text="%Override default font settings"
                   GridPane.rowIndex="4" GridPane.columnIndex="0"/>
-        <HBox alignment="CENTER_LEFT" spacing="4.0"
+        <HBox alignment="CENTER_LEFT" spacing="4.0" disable="${!fontOverride.selected}"
               GridPane.rowIndex="4" GridPane.columnIndex="1">
             <Label text="%Size"/>
             <Spinner fx:id="fontSize" styleClass="fontsizeSpinner" editable="true"/>

From f648e50f3cb1500701fb062650ee23c41dab96dc Mon Sep 17 00:00:00 2001
From: DiamondMyK <1094933454@qq.com>
Date: Mon, 30 Oct 2023 01:38:04 +0800
Subject: [PATCH 05/11] edit

---
 src/main/resources/build.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/resources/build.properties b/src/main/resources/build.properties
index efe52c53aad..61d2b743c9e 100644
--- a/src/main/resources/build.properties
+++ b/src/main/resources/build.properties
@@ -6,3 +6,5 @@ springerNatureAPIKey=${springerNatureAPIKey}
 astrophysicsDataSystemAPIKey=${astrophysicsDataSystemAPIKey}
 ieeeAPIKey=${ieeeAPIKey}
 biodiversityHeritageApiKey=${biodiversityHeritageApiKey}
+Single\ instance=????
+Enforce\ single\ JabRef\ instance\ (and\ allow\ remote\ operations)\ using\ port=???? JabRef ???????????????

From ab974d69e13e11716693830b18c7d2c05891433a Mon Sep 17 00:00:00 2001
From: DiamondMyK <1094933454@qq.com>
Date: Mon, 30 Oct 2023 01:43:17 +0800
Subject: [PATCH 06/11] edit

---
 src/main/resources/build.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/build.properties b/src/main/resources/build.properties
index 61d2b743c9e..a6d6ce8a888 100644
--- a/src/main/resources/build.properties
+++ b/src/main/resources/build.properties
@@ -6,5 +6,5 @@ springerNatureAPIKey=${springerNatureAPIKey}
 astrophysicsDataSystemAPIKey=${astrophysicsDataSystemAPIKey}
 ieeeAPIKey=${ieeeAPIKey}
 biodiversityHeritageApiKey=${biodiversityHeritageApiKey}
-Single\ instance=????
-Enforce\ single\ JabRef\ instance\ (and\ allow\ remote\ operations)\ using\ port=???? JabRef ???????????????
+Single instance=????
+Enforce single JabRef instance (and allow remote operations) using port=???? JabRef ???????????????

From 67af5e56763bdf1adc57a52a6f519091a2595884 Mon Sep 17 00:00:00 2001
From: DiamondMyK <1094933454@qq.com>
Date: Mon, 30 Oct 2023 03:39:51 +0800
Subject: [PATCH 07/11] edit

---
 src/main/resources/build.properties          | 3 +--
 src/main/resources/l10n/JabRef_en.properties | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/build.properties b/src/main/resources/build.properties
index a6d6ce8a888..6e646dd0160 100644
--- a/src/main/resources/build.properties
+++ b/src/main/resources/build.properties
@@ -6,5 +6,4 @@ springerNatureAPIKey=${springerNatureAPIKey}
 astrophysicsDataSystemAPIKey=${astrophysicsDataSystemAPIKey}
 ieeeAPIKey=${ieeeAPIKey}
 biodiversityHeritageApiKey=${biodiversityHeritageApiKey}
-Single instance=????
-Enforce single JabRef instance (and allow remote operations) using port=???? JabRef ???????????????
+
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 4e0a11780c2..a38a01092bd 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2604,3 +2604,6 @@ Help\ on\ external\ applications=Help on external applications
 Identifier-based\ Web\ Search=Identifier-based Web Search
 
 Pushing\ citations\ to\ TeXShop\ is\ only\ possible\ on\ macOS\!=Pushing citations to TeXShop is only possible on macOS!
+
+Single\ instance=Single instance
+Enforce\ single\ JabRef\ instance\ (and\ allow\ remote\ operations)\ using\ port=Enforce single JabRef instance (and allow remote operations) using port

From bf9ec9d58ef45ecdcf0b3d1b8d7b5cefeb9d481a Mon Sep 17 00:00:00 2001
From: DiamondMyK <1094933454@qq.com>
Date: Mon, 30 Oct 2023 03:55:45 +0800
Subject: [PATCH 08/11] edit

---
 src/main/resources/l10n/JabRef_en.properties | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index a38a01092bd..4b573e7e07a 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -520,7 +520,6 @@ Last\ modified=Last modified
 LaTeX\ AUX\ file\:=LaTeX AUX file\:
 
 Link=Link
-Listen\ for\ remote\ operation\ on\ port=Listen for remote operation on port
 Memory\ stick\ mode\ -\ Store\ preferences\ in\ 'jabref.xml'\ in\ the\ app\ folder.=Memory stick mode - Store preferences in 'jabref.xml' in the app folder.
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Show advanced hints (i.e. helpful tooltips, suggestions and explanation)
@@ -691,8 +690,6 @@ regular\ expression=regular expression
 
 Related\ articles=Related articles
 
-Remote\ operation=Remote operation
-
 Remove=Remove
 
 Remove\ subgroups=Remove subgroups
@@ -1009,7 +1006,6 @@ Citation\ key\ generator=Citation key generator
 Unable\ to\ open\ link.=Unable to open link.
 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
 
 Line\ %0\:\ Found\ corrupted\ citation\ key\ %1.=Line %0: Found corrupted citation key %1.

From f0af57e432afab5b922d62d9e483a1688493808f Mon Sep 17 00:00:00 2001
From: DiamondMyK <1094933454@qq.com>
Date: Mon, 30 Oct 2023 04:12:39 +0800
Subject: [PATCH 09/11] edit

---
 src/main/resources/l10n/JabRef_en.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 4b573e7e07a..e0c5c45f5cd 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -690,6 +690,8 @@ regular\ expression=regular expression
 
 Related\ articles=Related articles
 
+Remote\ operation=Remote operation
+
 Remove=Remove
 
 Remove\ subgroups=Remove subgroups

From 14f942143f184379c44dcbf7a2564afa1e58f04d Mon Sep 17 00:00:00 2001
From: DiamondMyK <1094933454@qq.com>
Date: Mon, 30 Oct 2023 11:36:51 +0800
Subject: [PATCH 10/11] fix trustStoreManager NullPointerException

---
 .../org/jabref/gui/preferences/general/GeneralTab.java   | 9 +++++----
 .../gui/preferences/general/GeneralTabViewModel.java     | 2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
index 5e977919702..5097abe013e 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
@@ -13,6 +13,7 @@
 import javafx.scene.control.TextFormatter;
 import javafx.util.converter.IntegerStringConverter;
 
+import org.jabref.gui.Globals;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.help.HelpAction;
@@ -128,15 +129,15 @@ public void initialize() {
 
         alwaysReformatBib.selectedProperty().bindBidirectional(viewModel.alwaysReformatBibProperty());
         autosaveLocalLibraries.selectedProperty().bindBidirectional(viewModel.autosaveLocalLibrariesProperty());
-        ActionFactory actionFactory = new ActionFactory(preferencesService.getKeyBindingRepository());
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AUTOSAVE, dialogService, preferencesService.getFilePreferences()), autosaveLocalLibrariesHelp);
+        ActionFactory actionFactoryAutoSave = new ActionFactory(preferencesService.getKeyBindingRepository());
+        actionFactoryAutoSave.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AUTOSAVE, dialogService, preferencesService.getFilePreferences()), autosaveLocalLibrariesHelp);
+        ActionFactory actionFactoryRemove = new ActionFactory(Globals.getKeyPrefs());
+        actionFactoryRemove.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.REMOTE, dialogService, preferencesService.getFilePreferences()), remoteHelp);
 
         createBackup.selectedProperty().bindBidirectional(viewModel.createBackupProperty());
         backupDirectory.textProperty().bindBidirectional(viewModel.backupDirectoryProperty());
         backupDirectory.disableProperty().bind(viewModel.createBackupProperty().not());
 
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.REMOTE, dialogService, preferencesService.getFilePreferences()), remoteHelp);
-
         Platform.runLater(() -> {
             validationVisualizer.initVisualization(viewModel.remotePortValidationStatus(), remotePort);
             validationVisualizer.initVisualization(viewModel.fontSizeValidationStatus(), fontSize);
diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
index eb142fde8e6..09ad3002b2c 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
@@ -154,6 +154,8 @@ public GeneralTabViewModel(DialogService dialogService, PreferencesService prefe
                         Localization.lang("Network"),
                         Localization.lang("Remote operation"),
                         Localization.lang("You must enter an integer value in the interval 1025-65535"))));
+
+        this.trustStoreManager = new TrustStoreManager(Path.of(preferences.getSSLPreferences().getTruststorePath()));
     }
 
     public ValidationStatus remotePortValidationStatus() {

From e7b96c69a721d26190d0ac8553dd76510063184f Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 30 Oct 2023 21:07:49 +0100
Subject: [PATCH 11/11] use one action factory

---
 .../org/jabref/gui/preferences/general/GeneralTab.java    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
index 5097abe013e..3f70e5e2525 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
@@ -13,7 +13,6 @@
 import javafx.scene.control.TextFormatter;
 import javafx.util.converter.IntegerStringConverter;
 
-import org.jabref.gui.Globals;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.help.HelpAction;
@@ -129,10 +128,9 @@ public void initialize() {
 
         alwaysReformatBib.selectedProperty().bindBidirectional(viewModel.alwaysReformatBibProperty());
         autosaveLocalLibraries.selectedProperty().bindBidirectional(viewModel.autosaveLocalLibrariesProperty());
-        ActionFactory actionFactoryAutoSave = new ActionFactory(preferencesService.getKeyBindingRepository());
-        actionFactoryAutoSave.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AUTOSAVE, dialogService, preferencesService.getFilePreferences()), autosaveLocalLibrariesHelp);
-        ActionFactory actionFactoryRemove = new ActionFactory(Globals.getKeyPrefs());
-        actionFactoryRemove.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.REMOTE, dialogService, preferencesService.getFilePreferences()), remoteHelp);
+        ActionFactory actionFactory = new ActionFactory(preferencesService.getKeyBindingRepository());
+        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AUTOSAVE, dialogService, preferencesService.getFilePreferences()), autosaveLocalLibrariesHelp);
+        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.REMOTE, dialogService, preferencesService.getFilePreferences()), remoteHelp);
 
         createBackup.selectedProperty().bindBidirectional(viewModel.createBackupProperty());
         backupDirectory.textProperty().bindBidirectional(viewModel.backupDirectoryProperty());