rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-28 09:24:14 +01:00
Code Issues Releases Activity

Merge 1ab1651bbe into 3278173ef8

Browse Source
This commit is contained in:
Yury Zykov 2024-11-28 04:19:28 +01:00 committed by GitHub
commit 6274686f98
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,6 +168,9 @@ 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
@ -669,7 +672,14 @@ 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
if (OSUtils.isLinux()) {
item = newJMenuItemAlt(tr("Upload Using Programmer"), 'U');
} else {
item = newJMenuItemShift(tr("Upload Using Programmer"), 'U');
}
item.addActionListener(event -> handleExport(true));
sketchMenu.add(item);
@ -1349,7 +1359,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_KEY_MASK | ActionEvent.SHIFT_MASK));
menuItem.setAccelerator(KeyStroke.getKeyStroke(what, SHORTCUT_SHIFT_KEY_MASK));
return menuItem;
}