mirror of https://github.com/noisymime/Arduino.git
Fixed erratic behaviour of "include library" menu
This commit is contained in:
parent
ab227d37e5
commit
60dac7e59d
|
@ -187,7 +187,7 @@ public class Editor extends JFrame implements RunnerListener {
|
||||||
// re-add the sub-menus that are shared by all windows
|
// re-add the sub-menus that are shared by all windows
|
||||||
fileMenu.insert(sketchbookMenu, 2);
|
fileMenu.insert(sketchbookMenu, 2);
|
||||||
fileMenu.insert(examplesMenu, 3);
|
fileMenu.insert(examplesMenu, 3);
|
||||||
sketchMenu.insert(importMenu, 4);
|
buildSketchMenu();
|
||||||
int offset = 0;
|
int offset = 0;
|
||||||
for (JMenu menu : base.getBoardsCustomMenus()) {
|
for (JMenu menu : base.getBoardsCustomMenus()) {
|
||||||
toolsMenu.insert(menu, numTools + offset);
|
toolsMenu.insert(menu, numTools + offset);
|
||||||
|
@ -201,7 +201,7 @@ public class Editor extends JFrame implements RunnerListener {
|
||||||
public void windowDeactivated(WindowEvent e) {
|
public void windowDeactivated(WindowEvent e) {
|
||||||
fileMenu.remove(sketchbookMenu);
|
fileMenu.remove(sketchbookMenu);
|
||||||
fileMenu.remove(examplesMenu);
|
fileMenu.remove(examplesMenu);
|
||||||
sketchMenu.remove(importMenu);
|
buildSketchMenu();
|
||||||
List<Component> toolsMenuItemsToRemove = new LinkedList<Component>();
|
List<Component> toolsMenuItemsToRemove = new LinkedList<Component>();
|
||||||
for (Component menuItem : toolsMenu.getMenuComponents()) {
|
for (Component menuItem : toolsMenu.getMenuComponents()) {
|
||||||
if (menuItem instanceof JComponent) {
|
if (menuItem instanceof JComponent) {
|
||||||
|
@ -627,10 +627,13 @@ public class Editor extends JFrame implements RunnerListener {
|
||||||
|
|
||||||
|
|
||||||
protected JMenu buildSketchMenu() {
|
protected JMenu buildSketchMenu() {
|
||||||
JMenuItem item;
|
if (sketchMenu == null) {
|
||||||
sketchMenu = new JMenu(_("Sketch"));
|
sketchMenu = new JMenu(_("Sketch"));
|
||||||
|
} else {
|
||||||
|
sketchMenu.removeAll();
|
||||||
|
}
|
||||||
|
|
||||||
item = newJMenuItem(_("Verify / Compile"), 'R');
|
JMenuItem item = newJMenuItem(_("Verify / Compile"), 'R');
|
||||||
item.addActionListener(new ActionListener() {
|
item.addActionListener(new ActionListener() {
|
||||||
public void actionPerformed(ActionEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
handleRun(false);
|
handleRun(false);
|
||||||
|
@ -656,13 +659,6 @@ public class Editor extends JFrame implements RunnerListener {
|
||||||
|
|
||||||
sketchMenu.addSeparator();
|
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 = newJMenuItem(_("Show Sketch Folder"), 'K');
|
||||||
item.addActionListener(new ActionListener() {
|
item.addActionListener(new ActionListener() {
|
||||||
public void actionPerformed(ActionEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
|
@ -672,6 +668,13 @@ public class Editor extends JFrame implements RunnerListener {
|
||||||
sketchMenu.add(item);
|
sketchMenu.add(item);
|
||||||
item.setEnabled(Base.openFolderAvailable());
|
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 = new JMenuItem(_("Add File..."));
|
||||||
item.addActionListener(new ActionListener() {
|
item.addActionListener(new ActionListener() {
|
||||||
public void actionPerformed(ActionEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
|
|
Loading…
Reference in New Issue