Merge remote-tracking branch 'upstream/main' into fix-mac

* upstream/main:
  Fix directory path validation checks (#13029)
  Keep merge=union for JabRef_en.properties
  Merging Entry Creation Buttons Into a Single Tool (#13020)
  refine-jabsrv (#13044)
  Switch if branches for readbility (#13042)
  Updating the gradle wrapper does not need any JDK (#13037)
  Fix path - and fix typo (#13038)

Author: Siedlerchr

.gitattributes

@@ -13,4 +13,5 @@ gradlew text eol=lf
 *.properties text eol=lf
 
 CHANGELOG.md merge=union
+jablib/src/main/resources/l10n/JabRef_en.properties merge=union
 src/main/resources/l10n/JabRef_en.properties merge=union

.github/workflows/update-gradle-wrapper.yml

@@ -9,15 +9,8 @@ jobs:
   update-gradle-wrapper:
     if: github.repository == 'JabRef/jabref'
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v4
-      - name: Setup JDK
-        uses: actions/setup-java@v4
-        with:
-          java-version: 24.0.1
-          distribution: 'zulu'
-
       - name: Update Gradle Wrapper
         uses: gradle-update/update-gradle-wrapper-action@v2
         with:

CHANGELOG.md

@@ -11,10 +11,17 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 
 ### Added
 
+- We added an option to create entries directly from Bib(La)TeX sources to the 'Create New Entry' tool. [#8808](https://github.com/JabRef/jabref/issues/8808)
+
 ### Changed
 
+- We merged the 'New Entry', 'Import by ID', and 'New Entry from Plain Text' tools into a single 'Create New Entry' tool. [#8808](https://github.com/JabRef/jabref/issues/8808)
+
 ### Fixed
 
+- We fixed an issue where directory check for relative path was not handled properly under library properties. [#13017](https://github.com/JabRef/jabref/issues/13017)
+- We fixed an issue where the option for which method to use when parsing plaintext citations was unavailable in the 'Create New Entry' tool. [#8808](https://github.com/JabRef/jabref/issues/8808)
+
 ### Removed
 
 - We removed support for MySQL/MariaDB and Oracle. [#12990](https://github.com/JabRef/jabref/pull/12990)
@@ -324,7 +331,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We fixed that the import of the related articles tab sometimes used the wrong library mode. [#11282](https://github.com/JabRef/jabref/pull/11282)
 - We fixed an issue where the entry editor context menu was not shown correctly when JabRef is opened on a second, extended screen [#11323](https://github.com/JabRef/jabref/issues/11323), [#11174](https://github.com/JabRef/jabref/issues/11174)
 - We fixed an issue where the value of "Override default font settings" was not applied on startup [#11344](https://github.com/JabRef/jabref/issues/11344)
-- We fixed an issue when "Library changed on disk" appeared after a save by JabRef. [#4877](https://github.com/JabRef/jabref/issues/4877)  
+- We fixed an issue when "Library changed on disk" appeared after a save by JabRef. [#4877](https://github.com/JabRef/jabref/issues/4877)
 - We fixed an issue where the Pubmed/Medline Plain importer would not respect the user defined keyword separator [#11413](https://github.com/JabRef/jabref/issues/11413)
 - We fixed an issue where the value of "Override default font settings" was not applied on startup [#11344](https://github.com/JabRef/jabref/issues/11344)
 - We fixed an issue where DatabaseChangeDetailsView was not scrollable when reviewing external metadata changes [#11220](https://github.com/JabRef/jabref/issues/11220)
@@ -427,7 +434,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 
 ### Added
 
-- We added a scite.ai tab in the entry editor that retrieves 'Smart Citation' tallies for citations that have a DOI. [koppor#375](https://github.com/koppor/jabref/issues/375)  
+- We added a scite.ai tab in the entry editor that retrieves 'Smart Citation' tallies for citations that have a DOI. [koppor#375](https://github.com/koppor/jabref/issues/375)
 - We added a dropdown menu to let users change the reference library during AUX file import. [#10472](https://github.com/JabRef/jabref/issues/10472)
 - We added a button to let users reset the cite command to the default value. [#10569](https://github.com/JabRef/jabref/issues/10569)
 - We added the option to use System Preference for Light/Dark Theme [#8729](https://github.com/JabRef/jabref/issues/8729).

build.gradle.kts

@@ -56,8 +56,12 @@ requirementTracing {
 
 subprojects {
     plugins.apply("checkstyle")
+
     plugins.apply("com.github.andygoossens.modernizer")
+
+    // Hint from https://stackoverflow.com/a/46533151/873282
     plugins.apply("com.adarshr.test-logger")
+
     plugins.apply("com.github.koppor.gradle-modules-plugin")
 
     checkstyle {

docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-11-code-into-ide.md

@@ -52,14 +52,14 @@ Currently, it looks as follows:
 ![Directory Mappings including sub modules](intellij-directory-mappings-unmodified.png)
 {% endfigure %}
 
-You need to tell IntelliJ to ignore the submodules `buildres\abbrv.jabref.org`, `jablib\src\main\resources\csl-locales`, and `jablib\src\main\resources\csl-styles`.
+You need to tell IntelliJ to ignore the submodules `jablib\src\main\abbrv.jabref.org`, `jablib\src\main\resources\csl-locales`, and `jablib\src\main\resources\csl-styles`.
 Select all three (holding the <kbd>Ctrl</kbd> key).
 Then press the red minus button on top.
 
 This will make these directories "Unregistered roots:", which is fine.
 
 {% figure caption:"Directory Mappings having three unregistered roots" %}
-![Directory Mappings having three repositories unregsitered](intellij-directory-mappings-unregistered-roots.png)
+![Directory Mappings having three repositories unregistered](intellij-directory-mappings-unregistered-roots.png)
 {% endfigure %}
 
 ## Ensure that committing with other tools work

docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/pre-02-software.md

@@ -16,7 +16,7 @@ It is strongly recommended that you have git installed.
 
 ### macOS
 
-* Use [homebrew](https://brew.sh/))
+* Use [homebrew](https://brew.sh/)
 * `brew install git git-gui`
 
 ### Windows

jabgui/src/main/java/org/jabref/gui/CoreGuiPreferences.java

@@ -4,8 +4,6 @@
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleDoubleProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
 
 public class CoreGuiPreferences {
     private final DoubleProperty positionX;
@@ -18,22 +16,18 @@ public class CoreGuiPreferences {
     private final DoubleProperty horizontalDividerPosition;
     private final DoubleProperty verticalDividerPosition;
 
-    private final StringProperty lastSelectedIdBasedFetcher;
-
     public CoreGuiPreferences(double positionX,
                               double positionY,
                               double sizeX,
                               double sizeY,
                               boolean windowMaximised,
-                              String lastSelectedIdBasedFetcher,
                               double horizontalDividerPosition,
                               double verticalDividerPosition) {
         this.positionX = new SimpleDoubleProperty(positionX);
         this.positionY = new SimpleDoubleProperty(positionY);
         this.sizeX = new SimpleDoubleProperty(sizeX);
         this.sizeY = new SimpleDoubleProperty(sizeY);
         this.windowMaximised = new SimpleBooleanProperty(windowMaximised);
-        this.lastSelectedIdBasedFetcher = new SimpleStringProperty(lastSelectedIdBasedFetcher);
         this.horizontalDividerPosition = new SimpleDoubleProperty(horizontalDividerPosition);
         this.verticalDividerPosition = new SimpleDoubleProperty(verticalDividerPosition);
     }
@@ -98,18 +92,6 @@ public void setWindowMaximised(boolean windowMaximised) {
         this.windowMaximised.set(windowMaximised);
     }
 
-    public String getLastSelectedIdBasedFetcher() {
-        return lastSelectedIdBasedFetcher.get();
-    }
-
-    public StringProperty lastSelectedIdBasedFetcherProperty() {
-        return lastSelectedIdBasedFetcher;
-    }
-
-    public void setLastSelectedIdBasedFetcher(String lastSelectedIdBasedFetcher) {
-        this.lastSelectedIdBasedFetcher.set(lastSelectedIdBasedFetcher);
-    }
-
     public double getHorizontalDividerPosition() {
         return horizontalDividerPosition.get();
     }

jabgui/src/main/java/org/jabref/gui/actions/StandardActions.java

@@ -135,9 +135,11 @@ public enum StandardActions implements Action {
     EXPAND_ALL(Localization.lang("Expand all")),
     COLLAPSE_ALL(Localization.lang("Collapse all")),
 
-    NEW_ENTRY(Localization.lang("New entry"), IconTheme.JabRefIcons.ADD_ENTRY, KeyBinding.NEW_ENTRY),
-    NEW_ARTICLE(Localization.lang("New article"), IconTheme.JabRefIcons.ADD_ARTICLE),
-    NEW_ENTRY_FROM_PLAIN_TEXT(Localization.lang("New entry from plain text"), IconTheme.JabRefIcons.NEW_ENTRY_FROM_PLAIN_TEXT),
+    CREATE_ENTRY_IMMEDIATE(Localization.lang("Add entry"), IconTheme.JabRefIcons.CREATE_ENTRY_IMMEDIATE),
+    CREATE_ENTRY(Localization.lang("Create new entry..."), IconTheme.JabRefIcons.CREATE_ENTRY, KeyBinding.CREATE_ENTRY),
+    CREATE_ENTRY_IDENTIFIER(Localization.lang("Enter identifier..."), IconTheme.JabRefIcons.CREATE_ENTRY_IDENTIFIER, KeyBinding.CREATE_ENTRY_IDENTIFIER),
+    CREATE_ENTRY_PLAINTEXT(Localization.lang("Interpret citations..."), IconTheme.JabRefIcons.CREATE_ENTRY_PLAINTEXT, KeyBinding.CREATE_ENTRY_PLAINTEXT),
+
     LIBRARY_PROPERTIES(Localization.lang("Library properties")),
     FIND_DUPLICATES(Localization.lang("Find duplicates"), IconTheme.JabRefIcons.FIND_DUPLICATES),
     MERGE_ENTRIES(Localization.lang("Merge entries"), IconTheme.JabRefIcons.MERGE_ENTRIES, KeyBinding.MERGE_ENTRIES),