Corrected shortcut

CHANGELOG.md

@@ -45,13 +45,16 @@ inserting new citations in a OpenOffic/LibreOffice document. [#6957](https://git
 - We fixed the failure to Copy citation key and link. [#5835](https://github.com/JabRef/jabref/issues/5835)
 - We fixed an issue where the sort order of the entry table was reset after a restart of JabRef. [#6898](https://github.com/JabRef/jabref/pull/6898)
 - We fixed an issue where no longer a warning was displayed when inserting references into LibreOffice with an invalid "ReferenceParagraphFormat". [#6907](https://github.com/JabRef/jabref/pull/60907).
+- We fixed an issue where a selected field was not removed after the first click in the custom entry types dialog [#6934](https://github.com/JabRef/jabref/issues/6934)
+- We fixed an issue where a remove icon was shown for standard entry types in the custom entry types dialog [6906](https://github.com/JabRef/jabref/issues/6906)
+- We fixed an issue, when pulling changes from shared database via shortcut caused creation a new new tech report [6867](https://github.com/JabRef/jabref/issues/6867)
 - We fixed an issue where a selected field was not removed after the first click in the custom entry types dialog. [#6934](https://github.com/JabRef/jabref/issues/6934)
 - We fixed an issue where a remove icon was shown for standard entry types in the custom entry types dialog. [#6906](https://github.com/JabRef/jabref/issues/6906)
 - We fixed an issue where it was impossible to connect to OpenOffice/LibreOffice on Mac OSX. [#6970](https://github.com/JabRef/jabref/pull/6970)
 - We fixed an issue with the python script used by browser plugins that failed to locate JabRef if not installed in its default location. [#6963](https://github.com/JabRef/jabref/pull/6963/files)
 - We fixed an issue where identity column header had incorrect foreground color in the Dark theme. [#6796](https://github.com/JabRef/jabref/issues/6796)
 - We fixed an issue where clicking on Collapse All button in the Search for Unlinked Local Files expanded the directory structure erroneously [#6848](https://github.com/JabRef/jabref/issues/6848)
-
+- We fixed an issue, when pulling changes from shared database via shortcut caused creation a new new tech report [6867](https://github.com/JabRef/jabref/issues/6867)
 ### Removed
 
 ## [5.1] – 2020-08-30

src/main/java/org/jabref/gui/JabRefFrame.java

@@ -275,6 +275,9 @@ private void initKeyBindings() {
  case NEW_UNPUBLISHED:
  new NewEntryAction(this, StandardEntryType.Unpublished, dialogService, prefs, stateManager).execute();
  break;
+ case NEW_INPROCEEDINGS:
+ new NewEntryAction(this, StandardEntryType.InProceedings, dialogService, prefs, stateManager).execute();
+ break;
  case PASTE:
  if (OS.OS_X) { // Workaround for a jdk issue that executes paste twice when using cmd+v in a TextField
  // Extra workaround for CodeArea, which does not inherit from TextInputControl

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

@@ -20,7 +20,7 @@ public JabRefAction(Action action, KeyBindingRepository keyBindingRepository) {
  action.getIcon()
  .ifPresent(icon -> setGraphic(icon.getGraphicNode()));
  action.getKeyBinding()
- .ifPresent(keyBinding -> setAccelerator(keyBindingRepository.getKeyCombination(keyBinding)));
+ .ifPresent(keyBinding -> keyBindingRepository.getKeyCombination(keyBinding).ifPresent(combination -> setAccelerator(combination)));
 
  setLongText(action.getDescription());
  }

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

@@ -46,12 +46,13 @@ public enum KeyBinding {
  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("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),
- NEW_PROCEEDINGS("New proceedings", Localization.lang("New proceedings"), "ctrl+shift+P", KeyBindingCategory.BIBTEX),
- NEW_UNPUBLISHED("New unpublished", Localization.lang("New unpublished"), "ctrl+shift+U", KeyBindingCategory.BIBTEX),
- NEW_TECHREPORT("New technical report", Localization.lang("New technical report"), "ctrl+shift+R", KeyBindingCategory.BIBTEX),
+ NEW_INBOOK("New inbook", Localization.lang("New inbook"), "", KeyBindingCategory.BIBTEX),
+ NEW_MASTERSTHESIS("New mastersthesis", Localization.lang("New mastersthesis"), "", KeyBindingCategory.BIBTEX),
+ NEW_PHDTHESIS("New phdthesis", Localization.lang("New phdthesis"), "", KeyBindingCategory.BIBTEX),
+ NEW_PROCEEDINGS("New proceedings", Localization.lang("New proceedings"), "", KeyBindingCategory.BIBTEX),
+ NEW_UNPUBLISHED("New unpublished", Localization.lang("New unpublished"), "", KeyBindingCategory.BIBTEX),
+ NEW_TECHREPORT("New technical report", Localization.lang("New technical report"), "", KeyBindingCategory.BIBTEX),
+ NEW_INPROCEEDINGS("New inproceesings", Localization.lang("New inproceedings"), "", KeyBindingCategory.BIBTEX),
  NEXT_PREVIEW_LAYOUT("Next preview layout", Localization.lang("Next preview layout"), "F9", KeyBindingCategory.VIEW),
  NEXT_LIBRARY("Next library", Localization.lang("Next library"), "ctrl+PAGE_DOWN", KeyBindingCategory.VIEW),
  OPEN_CONSOLE("Open terminal here", Localization.lang("Open terminal here"), "ctrl+shift+L", KeyBindingCategory.TOOLS),

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

@@ -112,21 +112,23 @@ public int size() {
  }
 
  public Optional<KeyBinding> mapToKeyBinding(KeyEvent keyEvent) {
- for (KeyBinding binding : KeyBinding.values()) {
+ for (KeyBinding binding : KeyBinding.values()){
  if (checkKeyCombinationEquality(binding, keyEvent)) {
  return Optional.of(binding);
  }
  }
  return Optional.empty();
  }
 
- public KeyCombination getKeyCombination(KeyBinding bindName) {
+ public Optional<KeyCombination> getKeyCombination(KeyBinding bindName) {
  String binding = get(bindName.getConstant());
+ if (binding.isEmpty()){
+ return Optional.empty();
+ }
  if (OS.OS_X) {
  binding = binding.replace("ctrl", "meta");
  }
-
- return KeyCombination.valueOf(binding);
+ return Optional.of(KeyCombination.valueOf(binding));
  }
 
  /**
@@ -137,8 +139,11 @@ public KeyCombination getKeyCombination(KeyBinding bindName) {
  * @return true if matching, else false
  */
  public boolean checkKeyCombinationEquality(KeyBinding binding, KeyEvent keyEvent) {
- KeyCombination keyCombination = getKeyCombination(binding);
- return checkKeyCombinationEquality(keyCombination, keyEvent);
+ Optional<KeyCombination> keyCombination = getKeyCombination(binding);
+ if (!keyCombination.isPresent()){
+ return false;
+ }
+ return checkKeyCombinationEquality(keyCombination.get(), keyEvent);
  }
 
  public List<String> getBindNames() {

src/main/java/org/jabref/gui/preview/PreviewPanel.java

@@ -136,15 +136,15 @@ private void createKeyBindings() {
 
  private ContextMenu createPopupMenu() {
  MenuItem copyPreview = new MenuItem(Localization.lang("Copy preview"), IconTheme.JabRefIcons.COPY.getGraphicNode());
- copyPreview.setAccelerator(keyBindingRepository.getKeyCombination(KeyBinding.COPY_PREVIEW));
+ keyBindingRepository.getKeyCombination(KeyBinding.COPY_PREVIEW).ifPresent(keyCombination -> copyPreview.setAccelerator(keyCombination));
  copyPreview.setOnAction(event -> previewView.copyPreviewToClipBoard());
  MenuItem printEntryPreview = new MenuItem(Localization.lang("Print entry preview"), IconTheme.JabRefIcons.PRINTED.getGraphicNode());
  printEntryPreview.setOnAction(event -> previewView.print());
  MenuItem previousPreviewLayout = new MenuItem(Localization.lang("Previous preview layout"));
- previousPreviewLayout.setAccelerator(keyBindingRepository.getKeyCombination(KeyBinding.PREVIOUS_PREVIEW_LAYOUT));
+ keyBindingRepository.getKeyCombination(KeyBinding.PREVIOUS_PREVIEW_LAYOUT).ifPresent(keyCombination -> previousPreviewLayout.setAccelerator(keyCombination));
  previousPreviewLayout.setOnAction(event -> this.previousPreviewStyle());
  MenuItem nextPreviewLayout = new MenuItem(Localization.lang("Next preview layout"));
- nextPreviewLayout.setAccelerator(keyBindingRepository.getKeyCombination(KeyBinding.NEXT_PREVIEW_LAYOUT));
+ keyBindingRepository.getKeyCombination(KeyBinding.NEXT_PREVIEW_LAYOUT).ifPresent(keyCombination -> nextPreviewLayout.setAccelerator(keyCombination));
  nextPreviewLayout.setOnAction(event -> this.nextPreviewStyle());
 
  ContextMenu menu = new ContextMenu();