Merge branch 'new-extension' of git@github.com:arduino/Arduino

Author: tigoe

app/src/processing/app/Base.java

@@ -545,7 +545,7 @@ protected String createNewUntitled() throws IOException {
     newbieDir.mkdirs();
 
     // Make an empty pde file
-    File newbieFile = new File(newbieDir, newbieName + ".pde");
+    File newbieFile = new File(newbieDir, newbieName + ".ino");
     new FileOutputStream(newbieFile);  // create the file
     return newbieFile.getAbsolutePath();
   }
@@ -637,7 +637,8 @@ public void handleOpenPrompt() {
         public boolean accept(File dir, String name) {
           // TODO this doesn't seem to ever be used. AWESOME.
           //System.out.println("check filter on " + dir + " " + name);
-          return name.toLowerCase().endsWith(".pde");
+          return name.toLowerCase().endsWith(".ino")
+              || name.toLowerCase().endsWith(".pde");
         }
       });
 
@@ -1016,22 +1017,28 @@ public void actionPerformed(ActionEvent actionevent) {
   }
 
 
-  public void rebuildBurnBootloaderMenu(JMenu menu) {
-    //System.out.println("rebuilding burn bootloader menu");
+  public void rebuildProgrammerMenu(JMenu menu) {
+    //System.out.println("rebuilding programmer menu");
     menu.removeAll();      
+    ButtonGroup group = new ButtonGroup();
     for (Target target : targetsTable.values()) {
       for (String programmer : target.getProgrammers().keySet()) {
         AbstractAction action = 
           new AbstractAction(
-            "w/ " + target.getProgrammers().get(programmer).get("name")) {
+            target.getProgrammers().get(programmer).get("name")) {
             public void actionPerformed(ActionEvent actionevent) {
-              activeEditor.handleBurnBootloader((String) getValue("target"),
-                                                (String) getValue("programmer"));
+              Preferences.set("programmer", getValue("target") + ":" +
+                                            getValue("programmer"));
             }
           };
         action.putValue("target", target.getName());
         action.putValue("programmer", programmer);
-        JMenuItem item = new JMenuItem(action);
+        JMenuItem item = new JRadioButtonMenuItem(action);
+        if (Preferences.get("programmer").equals(target.getName() + ":" +
+                                                 programmer)) {
+          item.setSelected(true);
+        }
+        group.add(item);
         menu.add(item);
       }
     }
@@ -1091,7 +1098,10 @@ public void actionPerformed(ActionEvent e) {
       File subfolder = new File(folder, list[i]);
       if (!subfolder.isDirectory()) continue;
 
-      File entry = new File(subfolder, list[i] + ".pde");
+      File entry = new File(subfolder, list[i] + ".ino");
+      if (!entry.exists() && (new File(subfolder, list[i] + ".pde")).exists()) {
+      	entry = new File(subfolder, list[i] + ".pde");
+      }
       // if a .pde file of the same prefix as the folder exists..
       if (entry.exists()) {
         //String sanityCheck = sanitizedName(list[i]);

app/src/processing/app/Editor.java

@@ -538,21 +538,21 @@ public void actionPerformed(ActionEvent e) {
       });
     fileMenu.add(saveAsMenuItem);
 
-    item = newJMenuItem("Upload to I/O Board", 'U');
+    item = newJMenuItem("Upload", 'U');
     item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           handleExport(false);
         }
       });
     fileMenu.add(item);
 
-//    item = newJMenuItemShift("Upload to I/O Board (verbose)", 'U');
-//    item.addActionListener(new ActionListener() {
-//        public void actionPerformed(ActionEvent e) {
-//          handleExport(true);
-//        }
-//      });
-//    fileMenu.add(item);
+    item = newJMenuItemShift("Upload Using Programmer", 'U');
+    item.addActionListener(new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+          handleExport(true);
+        }
+      });
+    fileMenu.add(item);
 
     fileMenu.addSeparator();
 
@@ -618,13 +618,13 @@ public void actionPerformed(ActionEvent e) {
 //      });
 //    sketchMenu.add(item);
 
-    item = new JMenuItem("Stop");
-    item.addActionListener(new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-          handleStop();
-        }
-      });
-    sketchMenu.add(item);
+//    item = new JMenuItem("Stop");
+//    item.addActionListener(new ActionListener() {
+//        public void actionPerformed(ActionEvent e) {
+//          handleStop();
+//        }
+//      });
+//    sketchMenu.add(item);
 
     sketchMenu.addSeparator();
 
@@ -693,12 +693,20 @@ public void actionPerformed(ActionEvent e) {
       serialMenu = new JMenu("Serial Port");
     populateSerialMenu();
     menu.add(serialMenu);
-	  
+    
     menu.addSeparator();
+    
+    JMenu programmerMenu = new JMenu("Programmer");
+    base.rebuildProgrammerMenu(programmerMenu);
+    menu.add(programmerMenu);
 
-    JMenu bootloaderMenu = new JMenu("Burn Bootloader");
-    base.rebuildBurnBootloaderMenu(bootloaderMenu);
-    menu.add(bootloaderMenu);
+    item = new JMenuItem("Burn Bootloader");
+    item.addActionListener(new ActionListener() {
+      public void actionPerformed(ActionEvent e) {
+        handleBurnBootloader();
+      }
+    });
+    menu.add(item);
 
     menu.addMenuListener(new MenuListener() {
       public void menuCanceled(MenuEvent e) {}
@@ -989,8 +997,8 @@ protected void populateSerialMenu() {
     //serialMenu.addSeparator();
     //serialMenu.add(item);
   }
-
-
+  
+  
   protected JMenu buildHelpMenu() {
     // To deal with a Mac OS X 10.5 bug, add an extra space after the name
     // so that the OS doesn't try to insert its slow help menu.
@@ -1887,12 +1895,12 @@ public Point getSketchLocation() {
    * Implements Sketch → Stop, or pressing Stop on the toolbar.
    */
   public void handleStop() {  // called by menu or buttons
-    toolbar.activate(EditorToolbar.STOP);
+//    toolbar.activate(EditorToolbar.STOP);
 
     internalCloseRunner();
 
     toolbar.deactivate(EditorToolbar.RUN);
-    toolbar.deactivate(EditorToolbar.STOP);
+//    toolbar.deactivate(EditorToolbar.STOP);
 
     // focus the PDE again after quitting presentation mode [toxi 030903]
     toFront();
@@ -2032,14 +2040,65 @@ protected void handleOpenUnchecked(String path, int codeIndex,
    * modifications (if any) to the previous sketch need to be saved.
    */
   protected boolean handleOpenInternal(String path) {
+    // rename .pde files to .ino
+    File[] oldFiles = (new File(path)).getParentFile().listFiles(new FilenameFilter() {
+      public boolean accept(File dir, String name) {
+        return (name.toLowerCase().endsWith(".pde"));
+      }
+    });
+    
+    if (oldFiles != null && oldFiles.length > 0) {
+      if (!Preferences.getBoolean("editor.update_extension")) {
+        Object[] options = { "OK", "Cancel" };
+        String prompt =
+          "In Arduino 1.0, the file extension for sketches changed\n" +
+          "from \".pde\" to \".ino\".  This version of the software only\n" +
+          "supports the new extension.  Rename the files in this sketch\n" +
+          "(and future sketches) and continue?";
+        
+        int result = JOptionPane.showOptionDialog(this,
+                                                  prompt,
+                                                  "New extension",
+                                                  JOptionPane.YES_NO_OPTION,
+                                                  JOptionPane.QUESTION_MESSAGE,
+                                                  null,
+                                                  options,
+                                                  options[0]);
+        if (result != JOptionPane.YES_OPTION) {
+          return false;
+        }
+        
+        Preferences.setBoolean("editor.update_extension", true);
+      }
+      
+      for (int i = 0; i < oldFiles.length; i++) {
+        String oldPath = oldFiles[i].getPath();
+        File newFile = new File(oldPath.substring(0, oldPath.length() - 4) + ".ino");
+        try {
+          Base.copyFile(oldFiles[i], newFile);
+        } catch (IOException e) {
+          Base.showWarning("Error", "Could not copy to a proper location.", e);
+          return false;
+        }
+
+        // remove the original file, so user doesn't get confused
+        oldFiles[i].delete();
+
+        // update with the new path
+        if (oldFiles[i].compareTo(new File(path)) == 0) {
+          path = newFile.getAbsolutePath();      	
+        }
+      }
+    }
+    
     // check to make sure that this .pde file is
     // in a folder of the same name
     File file = new File(path);
     File parentFile = new File(file.getParent());
     String parentName = parentFile.getName();
-    String pdeName = parentName + ".pde";
+    String pdeName = parentName + ".ino";
     File altFile = new File(file.getParent(), pdeName);
-
+    
     if (pdeName.equals(file.getName())) {
       // no beef with this guy
 
@@ -2049,10 +2108,10 @@ protected boolean handleOpenInternal(String path) {
       path = altFile.getAbsolutePath();
       //System.out.println("found alt file in same folder");
 
-    } else if (!path.endsWith(".pde")) {
+    } else if (!path.endsWith(".ino")) {
       Base.showWarning("Bad file selected",
                        "Processing can only open its own sketches\n" +
-                       "and other files ending in .pde", null);
+                       "and other files ending in .ino", null);
       return false;
 
     } else {
@@ -2271,13 +2330,13 @@ public boolean serialPrompt() {
    * Made synchronized to (hopefully) avoid problems of people
    * hitting export twice, quickly, and horking things up.
    */
-  synchronized public void handleExport(final boolean verbose) {
+  synchronized public void handleExport(final boolean usingProgrammer) {
     //if (!handleExportCheckModified()) return;
     toolbar.activate(EditorToolbar.EXPORT);
     console.clear();
     statusNotice("Uploading to I/O Board...");
 
-    new Thread(verbose ? exportAppHandler : exportHandler).start();
+    new Thread(usingProgrammer ? exportAppHandler : exportHandler).start();
   }
 
   // DAM: in Arduino, this is upload
@@ -2395,14 +2454,14 @@ public void handleSerial() {
   }
 
 
-  protected void handleBurnBootloader(final String target, final String programmer) {
+  protected void handleBurnBootloader() {
     console.clear();
     statusNotice("Burning bootloader to I/O Board (this may take a minute)...");
     SwingUtilities.invokeLater(new Runnable() {
       public void run() {
         try {
           Uploader uploader = new AvrdudeUploader();
-          if (uploader.burnBootloader(target, programmer)) {
+          if (uploader.burnBootloader()) {
             statusNotice("Done burning bootloader.");
           } else {
             statusError("Error while burning bootloader.");

app/src/processing/app/EditorToolbar.java

@@ -37,12 +37,12 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
 
   /** Rollover titles for each button. */
   static final String title[] = {
-    "Verify", "Stop", "New", "Open", "Save", "Upload", "Serial Monitor"
+    "Verify", "Upload", "New", "Open", "Save", "Serial Monitor"
   };
 
   /** Titles for each button when the shift key is pressed. */ 
   static final String titleShift[] = {
-    "Verify (w/ Verbose Output)", "Stop", "New Editor Window", "Open in Another Window", "Save", "Upload (w/ Verbose Output)", "Serial Monitor"
+    "Verify", "Upload Using Programmer", "New Editor Window", "Open in Another Window", "Save", "Serial Monitor"
   };
 
   static final int BUTTON_COUNT  = title.length;
@@ -57,14 +57,13 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
 
 
   static final int RUN      = 0;
-  static final int STOP     = 1;
+  static final int EXPORT   = 1;
 
   static final int NEW      = 2;
   static final int OPEN     = 3;
   static final int SAVE     = 4;
-  static final int EXPORT   = 5;
 
-  static final int SERIAL   = 6;
+  static final int SERIAL   = 5;
 
   static final int INACTIVE = 0;
   static final int ROLLOVER = 1;
@@ -105,11 +104,10 @@ public EditorToolbar(Editor editor, JMenu menu) {
 
     //which[buttonCount++] = NOTHING;
     which[buttonCount++] = RUN;
-    which[buttonCount++] = STOP;
+    which[buttonCount++] = EXPORT;
     which[buttonCount++] = NEW;
     which[buttonCount++] = OPEN;
     which[buttonCount++] = SAVE;
-    which[buttonCount++] = EXPORT;
     which[buttonCount++] = SERIAL;
 
     currentRollover = -1;
@@ -312,13 +310,13 @@ public void mousePressed(MouseEvent e) {
 
     switch (sel) {
     case RUN:
-      editor.handleRun(e.isShiftDown());
-      break;
-
-    case STOP:
-      editor.handleStop();
+      editor.handleRun(false);
       break;
 
+//    case STOP:
+//      editor.handleStop();
+//      break;
+//
     case OPEN:
       popup = menu.getPopupMenu();
       popup.show(EditorToolbar.this, x, y);

app/src/processing/app/Preferences.java

@@ -113,6 +113,8 @@ public class Preferences {
 
   JTextField sketchbookLocationField;
   JCheckBox exportSeparateBox;
+  JCheckBox verboseCompilationBox;
+  JCheckBox verboseUploadBox;
   JCheckBox deletePreviousBox;
   JCheckBox externalEditorBox;
   JCheckBox memoryOverrideBox;
@@ -279,6 +281,21 @@ public void actionPerformed(ActionEvent e) {
     top += d.height + GUI_BETWEEN;
 
 
+    // Show verbose output during: [ ] compilation [ ] upload
+    
+    box = Box.createHorizontalBox();
+    label = new JLabel("Show verbose output during: ");
+    box.add(label);
+    verboseCompilationBox = new JCheckBox("compilation ");
+    box.add(verboseCompilationBox);
+    verboseUploadBox = new JCheckBox("upload");
+    box.add(verboseUploadBox);
+    pain.add(box);
+    d = box.getPreferredSize();
+    box.setBounds(left, top, d.width, d.height);
+    top += d.height + GUI_BETWEEN;
+    
+
     // [ ] Delete previous applet or application folder on export
 
     deletePreviousBox =
@@ -461,6 +478,8 @@ protected void disposeFrame() {
    */
   protected void applyFrame() {
     // put each of the settings into the table
+    setBoolean("build.verbose", verboseCompilationBox.isSelected());
+    setBoolean("upload.verbose", verboseUploadBox.isSelected());
     setBoolean("export.delete_target_folder",
                deletePreviousBox.isSelected());
 
@@ -516,6 +535,8 @@ protected void showFrame(Editor editor) {
     this.editor = editor;
 
     // set all settings entry boxes to their actual status
+    verboseCompilationBox.setSelected(getBoolean("build.verbose"));
+    verboseUploadBox.setSelected(getBoolean("upload.verbose"));
     deletePreviousBox.
       setSelected(getBoolean("export.delete_target_folder"));