From 2c520687000c7732763a261bc86fa32c262cf6ac Mon Sep 17 00:00:00 2001 From: yzykov Date: Fri, 27 Mar 2020 17:09:03 -0700 Subject: [PATCH] Revert "Ctrl-shift-U does not work work when editor is focused #9895" This reverts commit 15fc84e0216ffabeb75b58e735dd15a984b418b7. --- app/src/processing/app/Editor.java | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java index 469f4dd2e..2ec29c498 100644 --- a/app/src/processing/app/Editor.java +++ b/app/src/processing/app/Editor.java @@ -169,9 +169,6 @@ public class Editor extends JFrame implements RunnerListener { /** Command-Option on Mac OS X, Ctrl-Alt on Windows and Linux */ static final int SHORTCUT_ALT_KEY_MASK = ActionEvent.ALT_MASK | Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(); - /** Command-Option on Mac OS X, Ctrl-Shift on Windows and Linux */ - static final int SHORTCUT_SHIFT_KEY_MASK = ActionEvent.SHIFT_MASK | - Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(); /** * true if this file has not yet been given a name by the user @@ -673,22 +670,9 @@ public class Editor extends JFrame implements RunnerListener { item.addActionListener(event -> handleExport(false)); sketchMenu.add(item); - // Since CTRL+SHIFT+U is not working on iBus keyboard input method - // Lets redirect the shorcut for Linux to CTRL+ALT+U - // Leaving the preexisting behaviour for Windows & Mac OS - String OS = System.getProperty("os.name").toLowerCase(); - if (OS.indexOf("nix") >= 0 || OS.indexOf("nux") >= 0 || OS.indexOf("aix") > 0) - { - item = newJMenuItemAlt(tr("Upload Using Programmer"), 'U'); - item.addActionListener(event -> handleExport(true)); - sketchMenu.add(item); - } - else - { - item = newJMenuItemShift(tr("Upload Using Programmer"), 'U'); - item.addActionListener(event -> handleExport(true)); - sketchMenu.add(item); - } + item = newJMenuItemShift(tr("Upload Using Programmer"), 'U'); + item.addActionListener(event -> handleExport(true)); + sketchMenu.add(item); item = newJMenuItemAlt(tr("Export compiled Binary"), 'S'); item.addActionListener(event -> { @@ -1366,7 +1350,7 @@ public class Editor extends JFrame implements RunnerListener { // Control + Shift + K seems to not be working on linux (Xubuntu 17.04, 2017-08-19) static public JMenuItem newJMenuItemShift(String title, int what) { JMenuItem menuItem = new JMenuItem(title); - menuItem.setAccelerator(KeyStroke.getKeyStroke(what, SHORTCUT_SHIFT_KEY_MASK)); + menuItem.setAccelerator(KeyStroke.getKeyStroke(what, SHORTCUT_KEY_MASK | ActionEvent.SHIFT_MASK)); return menuItem; }