Merge branch 'main' into welcome-screen

Author: Stefterv

app/ant/processing/app/ui/Welcome.java

@@ -21,22 +21,18 @@
 
 package processing.app.ui;
 
-import java.awt.Color;
-import java.awt.EventQueue;
-import java.awt.Font;
+import processing.app.Base;
+import processing.app.Platform;
+import processing.app.Preferences;
+
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import java.awt.*;
 import java.awt.event.ItemEvent;
 import java.io.File;
 import java.io.IOException;
 
-import javax.swing.Box;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComponent;
-import javax.swing.border.EmptyBorder;
-
-import processing.app.Base;
-import processing.app.Platform;
-import processing.app.Preferences;
+import static processing.app.ui.WelcomeSurveyKt.addSurveyToWelcomeScreen;
 
 
 public class Welcome {
@@ -47,6 +43,7 @@ public class Welcome {
   public Welcome(Base base) throws IOException {
     this.base = base;
 
+      var parent = Box.createVerticalBox();
     JComponent panel = Box.createHorizontalBox();
     //panel.setBackground(new Color(245, 245, 245));
     panel.setBackground(Color.WHITE);
@@ -71,11 +68,13 @@ public Welcome(Base base) throws IOException {
     button.setFont(Toolkit.getSansFont(14, Font.PLAIN));
     button.addActionListener(e -> view.handleClose());
     panel.add(button);
+      parent.add(addSurveyToWelcomeScreen());
+      parent.add(panel);
 
     File indexFile = getIndexFile();
     if (indexFile == null) return;  // giving up; error already printed
 
-    view = new WebFrame(getIndexFile(), 420, panel) {
+      view = new WebFrame(getIndexFile(), 420, parent) {
       /*
       @Override
       public void handleSubmit(StringDict dict) {

app/src/main/resources/languages/PDE.properties

@@ -633,6 +633,9 @@ beta.window.title = Welcome to Beta
 beta.title = Thanks for testing this Processing Beta!
 beta.message = This preview release lets us gather feedback and fix issues before the final version. **Some features may not work as expected.** If you encounter problems, [please post on the forum](https://discourse.processing.org) or [open a GitHub issue](https://github.com/processing/processing4/issues).
 beta.button = Ok
+# Welcome
+welcome.survey.title=Take the Community Survey
+welcome.survey.description=Processing is free, open-source, and shaped by its community. Your answers help us focus on what matters most.
 
 # ---------------------------------------
 # Color Chooser

app/src/main/resources/languages/PDE_ar.properties

@@ -550,6 +550,10 @@ update_check = تحديث
 update_check.updates_available.core = يوجد نسخة جديدة من بروسسنج جاهزة للتحميل. \nهل تود زيارة الموقع الرسمي لتحميلها؟
 update_check.updates_available.contributions = يوجد تحديثات متوفرة لبعض المشاركات المثبتة. \nهل تريد الذهاب إلى مدير المشاركات الآن؟
 
+# ---------------------------------------
+# Welcome
+welcome.survey.title=شارك في استطلاع المجتمع (بالإنجليزية)
+welcome.survey.description=Processing مجاني ومفتوح المصدر ومشكّل من قبل مجتمعه. إجاباتك تساعدنا على التركيز على ما يهم أكثر.
 
 # ---------------------------------------
 # Color Chooser

app/src/main/resources/languages/PDE_de.properties

@@ -420,6 +420,10 @@ update_check = Update
 update_check.updates_available.core = Eine neue Version von Processing ist verfügbar,\nsoll der Download-Bereich aufgerufen werden?
 update_check.updates_available.contributions = Es sind neue Updates von installierten Paketen verfügbar,\nsoll der Contribution Manager geöffnet werden?
 
+# ---------------------------------------
+# Welcome
+welcome.survey.title=Nimm an der Community-Umfrage teil (auf Englisch)
+welcome.survey.description=Processing ist kostenlos, open source und von seiner Community geprägt. Deine Antworten helfen uns, die wichtigsten Schwerpunkte zu setzen.
 
 # ---------------------------------------
 # Color Chooser

app/src/main/resources/languages/PDE_fr.properties

@@ -502,6 +502,9 @@ update_check = Mise à jour
 update_check.updates_available.core = Une nouvelle version de Processing est disponible, \nVoulez-vous visiter la page de téléchargement de Processing?
 update_check.updates_available.contributions = Il y a des mises à jour disponibles pour certaines des contributions installées, \nVoulez-vous ouvrir le gestionnaire de contributions?
 
+# Welcome
+welcome.survey.title=Participez au sondage de la communauté (en anglais)
+welcome.survey.description=Processing est gratuit, open source et façonné par sa communauté. Vos réponses nous aident à nous concentrer sur ce qui compte le plus.
 
 # ---------------------------------------
 # Color Chooser

app/src/main/resources/languages/PDE_it.properties

@@ -546,6 +546,11 @@ update_check = Aggiorna
 update_check.updates_available.core = Una nuova versione di Processing è disponibile,\nvuoi visitare la pagina di download del sito di Processing?
 update_check.updates_available.contributions = Ci sono aggiornamenti disponibili per alcuni dei contributi installati,\nvorresti aprire il gestore dei contributi ora?
 
+# ---------------------------------------
+# Welcome
+welcome.survey.title=Partecipa al sondaggio della community (in inglese)
+welcome.survey.description=Processing è gratuito, open-source e plasmato dalla sua community. Le tue risposte ci aiutano a capire ciò che conta di più.
+
 # ---------------------------------------
 # Color Chooser
 

app/src/main/resources/languages/PDE_ja.properties

@@ -550,6 +550,11 @@ update_check = 更新
 update_check.updates_available.core = 新しいバージョンのProcessingが利用可能です。\nProcessingのダウンロードページにアクセスしますか?
 update_check.updates_available.contributions = There are updates available for some of the installed contributions,\nwould you like to open the the Contribution Manager now?
 
+# ---------------------------------------
+# Welcome
+welcome.survey.title=コミュニティ調査にご協力ください（英語）
+welcome.survey.description=Processing は無料でオープンソースであり、コミュニティによって形作られています。あなたの回答は、私たちが何に注力すべきかを知る助けになります。
+
 
 # ---------------------------------------
 # Color Chooser

app/src/main/resources/languages/PDE_nl.properties

@@ -315,6 +315,11 @@ update_check = Update
 update_check.updates_available.core = Een nieuwe versie van Processing is beschikbaar,\nwilt u de Processing download pagina bezoeken?
 update_check.updates_available.contributions = Er zijn updates beschikbaar voor sommige van de door u geïnstalleerde bijdragen,\nwilt u nu de Bijdragen Manager openen?
 
+# ---------------------------------------
+# Welcome
+welcome.survey.title=Doe mee aan de community-enquête (in het Engels)
+welcome.survey.description=Processing is gratis, open-source en gevormd door de community. Jouw antwoorden helpen ons te focussen op wat het belangrijkst is.
+
 # ---------------------------------------
 # Beta
 beta.window.title = Welkom bij Beta

app/src/main/resources/languages/PDE_zh-CN.properties

@@ -313,4 +313,9 @@ warn.delete.sketch_last = 为了确保您的文件安全，Processing 不支持
 warn.delete.file = 你确定要删除 "%s" 吗？
 warn.delete.sketch_file = 你确定要删除 “%s” 吗？
 warn.cannot_change_mode.title = 无法切换模式
-warn.cannot_change_mode.body = 无法切换模式，\n因为 “%s” 模式与当前模式不兼容。
+warn.cannot_change_mode.body = 无法切换模式，\n因为 “%s” 模式与当前模式不兼容。
+
+# ---------------------------------------
+# Welcome
+welcome.survey.title=参与社区调查（英文）
+welcome.survey.description=Processing 是免费的、开源的，并由社区共同塑造。你的回答将帮助我们关注最重要的事项。

app/src/processing/app/Base.java

@@ -2206,29 +2206,54 @@ static public InputStream getLibStream(String filename) throws IOException {
    * something similar on Windows, a dot folder on Linux.) Removed this as a
    * preference for 3.0a3 because we need this to be stable, but adding back
    * for 4.0 beta 4 so that folks can do 'portable' versions again.
+   *
+   * @deprecated use processing.utils.Settings.getFolder() instead, this method will invoke AWT
    */
   static public File getSettingsFolder() {
-    File settingsFolder = null;
-
-    try {
-      settingsFolder = Platform.getSettingsFolder();
-
-      // create the folder if it doesn't exist already
-      if (!settingsFolder.exists()) {
-        if (!settingsFolder.mkdirs()) {
-          Messages.showError("Settings issues",
-                             "Processing cannot run because it could not\n" +
-                             "create a folder to store your settings at\n" +
-                             settingsFolder, null);
-        }
+      var override = getSettingsOverride();
+      if (override != null) {
+          return override;
       }
-    } catch (Exception e) {
-      Messages.showTrace("An rare and unknowable thing happened",
-                         "Could not get the settings folder. Please report:\n" +
-                         "http://github.com/processing/processing/issues/new",
-                         e, true);
-    }
-    return settingsFolder;
+      try {
+          return processing.utils.Settings.getFolder();
+      } catch (processing.utils.Settings.SettingsFolderException e) {
+          switch (e.getType()) {
+              case COULD_NOT_CREATE_FOLDER -> Messages.showError("Settings issues",
+                      """
+                              Processing cannot run because it could not
+                              create a folder to store your settings at
+                              """ + e.getMessage(), null);
+              case WINDOWS_APPDATA_NOT_FOUND -> Messages.showError("Settings issues",
+                      """
+                              Processing cannot run because it could not
+                              find the AppData or LocalAppData folder on your system.
+                              """, null);
+              case MACOS_LIBRARY_FOLDER_NOT_FOUND -> Messages.showError("Settings issues",
+                      """
+                              Processing cannot run because it could not
+                              find the Library folder on your system.
+                              """, null);
+              case LINUX_CONFIG_FOLDER_NOT_FOUND -> Messages.showError("Settings issues",
+                      """
+                              Processing cannot run because either your
+                              XDG_CONFIG_HOME or SNAP_USER_COMMON is set
+                              but the folder does not exist.
+                              """, null);
+              case LINUX_SUDO_USER_ERROR -> Messages.showError("Settings issues",
+                      """
+                              Processing cannot run because it was started
+                              with sudo and Processing could not resolve
+                              the original users home directory.
+                              """, null);
+              default -> Messages.showTrace("An rare and unknowable thing happened",
+                      """
+                              Could not get the settings folder. Please report:
+                              http://github.com/processing/processing4/issues/new
+                              """,
+                      e, true);
+          }
+      }
+      throw new RuntimeException("Unreachable code in Base.getSettingsFolder()");
   }