rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-26 20:54:22 +01:00
Code Issues Releases Activity

Revert "Ctrl-shift-U does not work work when editor is focused #9895"

Browse Source 
This reverts commit 15fc84e0216ffabeb75b58e735dd15a984b418b7.
This commit is contained in:
yzykov 2020-03-27 17:09:03 -07:00
parent fbb07bbe76
commit 2c52068700
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/processing/app/Editor.java
View File

@ -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 = 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;
}