From a0d608e946be4ad2e2a625329519c2780fb80988 Mon Sep 17 00:00:00 2001 From: "David A. Mellis" Date: Tue, 14 Jul 2009 22:24:20 +0000 Subject: [PATCH] Fixing default sketchbook path (Processing -> Arduino). Not setting the Windows window icon to the Processing icon (it stays as the Java icon instead). --- app/src/processing/app/Editor.java | 2 +- app/src/processing/app/macosx/Platform.java | 4 ++-- app/src/processing/app/windows/Platform.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java index 1e3f7b82f..392efdc38 100644 --- a/app/src/processing/app/Editor.java +++ b/app/src/processing/app/Editor.java @@ -145,7 +145,7 @@ public class Editor extends JFrame implements RunnerListener { super("Arduino"); this.base = ibase; - Base.setIcon(this); + //Base.setIcon(this); // add listener to handle window close box hit event addWindowListener(new WindowAdapter() { diff --git a/app/src/processing/app/macosx/Platform.java b/app/src/processing/app/macosx/Platform.java index e260ecccf..a7180aadc 100644 --- a/app/src/processing/app/macosx/Platform.java +++ b/app/src/processing/app/macosx/Platform.java @@ -92,7 +92,7 @@ public class Platform extends processing.app.Platform { Class clazz = Class.forName("processing.app.BaseMacOS"); Method m = clazz.getMethod("getDocumentsFolder", new Class[] { }); String documentsPath = (String) m.invoke(null, new Object[] { }); - sketchbookFolder = new File(documentsPath, "Processing"); + sketchbookFolder = new File(documentsPath, "Arduino"); } catch (Exception e) { sketchbookFolder = promptSketchbookLocation(); @@ -181,4 +181,4 @@ public class Platform extends processing.app.Platform { protected String getDocumentsFolder() throws FileNotFoundException { return FileManager.findFolder(kUserDomain, kDocumentsFolderType); } -} \ No newline at end of file +} diff --git a/app/src/processing/app/windows/Platform.java b/app/src/processing/app/windows/Platform.java index 278244447..cdc685ecf 100644 --- a/app/src/processing/app/windows/Platform.java +++ b/app/src/processing/app/windows/Platform.java @@ -184,7 +184,7 @@ public class Platform extends processing.app.Platform { String appDataPath = Registry.getStringValue(REGISTRY_ROOT_KEY.CURRENT_USER, keyPath, "AppData"); - File dataFolder = new File(appDataPath, "Processing"); + File dataFolder = new File(appDataPath, "Arduino"); return dataFolder; } @@ -213,7 +213,7 @@ public class Platform extends processing.app.Platform { String personalPath = Registry.getStringValue(REGISTRY_ROOT_KEY.CURRENT_USER, keyPath, "Personal"); - return new File(personalPath, "Processing"); + return new File(personalPath, "Arduino"); }