diff --git a/build/macosx/processing.icns b/build/macosx/processing.icns index dce33c84f..3320f93fa 100644 Binary files a/build/macosx/processing.icns and b/build/macosx/processing.icns differ diff --git a/build/shared/lib/about-1x.png b/build/shared/lib/about-1x.png index 2d5410f49..2b21501cc 100644 Binary files a/build/shared/lib/about-1x.png and b/build/shared/lib/about-1x.png differ diff --git a/build/shared/lib/about-2x.png b/build/shared/lib/about-2x.png index c3d519a01..da28b059c 100644 Binary files a/build/shared/lib/about-2x.png and b/build/shared/lib/about-2x.png differ diff --git a/build/windows/application.ico b/build/windows/application.ico deleted file mode 100644 index d46484e28..000000000 Binary files a/build/windows/application.ico and /dev/null differ diff --git a/build/windows/config.xml b/build/windows/config.xml index 4f8727a9a..b88991d90 100755 --- a/build/windows/config.xml +++ b/build/windows/config.xml @@ -12,7 +12,7 @@ false false - application.ico + processing.ico processing.app.ui.Splash diff --git a/build/windows/processing.ico b/build/windows/processing.ico new file mode 100644 index 000000000..16986694b Binary files /dev/null and b/build/windows/processing.ico differ diff --git a/core/src/icon/icon-1024.png b/core/src/icon/icon-1024.png index 5284fd718..7d67a3307 100644 Binary files a/core/src/icon/icon-1024.png and b/core/src/icon/icon-1024.png differ diff --git a/core/src/icon/icon-128.png b/core/src/icon/icon-128.png index 2d1ca1e72..580eb61ab 100644 Binary files a/core/src/icon/icon-128.png and b/core/src/icon/icon-128.png differ diff --git a/core/src/icon/icon-16.png b/core/src/icon/icon-16.png index 258b9f371..560b9db0b 100644 Binary files a/core/src/icon/icon-16.png and b/core/src/icon/icon-16.png differ diff --git a/core/src/icon/icon-256.png b/core/src/icon/icon-256.png index 67c1bc8bd..afd815770 100644 Binary files a/core/src/icon/icon-256.png and b/core/src/icon/icon-256.png differ diff --git a/core/src/icon/icon-32.png b/core/src/icon/icon-32.png index e5dbe9284..ec65430d5 100644 Binary files a/core/src/icon/icon-32.png and b/core/src/icon/icon-32.png differ diff --git a/core/src/icon/icon-48.png b/core/src/icon/icon-48.png index 62f906d98..a0c50ceb6 100644 Binary files a/core/src/icon/icon-48.png and b/core/src/icon/icon-48.png differ diff --git a/core/src/icon/icon-512.png b/core/src/icon/icon-512.png index 897dc5831..ec7ceb476 100644 Binary files a/core/src/icon/icon-512.png and b/core/src/icon/icon-512.png differ diff --git a/core/src/icon/icon-64.png b/core/src/icon/icon-64.png index 971d4e58c..77a356a12 100644 Binary files a/core/src/icon/icon-64.png and b/core/src/icon/icon-64.png differ diff --git a/java/application/Info.plist.tmpl b/java/application/Info.plist.tmpl index d86e39df2..5c8c8488f 100644 --- a/java/application/Info.plist.tmpl +++ b/java/application/Info.plist.tmpl @@ -7,7 +7,7 @@ CFBundleExecutable @@sketch@@ CFBundleIconFile - sketch.icns + application.icns CFBundleIdentifier @@sketch@@ CFBundleDisplayName @@ -60,7 +60,7 @@ JVMOptions @@jvm_options_list@@ - -Xdock:icon=$APP_ROOT/Contents/Resources/sketch.icns + -Xdock:icon=$APP_ROOT/Contents/Resources/application.icns -Djava.library.path=$APP_ROOT/Contents/Java:$APP_ROOT/Contents/Java/core/library -Dapple.laf.useScreenMenuBar=true -Dcom.apple.macos.use-file-dialog-packages=true diff --git a/java/application/application.icns b/java/application/application.icns new file mode 100644 index 000000000..e4be24527 Binary files /dev/null and b/java/application/application.icns differ diff --git a/java/application/application.ico b/java/application/application.ico new file mode 100644 index 000000000..e1af8f97c Binary files /dev/null and b/java/application/application.ico differ diff --git a/java/application/sketch.icns b/java/application/sketch.icns deleted file mode 100644 index 8a9b3133f..000000000 Binary files a/java/application/sketch.icns and /dev/null differ diff --git a/java/application/sketch.ico b/java/application/sketch.ico deleted file mode 100644 index e843e90c4..000000000 Binary files a/java/application/sketch.ico and /dev/null differ diff --git a/java/src/processing/mode/java/JavaBuild.java b/java/src/processing/mode/java/JavaBuild.java index 8070de74c..14e11550c 100644 --- a/java/src/processing/mode/java/JavaBuild.java +++ b/java/src/processing/mode/java/JavaBuild.java @@ -710,8 +710,8 @@ public class JavaBuild { File resourcesFolder = new File(contentsFolder, "Resources"); Util.copyDir(new File(contentsOrig, "Resources/en.lproj"), new File(resourcesFolder, "en.lproj")); - Util.copyFile(mode.getContentFile("application/sketch.icns"), - new File(resourcesFolder, "sketch.icns")); + Util.copyFile(mode.getContentFile("application/application.icns"), + new File(resourcesFolder, "application.icns")); } else if (exportPlatform == PConstants.LINUX) { if (embedJava) { @@ -940,7 +940,7 @@ public class JavaBuild { File exeFile = new File(destFolder, sketch.getName() + ".exe"); config.addChild("outfile").setContent(exeFile.getAbsolutePath()); - File iconFile = mode.getContentFile("application/sketch.ico"); + File iconFile = mode.getContentFile("application/application.ico"); config.addChild("icon").setContent(iconFile.getAbsolutePath()); XML clazzPath = config.addChild("classPath"); diff --git a/todo.txt b/todo.txt index b697645cd..a7f0eb799 100755 --- a/todo.txt +++ b/todo.txt @@ -35,6 +35,9 @@ X move preferences to ~/.config on Linux X use ~/.config as parent, or $XDG_CONFIG_HOME o https://github.com/processing/processing/issues/6115 (moved) X https://github.com/processing/processing4/issues/203 +X update with a new round of icons +X replace sketch.ico and sketch.icns to application (for exported app) +X (too confusing b/c .pde is the "sketch", or especially if we go pdp) install from pdex files X initial code to install a contrib from a pdex file @@ -68,12 +71,6 @@ fixed in 4.0a4 X sketch window resets position after each run (regression from 3.4?) X https://github.com/processing/processing/issues/5781 -may be fixed -_ Undo feature may have undesired results (4.0a4) -_ https://github.com/processing/processing/issues/4775 -_ HDPI support GNOME desktop -_ https://github.com/processing/processing/issues/6059 - sketch/launching X should it be pskz, pcbz? psk for the sketch file to double-click? X pdez as a sketch bundle? @@ -124,11 +121,17 @@ X web server confirmed to be working, but should check w/ new docs X local web server to run reference from .zip? X no more gazillion file nastiness +may be fixed +_ Undo feature may have undesired results (4.0a4) +_ https://github.com/processing/processing/issues/4775 +_ HDPI support GNOME desktop +_ https://github.com/processing/processing/issues/6059 + before alpha 7/beta 1 _ update the README for alpha 6 (and this release too, when ready) _ turn off javafx web if not using -_ look through dist files, looks like 'bin'and 'src' from Java Mode are included +_ look through dist files, looks like 'bin' and 'src' from Java Mode are included _ can we compress jdk/Contents/Home/legal into a single zip? _ what to double-click when opening p5 projects (.pdp?) @@ -193,13 +196,18 @@ _ was looking crunchy on low-dpi screen set to 125% _ was this due to the args change in alpha 5? -before 4.x final +design _ Update graphics and visual design elements for 4.x _ https://github.com/processing/processing4/issues/48 _ need icons for .pde, .pdex, .pdez +_ core/src/icon-NN.png should be the exported application icon +_ currently it's the p5 icon since the export just looks black _ use svg images for res-indep icons/gui? _ https://stackoverflow.com/a/2495712 _ (built and tested a version of this code if we want to use it) + + +before 4.x final _ SVG library, show a warning when using style instead of presentation attributes _ Welcome screen or not? _ set a new preference for it, so people see it