arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

"Add library" moved into "Import library" menu

Browse Source
This commit is contained in:
Federico Fissore
2012-10-19 09:32:26 +02:00
parent 3e9ef44401
commit 2a401f2a8b
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/processing/app/Base.java
View File

@ -954,9 +954,19 @@ public class Base {
return userLibs; return userLibs;
} }
public void rebuildImportMenu(JMenu importMenu) { public void rebuildImportMenu(JMenu importMenu, final Editor editor) {
importMenu.removeAll(); importMenu.removeAll();
JMenuItem addLibraryMenuItem = new JMenuItem(_("Add Library..."));
addLibraryMenuItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
Base.this.handleAddLibrary(editor);
Base.this.onBoardOrPortChange();
Base.this.rebuildImportMenu(Editor.importMenu, editor);
}
});
importMenu.add(addLibraryMenuItem);
// Split between user supplied libraries and IDE libraries // Split between user supplied libraries and IDE libraries
Map<String, File> ideLibs = getIDELibs(); Map<String, File> ideLibs = getIDELibs();
Map<String, File> userLibs = getUserLibs(); Map<String, File> userLibs = getUserLibs();
@ -1108,7 +1118,7 @@ public class Base {
} }
public void rebuildBoardsMenu(JMenu boardsMenu, final JMenu cpuTypeMenu) { public void rebuildBoardsMenu(JMenu boardsMenu, final JMenu cpuTypeMenu, final Editor editor) {
String selPackage = Preferences.get("target_package"); String selPackage = Preferences.get("target_package");
String selPlatform = Preferences.get("target_platform"); String selPlatform = Preferences.get("target_platform");
String selBoard = Preferences.get("board"); String selBoard = Preferences.get("board");
@ -1172,7 +1182,7 @@ public class Base {
onBoardOrPortChange(); onBoardOrPortChange();
Sketch.buildSettingChanged(); Sketch.buildSettingChanged();
rebuildImportMenu(Editor.importMenu); rebuildImportMenu(Editor.importMenu, editor);
rebuildExamplesMenu(Editor.examplesMenu); rebuildExamplesMenu(Editor.examplesMenu);
} }
}; };

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

@ -630,20 +630,10 @@ public class Editor extends JFrame implements RunnerListener {
if (importMenu == null) { if (importMenu == null) {
importMenu = new JMenu(_("Import Library...")); importMenu = new JMenu(_("Import Library..."));
base.rebuildImportMenu(importMenu); base.rebuildImportMenu(importMenu, this);
} }
sketchMenu.add(importMenu); sketchMenu.add(importMenu);
item = new JMenuItem(_("Add Library..."));
item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
base.handleAddLibrary(Editor.this);
base.onBoardOrPortChange();
base.rebuildImportMenu(Editor.importMenu);
}
});
sketchMenu.add(item);
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) {
@ -694,10 +684,10 @@ public class Editor extends JFrame implements RunnerListener {
if (boardsMenu == null) { if (boardsMenu == null) {
boardsMenu = new JMenu(_("Board")); boardsMenu = new JMenu(_("Board"));
cpuTypeMenu = new JMenu(_("Processor")); cpuTypeMenu = new JMenu(_("Processor"));
base.rebuildBoardsMenu(boardsMenu, cpuTypeMenu); base.rebuildBoardsMenu(boardsMenu, cpuTypeMenu, this);
//Debug: rebuild imports //Debug: rebuild imports
importMenu.removeAll(); importMenu.removeAll();
base.rebuildImportMenu(importMenu); base.rebuildImportMenu(importMenu, this);
} }
menu.add(boardsMenu); menu.add(boardsMenu);
menu.add(cpuTypeMenu); menu.add(cpuTypeMenu);