doradocodes · doradocodes · Oct 27, 2024 · Nov 12, 2024
diff --git a/electronUtils/ipcUtils.js b/electronUtils/ipcUtils.js
@@ -9,7 +9,7 @@ const isPackaged = app.isPackaged;
 const documentsFolderPath = path.join(os.homedir(), 'Documents', 'Processing Collaborative Sketches');
 const processingJavaPath = isPackaged
     ? path.join(process.resourcesPath, 'tools', 'processing-java')
-    : 'processing-java';
+    : path.join(__dirname, '..', 'tools', 'processing-java');
 
 let processingProcess = null; // To store the reference to the process
 

diff --git a/main.js b/main.js
@@ -14,7 +14,7 @@ const { loadIpcFunctions } = require("./electronUtils/ipcUtils");
 const package = require('./package.json');
 
 // Set development mode flag
-const isDev = process.env.NODE_ENV === 'development';
+const isDev = 'development';
 
 // Initialize window management
 const windows = [];
@@ -24,7 +24,7 @@ let splashWindow = null;
 const isMac = process.platform === 'darwin';
 
 // Set up file paths
-const documentsFolderPath = path.join(os.homedir(), 'Documents', 'Processing Collaborative Sketches');
+const documentsFolderPath = path.join(os.homedir(), 'Documents', 'Processing_Collaborative_Sketches');
 
 // Load user preferences
 const userPreferences = loadPreferences();
@@ -35,16 +35,16 @@ const version = package.version;
  * Define menu template for the application
  * @type {Electron.MenuItemConstructorOptions[]}
  */
+
 const template = [
-    {
+    ...(isMac ? [{
         label: app.name,
-        role: 'appMenu',
         submenu: [
             { label: 'About ' + app.name, role: 'about' },
             { type: 'separator' },
             { role: 'quit' }
         ]
-    },
+    }] : []),
     {
         label: 'File',
         submenu: [
@@ -136,12 +136,13 @@ const createWindow = (urlPath = '') => {
  * @param {string} urlPath - The URL path to load
  */
 const loadWindow = (window, urlPath = '') => {
-    const windowUrl = isDev ?
-        `http://localhost:5173#/theme/${userPreferences.theme}/${urlPath}`
-        :
+    const windowUrl = 
+    // isDev ?
+    //     `http://localhost:5173#/theme/${userPreferences.theme}/${urlPath}`
+    //     :
         `file://${path.join(__dirname, 'build', 'index.html')}#theme/${userPreferences.theme}/${urlPath}`;
     window.loadURL(windowUrl);
-    window.hide();
+    // window.hide();
 
     window.once('ready-to-show', () => {
         if (splashWindow) {

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "build": "cd react-ui && npm run build",
     "dev": "concurrently \"npm run dev:react\" \"npm run dev:electron\"",
     "dev:react": "cd react-ui && npm run dev",
-    "dev:electron": "wait-on tcp:5173 && ELECTRON_START_URL=http://localhost:5173/ NODE_ENV=development electron-forge start",
+    "dev:electron": "wait-on tcp:5173 && electron-forge start",
     "package": "electron-forge package",
     "make": "npm run build && electron-forge make",
     "make:win": "npm run build && electron-forge make --platform=win32",

diff --git a/sketches/sketches.pde b/sketches/sketches.pde
diff --git a/tools/Java/ant-launcher.jar b/tools/Java/ant-launcher.jar
diff --git a/tools/Java/ant.jar b/tools/Java/ant.jar
diff --git a/tools/Java/core.jar b/tools/Java/core.jar
diff --git a/tools/Java/core/library/gluegen-rt.jar b/tools/Java/core/library/gluegen-rt.jar
diff --git a/tools/Java/core/library/jogl-all.jar b/tools/Java/core/library/jogl-all.jar
diff --git a/tools/Java/core/library/linux-aarch64/libgluegen_rt.so b/tools/Java/core/library/linux-aarch64/libgluegen_rt.so
diff --git a/tools/Java/core/library/linux-aarch64/libjogl_desktop.so b/tools/Java/core/library/linux-aarch64/libjogl_desktop.so
diff --git a/tools/Java/core/library/linux-aarch64/libjogl_mobile.so b/tools/Java/core/library/linux-aarch64/libjogl_mobile.so
diff --git a/tools/Java/core/library/linux-aarch64/libnativewindow_awt.so b/tools/Java/core/library/linux-aarch64/libnativewindow_awt.so
diff --git a/tools/Java/core/library/linux-aarch64/libnativewindow_drm.so b/tools/Java/core/library/linux-aarch64/libnativewindow_drm.so
diff --git a/tools/Java/core/library/linux-aarch64/libnativewindow_x11.so b/tools/Java/core/library/linux-aarch64/libnativewindow_x11.so
diff --git a/tools/Java/core/library/linux-aarch64/libnewt_drm.so b/tools/Java/core/library/linux-aarch64/libnewt_drm.so
diff --git a/tools/Java/core/library/linux-aarch64/libnewt_head.so b/tools/Java/core/library/linux-aarch64/libnewt_head.so
diff --git a/tools/Java/core/library/linux-amd64/libgluegen_rt.so b/tools/Java/core/library/linux-amd64/libgluegen_rt.so
diff --git a/tools/Java/core/library/linux-amd64/libjogl_desktop.so b/tools/Java/core/library/linux-amd64/libjogl_desktop.so
diff --git a/tools/Java/core/library/linux-amd64/libjogl_mobile.so b/tools/Java/core/library/linux-amd64/libjogl_mobile.so
diff --git a/tools/Java/core/library/linux-amd64/libnativewindow_awt.so b/tools/Java/core/library/linux-amd64/libnativewindow_awt.so
diff --git a/tools/Java/core/library/linux-amd64/libnativewindow_drm.so b/tools/Java/core/library/linux-amd64/libnativewindow_drm.so
diff --git a/tools/Java/core/library/linux-amd64/libnativewindow_x11.so b/tools/Java/core/library/linux-amd64/libnativewindow_x11.so
diff --git a/tools/Java/core/library/linux-amd64/libnewt_drm.so b/tools/Java/core/library/linux-amd64/libnewt_drm.so
diff --git a/tools/Java/core/library/linux-amd64/libnewt_head.so b/tools/Java/core/library/linux-amd64/libnewt_head.so
diff --git a/tools/Java/core/library/linux-arm/libgluegen_rt.so b/tools/Java/core/library/linux-arm/libgluegen_rt.so
diff --git a/tools/Java/core/library/linux-arm/libjogl_desktop.so b/tools/Java/core/library/linux-arm/libjogl_desktop.so
diff --git a/tools/Java/core/library/linux-arm/libjogl_mobile.so b/tools/Java/core/library/linux-arm/libjogl_mobile.so
diff --git a/tools/Java/core/library/linux-arm/libnativewindow_awt.so b/tools/Java/core/library/linux-arm/libnativewindow_awt.so
diff --git a/tools/Java/core/library/linux-arm/libnativewindow_drm.so b/tools/Java/core/library/linux-arm/libnativewindow_drm.so
diff --git a/tools/Java/core/library/linux-arm/libnativewindow_x11.so b/tools/Java/core/library/linux-arm/libnativewindow_x11.so
diff --git a/tools/Java/core/library/linux-arm/libnewt_drm.so b/tools/Java/core/library/linux-arm/libnewt_drm.so
diff --git a/tools/Java/core/library/linux-arm/libnewt_head.so b/tools/Java/core/library/linux-arm/libnewt_head.so
diff --git a/tools/Java/core/library/macos-aarch64/libgluegen_rt.dylib b/tools/Java/core/library/macos-aarch64/libgluegen_rt.dylib
diff --git a/tools/Java/core/library/macos-aarch64/libjogl_desktop.dylib b/tools/Java/core/library/macos-aarch64/libjogl_desktop.dylib
diff --git a/tools/Java/core/library/macos-aarch64/libjogl_mobile.dylib b/tools/Java/core/library/macos-aarch64/libjogl_mobile.dylib
diff --git a/tools/Java/core/library/macos-aarch64/libnativewindow_awt.dylib b/tools/Java/core/library/macos-aarch64/libnativewindow_awt.dylib
diff --git a/tools/Java/core/library/macos-aarch64/libnativewindow_macosx.dylib b/tools/Java/core/library/macos-aarch64/libnativewindow_macosx.dylib
diff --git a/tools/Java/core/library/macos-aarch64/libnewt_head.dylib b/tools/Java/core/library/macos-aarch64/libnewt_head.dylib
diff --git a/tools/Java/core/library/macos-x86_64/libjogl_desktop.dylib b/tools/Java/core/library/macos-x86_64/libjogl_desktop.dylib
diff --git a/tools/Java/core/library/macos-x86_64/libjogl_mobile.dylib b/tools/Java/core/library/macos-x86_64/libjogl_mobile.dylib
diff --git a/tools/Java/core/library/macos-x86_64/libnativewindow_macosx.dylib b/tools/Java/core/library/macos-x86_64/libnativewindow_macosx.dylib
diff --git a/tools/Java/core/library/macos-x86_64/libnewt_head.dylib b/tools/Java/core/library/macos-x86_64/libnewt_head.dylib
diff --git a/tools/Java/core/library/windows-amd64/fenster.exe b/tools/Java/core/library/windows-amd64/fenster.exe
diff --git a/tools/Java/core/library/windows-amd64/gluegen_rt.dll b/tools/Java/core/library/windows-amd64/gluegen_rt.dll
diff --git a/tools/Java/core/library/windows-amd64/jogl_desktop.dll b/tools/Java/core/library/windows-amd64/jogl_desktop.dll
diff --git a/tools/Java/core/library/windows-amd64/jogl_mobile.dll b/tools/Java/core/library/windows-amd64/jogl_mobile.dll
diff --git a/tools/Java/core/library/windows-amd64/nativewindow_awt.dll b/tools/Java/core/library/windows-amd64/nativewindow_awt.dll
diff --git a/tools/Java/core/library/windows-amd64/nativewindow_win32.dll b/tools/Java/core/library/windows-amd64/nativewindow_win32.dll
diff --git a/tools/Java/core/library/windows-amd64/newt_head.dll b/tools/Java/core/library/windows-amd64/newt_head.dll
diff --git a/tools/Java/flatlaf.jar b/tools/Java/flatlaf.jar
diff --git a/tools/Java/jna-platform.jar b/tools/Java/jna-platform.jar
diff --git a/tools/Java/lib/about-1x.png b/tools/Java/lib/about-1x.png
diff --git a/tools/Java/lib/about-2x.png b/tools/Java/lib/about-2x.png
diff --git a/tools/Java/lib/defaults.txt b/tools/Java/lib/defaults.txt
diff --git a/tools/Java/lib/fonts/ProcessingSans-Bold.ttf b/tools/Java/lib/fonts/ProcessingSans-Bold.ttf
diff --git a/tools/Java/lib/fonts/ProcessingSans-LICENSE.md b/tools/Java/lib/fonts/ProcessingSans-LICENSE.md
diff --git a/tools/Java/lib/fonts/ProcessingSans-Regular.ttf b/tools/Java/lib/fonts/ProcessingSans-Regular.ttf
diff --git a/tools/Java/lib/fonts/SourceCodePro-Bold.ttf b/tools/Java/lib/fonts/SourceCodePro-Bold.ttf