rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-06 01:08:25 +01:00
Code Issues Releases Activity

Stop using [ and ] as indentation menu accelerators. Use TAB/SHIFT+TAB instead. CMD+BRAKETS are still available on MacOSX only

Browse Source 
Fixes #3224 and #220
Also see https://github.com/processing/processing/issues/2199
This commit is contained in:
Federico Fissore 2015-05-25 14:37:18 +02:00
parent 5490b96f2e
commit 4bf40fc23b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1420,7 +1420,8 @@ public class Editor extends JFrame implements RunnerListener {
}); });
menu.add(commentItem); menu.add(commentItem);
JMenuItem increaseIndentItem = newJMenuItem(_("Increase Indent"), ']'); JMenuItem increaseIndentItem = new JMenuItem(_("Increase Indent"));
increaseIndentItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, 0));
increaseIndentItem.addActionListener(new ActionListener() { increaseIndentItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
handleIndentOutdent(true); handleIndentOutdent(true);
@ -1428,7 +1429,8 @@ public class Editor extends JFrame implements RunnerListener {
}); });
menu.add(increaseIndentItem); menu.add(increaseIndentItem);
JMenuItem decreseIndentItem = newJMenuItem(_("Decrease Indent"), '['); JMenuItem decreseIndentItem = new JMenuItem(_("Decrease Indent"));
decreseIndentItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, InputEvent.SHIFT_MASK));
decreseIndentItem.setName("menuDecreaseIndent"); decreseIndentItem.setName("menuDecreaseIndent");
decreseIndentItem.addActionListener(new ActionListener() { decreseIndentItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {

3
app/src/processing/app/syntax/SketchTextAreaDefaultInputMap.java
View File

@ -39,6 +39,9 @@ public class SketchTextAreaDefaultInputMap extends RSyntaxTextAreaDefaultInputMa
put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, defaultModifier), DefaultEditorKit.endAction); put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, defaultModifier), DefaultEditorKit.endAction);
remove(KeyStroke.getKeyStroke(KeyEvent.VK_J, defaultModifier)); remove(KeyStroke.getKeyStroke(KeyEvent.VK_J, defaultModifier));
put(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, defaultModifier), DefaultEditorKit.insertTabAction);
put(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, defaultModifier), RSyntaxTextAreaEditorKit.rstaDecreaseIndentAction);
} }
put(KeyStroke.getKeyStroke(KeyEvent.VK_DIVIDE, defaultModifier), RSyntaxTextAreaEditorKit.rstaToggleCommentAction); put(KeyStroke.getKeyStroke(KeyEvent.VK_DIVIDE, defaultModifier), RSyntaxTextAreaEditorKit.rstaToggleCommentAction);