Merge pull request #241 from ImpulseAdventure/pconti-17b24

Pconti 17b24
ImpulseAdventure · Jun 2, 2023 · 2ac7f44 · 2ac7f44
2 parents 2728af9 + 84eb0f2
commit 2ac7f44
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 55 deletions.
diff --git a/README.md b/README.md
@@ -121,6 +121,10 @@ You will need to select "Allow Anyway" to continue.
 
 ## Release History
 
+### Bug Fixes 0.17.b24
+- Issue `233` Using TFT_eSPI with gfx freefonts created include 'NULLFreeSans12pt7b.h'
+- Bug Fix Now the Builder tests that your enums start with a capital letter A to Z to fix compile time issues.
+
 ### Enhancement for 0.17.b23
 
 Removed edit->options tabs for Box, Text, and TextButton since now you should edit theme inside GUIsliceBuilder/templates

diff --git a/builder/build.gradle b/builder/build.gradle
@@ -15,7 +15,7 @@ repositories {
 mainClassName = "builder.Builder"
 applicationName = "GUIslice"
 archivesBaseName = 'builder'
-project.version = '0.17.b23'
+project.version = '0.17.b24'
 
 processResources { 
      from("src/main/java/") { 

diff --git a/builder/docs/FAQ.md b/builder/docs/FAQ.md
@@ -13,10 +13,14 @@ GUIslice API
 
 **Publication date and software versions**
 
-Published May, 2023. Based on GUIslice Builder 0.17.b21 and GUIslice API Library 0.16.0
+Published June, 2023. Based on GUIslice Builder 0.17.b24 and GUIslice API Library 0.17.0
 
 ## Using the GUIsliceBuilder
 
+### WARNING!
+
+You must not place switch or additional break statements inside your button callbacks. The code generator will crash. Instead simply create a subroutine that has your more complex logic and call that from inside your callback.
+
 ### I changed the Graphics Library by way of  GUIslice Builder->Edit->Options->General Tab->Graphics Library
 
 All new projects will use this value but your existing projects will still have the old values and will need to be modified by going to the Project Options tab and changing the graphics library.  

diff --git a/builder/docs/LICENSE.txt b/builder/docs/LICENSE.txt
@@ -1,7 +1,7 @@
 
 The MIT License
 
-Copyright 2018-2022 Paul Conti
+Copyright 2018-2023 Paul Conti
 
 Permission is hereby granted, free of charge, to any person obtaining 
 a copy of this software and associated documentation files (the 

diff --git a/builder/docs/user_guide.md b/builder/docs/user_guide.md
@@ -6,15 +6,15 @@
         User Guide
     </H2>
     <H3>
-        Ver: 0.17.b12
+        Ver: 0.17.b24
     </H3>
 </center>
 
 ![](images/title_demo_control.png)
 
 **Publication date and software version**
 
-Published April 2022. Based on GUIslice API Library 0.17.0
+Published June 2023. Based on GUIslice API Library 0.17.0
 
 **Copyright**
 
@@ -2332,6 +2332,12 @@ The Builder supports a richer set of functions for Button callbacks like Jump to
 
 The rules here apply only to the Button callbacks.  All other callbacks simply look for existing case statement with ENUM and if it finds it within your *.ino file the code is left unchanged. If a UI Element is deleted the code generator will remove it's case statement.
 
+**WARNING!**
+
+You must not place switch or additional break statements inside your callbacks.  The code generator will crash.
+Instead simply create a subroutine that has your more complex logic and call that from inside your callback.
+
+
 **Example** **One**
 
 You create a simple button in the Builder with no Jump, Popup, or Hide Page like the Quit button used in the examples and do a code generation.

diff --git a/builder/package/templates/builder_fonts.json b/builder/package/templates/builder_fonts.json
@@ -2144,7 +2144,6 @@
               "familyName": "FreeMono",
               "displayName": "FreeMono9pt7b",
               "fileName": "FreeMono/PLAIN/FreeMono9pt7b.h",
-              "includeFile": "FreeMono9pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeMono9pt7b",
               "nFontSz": "1",
@@ -2157,7 +2156,6 @@
               "familyName": "FreeMono",
               "displayName": "FreeMono12pt7b",
               "fileName": "FreeMono/PLAIN/FreeMono12pt7b.h",
-              "includeFile": "FreeMono12pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeMono12pt7b",
               "nFontSz": "1",
@@ -2170,7 +2168,6 @@
               "familyName": "FreeMono",
               "displayName": "FreeMono18pt7b",
               "fileName": "FreeMono/PLAIN/FreeMono18pt7b.h",
-              "includeFile": "FreeMono18pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeMono18pt7b",
               "nFontSz": "1",
@@ -2183,7 +2180,6 @@
               "familyName": "FreeMono",
               "displayName": "FreeMono24pt7b",
               "fileName": "FreeMono/PLAIN/FreeMono24pt7b.h",
-              "includeFile": "FreeMono24pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeMono24pt7b",
               "nFontSz": "1",
@@ -2196,7 +2192,6 @@
               "familyName": "FreeMono",
               "displayName": "FreeMonoBold9pt7b",
               "fileName": "FreeMono/BOLD/FreeMonoBold9pt7b.h",
-              "includeFile": "FreeMonoBold9pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeMonoBold9pt7b",
               "nFontSz": "1",
@@ -2209,7 +2204,6 @@
               "familyName": "FreeMono",
               "displayName": "FreeMonoBold12pt7b",
               "fileName": "FreeMono/BOLD/FreeMonoBold12pt7b.h",
-              "includeFile": "FreeMonoBold12pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeMonoBold12pt7b",
               "nFontSz": "1",
@@ -2222,7 +2216,6 @@
               "familyName": "FreeMono",
               "displayName": "FreeMonoBold18pt7b",
               "fileName": "FreeMono/BOLD/FreeMonoBold18pt7b.h",
-              "includeFile": "FreeMonoBold18pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeMonoBold18pt7b",
               "nFontSz": "1",
@@ -2235,7 +2228,6 @@
               "familyName": "FreeMono",
               "displayName": "FreeMonoBold24pt7b",
               "fileName": "FreeMono/BOLD/FreeMonoBold24pt7b.h",
-              "includeFile": "FreeMonoBold24pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeMonoBold24pt7b",
               "nFontSz": "1",
@@ -2248,7 +2240,6 @@
               "familyName": "FreeMono",
               "displayName": "FreeMonoOblique9pt7b",
               "fileName": "FreeMono/ITALIC/FreeMonoOblique9pt7b.h",
-              "includeFile": "FreeMonoOblique9pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeMonoOblique9pt7b",
               "nFontSz": "1",
@@ -2261,7 +2252,6 @@
               "familyName": "FreeMono",
               "displayName": "FreeMonoOblique12pt7b",
               "fileName": "FreeMono/ITALIC/FreeMonoOblique12pt7b.h",
-              "includeFile": "FreeMonoOblique12pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeMonoOblique12pt7b",
               "nFontSz": "1",
@@ -2274,7 +2264,6 @@
               "familyName": "FreeMono",
               "displayName": "FreeMonoOblique18pt7b",
               "fileName": "FreeMono/ITALIC/FreeMonoOblique18pt7b.h",
-              "includeFile": "FreeMonoOblique18pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeMonoOblique18pt7b",
               "nFontSz": "1",
@@ -2287,7 +2276,6 @@
               "familyName": "FreeMono",
               "displayName": "FreeMonoOblique24pt7b",
               "fileName": "FreeMono/ITALIC/FreeMonoOblique24pt7b.h",
-              "includeFile": "FreeMonoOblique24pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeMonoOblique24pt7b",
               "nFontSz": "1",
@@ -2300,7 +2288,6 @@
               "familyName": "FreeSans",
               "displayName": "FreeSans9pt7b",
               "fileName": "FreeSans/PLAIN/FreeSans9pt7b.h",
-              "includeFile": "FreeSans9pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSans9pt7b",
               "nFontSz": "1",
@@ -2313,7 +2300,6 @@
               "familyName": "FreeSans",
               "displayName": "FreeSans12pt7b",
               "fileName": "FreeSans/PLAIN/FreeSans12pt7b.h",
-              "includeFile": "FreeSans12pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSans12pt7b",
               "nFontSz": "1",
@@ -2326,7 +2312,6 @@
               "familyName": "FreeSans",
               "displayName": "FreeSans18pt7b",
               "fileName": "FreeSans/PLAIN/FreeSans18pt7b.h",
-              "includeFile": "FreeSans18pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSans18pt7b",
               "nFontSz": "1",
@@ -2339,7 +2324,6 @@
               "familyName": "FreeSans",
               "displayName": "FreeSans24pt7b",
               "fileName": "FreeSans/PLAIN/FreeSans24pt7b.h",
-              "includeFile": "FreeSans24pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSans24pt7b",
               "nFontSz": "1",
@@ -2352,7 +2336,6 @@
               "familyName": "FreeSans",
               "displayName": "FreeSansBold9pt7b",
               "fileName": "FreeSans/BOLD/FreeSansBold9pt7b.h",
-              "includeFile": "FreeSansBold9pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSansBold9pt7b",
               "nFontSz": "1",
@@ -2365,7 +2348,6 @@
               "familyName": "FreeSans",
               "displayName": "FreeSansBold12pt7b",
               "fileName": "FreeSans/BOLD/FreeSansBold12pt7b.h",
-              "includeFile": "FreeSansBold12pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSansBold12pt7b",
               "nFontSz": "1",
@@ -2378,7 +2360,6 @@
               "familyName": "FreeSans",
               "displayName": "FreeSansBold18pt7b",
               "fileName": "FreeSans/BOLD/FreeSansBold18pt7b.h",
-              "includeFile": "FreeSansBold18pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSansBold18pt7b",
               "nFontSz": "1",
@@ -2391,7 +2372,6 @@
               "familyName": "FreeSans",
               "displayName": "FreeSansBold24pt7b",
               "fileName": "FreeSans/BOLD/FreeSansBold24pt7b.h",
-              "includeFile": "FreeSansBold24pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSansBold24pt7b",
               "nFontSz": "1",
@@ -2404,7 +2384,6 @@
               "familyName": "FreeSans",
               "displayName": "FreeSansOblique9pt7b",
               "fileName": "FreeSans/ITALIC/FreeSansOblique9pt7b.h",
-              "includeFile": "FreeSansOblique9pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSansOblique9pt7b",
               "nFontSz": "1",
@@ -2417,7 +2396,6 @@
               "familyName": "FreeSans",
               "displayName": "FreeSansOblique12pt7b",
               "fileName": "FreeSans/ITALIC/FreeSansOblique12pt7b.h",
-              "includeFile": "FreeSansOblique12pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSansOblique12pt7b",
               "nFontSz": "1",
@@ -2430,7 +2408,6 @@
               "familyName": "FreeSans",
               "displayName": "FreeSansOblique18pt7b",
               "fileName": "FreeSans/ITALIC/FreeSansOblique18pt7b.h",
-              "includeFile": "FreeSansOblique18pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSansOblique18pt7b",
               "nFontSz": "1",
@@ -2443,7 +2420,6 @@
               "familyName": "FreeSans",
               "displayName": "FreeSansOblique24pt7b",
               "fileName": "FreeSans/ITALIC/FreeSansOblique24pt7b.h",
-              "includeFile": "FreeSansOblique24pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSansOblique24pt7b",
               "nFontSz": "1",
@@ -2456,7 +2432,6 @@
               "familyName": "FreeSerif",
               "displayName": "FreeSerif9pt7b",
               "fileName": "FreeSerif/PLAIN/FreeSerif9pt7b.h",
-              "includeFile": "FreeSerif9pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSerif9pt7b",
               "nFontSz": "1",
@@ -2469,7 +2444,6 @@
               "familyName": "FreeSerif",
               "displayName": "FreeSerif12pt7b",
               "fileName": "FreeSerif/PLAIN/FreeSerif12pt7b.h",
-              "includeFile": "FreeSerif12pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSerif12pt7b",
               "nFontSz": "1",
@@ -2482,7 +2456,6 @@
               "familyName": "FreeSerif",
               "displayName": "FreeSerif18pt7b",
               "fileName": "FreeSerif/PLAIN/FreeSerif18pt7b.h",
-              "includeFile": "FreeSerif18pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSerif18pt7b",
               "nFontSz": "1",
@@ -2495,7 +2468,6 @@
               "familyName": "FreeSerif",
               "displayName": "FreeSerif24pt7b",
               "fileName": "FreeSerif/PLAIN/FreeSerif24pt7b.h",
-              "includeFile": "FreeSerif24pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSerif24pt7b",
               "nFontSz": "1",
@@ -2508,7 +2480,6 @@
               "familyName": "FreeSerif",
               "displayName": "FreeSerifBold9pt7b",
               "fileName": "FreeSerif/BOLD/FreeSerifBold9pt7b.h",
-              "includeFile": "FreeSerifBold9pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSerifBold9pt7b",
               "nFontSz": "1",
@@ -2521,7 +2492,6 @@
               "familyName": "FreeSerif",
               "displayName": "FreeSerifBold12pt7b",
               "fileName": "FreeSerif/BOLD/FreeSerifBold12pt7b.h",
-              "includeFile": "FreeSerifBold12pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSerifBold12pt7b",
               "nFontSz": "1",
@@ -2534,7 +2504,6 @@
               "familyName": "FreeSerif",
               "displayName": "FreeSerifBold18pt7b",
               "fileName": "FreeSerif/BOLD/FreeSerifBold18pt7b.h",
-              "includeFile": "FreeSerifBold18pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSerifBold18pt7b",
               "nFontSz": "1",
@@ -2547,7 +2516,6 @@
               "familyName": "FreeSerif",
               "displayName": "FreeSerifBold24pt7b",
               "fileName": "FreeSerif/BOLD/FreeSerifBold24pt7b.h",
-              "includeFile": "FreeSerifBold24pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSerifBold24pt7b",
               "nFontSz": "1",
@@ -2560,7 +2528,6 @@
               "familyName": "FreeSerif",
               "displayName": "FreeSerifItalic9pt7b",
               "fileName": "FreeSerif/ITALIC/FreeSerifItalic9pt7b.h",
-              "includeFile": "FreeSerifItalic9pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSerifItalic9pt7b",
               "nFontSz": "1",
@@ -2573,7 +2540,6 @@
               "familyName": "FreeSerif",
               "displayName": "FreeSerifItalic12pt7b",
               "fileName": "FreeSerif/ITALIC/FreeSerifItalic12pt7b.h",
-              "includeFile": "FreeSerifItalic12pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSerifItalic9pt7b",
               "nFontSz": "1",
@@ -2586,7 +2552,6 @@
               "familyName": "FreeSerif",
               "displayName": "FreeSerifItalic18pt7b",
               "fileName": "FreeSerif/ITALIC/FreeSerifItalic18pt7b.h",
-              "includeFile": "FreeSerifItalic18pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSerifItalic9pt7b",
               "nFontSz": "1",
@@ -2599,7 +2564,6 @@
               "familyName": "FreeSerif",
               "displayName": "FreeSerifItalic24pt7b",
               "fileName": "FreeSerif/ITALIC/FreeSerifItalic24pt7b.h",
-              "includeFile": "FreeSerifItalic24pt7b.h",
               "eFontRefType": "GSLC_FONTREF_PTR",
               "pvFontRef": "&FreeSerifItalic9pt7b",
               "nFontSz": "1",

diff --git a/builder/src/main/java/builder/Builder.java b/builder/src/main/java/builder/Builder.java
@@ -114,7 +114,7 @@ public class Builder  extends JDesktopPane {
   private static final long serialVersionUID = 1L;
 
   /** The Constant VERSION. */
-  public static final String VERSION = "0.17.b23";
+  public static final String VERSION = "0.17.b24";
 
   /** The Constant VERSION_NO is for save and restore of user preferences. */
   public static final String VERSION_NO = "-16";

diff --git a/builder/src/main/java/builder/models/ImgButtonModel.java b/builder/src/main/java/builder/models/ImgButtonModel.java
@@ -412,9 +412,7 @@ public void setValueAt(Object value, int row, int col) {
           return;
         }
       }
-      // commands are used to support undo and redo actions.
-      PropertyCommand c = new PropertyCommand(this, value, row);
-      execute(c);
+      super.setValueAt(value, row, col);
     }
   }
 

diff --git a/builder/src/main/java/builder/models/ListBoxModel.java b/builder/src/main/java/builder/models/ListBoxModel.java
@@ -243,11 +243,7 @@ public void buttonClicked(String[] strings) {
   public void setValueAt(Object value, int row, int col) {
     // we handle list of items through a backdoor "buttonClicked"
     if (row == PROP_ITEMS) return;
-    if (col == COLUMN_VALUE) {
-      // commands are used to support undo and redo actions.
-      PropertyCommand c = new PropertyCommand(this, value, row);
-      execute(c);
-    }
+    super.setValueAt(value, row, col);
   }
 
   /**