"Add library" moved into "Import library" menu

Conflicts:
	app/src/processing/app/Base.java
	app/src/processing/app/Editor.java

Author: cmaglie

app/src/processing/app/Base.java

@@ -943,10 +943,20 @@ protected void rebuildSketchbookMenu(JMenu menu) {
   }
 
 
-  public void rebuildImportMenu(JMenu importMenu) {
-    //System.out.println("rebuilding import menu");
+  public void rebuildImportMenu(JMenu importMenu, final Editor editor) {
     importMenu.removeAll();
-
+    
+    JMenuItem addLibraryMenuItem = new JMenuItem(_("Add Library..."));
+    addLibraryMenuItem.addActionListener(new ActionListener() {
+      public void actionPerformed(ActionEvent e) {
+        Base.this.handleAddZipLibrary(editor);
+        Base.this.onBoardOrPortChange();
+        Base.this.rebuildImportMenu(Editor.importMenu, editor);
+      }
+    });
+    importMenu.add(addLibraryMenuItem);
+    importMenu.addSeparator();
+    
     // reset the set of libraries
     libraries = new HashSet<File>();
 
@@ -998,7 +1008,7 @@ public void onBoardOrPortChange() {
   }
 
 
-  public void rebuildBoardsMenu(JMenu menu) {
+  public void rebuildBoardsMenu(JMenu menu, final Editor editor) {
     //System.out.println("rebuilding boards menu");
     menu.removeAll();      
     ButtonGroup group = new ButtonGroup();

app/src/processing/app/Editor.java

@@ -627,20 +627,10 @@ public void actionPerformed(ActionEvent e) {
 
     if (importMenu == null) {
       importMenu = new JMenu(_("Import Library..."));
-      base.rebuildImportMenu(importMenu);
+      base.rebuildImportMenu(importMenu, this);
     }
     sketchMenu.add(importMenu);
 
-    item = new JMenuItem(_("Add Library from ZIP"));
-    item.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        base.handleAddZipLibrary(Editor.this);
-        base.onBoardOrPortChange();
-        base.rebuildImportMenu(Editor.importMenu);
-      }
-    });
-    sketchMenu.add(item);
-
     item = newJMenuItem(_("Show Sketch Folder"), 'K');
     item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
@@ -690,7 +680,7 @@ public void actionPerformed(ActionEvent e) {
 
     if (boardsMenu == null) {
       boardsMenu = new JMenu(_("Board"));
-      base.rebuildBoardsMenu(boardsMenu);
+      base.rebuildBoardsMenu(boardsMenu, this);
     }
     menu.add(boardsMenu);
 

build/shared/revisions.txt

@@ -1,5 +1,5 @@
 
-ARDUINO 1.0.5 - 2013.03.29
+ARDUINO 1.0.5 - 2013.04.08
 
 [core]
 
@@ -15,6 +15,10 @@ ARDUINO 1.0.5 - 2013.03.29
 
 * Upgrades to WiFi firmwares
 
+[ide]
+
+* Backport from 1.5: install Library from file
+
 ARDUINO 1.0.4 - 2013.03.11
 
 [core]