Merge branch 'processing:main' into main-gradle

Author: Stefterv

.all-contributorsrc

@@ -1428,6 +1428,34 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "xinemata",
+      "name": "Xin Xin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9159424?v=4",
+      "profile": "https://github.com/xinemata",
+      "contributions": [
+        "eventOrganizing",
+        "ideas"
+      ]
+    },
+    {
+      "login": "tracerstar",
+      "name": "Benjamin Fox",
+      "avatar_url": "https://avatars.githubusercontent.com/u/234190?v=4",
+      "profile": "http://benjaminfoxstudios.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "e1dem",
+      "name": "e1dem",
+      "avatar_url": "https://avatars.githubusercontent.com/u/32488297?v=4",
+      "profile": "https://github.com/e1dem",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "repoType": "github",

.github/workflows/pull_request.yml

@@ -55,7 +55,7 @@ jobs:
       - name: Build Release
         run: ant -noinput -buildfile build/build.xml ${{ matrix.os_prefix }}-dist -Dversion="${{ github.sha }}" -Dplatform=${{ matrix.os_prefix }}
       - name: Add artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         id: upload
         with:
           name: processing-pr${{ github.event.pull_request.number }}-${{github.sha}}-${{ matrix.os_prefix }}-${{ matrix.arch }}-ant

README.md

@@ -64,7 +64,7 @@ For licensing information about the Processing website see the [processing-websi
 
 Copyright (c) 2015-now The Processing Foundation
 
-## Contributors
+## All Contributors List
 
 Add yourself to the contributors list [here](https://github.com/processing/processing4-carbon-aug-19/issues/839)!
 
@@ -281,6 +281,11 @@ Add yourself to the contributors list [here](https://github.com/processing/proce
       <td align="center" valign="top" width="16.66%"><a href="http://d.hatena.ne.jp/junology/"><img src="https://avatars.githubusercontent.com/u/1933073?v=4?s=120" width="120px;" alt="Junology"/><br /><sub><b>Junology</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=Junology" title="Code">💻</a></td>
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/twisst"><img src="https://avatars.githubusercontent.com/u/2244463?v=4?s=120" width="120px;" alt="Jaap Meijers"/><br /><sub><b>Jaap Meijers</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=twisst" title="Documentation">📖</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/xinemata"><img src="https://avatars.githubusercontent.com/u/9159424?v=4?s=120" width="120px;" alt="Xin Xin"/><br /><sub><b>Xin Xin</b></sub></a><br /><a href="#eventOrganizing-xinemata" title="Event Organizing">📋</a> <a href="#ideas-xinemata" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="http://benjaminfoxstudios.com"><img src="https://avatars.githubusercontent.com/u/234190?v=4?s=120" width="120px;" alt="Benjamin Fox"/><br /><sub><b>Benjamin Fox</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=tracerstar" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/e1dem"><img src="https://avatars.githubusercontent.com/u/32488297?v=4?s=120" width="120px;" alt="e1dem"/><br /><sub><b>e1dem</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=e1dem" title="Code">💻</a></td>
+    </tr>
   </tbody>
 </table>
 

app/src/processing/app/Sketch.java

@@ -659,11 +659,25 @@ public void handleDeleteCode() {
       return;
     }
 
+    if(currentIndex == 0){
+      Object[] options = { Language.text("menu.sketch.show_sketch_folder"), Language.text("prompt.cancel") };
+      int result = JOptionPane.showOptionDialog(editor,
+              Language.interpolate("warn.delete.sketch_last", getName()),
+              Language.text("warn.delete"),
+              JOptionPane.YES_NO_OPTION,
+              JOptionPane.ERROR_MESSAGE,
+              null,
+              options,
+              options[1]);
+      if (result == JOptionPane.YES_OPTION) {
+        Platform.openFolder(folder);
+      }
+      return;
+    }
+
     // confirm deletion with user, yes/no
     Object[] options = { Language.text("prompt.ok"), Language.text("prompt.cancel") };
-    String prompt = (currentIndex == 0) ?
-      Language.interpolate("warn.delete.sketch_folder", getName()) :
-      Language.interpolate("warn.delete.sketch_file", current.getPrettyName());
+    String prompt = Language.interpolate("warn.delete.sketch_file", current.getPrettyName());
     int result = JOptionPane.showOptionDialog(editor,
                                               prompt,
                                               Language.text("warn.delete"),
@@ -672,6 +686,7 @@ public void handleDeleteCode() {
                                               null,
                                               options,
                                               options[0]);
+    // TODO: Remove the code to remove the entire sketch folder
     if (result == JOptionPane.YES_OPTION) {
       if (currentIndex == 0) {  // delete the entire sketch
         // need to unset all the modified flags, otherwise tries

build/README.md

@@ -9,8 +9,9 @@ First, [download the IntelliJ IDEA Community Edition](https://www.jetbrains.com/
 1. Clone the Processing4 repository to your machine locally
 1. Open the cloned repository in IntelliJ IDEA CE
 1. Click `Install Required Plugins` on the bottom right or in the notification tray
-1. In the main menu, go to File > Project Structure > Project Settings > Project.
-1. In the SDK Dropdown option, select a JDK version 17 or Download the jdk 
+1. Open the `Project Structure` window (`Ctrl+Alt+Shift+S` on Windows/Linux or `⌘;` on macOS)
+2. Go to `Project Settings > Project`
+1. In the SDK Dropdown option, select a JDK version 17 or `Download a JDK`
 1. Select your platform (Windows, MacOS or Linux) in the top right of the window
 1. Click the green Run Icon next to it
 1. Logs can be found in the `messages` or `run` pane on the bottom left of the window

build/shared/lib/languages/PDE.properties

@@ -600,6 +600,7 @@ contrib.import.errors.link = Error: The library %s has a strange looking downloa
 
 warn.delete = Delete
 warn.delete.sketch_folder = Are you sure you want to delete this sketch?\nThis will remove the entire “%s” folder.
+warn.delete.sketch_last = To keep your files safe, deleting the whole sketch folder is not supported in Processing. \nPlease open the sketch folder in your file explorer to delete it.
 warn.delete.sketch_file = Are you sure you want to delete “%s”?
 warn.cannot_change_mode.title = Cannot change mode
 warn.cannot_change_mode.body = Cannot change mode,\nbecause “%s” mode is not compatible with current mode.

build/shared/lib/languages/PDE_de.properties

@@ -407,6 +407,7 @@ editor.status.error.syntax = Syntaxfehler - %s
 
 warn.delete = Löschen
 warn.delete.sketch = Den Sketch endgültig löschen?
+warn.delete.sketch_last = Um deine Dateien sicher zu halten, wird das Löschen des gesamten Sketch-Ordners in Processing nicht unterstützt. \nBitte öffne den Sketch-Ordner in deinem Datei-Explorer, um ihn zu löschen.
 warn.delete.file = Die Datei "%s" entgültig löschen?
 
 

build/shared/lib/languages/PDE_el.properties

@@ -478,6 +478,7 @@ contrib.import.errors.link = Error: The library %s has a strange looking downloa
 
 warn.delete = Διαγραφή
 warn.delete.sketch = Είσαι σίγουρος ότι θέλεις να διαγραφεί το Σχέδιο;
+warn.delete.sketch_last = Για να διατηρήσετε τα αρχεία σας ασφαλή, η διαγραφή ολόκληρου του φακέλου Σχεδίου δεν υποστηρίζεται στο Processing.\nΠαρακαλούμε ανοίξτε το φάκελο Σχεδίου στον εξερευνητή αρχείων για να το διαγράψετε.
 warn.delete.file = Είσαι σίγουρος ότι θέλεις να διαγράψεις το "%s";
 
 

build/shared/lib/languages/PDE_es.properties

@@ -599,6 +599,7 @@ contrib.import.errors.link = Error: el enlace de descarga de la biblioteca «%s
 
 warn.delete = Eliminar
 warn.delete.sketch_folder = ¿Seguro que quieres eliminar el sketch?\nEsto suprimirá la carpeta «%s» y todo su contenido.
+warn.delete.sketch_last = Para mantener tus archivos seguros, no se admite eliminar toda la carpeta del sketch en Processing.\nAbre la carpeta del sketch en tu explorador de archivos para eliminarla.
 warn.delete.sketch_file = ¿Seguro que quieres eliminar el archivo «%s»?
 warn.cannot_change_mode.title = Error cambio de modo
 warn.cannot_change_mode.body = No se puede cambiar al modo «%s»\nporque no es compatible con el modo actual.

build/shared/lib/languages/PDE_fr.properties

@@ -487,7 +487,9 @@ contrib.import.errors.link = Erreur : Le lien de téléchargement de la biblioth
 # Warnings
 
 warn.delete = Supprimer
-warn.delete.sketch = Êtes-vous sûr(e) de vouloir supprimer ce sketch?
+warn.delete.sketch = Êtes-vous sûr(e) de vouloir supprimer ce sketch? \nLe dossier “%s” sera entièrement effacé.
+# warn.delete.sketch_last = To keep your files safe, deleting the whole sketch folder isn?t supported in Processing. \nPlease open the sketch folder in your file explorer to delete it.
+warn.delete.sketch_last = Pour protéger vos fichiers, la suppression du dossier de sketch entier n'est pas prise en charge dans Processing. \nVeuillez ouvrir le dossier de sketch dans votre explorateur de fichiers pour le supprimer.
 warn.delete.file = Êtes-vous sûr(e) de vouloir supprimer «%s»?
 warn.cannot_change_mode.title = Impossible de changer le mode
 warn.cannot_change_mode.body = Impossible de changer de mode, \ncar le mode "%s" n'est pas compatible avec le mode actuel.