diff --git a/app/src/processing/app/macosx/Platform.java b/app/src/processing/app/macosx/Platform.java
index 6372beb0b..406e65987 100644
--- a/app/src/processing/app/macosx/Platform.java
+++ b/app/src/processing/app/macosx/Platform.java
@@ -22,12 +22,9 @@
package processing.app.macosx;
-import java.awt.Insets;
import java.io.File;
import java.io.FileNotFoundException;
-import javax.swing.UIManager;
-
import com.apple.eio.FileManager;
import processing.app.Base;
@@ -38,6 +35,8 @@ import processing.app.Base;
*/
public class Platform extends processing.app.Platform {
+ // Removing for 2.0b8 because Quaqua doesn't have OS X 10.8 version.
+ /*
public void setLookAndFeel() throws Exception {
// Use the Quaqua L & F on OS X to make JFileChooser less awful
UIManager.setLookAndFeel("ch.randelshofer.quaqua.QuaquaLookAndFeel");
@@ -45,6 +44,7 @@ public class Platform extends processing.app.Platform {
// hacked that in, bit by bit, over the years
UIManager.put("Component.visualMargin", new Insets(1, 1, 1, 1));
}
+ */
public void init(Base base) {
diff --git a/build/macosx/template.app/Contents/Info.plist b/build/macosx/template.app/Contents/Info.plist
index 300aef3ff..46b2fd302 100755
--- a/build/macosx/template.app/Contents/Info.plist
+++ b/build/macosx/template.app/Contents/Info.plist
@@ -84,7 +84,7 @@
- $JAVAROOT/lib/pde.jar:$JAVAROOT/core/library/core.jar:$JAVAROOT/lib/ant.jar:$JAVAROOT/lib/ant-launcher.jar:$JAVAROOT/lib/antlr.jar:$JAVAROOT/lib/jna.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/lib/org-netbeans-swing-outline.jar
+ $JAVAROOT/lib/pde.jar:$JAVAROOT/core/library/core.jar:$JAVAROOT/lib/ant.jar:$JAVAROOT/lib/ant-launcher.jar:$JAVAROOT/lib/antlr.jar:$JAVAROOT/lib/jna.jar:$JAVAROOT/lib/org-netbeans-swing-outline.jar
Properties
diff --git a/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMaker.java b/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMaker.java
index 4f56cfe1f..eb8dc70f3 100644
--- a/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMaker.java
+++ b/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMaker.java
@@ -34,8 +34,7 @@ public class MovieMaker implements Tool {
e.printStackTrace();
}
} else {
- System.out.println("null frame, yeah baby");
- MovieMakerFrame.main(null);
+// MovieMakerFrame.main(null);
}
}
diff --git a/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMakerFrame.java b/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMakerFrame.java
index a33101b4f..63741b739 100644
--- a/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMakerFrame.java
+++ b/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMakerFrame.java
@@ -15,7 +15,6 @@ import ch.randelshofer.gui.datatransfer.FileTextFieldTransferHandler;
import ch.randelshofer.media.mp3.MP3AudioInputStream;
import ch.randelshofer.media.quicktime.QuickTimeWriter;
-import java.awt.EventQueue;
import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
@@ -41,6 +40,8 @@ import javax.swing.*;
import javax.swing.border.EmptyBorder;
import javax.swing.filechooser.FileSystemView;
+import processing.app.Editor;
+
// TODO [fry 2011-09-06]
// + The dialog box is super ugly. It's a hacked up version of the previous
@@ -57,7 +58,7 @@ import javax.swing.filechooser.FileSystemView;
* Hacked from Werner Randelshofer's QuickTimeWriter demo. The original version
* can be found here.
*/
-public class MovieMakerFrame extends JFrame {
+public class MovieMakerFrame extends JFrame implements Tool {
private JFileChooser imageFolderChooser;
private JFileChooser soundFileChooser;
private JFileChooser movieFileChooser;
@@ -69,15 +70,15 @@ public class MovieMakerFrame extends JFrame {
//m.setVisible(true);
//m.pack();
-// public String getMenuTitle() {
-// return "Movie Maker";
-// }
+ public String getMenuTitle() {
+ return "Movie Maker";
+ }
-// public void run() {
-//// System.out.println("calling run() for MovieMaker " + EventQueue.isDispatchThread());
-// setVisible(true);
-// }
+ public void run() {
+// System.out.println("calling run() for MovieMaker " + EventQueue.isDispatchThread());
+ setVisible(true);
+ }
// public void run() {
@@ -95,11 +96,7 @@ public class MovieMakerFrame extends JFrame {
// }
-// public void init(Editor editor) {
-// }
-
-
- protected void init() {
+ public void init(Editor editor) {
// System.out.println("calling init for MovieMaker " + EventQueue.isDispatchThread());
// this.editor = editor;
initComponents();
@@ -943,17 +940,17 @@ public class MovieMakerFrame extends JFrame {
// /**
// * @param args the command line arguments
// */
- public static void main(String args[]) {
- EventQueue.invokeLater(new Runnable() {
- public void run() {
- MovieMakerFrame m = new MovieMakerFrame();
-// m.init(null);
- m.init();
- m.setVisible(true);
-// m.pack();
- }
- });
- }
+// public static void main(String args[]) {
+// EventQueue.invokeLater(new Runnable() {
+// public void run() {
+// MovieMakerFrame m = new MovieMakerFrame();
+//// m.init(null);
+// m.init();
+// m.setVisible(true);
+//// m.pack();
+// }
+// });
+// }
private JLabel aboutLabel;
private JButton chooseImageFolderButton;
diff --git a/core/todo.txt b/core/todo.txt
index f73b7ae9c..4fd70f559 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -37,6 +37,8 @@ X also problematic with it not being called now
andres
A P3D sketches failing to run
A http://code.google.com/p/processing/issues/detail?id=1500
+A transparent pixels are not set on multisampled offscreen GL surfaces
+A http://code.google.com/p/processing/issues/detail?id=1516
cleaning/earlier
C textureWrap() CLAMP and REPEAT now added
@@ -85,6 +87,8 @@ o 3) we deprecate our nice short getFloat/getInt/etc and go with
o getXxxxAttribute() and getXxxxContent() methods.
X not gonna do getFloatContent() since it's not really any shorter
X beginning slash in getChild() threw an NPE
+_ XML.format(0) throws error
+_ http://code.google.com/p/processing/issues/detail?id=1512
decisions on data
X are we comfortable with setInt/Float/etc instead of just set(int, blah)
@@ -109,6 +113,8 @@ _ JSONObject.has(key) vs XML.hasAttribute(attr) vs HashMap.containsKey()
_ and how it should be handled with hash/dict
_ right now using hasKey().. in JSONObject
+_ OpenGL/P3D sketches show graphical corruption
+_ http://code.google.com/p/processing/issues/detail?id=1452
_ add 'gz' as one of the loadXxx() options
_ helps .svgz case from being weird, also generally dealing w/ compressed data
diff --git a/todo.txt b/todo.txt
index c38e052de..e106a8989 100644
--- a/todo.txt
+++ b/todo.txt
@@ -39,6 +39,13 @@ X add cmd-shift-O to "Open Examples" on OS X with no window open
X go through vida examples to make sure extra imports are not being used
o do command line to run through all examples?
+_ remove Quaqua
+_ http://code.google.com/p/processing/issues/detail?id=1509
+_ remove separate launch of QT movie creator
+
+manindra
+M bug that was causing the Debugger to point to wrong break point line numbers
+
earlier
X include debug mode as 'experimental'?
X DebugMode throwing exception about breakpoints when trying to save
@@ -55,6 +62,9 @@ X removed in 2.0b7, because it has bugs and is no longer compatible
o also can have case of opening two of same sketch at once
o if sketch was open, then restart by dragging the .pde to p5.app
+_ crashes when selecting "Show Sketch Folder" with Windows 7
+_ http://code.google.com/p/processing/issues/detail?id=1473
+
https://processing-js.lighthouseapp.com/
_ remove sketch.properties when moving back to the default?