Skip to content

Commit d0ededd

Browse files
Enable and disable menu items through their Action
Previously, references to the menu items themselves were kept and enabled / disabled. With this commit, these references are removed and the corresponding Action objects are enabled or disabled instead.
1 parent fbcb286 commit d0ededd

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

app/src/processing/app/Editor.java

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,6 @@ public boolean test(SketchController sketch) {
174174

175175
//Runner runtime;
176176

177-
private JMenuItem saveMenuItem;
178-
private JMenuItem saveAsMenuItem;
179-
180177
//boolean presenting;
181178
private boolean uploading;
182179

@@ -200,6 +197,7 @@ public Editor(Base ibase, File file, int[] storedLocation, int[] defaultLocation
200197
super("Arduino");
201198
this.base = ibase;
202199
this.platform = platform;
200+
showSketchFolderAction.setEnabled(Base.openFolderAvailable());
203201

204202
Base.setIcon(this);
205203

@@ -477,8 +475,8 @@ protected int[] getPlacement() {
477475
*/
478476
public void applyPreferences() {
479477
boolean external = PreferencesData.getBoolean("editor.external");
480-
saveMenuItem.setEnabled(!external);
481-
saveAsMenuItem.setEnabled(!external);
478+
saveSketchAction.setEnabled(!external);
479+
saveSketchAsAction.setEnabled(!external);
482480
for (EditorTab tab: tabs)
483481
tab.applyPreferences();
484482
}
@@ -582,10 +580,8 @@ public void run() {
582580
fileMenu.add(examplesMenu);
583581

584582
fileMenu.add(new JMenuItem(closeSketchAction));
585-
saveMenuItem = new JMenuItem(saveSketchAction);
586-
fileMenu.add(saveMenuItem);
587-
saveAsMenuItem = new JMenuItem(saveSketchAsAction);
588-
fileMenu.add(saveAsMenuItem);
583+
fileMenu.add(new JMenuItem(saveSketchAction));
584+
fileMenu.add(new JMenuItem(saveSketchAsAction));
589585
fileMenu.addSeparator();
590586
fileMenu.add(new JMenuItem(pageSetupAction));
591587
fileMenu.add(new JMenuItem(printAction));
@@ -614,10 +610,7 @@ private void buildSketchMenu(JMenu sketchMenu) {
614610
sketchMenu.add(new JMenuItem(uploadUsingProgrammerAction));
615611
sketchMenu.add(new JMenuItem(verifyAndSaveAction));
616612
sketchMenu.addSeparator();
617-
618-
JMenuItem item = new JMenuItem(showSketchFolderAction);
619-
sketchMenu.add(item);
620-
item.setEnabled(Base.openFolderAvailable());
613+
sketchMenu.add(new JMenuItem(showSketchFolderAction));
621614

622615
if (importMenu == null) {
623616
importMenu = new JMenu(tr("Include Library"));

0 commit comments

Comments
 (0)