Pre-merge upstream Arduino

Author: cmaglie

.gitignore

@@ -0,0 +1,8 @@
+app/bin/
+app/pde.jar
+build/macosx/work/
+core/bin/
+core/core.jar
+build/macosx/arduino.xcworkspace/contents.xcworkspacedata
+
+build/macosx/arduino.xcworkspace/xcuserdata/mellis.xcuserdatad/UserInterfaceState.xcuserstate

app/src/processing/app/Base.java

@@ -46,9 +46,9 @@
  * files and images, etc) that comes from that.
  */
 public class Base {
-  public static final int REVISION = 100;
+  public static final int REVISION = 101;
   /** This might be replaced by main() if there's a lib/version.txt file. */
-  static String VERSION_NAME = "0100";
+  static String VERSION_NAME = "0101";
   /** Set true if this a proper release rather than a numbered revision. */
   static public boolean RELEASE = false;
 
@@ -171,6 +171,9 @@ static public void main(String args[]) {
     // run static initialization that grabs all the prefs
     Preferences.init(null);
 
+    // load the I18n module for internationalization
+    I18n.init(Preferences.get("editor.languages.current"));
+
     // setup the theme coloring fun
     Theme.init();
 
@@ -1535,12 +1538,12 @@ static public String getHardwarePath() {
 
 
   static public String getAvrBasePath() {
-    if(Base.isLinux()) {
-      return ""; // avr tools are installed system-wide and in the path
-    } else {
-      return getHardwarePath() + File.separator + "tools" +
-             File.separator + "avr" + File.separator + "bin" + File.separator;
-    }  
+    String path = getHardwarePath() + File.separator + "tools" +
+                  File.separator + "avr" + File.separator + "bin" + File.separator;
+    if (Base.isLinux() && !(new File(path)).exists()) {
+      return "";  // use distribution provided avr tools if bundled tools missing
+    }
+    return path;
   }
 
 

app/src/processing/app/Editor.java

@@ -264,7 +264,9 @@ public void windowDeactivated(WindowEvent e) {
       splitPane.setDividerSize(dividerSize);
     }
 
-    splitPane.setMinimumSize(new Dimension(600, 400));
+    // the following changed from 600, 400 for netbooks
+    // http://code.google.com/p/arduino/issues/detail?id=52
+    splitPane.setMinimumSize(new Dimension(600, 100));
     box.add(splitPane);
 
     // hopefully these are no longer needed w/ swing
@@ -288,19 +290,9 @@ public void windowDeactivated(WindowEvent e) {
     setPlacement(location);
 
 
-    // If the window is resized too small this will resize it again to the
-    // minimums. Adapted by Chris Lonnen from comments here:
-    // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4320050
-    // as a fix for http://dev.processing.org/bugs/show_bug.cgi?id=25
-    final int minW = Preferences.getInteger("editor.window.width.min");
-    final int minH = Preferences.getInteger("editor.window.height.min");
-    addComponentListener(new java.awt.event.ComponentAdapter() {
-        public void componentResized(ComponentEvent event) {
-          setSize((getWidth() < minW) ? minW : getWidth(),
-                  (getHeight() < minH) ? minH : getHeight());
-        }
-      });
-
+    // Set the minimum size for the editor window
+    setMinimumSize(new Dimension(Preferences.getInteger("editor.window.width.min"),
+                                 Preferences.getInteger("editor.window.height.min")));
 //    System.out.println("t3");
 
     // Bring back the general options for the editor
@@ -1135,7 +1127,11 @@ protected JMenu buildEditMenu() {
     undoItem.addActionListener(undoAction = new UndoAction());
     menu.add(undoItem);
 
-    redoItem = newJMenuItem(_("Redo"), 'Y');
+    if (!Base.isMacOS()) {
+        redoItem = newJMenuItem(_("Redo"), 'Y');
+    } else {
+        redoItem = newJMenuItemShift(_("Redo"), 'Z');
+    }
     redoItem.addActionListener(redoAction = new RedoAction());
     menu.add(redoItem);
 
@@ -1247,10 +1243,29 @@ public void actionPerformed(ActionEvent e) {
     item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           if (find != null) {
-            //find.find(true);
-            //FindReplace find = new FindReplace(Editor.this); //.show();
-            find.find(true);
+            find.findNext();
+          }
+        }
+      });
+    menu.add(item);
+
+    item = newJMenuItemShift(_("Find Previous"), 'G');
+    item.addActionListener(new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+          if (find != null) {
+            find.findPrevious();
+          }
+        }
+      });
+    menu.add(item);
+
+    item = newJMenuItem(_("Use Selection For Find"), 'E');
+    item.addActionListener(new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+          if (find == null) {
+            find = new FindReplace(Editor.this);
           }
+          find.setFindText( getSelectedText() );
         }
       });
     menu.add(item);

app/src/processing/app/EditorListener.java

@@ -122,6 +122,14 @@ public boolean keyPressed(KeyEvent event) {
       }
     }
 
+    if ((event.getModifiers() & KeyEvent.CTRL_MASK) != 0) {
+      // Consume ctrl-m(carriage return) keypresses
+      if (code == KeyEvent.VK_M) {
+        event.consume();  // does nothing
+        return false;
+      }
+    }
+
     if ((event.getModifiers() & KeyEvent.META_MASK) != 0) {
       //event.consume();  // does nothing
       return false;