noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed erratic behaviour of "include library" menu

This commit is contained in:
Federico Fissore 2015-03-24 21:45:11 +01:00
parent ab227d37e5
commit 60dac7e59d
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,7 +187,7 @@ public class Editor extends JFrame implements RunnerListener {
// re-add the sub-menus that are shared by all windows
fileMenu.insert(sketchbookMenu, 2);
fileMenu.insert(examplesMenu, 3);
sketchMenu.insert(importMenu, 4);
buildSketchMenu();
int offset = 0;
for (JMenu menu : base.getBoardsCustomMenus()) {
toolsMenu.insert(menu, numTools + offset);
@ -201,7 +201,7 @@ public class Editor extends JFrame implements RunnerListener {
public void windowDeactivated(WindowEvent e) {
fileMenu.remove(sketchbookMenu);
fileMenu.remove(examplesMenu);
sketchMenu.remove(importMenu);
buildSketchMenu();
List<Component> toolsMenuItemsToRemove = new LinkedList<Component>();
for (Component menuItem : toolsMenu.getMenuComponents()) {
if (menuItem instanceof JComponent) {
@ -627,10 +627,13 @@ public class Editor extends JFrame implements RunnerListener {
protected JMenu buildSketchMenu() {
JMenuItem item;
if (sketchMenu == null) {
sketchMenu = new JMenu(_("Sketch"));
} else {
sketchMenu.removeAll();
}
item = newJMenuItem(_("Verify / Compile"), 'R');
JMenuItem item = newJMenuItem(_("Verify / Compile"), 'R');
item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
handleRun(false);
@ -656,13 +659,6 @@ public class Editor extends JFrame implements RunnerListener {
sketchMenu.addSeparator();
if (importMenu == null) {
importMenu = new JMenu(_("Include Library"));
MenuScroller.setScrollerFor(importMenu);
base.rebuildImportMenu(importMenu);
}
sketchMenu.add(importMenu);
item = newJMenuItem(_("Show Sketch Folder"), 'K');
item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@ -672,6 +668,13 @@ public class Editor extends JFrame implements RunnerListener {
sketchMenu.add(item);
item.setEnabled(Base.openFolderAvailable());
if (importMenu == null) {
importMenu = new JMenu(_("Include Library"));
MenuScroller.setScrollerFor(importMenu);
base.rebuildImportMenu(importMenu);
}
sketchMenu.add(importMenu);
item = new JMenuItem(_("Add File..."));
item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {