From 5bd87bf45ad7771d2ffd120183923bd2e1fb66cf Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Fri, 23 Mar 2018 22:49:06 +0100 Subject: [PATCH] Reenable closing of entry preview by pressing Esc --- src/main/java/org/jabref/gui/EntryTypeDialog.java | 2 +- src/main/java/org/jabref/gui/FXDialog.java | 2 +- src/main/java/org/jabref/gui/GenFieldsCustomizer.java | 2 +- src/main/java/org/jabref/gui/MergeDialog.java | 2 +- src/main/java/org/jabref/gui/PreviewPanel.java | 2 +- src/main/java/org/jabref/gui/ReplaceStringDialog.java | 2 +- src/main/java/org/jabref/gui/StringDialog.java | 4 ++-- .../java/org/jabref/gui/actions/ManageKeywordsAction.java | 2 +- .../java/org/jabref/gui/actions/MassSetFieldAction.java | 2 +- src/main/java/org/jabref/gui/auximport/FromAuxDialog.java | 2 +- .../gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java | 2 +- .../gui/customentrytypes/EntryCustomizationDialog.java | 2 +- .../jabref/gui/dbproperties/DatabasePropertiesDialog.java | 2 +- src/main/java/org/jabref/gui/entryeditor/EntryEditor.java | 2 +- .../java/org/jabref/gui/exporter/CustomExportDialog.java | 2 +- .../jabref/gui/exporter/ExportCustomizationDialog.java | 2 +- .../jabref/gui/externalfiles/WriteXMPActionWorker.java | 2 +- .../gui/externalfiletype/ExternalFileTypeEditor.java | 4 ++-- .../java/org/jabref/gui/filelist/FileListEntryEditor.java | 2 +- .../java/org/jabref/gui/groups/GroupAddRemoveDialog.java | 2 +- src/main/java/org/jabref/gui/groups/GroupDialog.java | 2 +- .../org/jabref/gui/importer/FetcherPreviewDialog.java | 2 +- .../jabref/gui/importer/ImportCustomizationDialog.java | 2 +- .../org/jabref/gui/importer/ImportInspectionDialog.java | 2 +- src/main/java/org/jabref/gui/keyboard/KeyBinder.java | 2 +- src/main/java/org/jabref/gui/keyboard/KeyBinding.java | 6 ++---- .../org/jabref/gui/openoffice/AdvancedCiteDialog.java | 2 +- .../java/org/jabref/gui/openoffice/CitationManager.java | 4 ++-- .../java/org/jabref/gui/openoffice/StyleSelectDialog.java | 6 +++--- .../org/jabref/gui/plaintextimport/TextInputDialog.java | 2 +- .../gui/protectedterms/NewProtectedTermsFileDialog.java | 2 +- .../jabref/gui/protectedterms/ProtectedTermsDialog.java | 4 ++-- .../jabref/gui/push/PushToApplicationSettingsDialog.java | 2 +- src/main/java/org/jabref/gui/search/GlobalSearchBar.java | 2 +- .../java/org/jabref/gui/search/SearchResultFrame.java | 2 +- src/main/java/org/jabref/gui/util/BaseDialog.java | 2 +- .../gui/keyboard/KeyBindingsDialogViewModelTest.java | 8 ++++---- 37 files changed, 47 insertions(+), 49 deletions(-) diff --git a/src/main/java/org/jabref/gui/EntryTypeDialog.java b/src/main/java/org/jabref/gui/EntryTypeDialog.java index 5a0f7eb7b8a..f99d386690e 100644 --- a/src/main/java/org/jabref/gui/EntryTypeDialog.java +++ b/src/main/java/org/jabref/gui/EntryTypeDialog.java @@ -116,7 +116,7 @@ private JPanel createCancelButtonBarPanel() { cancel.addActionListener(this); // Make ESC close dialog, equivalent to clicking Cancel. - cancel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + cancel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); cancel.getActionMap().put("close", cancelAction); JPanel buttons = new JPanel(); diff --git a/src/main/java/org/jabref/gui/FXDialog.java b/src/main/java/org/jabref/gui/FXDialog.java index 6b99c8c18c5..4670d5b36ad 100644 --- a/src/main/java/org/jabref/gui/FXDialog.java +++ b/src/main/java/org/jabref/gui/FXDialog.java @@ -59,7 +59,7 @@ public FXDialog(AlertType type, boolean isModal) { dialogWindow.getScene().setOnKeyPressed(event -> { KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs(); - if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE_DIALOG, event)) { + if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE, event)) { dialogWindow.close(); } }); diff --git a/src/main/java/org/jabref/gui/GenFieldsCustomizer.java b/src/main/java/org/jabref/gui/GenFieldsCustomizer.java index 4d2fc236d93..6bff3e65d56 100644 --- a/src/main/java/org/jabref/gui/GenFieldsCustomizer.java +++ b/src/main/java/org/jabref/gui/GenFieldsCustomizer.java @@ -97,7 +97,7 @@ private void jbInit() { // Key bindings: ActionMap am = buttons.getActionMap(); InputMap im = buttons.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", new AbstractAction() { @Override diff --git a/src/main/java/org/jabref/gui/MergeDialog.java b/src/main/java/org/jabref/gui/MergeDialog.java index 3148e9ecc6d..b843419c624 100644 --- a/src/main/java/org/jabref/gui/MergeDialog.java +++ b/src/main/java/org/jabref/gui/MergeDialog.java @@ -91,7 +91,7 @@ private void jbInit() { // Key bindings: ActionMap am = jPanel1.getActionMap(); InputMap im = jPanel1.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", new AbstractAction() { @Override diff --git a/src/main/java/org/jabref/gui/PreviewPanel.java b/src/main/java/org/jabref/gui/PreviewPanel.java index 9afe203c4f2..2e5bf256438 100644 --- a/src/main/java/org/jabref/gui/PreviewPanel.java +++ b/src/main/java/org/jabref/gui/PreviewPanel.java @@ -112,7 +112,7 @@ private void createKeyBindings() { copyPreviewToClipBoard(); event.consume(); break; - case CLOSE_DIALOG: + case CLOSE: close(); event.consume(); break; diff --git a/src/main/java/org/jabref/gui/ReplaceStringDialog.java b/src/main/java/org/jabref/gui/ReplaceStringDialog.java index 6d3e6fec37f..10fd5ccc1cf 100644 --- a/src/main/java/org/jabref/gui/ReplaceStringDialog.java +++ b/src/main/java/org/jabref/gui/ReplaceStringDialog.java @@ -81,7 +81,7 @@ public void actionPerformed(ActionEvent e) { JPanel settings = new JPanel(); ActionMap am = settings.getActionMap(); InputMap im = settings.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", cancelAction); // Layout starts here. diff --git a/src/main/java/org/jabref/gui/StringDialog.java b/src/main/java/org/jabref/gui/StringDialog.java index 1ec90ffecd8..2e54e09ce69 100644 --- a/src/main/java/org/jabref/gui/StringDialog.java +++ b/src/main/java/org/jabref/gui/StringDialog.java @@ -119,7 +119,7 @@ protected boolean accept(Component c) { am.put("remove", removeStringAction); im.put(Globals.getKeyPrefs().getKey(KeyBinding.SAVE_DATABASE), "save"); am.put("save", saveAction); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", closeAction); im.put(Globals.getKeyPrefs().getKey(KeyBinding.HELP), "help"); am.put("help", helpAction); @@ -217,7 +217,7 @@ public StringTable(StringTableModel stm) { TableColumnModel cm = getColumnModel(); cm.getColumn(0).setPreferredWidth(800); cm.getColumn(1).setPreferredWidth(2000); - getInputMap().put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + getInputMap().put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); getActionMap().put("close", closeAction); getInputMap().put(Globals.getKeyPrefs().getKey(KeyBinding.HELP), "help"); getActionMap().put("help", helpAction); diff --git a/src/main/java/org/jabref/gui/actions/ManageKeywordsAction.java b/src/main/java/org/jabref/gui/actions/ManageKeywordsAction.java index dbb2f7beed6..0af7a02f91c 100644 --- a/src/main/java/org/jabref/gui/actions/ManageKeywordsAction.java +++ b/src/main/java/org/jabref/gui/actions/ManageKeywordsAction.java @@ -197,7 +197,7 @@ public void keyPressed(KeyEvent e) { // Key bindings: ActionMap am = builder.getPanel().getActionMap(); InputMap im = builder.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", cancelAction); diag.getContentPane().add(builder.getPanel(), BorderLayout.CENTER); diff --git a/src/main/java/org/jabref/gui/actions/MassSetFieldAction.java b/src/main/java/org/jabref/gui/actions/MassSetFieldAction.java index 2d6e2a907db..953d420d024 100644 --- a/src/main/java/org/jabref/gui/actions/MassSetFieldAction.java +++ b/src/main/java/org/jabref/gui/actions/MassSetFieldAction.java @@ -189,7 +189,7 @@ public void actionPerformed(ActionEvent e) { // Key bindings: ActionMap am = builder.getPanel().getActionMap(); InputMap im = builder.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", cancelAction); } diff --git a/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java b/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java index 7e879d1a36f..22a65babf34 100644 --- a/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java +++ b/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java @@ -132,7 +132,7 @@ private void jbInit() { // Key bindings: ActionMap am = statusPanel.getActionMap(); InputMap im = statusPanel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", new AbstractAction() { @Override diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java b/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java index 3a36c4f686e..e4ecee93456 100644 --- a/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java +++ b/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java @@ -104,7 +104,7 @@ public void actionPerformed(ActionEvent e) { ActionMap am = b.getPanel().getActionMap(); InputMap im = b.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", closeAction); } diff --git a/src/main/java/org/jabref/gui/customentrytypes/EntryCustomizationDialog.java b/src/main/java/org/jabref/gui/customentrytypes/EntryCustomizationDialog.java index 6fa48081af5..9c7e8375f60 100644 --- a/src/main/java/org/jabref/gui/customentrytypes/EntryCustomizationDialog.java +++ b/src/main/java/org/jabref/gui/customentrytypes/EntryCustomizationDialog.java @@ -156,7 +156,7 @@ public void actionPerformed(ActionEvent e) { }; ActionMap am = main.getActionMap(); InputMap im = main.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", closeAction); //con.fill = GridBagConstraints.BOTH; diff --git a/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java b/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java index ab91d923c27..c51d1626a6f 100644 --- a/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java +++ b/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java @@ -163,7 +163,7 @@ public void actionPerformed(ActionEvent e) { }; ActionMap am = builder.getPanel().getActionMap(); InputMap im = builder.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", closeAction); ok.addActionListener(e -> { diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java index af88a97cedd..d379a7e0c60 100644 --- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java +++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java @@ -125,7 +125,7 @@ private void setupKeyBindings() { HelpAction.openHelpPage(HelpFile.ENTRY_EDITOR); event.consume(); break; - case CLOSE_ENTRY_EDITOR: + case CLOSE: close(); event.consume(); break; diff --git a/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java b/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java index b869ee8d8b2..fb08512a5a1 100644 --- a/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java +++ b/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java @@ -112,7 +112,7 @@ public void actionPerformed(ActionEvent e) { JPanel main = new JPanel(); ActionMap am = main.getActionMap(); InputMap im = main.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", cancelAction); // Layout starts here. diff --git a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java index e6158243ca8..b2b13d72b1d 100644 --- a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java +++ b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java @@ -136,7 +136,7 @@ public void actionPerformed(ActionEvent e) { JPanel main = new JPanel(); ActionMap am = main.getActionMap(); InputMap im = main.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", closeAction); main.setLayout(new BorderLayout()); main.add(sp, BorderLayout.CENTER); diff --git a/src/main/java/org/jabref/gui/externalfiles/WriteXMPActionWorker.java b/src/main/java/org/jabref/gui/externalfiles/WriteXMPActionWorker.java index 52e6d6d2442..3454f6e4cfd 100644 --- a/src/main/java/org/jabref/gui/externalfiles/WriteXMPActionWorker.java +++ b/src/main/java/org/jabref/gui/externalfiles/WriteXMPActionWorker.java @@ -205,7 +205,7 @@ public void actionPerformed(ActionEvent e) { InputMap im = cancelButton.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); ActionMap am = cancelButton.getActionMap(); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", cancel); progressArea = new JTextArea(15, 60); diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java index a042f5e3d08..b5d698cf658 100644 --- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java +++ b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java @@ -194,11 +194,11 @@ public void actionPerformed(ActionEvent e) { // Key bindings: ActionMap am = upper.getActionMap(); InputMap im = upper.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", cancelAction); am = bb.getPanel().getActionMap(); im = bb.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", cancelAction); if (frame == null) { diff --git a/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java b/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java index 0201d148e03..af21a220638 100644 --- a/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java +++ b/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java @@ -206,7 +206,7 @@ public void actionPerformed(ActionEvent e) { // Key bindings: ActionMap am = builder.getPanel().getActionMap(); InputMap im = builder.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", cancelAction); link.getDocument().addDocumentListener(new DocumentListener() { diff --git a/src/main/java/org/jabref/gui/groups/GroupAddRemoveDialog.java b/src/main/java/org/jabref/gui/groups/GroupAddRemoveDialog.java index 6497cdd0db4..9cfc6d32bef 100644 --- a/src/main/java/org/jabref/gui/groups/GroupAddRemoveDialog.java +++ b/src/main/java/org/jabref/gui/groups/GroupAddRemoveDialog.java @@ -109,7 +109,7 @@ public void action() throws Exception { // Key bindings: ActionMap am = sp.getActionMap(); InputMap im = sp.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", new AbstractAction() { @Override diff --git a/src/main/java/org/jabref/gui/groups/GroupDialog.java b/src/main/java/org/jabref/gui/groups/GroupDialog.java index fb743b8c4c0..4abd8d6ac83 100644 --- a/src/main/java/org/jabref/gui/groups/GroupDialog.java +++ b/src/main/java/org/jabref/gui/groups/GroupDialog.java @@ -348,7 +348,7 @@ public void actionPerformed(ActionEvent e) { }; mCancel.addActionListener(cancelAction); builderAll.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW) - .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); builderAll.getPanel().getActionMap().put("close", cancelAction); okButton.addActionListener(e -> { diff --git a/src/main/java/org/jabref/gui/importer/FetcherPreviewDialog.java b/src/main/java/org/jabref/gui/importer/FetcherPreviewDialog.java index 814de298e21..5559830dde4 100644 --- a/src/main/java/org/jabref/gui/importer/FetcherPreviewDialog.java +++ b/src/main/java/org/jabref/gui/importer/FetcherPreviewDialog.java @@ -113,7 +113,7 @@ public void actionPerformed(ActionEvent e) { }; ActionMap am = centerPan.getActionMap(); InputMap im = centerPan.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", closeAction); pack(); diff --git a/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java b/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java index 04ea80df041..2626933ae89 100644 --- a/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java +++ b/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java @@ -193,7 +193,7 @@ public void actionPerformed(ActionEvent e) { JPanel mainPanel = new JPanel(); ActionMap am = mainPanel.getActionMap(); InputMap im = mainPanel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", closeAction); mainPanel.setLayout(new BorderLayout()); mainPanel.add(sp, BorderLayout.CENTER); diff --git a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java index 34293fc8dca..708256a6a44 100644 --- a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java +++ b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java @@ -340,7 +340,7 @@ public void actionPerformed(ActionEvent e) { }; ActionMap am = contentPane.getActionMap(); InputMap im = contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", closeAction); } diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinder.java b/src/main/java/org/jabref/gui/keyboard/KeyBinder.java index b1a40c2a112..1944bd038cd 100644 --- a/src/main/java/org/jabref/gui/keyboard/KeyBinder.java +++ b/src/main/java/org/jabref/gui/keyboard/KeyBinder.java @@ -22,7 +22,7 @@ private KeyBinder() { public static void bindCloseDialogKeyToCancelAction(JRootPane rootPane, Action cancelAction) { InputMap im = rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); ActionMap am = rootPane.getActionMap(); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", cancelAction); } diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java index e5adbad4de3..72e498151bb 100644 --- a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java +++ b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java @@ -11,8 +11,7 @@ public enum KeyBinding { CHECK_INTEGRITY("Check integrity", Localization.menuTitle("Check integrity"), "ctrl+F8", KeyBindingCategory.QUALITY), CLEANUP("Cleanup", Localization.lang("Cleanup entries"), "alt+F8", KeyBindingCategory.QUALITY), CLOSE_DATABASE("Close library", Localization.lang("Close library"), "ctrl+W", KeyBindingCategory.FILE), - CLOSE_DIALOG("Close dialog", Localization.lang("Close dialog"), "ESCAPE", KeyBindingCategory.FILE), - CLOSE_ENTRY_EDITOR("Close entry editor", Localization.lang("Close entry editor"), "Esc", KeyBindingCategory.VIEW), + CLOSE("Close dialog", Localization.lang("Close dialog"), "Esc", KeyBindingCategory.VIEW), COPY("Copy", Localization.lang("Copy"), "ctrl+C", KeyBindingCategory.EDIT), COPY_TITLE("Copy title", Localization.lang("Copy title"), "ctrl+shift+alt+T", KeyBindingCategory.EDIT), COPY_CITE_BIBTEX_KEY("Copy \\cite{BibTeX key}", Localization.lang("Copy \\cite{BibTeX key}"), "ctrl+K", KeyBindingCategory.EDIT), @@ -87,8 +86,7 @@ public enum KeyBinding { UNABBREVIATE("Unabbreviate", Localization.lang("Unabbreviate"), "ctrl+alt+shift+A", KeyBindingCategory.TOOLS), UNDO("Undo", Localization.lang("Undo"), "ctrl+Z", KeyBindingCategory.EDIT), WEB_SEARCH("Web search", Localization.lang("Web search"), "alt+4", KeyBindingCategory.SEARCH), - WRITE_XMP("Write XMP", Localization.lang("Write XMP"), "F6", KeyBindingCategory.TOOLS), - CLEAR_SEARCH("Clear search", Localization.lang("Clear search"), "ESC", KeyBindingCategory.SEARCH); + WRITE_XMP("Write XMP", Localization.lang("Write XMP"), "F6", KeyBindingCategory.TOOLS); private final String constant; private final String localization; diff --git a/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.java b/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.java index 4b920f36c61..2a2d48ef26e 100644 --- a/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.java +++ b/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.java @@ -89,7 +89,7 @@ public void actionPerformed(ActionEvent actionEvent) { }; cancel.addActionListener(cancelAction); builder.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW) - .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); builder.getPanel().getActionMap().put("close", cancelAction); } diff --git a/src/main/java/org/jabref/gui/openoffice/CitationManager.java b/src/main/java/org/jabref/gui/openoffice/CitationManager.java index fe69d79f67e..98f6440ba6a 100644 --- a/src/main/java/org/jabref/gui/openoffice/CitationManager.java +++ b/src/main/java/org/jabref/gui/openoffice/CitationManager.java @@ -110,7 +110,7 @@ public void actionPerformed(ActionEvent actionEvent) { cancel.addActionListener(cancelAction); bb.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put - (Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + (Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); bb.getPanel().getActionMap().put("close", cancelAction); table.getColumnModel().getColumn(0).setPreferredWidth(580); @@ -225,7 +225,7 @@ public void actionPerformed(ActionEvent actionEvent) { cancelButton.addActionListener(cancelAction); builder.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put - (Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + (Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); builder.getPanel().getActionMap().put("close", cancelAction); } diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java index 799cf4fe015..712d2833d1e 100644 --- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java +++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java @@ -193,7 +193,7 @@ public void actionPerformed(ActionEvent event) { ActionMap am = bb.getPanel().getActionMap(); InputMap im = bb.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", cancelListener); im.put(KeyStroke.getKeyStroke("ENTER"), "enterOk"); am.put("enterOk", okListener); @@ -517,8 +517,8 @@ public void actionPerformed(ActionEvent e) { // Key bindings: bb.getPanel() - .getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW) - .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + .getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW) + .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); bb.getPanel().getActionMap().put("close", cancelAction); pack(); setLocationRelativeTo(diag); diff --git a/src/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java b/src/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java index cbdd69816fb..af6b84b3bf0 100644 --- a/src/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java +++ b/src/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java @@ -174,7 +174,7 @@ private void jbInit() { // Key bindings: ActionMap am = buttons.getActionMap(); InputMap im = buttons.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", new AbstractAction() { @Override diff --git a/src/main/java/org/jabref/gui/protectedterms/NewProtectedTermsFileDialog.java b/src/main/java/org/jabref/gui/protectedterms/NewProtectedTermsFileDialog.java index c546df15777..e44dcdd98e0 100644 --- a/src/main/java/org/jabref/gui/protectedterms/NewProtectedTermsFileDialog.java +++ b/src/main/java/org/jabref/gui/protectedterms/NewProtectedTermsFileDialog.java @@ -111,7 +111,7 @@ public void actionPerformed(ActionEvent e) { // Key bindings: bb.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW) - .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); bb.getPanel().getActionMap().put("close", cancelAction); pack(); } diff --git a/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java b/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java index 8936805bd96..55a62069289 100644 --- a/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java +++ b/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java @@ -166,7 +166,7 @@ public void actionPerformed(ActionEvent event) { ActionMap am = bb.getPanel().getActionMap(); InputMap im = bb.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", cancelListener); im.put(KeyStroke.getKeyStroke("ENTER"), "enterOk"); am.put("enterOk", okListener); @@ -477,7 +477,7 @@ public void actionPerformed(ActionEvent e) { // Key bindings: bb.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW) - .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); bb.getPanel().getActionMap().put("close", cancelAction); pack(); setLocationRelativeTo(diag); diff --git a/src/main/java/org/jabref/gui/push/PushToApplicationSettingsDialog.java b/src/main/java/org/jabref/gui/push/PushToApplicationSettingsDialog.java index 598c6327fd7..ec52a2b2d36 100644 --- a/src/main/java/org/jabref/gui/push/PushToApplicationSettingsDialog.java +++ b/src/main/java/org/jabref/gui/push/PushToApplicationSettingsDialog.java @@ -43,7 +43,7 @@ public static void showSettingsDialog(JFrame parent, PushToApplication toApp, JP // Key bindings: ActionMap am = bb.getPanel().getActionMap(); InputMap im = bb.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); am.put("close", new AbstractAction() { @Override diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java index a42b2fe82ea..0bd95d895fc 100644 --- a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java +++ b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java @@ -143,7 +143,7 @@ public void actionPerformed(ActionEvent e) { updateOpenCurrentResultsTooltip(globalSearch.isSelected()); focus(); event.consume(); - } else if (keyBinding.get().equals(KeyBinding.CLEAR_SEARCH)) { + } else if (keyBinding.get().equals(KeyBinding.CLOSE)) { // Clear search and select first entry, if available clearSearch(); frame.getCurrentBasePanel().getMainTable().getSelectionModel().selectFirst(); diff --git a/src/main/java/org/jabref/gui/search/SearchResultFrame.java b/src/main/java/org/jabref/gui/search/SearchResultFrame.java index 0a781b36d54..85f78633f55 100644 --- a/src/main/java/org/jabref/gui/search/SearchResultFrame.java +++ b/src/main/java/org/jabref/gui/search/SearchResultFrame.java @@ -164,7 +164,7 @@ public void actionPerformed(ActionEvent e) { ActionMap actionMap = contentPane.getActionMap(); InputMap inputMap = contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - inputMap.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close"); + inputMap.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close"); inputMap.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DATABASE), "close"); actionMap.put("close", closeAction); diff --git a/src/main/java/org/jabref/gui/util/BaseDialog.java b/src/main/java/org/jabref/gui/util/BaseDialog.java index dce34d0b611..dd4bc151c58 100644 --- a/src/main/java/org/jabref/gui/util/BaseDialog.java +++ b/src/main/java/org/jabref/gui/util/BaseDialog.java @@ -14,7 +14,7 @@ public class BaseDialog extends Dialog { protected BaseDialog() { getDialogPane().getScene().setOnKeyPressed(event -> { KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs(); - if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE_DIALOG, event)) { + if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE, event)) { close(); } }); diff --git a/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java b/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java index 7b423d42ae0..7878cb9c678 100644 --- a/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java +++ b/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java @@ -145,16 +145,16 @@ public void testSetAllKeyBindingsToDefault() { @Test public void testCloseEntryEditorCloseEntryKeybinding() { - KeyBindingViewModel viewModel = setKeyBindingViewModel(KeyBinding.CLOSE_ENTRY_EDITOR); + KeyBindingViewModel viewModel = setKeyBindingViewModel(KeyBinding.CLOSE); model.selectedKeyBindingProperty().set(viewModel); KeyEvent closeEditorEvent = new KeyEvent(KeyEvent.KEY_PRESSED, "", "", KeyCode.ESCAPE, false, false, false, false); - assertEquals(KeyBinding.CLOSE_ENTRY_EDITOR.getDefaultKeyBinding(), KeyCode.ESCAPE.getName()); + assertEquals(KeyBinding.CLOSE.getDefaultKeyBinding(), KeyCode.ESCAPE.getName()); - KeyCombination combi = KeyCombination.valueOf(KeyBinding.CLOSE_ENTRY_EDITOR.getDefaultKeyBinding()); + KeyCombination combi = KeyCombination.valueOf(KeyBinding.CLOSE.getDefaultKeyBinding()); assertTrue(combi.match(closeEditorEvent)); - assertTrue(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE_ENTRY_EDITOR, closeEditorEvent)); + assertTrue(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE, closeEditorEvent)); } @Test