Merge entry buttons

src/main/java/module-info.java

@@ -1,7 +1,8 @@
 open module org.jabref {
     // Swing
     requires java.desktop;
-
+    // JabRef codes
+    // review the code
     // SQL
     requires java.sql;
     requires java.sql.rowset;

src/main/java/org/jabref/Launcher.java

@@ -20,6 +20,9 @@
 ///
 /// - Handle the command line arguments
 /// - Start the JavaFX application (if not in CLI mode)
+
+// jabref
+// jabref
 public class Launcher {
 
     public static void main(String[] args) {

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

@@ -135,7 +135,7 @@ public enum StandardActions implements Action {
 
     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),
+    NEW_ENTRY_FROM_PLAIN_TEXT(Localization.lang("New entry from plain text"), IconTheme.JabRefIcons.NEW_ENTRY_FROM_PLAIN_TEXT, KeyBinding.NEW_ENTRY_FROM_PLAIN_TEXT),
     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),

src/main/java/org/jabref/gui/entrytype/EntryTypeView.java

@@ -87,6 +87,7 @@ public EntryTypeView(LibraryTab libraryTab, DialogService dialogService, GuiPref
                   .load()
                   .setAsDialogPane(this);
 
+        this.setWidth(1000);
         ControlHelper.setAction(generateButton, this.getDialogPane(), event -> viewModel.runFetcherWorker());
         setOnCloseRequest(e -> viewModel.cancelFetcherWorker());
 
@@ -138,7 +139,6 @@ public void initialize() {
                 stateManager,
                 (UiTaskExecutor) taskExecutor,
                 fileUpdateMonitor);
-
         idBasedFetchers.itemsProperty().bind(viewModel.fetcherItemsProperty());
         idTextField.textProperty().bindBidirectional(viewModel.idTextProperty());
         idBasedFetchers.valueProperty().bindBidirectional(viewModel.selectedItemProperty());

src/main/java/org/jabref/gui/frame/MainToolBar.java

@@ -2,8 +2,11 @@
 
 import javafx.concurrent.Task;
 import javafx.geometry.Orientation;
+import javafx.geometry.Pos;
 import javafx.scene.Group;
 import javafx.scene.control.Button;
+import javafx.scene.control.MenuButton;
+import javafx.scene.control.MenuItem;
 import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.Separator;
 import javafx.scene.control.ToolBar;
@@ -119,12 +122,7 @@ private void createToolBar() {
 
                 rightSpacer,
 
-                new HBox(
-                        factory.createIconButton(StandardActions.NEW_ARTICLE, new NewEntryAction(frame::getCurrentLibraryTab, StandardEntryType.Article, dialogService, preferences, stateManager)),
-                        factory.createIconButton(StandardActions.NEW_ENTRY, new NewEntryAction(frame::getCurrentLibraryTab, dialogService, preferences, stateManager)),
-                        createNewEntryFromIdButton(),
-                        factory.createIconButton(StandardActions.NEW_ENTRY_FROM_PLAIN_TEXT, new PlainCitationParserAction(dialogService, stateManager)),
-                        factory.createIconButton(StandardActions.DELETE_ENTRY, new EditAction(StandardActions.DELETE_ENTRY, frame::getCurrentLibraryTab, stateManager, undoManager))),
+                createNewEntryHBox(factory),
 
                 new Separator(Orientation.VERTICAL),
 
@@ -191,6 +189,46 @@ Button createNewEntryFromIdButton() {
         return newEntryFromIdButton;
     }
 
+    MenuItem createNewEntryFromIdMenuItem(ActionFactory factory, MenuButton menuButton) {
+        MenuItem newEntryFromIdItem = new MenuItem();
+        newEntryFromIdItem.setGraphic(IconTheme.JabRefIcons.IMPORT.getGraphicNode());
+        // 设置菜单项文本
+        newEntryFromIdItem.setText(Localization.lang("Import by ID"));
+        newEntryFromIdItem.disableProperty().bind(ActionHelper.needsDatabase(stateManager).not());
+
+        newEntryFromIdItem.setOnAction(event -> {
+            GenerateEntryFromIdDialog entryFromId = new GenerateEntryFromIdDialog(frame.getCurrentLibraryTab(), dialogService, preferences, taskExecutor, stateManager);
+
+            if (entryFromIdPopOver == null) {
+                entryFromIdPopOver = new PopOver(entryFromId.getDialogPane());
+                entryFromIdPopOver.setTitle(Localization.lang("Import by ID"));
+                entryFromIdPopOver.setArrowLocation(PopOver.ArrowLocation.TOP_CENTER);
+                entryFromIdPopOver.setContentNode(entryFromId.getDialogPane());
+                // 使用 MenuButton 作为锚点
+                entryFromIdPopOver.show(menuButton);
+                entryFromId.setEntryFromIdPopOver(entryFromIdPopOver);
+            } else if (entryFromIdPopOver.isShowing()) {
+                entryFromIdPopOver.hide();
+            } else {
+                entryFromIdPopOver.setContentNode(entryFromId.getDialogPane());
+                entryFromIdPopOver.show(menuButton);
+                entryFromId.setEntryFromIdPopOver(entryFromIdPopOver);
+            }
+        });
+
+        return newEntryFromIdItem;
+    }
+
+    HBox createNewEntryHBox(ActionFactory factory) {
+        HBox hBox = new HBox();
+        hBox.setAlignment(Pos.CENTER);
+        hBox.getChildren().addAll(
+                createNewEntryMenuButton(factory),
+                factory.createIconButton(StandardActions.DELETE_ENTRY, new EditAction(StandardActions.DELETE_ENTRY, frame::getCurrentLibraryTab, stateManager, undoManager))
+        );
+        return hBox;
+    }
+
     Group createTaskIndicator() {
         ProgressIndicator indicator = new ProgressIndicator();
         indicator.getStyleClass().add("progress-indicatorToolbar");
@@ -245,4 +283,19 @@ Group createTaskIndicator() {
 
         return new Group(indicator);
     }
+
+    private MenuButton createNewEntryMenuButton(ActionFactory factory) {
+        MenuButton menuButton = new MenuButton();
+        // create button of menue
+        menuButton.setGraphic(IconTheme.JabRefIcons.NEW_GROUP.getGraphicNode());
+
+        // create menu
+        MenuItem newArticleItem = factory.createMenuItem(StandardActions.NEW_ARTICLE, new NewEntryAction(frame::getCurrentLibraryTab, StandardEntryType.Article, dialogService, preferences, stateManager));
+        MenuItem newEntryItem = factory.createMenuItem(StandardActions.NEW_ENTRY, new NewEntryAction(frame::getCurrentLibraryTab, dialogService, preferences, stateManager));
+        MenuItem newEntryFromIdItem = createNewEntryFromIdMenuItem(factory, menuButton);
+        MenuItem newEntryFromPlainTextItem = factory.createMenuItem(StandardActions.NEW_ENTRY_FROM_PLAIN_TEXT, new PlainCitationParserAction(dialogService, stateManager));
+        menuButton.getItems().addAll(newArticleItem, newEntryItem, newEntryFromIdItem, newEntryFromPlainTextItem);
+
+        return menuButton;
+    }
 }

src/main/java/org/jabref/gui/keyboard/KeyBinding.java

@@ -71,7 +71,7 @@ public enum KeyBinding {
     NEW_ARTICLE("New article", Localization.lang("New article"), "ctrl+shift+A", KeyBindingCategory.BIBTEX),
     NEW_BOOK("New book", Localization.lang("New book"), "ctrl+shift+B", KeyBindingCategory.BIBTEX),
     NEW_ENTRY("New entry", Localization.lang("New entry"), "ctrl+N", KeyBindingCategory.BIBTEX),
-    NEW_ENTRY_FROM_PLAIN_TEXT_ONLINE("New entry from plain text", Localization.lang("New entry from plain text (online)"), "ctrl+shift+N", KeyBindingCategory.BIBTEX),
+    NEW_ENTRY_FROM_PLAIN_TEXT("New entry from plain text", Localization.lang("New entry from plain text"), "ctrl+shift+N", KeyBindingCategory.BIBTEX),
     NEW_INBOOK("New inbook", Localization.lang("New inbook"), "ctrl+shift+I", KeyBindingCategory.BIBTEX),
     NEW_MASTERSTHESIS("New mastersthesis", Localization.lang("New mastersthesis"), "ctrl+shift+M", KeyBindingCategory.BIBTEX),
     NEW_PHDTHESIS("New phdthesis", Localization.lang("New phdthesis"), "ctrl+shift+T", KeyBindingCategory.BIBTEX),

src/main/java/org/jabref/gui/preferences/keybindings/presets/NewEntryBindingPreset.java

@@ -25,7 +25,7 @@ public Map<KeyBinding, String> getKeyBindings() {
         keyBindings.put(KeyBinding.NEW_ARTICLE, "ctrl+shift+A");
         keyBindings.put(KeyBinding.NEW_BOOK, "ctrl+shift+B");
         keyBindings.put(KeyBinding.NEW_ENTRY, "ctrl+N");
-        keyBindings.put(KeyBinding.NEW_ENTRY_FROM_PLAIN_TEXT_ONLINE, "ctrl+shift+N");
+        keyBindings.put(KeyBinding.NEW_ENTRY_FROM_PLAIN_TEXT, "ctrl+shift+N");
         keyBindings.put(KeyBinding.NEW_INBOOK, "ctrl+shift+I");
         keyBindings.put(KeyBinding.NEW_INPROCEEDINGS, "ctrl+shift+C");
         keyBindings.put(KeyBinding.NEW_MASTERSTHESIS, "ctrl+shift+M");

src/main/resources/l10n/JabRef_en.properties

@@ -2136,7 +2136,7 @@ Your\ text\ is\ being\ parsed...=Your text is being parsed...
 LLM=LLM
 Please\ verify\ any\ information\ provided.=Please verify any information provided.
 Warning\:\ plain\ citation\ parsing\ may\ generate\ inaccurate\ or\ inappropriate\ responses.=Warning: plain citation parsing may generate inaccurate or inappropriate responses.
-New\ entry\ from\ plain\ text\ (online)=New entry from plain text (online)
+
 Parser\ choice=Parser choice
 Plain\ Citations\ Parser=Plain Citations Parser
 Please\ enter\ the\ plain\ citations\ to\ parse\ from\ separated\ by\ double\ empty\ lines.=Please enter the plain citations to parse from separated by double empty lines.