Skip to content

Commit 3086e6f

Browse files
benfrybenfry
committed
Merge remote-tracking branch 'upstream/master'
2 parents aa2f8dc + a56ef00 commit 3086e6f

5 files changed

Lines changed: 306 additions & 50 deletions

File tree

‎app/src/processing/app/Editor.java‎

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public abstract class Editor extends JFrame implements RunnerListener {
5151
protected EditorState state;
5252
protected Mode mode;
5353

54-
// otherwise, if the window is resized with the message label
55-
// set to blank, it's preferredSize() will be fukered
54+
// Otherwise, if the window is resized with the message label
55+
// set to blank, its preferredSize() will be fuckered
5656
static protected final String EMPTY =
5757
" " +
5858
" " +
@@ -66,7 +66,7 @@ public abstract class Editor extends JFrame implements RunnerListener {
6666
private PageFormat pageFormat;
6767
private PrinterJob printerJob;
6868

69-
// file and sketch menus for re-inserting items
69+
// File and sketch menus for re-inserting items
7070
private JMenu fileMenu;
7171
// private JMenuItem saveMenuItem;
7272
// private JMenuItem saveAsMenuItem;
@@ -148,7 +148,10 @@ public void windowActivated(WindowEvent e) {
148148
// fileMenu.insert(base.getSketchbookMenu(), 2);
149149
fileMenu.insert(base.getRecentMenu(), 2);
150150
// fileMenu.insert(mode.getExamplesMenu(), 3);
151+
Toolkit.setMenuMnemsInside(fileMenu);
152+
151153
sketchMenu.insert(mode.getImportMenu(), 4);
154+
Toolkit.setMenuMnemsInside(sketchMenu);
152155
mode.insertToolbarRecentMenu();
153156
}
154157

@@ -398,7 +401,6 @@ protected void initModeMenu() {
398401
public void actionPerformed(ActionEvent e) {
399402
if (!sketch.isModified()) {
400403
base.changeMode(m);
401-
402404
} else {
403405
Base.showWarning("Save",
404406
"Please save the sketch before changing the mode.",
@@ -433,6 +435,8 @@ public void actionPerformed(ActionEvent e) {
433435
}
434436
});
435437
modeMenu.add(addLib);
438+
439+
Toolkit.setMenuMnemsInside(modeMenu);
436440
}
437441

438442

@@ -557,7 +561,6 @@ protected void applyPreferences() {
557561

558562
protected void buildMenuBar() {
559563
JMenuBar menubar = new JMenuBar();
560-
menubar = new JMenuBar();
561564
fileMenu = buildFileMenu();
562565
menubar.add(fileMenu);
563566
menubar.add(buildEditMenu());
@@ -573,6 +576,7 @@ protected void buildMenuBar() {
573576
menubar.add(getToolMenu());
574577

575578
menubar.add(buildHelpMenu());
579+
Toolkit.setMenuMnemonics(menubar);
576580
setJMenuBar(menubar);
577581
}
578582

@@ -734,11 +738,11 @@ protected JMenu buildEditMenu() {
734738

735739
menu.addSeparator();
736740

737-
cutItems = Toolkit.newJMenuItem("Cut", 'X');
741+
cutItems = Toolkit.newJMenuItem(Language.text("menu.edit.cut"), 'X');
738742
cutItems.addActionListener(cutAction = new CutAction());
739743
menu.add(cutItems);
740744

741-
copyItems = Toolkit.newJMenuItem("Copy", 'C');
745+
copyItems = Toolkit.newJMenuItem(Language.text("menu.edit.copy"), 'C');
742746
copyItems.addActionListener(copyAction = new CopyAction());
743747
menu.add(copyItems);
744748

@@ -933,7 +937,9 @@ public void actionPerformed(ActionEvent e) {
933937
});
934938
sketchMenu.add(item);
935939

936-
sketchMenu.addSeparator();
940+
if (runItems != null && runItems.length != 0) {
941+
sketchMenu.addSeparator();
942+
}
937943

938944
// final Editor editorName = this;
939945

@@ -957,7 +963,6 @@ public void menuSelected(MenuEvent event) {
957963

958964
// Action listener to bring the appropriate sketch in front
959965
item.addActionListener(new ActionListener() {
960-
961966
@Override
962967
public void actionPerformed(ActionEvent e) {
963968
editor.setState(Frame.NORMAL);
@@ -967,6 +972,7 @@ public void actionPerformed(ActionEvent e) {
967972
});
968973
sketchMenu.add(item);
969974
menuList.add(item);
975+
Toolkit.setMenuMnemsInside(sketchMenu);
970976
}
971977
}
972978

@@ -1300,7 +1306,7 @@ static public void showChanges() {
13001306

13011307
class CutAction extends AbstractAction {
13021308
public CutAction() {
1303-
super("Cut");
1309+
super(Language.text("menu.edit.cut"));
13041310
this.setEnabled(false);
13051311
}
13061312

@@ -1310,11 +1316,7 @@ public void actionPerformed(ActionEvent e) {
13101316
}
13111317

13121318
public void updateCutState() {
1313-
if (canCut()) {
1314-
cutItems.setEnabled(true);
1315-
} else {
1316-
cutItems.setEnabled(false);
1317-
}
1319+
cutItems.setEnabled(canCut());
13181320
}
13191321

13201322
public boolean canCut() {
@@ -1324,7 +1326,7 @@ public boolean canCut() {
13241326

13251327
class CopyAction extends AbstractAction {
13261328
public CopyAction() {
1327-
super("Copy");
1329+
super(Language.text("menu.edit.copy"));
13281330
this.setEnabled(false);
13291331
}
13301332

@@ -1333,11 +1335,7 @@ public void actionPerformed(ActionEvent e) {
13331335
}
13341336

13351337
public void updateCopyState() {
1336-
if (canCopy()) {
1337-
copyItems.setEnabled(true);
1338-
} else {
1339-
copyItems.setEnabled(false);
1340-
}
1338+
copyItems.setEnabled(canCopy());
13411339
}
13421340

13431341
public boolean canCopy() {
@@ -2937,11 +2935,9 @@ public boolean isHalted() {
29372935
* Returns the edit popup menu.
29382936
*/
29392937
class TextAreaPopup extends JPopupMenu {
2940-
JMenuItem cutItem;
2941-
JMenuItem copyItem;
2942-
JMenuItem discourseItem;
2943-
JMenuItem referenceItem;
2944-
2938+
JMenuItem cutItem, copyItem, discourseItem, pasteItem,
2939+
selectAllItem, commUncommItem, incIndItem, decIndItem,
2940+
referenceItem;
29452941

29462942
public TextAreaPopup() {
29472943
JMenuItem item;
@@ -2996,15 +2992,15 @@ public void actionPerformed(ActionEvent e) {
29962992
});
29972993
this.add(item);
29982994

2999-
item = new JMenuItem("\u2192 "+Language.text("menu.edit.increase_indent"));
2995+
item = new JMenuItem("\u2192 " + Language.text("menu.edit.increase_indent"));
30002996
item.addActionListener(new ActionListener() {
30012997
public void actionPerformed(ActionEvent e) {
30022998
handleIndentOutdent(true);
30032999
}
30043000
});
30053001
this.add(item);
30063002

3007-
item = new JMenuItem("\u2190 "+Language.text("menu.edit.decrease_indent"));
3003+
item = new JMenuItem("\u2190 " + Language.text("menu.edit.decrease_indent"));
30083004
item.addActionListener(new ActionListener() {
30093005
public void actionPerformed(ActionEvent e) {
30103006
handleIndentOutdent(false);
@@ -3021,6 +3017,8 @@ public void actionPerformed(ActionEvent e) {
30213017
}
30223018
});
30233019
this.add(referenceItem);
3020+
3021+
Toolkit.setMenuMnemonics(this);
30243022
}
30253023

30263024
// if no text is selected, disable copy and cut menu items

‎app/src/processing/app/EditorHeader.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -615,6 +615,8 @@ public void actionPerformed(ActionEvent e) {
615615
menu.add(item);
616616
}
617617
}
618+
619+
Toolkit.setMenuMnemonics(menu);
618620
}
619621

620622

0 commit comments

Comments
 (0)