diff --git a/app/Editor.java b/app/Editor.java index ff6b440f6..94da9e7ab 100644 --- a/app/Editor.java +++ b/app/Editor.java @@ -604,7 +604,7 @@ public class Editor extends JFrame menu.addSeparator(); - item = newJMenuItem("Previous Tab", KeyEvent.VK_LEFT); + item = newJMenuItem("Previous Tab", '['); //KeyEvent.VK_LEFT); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { sketch.prevCode(); @@ -612,7 +612,7 @@ public class Editor extends JFrame }); menu.add(item); - item = newJMenuItem("Next Tab", KeyEvent.VK_RIGHT); + item = newJMenuItem("Next Tab", ']'); //KeyEvent.VK_RIGHT); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { sketch.nextCode(); diff --git a/app/Runner.java b/app/Runner.java index 2dacc926d..8d6ff6aa3 100644 --- a/app/Runner.java +++ b/app/Runner.java @@ -167,6 +167,10 @@ public class Runner implements MessageConsumer { params.add("java"); + //params.add("-Xint"); // interpreted mode + //params.add("-Xprof"); // profiler + //params.add("-Xrunhprof:cpu=samples"); // old-style profiler + String options = Preferences.get("run.options"); if (options.length() > 0) { String pieces[] = PApplet.split(options, ' '); diff --git a/app/Sketch.java b/app/Sketch.java index b7c479d3b..e2f86ca21 100644 --- a/app/Sketch.java +++ b/app/Sketch.java @@ -1616,6 +1616,13 @@ public class Sketch { // make sure the user didn't hide the sketch folder ensureExistence(); + // fix for issue posted on the board. make sure that the code + // is reloaded when exporting and an external editor is being used. + if (Preferences.getBoolean("editor.external")) { + // nuke previous files and settings + load(); + } + zipFileContents = new Hashtable(); // nuke the old applet folder because it can cause trouble @@ -2068,6 +2075,13 @@ public class Sketch { // make sure the user didn't hide the sketch folder ensureExistence(); + // fix for issue posted on the board. make sure that the code + // is reloaded when exporting and an external editor is being used. + if (Preferences.getBoolean("editor.external")) { + // nuke previous files and settings + load(); + } + //int exportPlatform = PApplet.platform; //PConstants.MACOSX; String exportPlatformStr = null; if (exportPlatform == PConstants.WINDOWS) {