eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

more library/menu work.. almost have video working properly

Browse Source
This commit is contained in:
benfry
2004-09-13 04:17:01 +00:00
parent 7132c85ca6
commit 9bbdcb923b
6 changed files with 111 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/PdeEditor.java
+9 -6
View File
@@ -425,7 +425,7 @@ implements MRJAboutHandler, MRJQuitHandler, MRJPrefsHandler
listener.applyPreferences();
// in case moved to a new location
sketchbook.rebuildMenu();
sketchbook.rebuildMenus();
}
@@ -502,6 +502,7 @@ implements MRJAboutHandler, MRJQuitHandler, MRJPrefsHandler
menu.add(item);
*/
/*
item = newJMenuItem("Open", 'O');
item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@ -509,9 +510,10 @@ implements MRJAboutHandler, MRJQuitHandler, MRJPrefsHandler
}
});
menu.add(item);
menu.add(sketchbook.rebuildMenu());
menu.add(sketchbook.getExamplesMenu());
*/
menu.add(sketchbook.getOpenMenu());
saveMenuItem = newJMenuItem("Save", 'S');
saveMenuItem.addActionListener(new ActionListener() {
@@ -620,7 +622,7 @@ implements MRJAboutHandler, MRJQuitHandler, MRJPrefsHandler
});
menu.add(item);
menu.add(sketchbook.getAddLibraryMenu());
menu.add(sketchbook.getImportMenu());
if ((PdeBase.platform == PdeBase.WINDOWS) ||
(PdeBase.platform == PdeBase.MACOSX)) {
@@ -1119,7 +1121,8 @@ implements MRJAboutHandler, MRJQuitHandler, MRJPrefsHandler
} catch (NullPointerException e) { }
}
if (running) doStop();
//if (running) doStop();
doStop(); // need to stop if runtime error
try {
if (runtime != null) {
@@ -1378,7 +1381,7 @@ implements MRJAboutHandler, MRJQuitHandler, MRJPrefsHandler
message(EMPTY);
}
// rebuild sketch menu in case a save-as was forced
sketchbook.rebuildMenu();
sketchbook.rebuildMenus();
} catch (Exception e) {
// show the error as a message in the window
@@ -1400,7 +1403,7 @@ implements MRJAboutHandler, MRJQuitHandler, MRJPrefsHandler
try {
if (sketch.saveAs()) {
message("Done Saving.");
sketchbook.rebuildMenu();
sketchbook.rebuildMenus();
} else {
message("Save Cancelled.");
}
app/PdePreprocessor.java
+7 -3
View File
@@ -43,11 +43,13 @@ public class PdePreprocessor {
static final int JDK14 = 2;
static String defaultImports[][] = new String[3][];
String extraImports[];
static final int STATIC = 0; // formerly BEGINNER
static final int ACTIVE = 1; // formerly INTERMEDIATE
static final int JAVA = 2; // formerly ADVANCED
static int programType = -1;
// static to make it easier for the antlr preproc to get at it
static int programType = -1;
Reader programReader;
String buildPath;
@@ -158,12 +160,14 @@ public class PdePreprocessor {
// just remove altogether?
program = program.substring(0, idx) + program.substring(idx + len);
System.out.println("removing " + piece);
//System.out.println("removing " + piece);
} while (true);
String extraImports[] = new String[imports.size()];
//if (imports.size() > 0) {
extraImports = new String[imports.size()];
imports.copyInto(extraImports);
//}
//
app/PdeRuntime.java
+6 -1
View File
@@ -93,7 +93,8 @@ public class PdeRuntime implements PdeMessageConsumer {
"-Djava.library.path=" +
// sketch.libraryPath might be ""
// librariesClassPath will always have sep char prepended
sketch.libraryPath + PdeSketchbook.librariesClassPath,
sketch.libraryPath + PdeSketchbook.librariesClassPath +
File.pathSeparator + System.getProperty("java.library.path"),
"-cp",
sketch.classPath + PdeSketchbook.librariesClassPath,
"processing.core.PApplet",
@@ -102,6 +103,10 @@ public class PdeRuntime implements PdeMessageConsumer {
sketch.mainClassName
};
//for (int i = 0; i < command.length; i++) {
// System.out.println(i + " = " + command[i]);
//}
//PApplet.println(PApplet.join(command, " "));
process = Runtime.getRuntime().exec(command);
new SystemOutSiphon(process.getInputStream());
app/PdeSketch.java
+2 -1
View File
@@ -1063,7 +1063,8 @@ public class PdeSketch {
//System.out.println("primary class " + primaryClassName);
// check if the 'main' file is in java mode
if (PdePreprocessor.programType == PdePreprocessor.JAVA) {
if ((PdePreprocessor.programType == PdePreprocessor.JAVA) ||
(preprocessor.extraImports.length != 0)) {
externalRuntime = true; // we in advanced mode now, boy
}
app/PdeSketchbook.java
+86 -81
View File
@@ -41,10 +41,10 @@ import com.apple.mrj.*;
public class PdeSketchbook {
PdeEditor editor;
JMenu popup;
JMenu menu;
JMenu examples;
JMenu addlib;
JMenu openMenu;
JMenu popupMenu;
//JMenu examples;
JMenu importMenu;
// set to true after the first time it's built.
// so that the errors while building don't show up again.
@@ -112,9 +112,14 @@ public class PdeSketchbook {
if (!sketchbookFolder.exists()) sketchbookFolder.mkdirs();
}
menu = new JMenu("Sketchbook");
popup = new JMenu("Sketchbook");
addlib = new JMenu("Import Library");
openMenu = new JMenu("Sketchbook");
popupMenu = new JMenu("Sketchbook");
importMenu = new JMenu("Import Library");
}
static public String getSketchbookPath() {
return PdePreferences.get("sketchbook.path");
}
@@ -149,7 +154,7 @@ public class PdeSketchbook {
//"Create new sketch named",
"Create sketch folder named:",
FileDialog.SAVE);
fd.setDirectory(PdePreferences.get("sketchbook.path"));
fd.setDirectory(getSketchbookPath());
fd.show();
String newbieParentDir = fd.getDirectory();
@@ -161,7 +166,7 @@ public class PdeSketchbook {
} else {
// use a generic name like sketch_031008a, the date plus a char
String newbieParentDir = PdePreferences.get("sketchbook.path");
String newbieParentDir = getSketchbookPath();
int index = 0;
SimpleDateFormat formatter = new SimpleDateFormat("yyMMdd");
@@ -201,7 +206,7 @@ public class PdeSketchbook {
}
// make a note of a newly added sketch in the sketchbook menu
rebuildMenu();
rebuildMenus();
// now open it up
//handleOpen(newbieName, newbieFile, newbieDir);
@@ -263,11 +268,8 @@ public class PdeSketchbook {
FileDialog fd = new FileDialog(editor, //new Frame(),
"Open a Processing sketch...",
FileDialog.LOAD);
//if (handleOpenDirectory == null) {
// handleOpenDirectory = PdePreferences.get("sketchbook.path");
//}
//fd.setDirectory(handleOpenDirectory);
fd.setDirectory(PdePreferences.get("sketchbook.path"));
//fd.setDirectory(PdePreferences.get("sketchbook.path"));
fd.setDirectory(getSketchbookPath());
// only show .pde files as eligible bachelors
// TODO this doesn't seem to ever be used. AWESOME.
@@ -296,16 +298,6 @@ public class PdeSketchbook {
}
public JPopupMenu getPopupMenu() {
return popup.getPopupMenu();
}
public JMenu getAddLibraryMenu() {
return addlib;
}
/**
* Rebuild the menu full of sketches based on the
* contents of the sketchbook.
@@ -314,62 +306,20 @@ public class PdeSketchbook {
* because it seems that after calling "getPopupMenu"
* the menu will disappear from its original location.
*/
public JMenu rebuildMenu() {
public void rebuildMenus() {
try {
// rebuild the popup menu
popup.removeAll();
JMenuItem item = new JMenuItem("Open...");
item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
editor.handleOpen(null);
}
});
popup.add(item);
popup.addSeparator();
boolean sketches =
addSketches(popup, new File(PdePreferences.get("sketchbook.path")));
if (sketches) popup.addSeparator();
JMenu ex = new JMenu("Examples");
addSketches(ex, examplesFolder);
popup.add(ex);
if (PdePreferences.getBoolean("export.library")) {
JMenu m = new JMenu("Libraries");
addSketches(m, librariesFolder);
popup.add(m);
}
// disable error messages while loading
builtOnce = true;
// rebuild the open menu
menu.removeAll();
/*
if (sketches) {
addSketches(menu, new File(PdePreferences.get("sketchbook.path")));
menu.addSeparator();
}
examples = new JMenu("Examples");
addSketches(examples, examplesFolder);
menu.add(examples);
*/
if (sketches) {
addSketches(menu, new File(PdePreferences.get("sketchbook.path")));
}
examples = new JMenu("Examples");
addSketches(examples, examplesFolder);
//menu.add(examples);
// rebuild file/open and the toolbar popup menus
buildMenu(openMenu);
builtOnce = true; // disable error messages while loading
buildMenu(popupMenu);
// rebuild the "import library" menu
addlib.removeAll();
importMenu.removeAll();
librariesClassPath = "";
boolean libs =
addLibraries(addlib, new File(PdePreferences.get("sketchbook.path")));
if (libs) addlib.addSeparator();
addLibraries(addlib, librariesFolder);
if (addLibraries(importMenu, new File(getSketchbookPath()))) {
importMenu.addSeparator();
}
addLibraries(importMenu, librariesFolder);
//System.out.println("libraries cp is now " + librariesClassPath);
} catch (IOException e) {
@@ -378,12 +328,67 @@ public class PdeSketchbook {
"sketchbook menu. Things might get a little\n" +
"kooky around here.", e);
}
return menu;
}
protected JMenu getExamplesMenu() {
return examples;
public void buildMenu(JMenu menu) {
JMenuItem item;
// rebuild the popup menu
menu.removeAll();
item = new JMenuItem("Open...");
item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
editor.handleOpen(null);
}
});
menu.add(item);
menu.addSeparator();
try {
boolean sketches =
addSketches(menu, new File(getSketchbookPath()));
if (sketches) menu.addSeparator();
} catch (IOException e) {
e.printStackTrace();
}
try {
JMenu examplesMenu = new JMenu("Examples");
addSketches(examplesMenu, examplesFolder);
menu.add(examplesMenu);
} catch (IOException e) {
e.printStackTrace();
}
try {
if (PdePreferences.getBoolean("export.library")) {
JMenu librariesMenu = new JMenu("Libraries");
addSketches(librariesMenu, librariesFolder);
menu.add(librariesMenu);
}
} catch (IOException e) {
e.printStackTrace();
}
}
public JMenu getOpenMenu() {
if (openMenu == null) rebuildMenus();
return openMenu;
}
public JPopupMenu getPopupMenu() {
if (popupMenu == null) rebuildMenus();
return popupMenu.getPopupMenu();
}
public JMenu getImportMenu() {
return importMenu;
}
@@ -551,7 +556,7 @@ public class PdeSketchbook {
public void clean() {
//if (!PdePreferences.getBoolean("sketchbook.auto_clean")) return;
File sketchbookFolder = new File(PdePreferences.get("sketchbook.path"));
File sketchbookFolder = new File(getSketchbookPath());
if (!sketchbookFolder.exists()) return;
//String entries[] = new File(userPath).list();
todo.txt
+1 -1
View File
@@ -53,7 +53,7 @@ X make built-in libraries read-only
X several menu changes as discussed with casey
X (capitalization, export/export app, tools)
X add preference for showing library stuff
_ figure out why user libraries not being added
X figure out why user libraries not being added
_ in lib mode, show internal libraries as part of the 'open' menu
_ make a note that p5 has to be restarted for libs
_ after export of library, rebuild "import library" menu