@@ -187,7 +187,7 @@ public void windowActivated(WindowEvent e) {
187
187
// re-add the sub-menus that are shared by all windows
188
188
fileMenu .insert (sketchbookMenu , 2 );
189
189
fileMenu .insert (examplesMenu , 3 );
190
- sketchMenu . insert ( importMenu , 4 );
190
+ buildSketchMenu ( );
191
191
int offset = 0 ;
192
192
for (JMenu menu : base .getBoardsCustomMenus ()) {
193
193
toolsMenu .insert (menu , numTools + offset );
@@ -201,7 +201,7 @@ public void windowActivated(WindowEvent e) {
201
201
public void windowDeactivated (WindowEvent e ) {
202
202
fileMenu .remove (sketchbookMenu );
203
203
fileMenu .remove (examplesMenu );
204
- sketchMenu . remove ( importMenu );
204
+ buildSketchMenu ( );
205
205
List <Component > toolsMenuItemsToRemove = new LinkedList <Component >();
206
206
for (Component menuItem : toolsMenu .getMenuComponents ()) {
207
207
if (menuItem instanceof JComponent ) {
@@ -627,10 +627,13 @@ public void actionPerformed(ActionEvent e) {
627
627
628
628
629
629
protected JMenu buildSketchMenu () {
630
- JMenuItem item ;
631
- sketchMenu = new JMenu (_ ("Sketch" ));
630
+ if (sketchMenu == null ) {
631
+ sketchMenu = new JMenu (_ ("Sketch" ));
632
+ } else {
633
+ sketchMenu .removeAll ();
634
+ }
632
635
633
- item = newJMenuItem (_ ("Verify / Compile" ), 'R' );
636
+ JMenuItem item = newJMenuItem (_ ("Verify / Compile" ), 'R' );
634
637
item .addActionListener (new ActionListener () {
635
638
public void actionPerformed (ActionEvent e ) {
636
639
handleRun (false );
@@ -656,22 +659,22 @@ public void actionPerformed(ActionEvent e) {
656
659
657
660
sketchMenu .addSeparator ();
658
661
662
+ item = newJMenuItem (_ ("Show Sketch Folder" ), 'K' );
663
+ item .addActionListener (new ActionListener () {
664
+ public void actionPerformed (ActionEvent e ) {
665
+ Base .openFolder (sketch .getFolder ());
666
+ }
667
+ });
668
+ sketchMenu .add (item );
669
+ item .setEnabled (Base .openFolderAvailable ());
670
+
659
671
if (importMenu == null ) {
660
672
importMenu = new JMenu (_ ("Include Library" ));
661
673
MenuScroller .setScrollerFor (importMenu );
662
674
base .rebuildImportMenu (importMenu );
663
675
}
664
676
sketchMenu .add (importMenu );
665
677
666
- item = newJMenuItem (_ ("Show Sketch Folder" ), 'K' );
667
- item .addActionListener (new ActionListener () {
668
- public void actionPerformed (ActionEvent e ) {
669
- Base .openFolder (sketch .getFolder ());
670
- }
671
- });
672
- sketchMenu .add (item );
673
- item .setEnabled (Base .openFolderAvailable ());
674
-
675
678
item = new JMenuItem (_ ("Add File..." ));
676
679
item .addActionListener (new ActionListener () {
677
680
public void actionPerformed (ActionEvent e ) {
0 commit comments