rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-26 20:54:22 +01:00
Code Issues Releases Activity

Updating / reverting to the previous / future Processing new window behavior: toolbar opens things in the existing window, menus in a new window.

Browse Source
This commit is contained in:
David A. Mellis 2010-08-15 19:12:00 +00:00
parent 5fb0b62e7c
commit bc8e5c3dcf
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -904,8 +904,8 @@ public class Base {
// Add a list of all sketches and subfolders // Add a list of all sketches and subfolders
try { try {
//boolean sketches = addSketches(menu, getSketchbookFolder(), true); boolean sketches = addSketches(menu, getSketchbookFolder(), true);
boolean sketches = addSketches(menu, getSketchbookFolder()); //boolean sketches = addSketches(menu, getSketchbookFolder());
if (sketches) menu.addSeparator(); if (sketches) menu.addSeparator();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
@ -914,11 +914,11 @@ public class Base {
//System.out.println("rebuilding examples menu"); //System.out.println("rebuilding examples menu");
// Add each of the subfolders of examples directly to the menu // Add each of the subfolders of examples directly to the menu
try { try {
boolean found = addSketches(menu, examplesFolder); boolean found = addSketches(menu, examplesFolder, true);
if (found) menu.addSeparator(); if (found) menu.addSeparator();
found = addSketches(menu, getSketchbookLibrariesFolder()); found = addSketches(menu, getSketchbookLibrariesFolder(), true);
if (found) menu.addSeparator(); if (found) menu.addSeparator();
addSketches(menu, librariesFolder); addSketches(menu, librariesFolder, true);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -930,8 +930,8 @@ public class Base {
//new Exception().printStackTrace(); //new Exception().printStackTrace();
try { try {
menu.removeAll(); menu.removeAll();
//addSketches(menu, getSketchbookFolder(), false); addSketches(menu, getSketchbookFolder(), false);
addSketches(menu, getSketchbookFolder()); //addSketches(menu, getSketchbookFolder());
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -975,11 +975,11 @@ public class Base {
//System.out.println("rebuilding examples menu"); //System.out.println("rebuilding examples menu");
try { try {
menu.removeAll(); menu.removeAll();
boolean found = addSketches(menu, examplesFolder); boolean found = addSketches(menu, examplesFolder, false);
if (found) menu.addSeparator(); if (found) menu.addSeparator();
found = addSketches(menu, getSketchbookLibrariesFolder()); found = addSketches(menu, getSketchbookLibrariesFolder(), false);
if (found) menu.addSeparator(); if (found) menu.addSeparator();
addSketches(menu, librariesFolder); addSketches(menu, librariesFolder, false);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -1042,7 +1042,8 @@ public class Base {
* should replace the sketch in the current window, or false when the * should replace the sketch in the current window, or false when the
* sketch should open in a new window. * sketch should open in a new window.
*/ */
protected boolean addSketches(JMenu menu, File folder) throws IOException { protected boolean addSketches(JMenu menu, File folder,
final boolean replaceExisting) throws IOException {
// skip .DS_Store files, etc (this shouldn't actually be necessary) // skip .DS_Store files, etc (this shouldn't actually be necessary)
if (!folder.isDirectory()) return false; if (!folder.isDirectory()) return false;
@ -1059,8 +1060,11 @@ public class Base {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
String path = e.getActionCommand(); String path = e.getActionCommand();
if (new File(path).exists()) { if (new File(path).exists()) {
// if (openReplaces) { boolean replace = replaceExisting;
if ((e.getModifiers() & ActionEvent.SHIFT_MASK) == 0) { if ((e.getModifiers() & ActionEvent.SHIFT_MASK) != 0) {
replace = !replace;
}
if (replace) {
handleOpenReplace(path); handleOpenReplace(path);
} else { } else {
handleOpen(path); handleOpen(path);
@ -1113,15 +1117,15 @@ public class Base {
} else { } else {
// don't create an extra menu level for a folder named "examples" // don't create an extra menu level for a folder named "examples"
if (subfolder.getName().equals("examples")) { if (subfolder.getName().equals("examples")) {
boolean found = addSketches(menu, subfolder); boolean found = addSketches(menu, subfolder, replaceExisting);
if (found) ifound = true; if (found) ifound = true;
} else { } else {
// not a sketch folder, but maybe a subfolder containing sketches // not a sketch folder, but maybe a subfolder containing sketches
JMenu submenu = new JMenu(list[i]); JMenu submenu = new JMenu(list[i]);
// needs to be separate var // needs to be separate var
// otherwise would set ifound to false // otherwise would set ifound to false
//boolean found = addSketches(submenu, subfolder, openReplaces); //, false); boolean found = addSketches(submenu, subfolder, replaceExisting);
boolean found = addSketches(submenu, subfolder); //, false); //boolean found = addSketches(submenu, subfolder); //, false);
if (found) { if (found) {
menu.add(submenu); menu.add(submenu);
ifound = true; ifound = true;