From 1866050e0783e85b814c6afb57fa36318f3496bb Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@bug.st>
Date: Sat, 6 Apr 2013 12:55:39 +0200
Subject: [PATCH] "Add library" moved into "Import library" menu

Conflicts:
	app/src/processing/app/Base.java
	app/src/processing/app/Editor.java
---
 app/src/processing/app/Base.java   | 18 ++++++++++++++----
 app/src/processing/app/Editor.java | 14 ++------------
 build/shared/revisions.txt         |  6 +++++-
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index 401def98c..33e8ff410 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -943,10 +943,20 @@ public class Base {
   }
 
 
-  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 class Base {
   }
 
   
-  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();
diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index cb18b0e44..4fc2d13cd 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -627,20 +627,10 @@ public class Editor extends JFrame implements RunnerListener {
 
     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 class Editor extends JFrame implements RunnerListener {
     
     if (boardsMenu == null) {
       boardsMenu = new JMenu(_("Board"));
-      base.rebuildBoardsMenu(boardsMenu);
+      base.rebuildBoardsMenu(boardsMenu, this);
     }
     menu.add(boardsMenu);
     
diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index 3f7e61b23..4fd135592 100644
--- a/build/shared/revisions.txt
+++ b/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]