This is an interim update to bring in line with web designer.

Author: dave

embedCONTROLCore/pom.xml

@@ -13,7 +13,7 @@
     <artifactId>embedCONTROLCore</artifactId>
     <name>embedCONTROLCore</name>
     <description>TcMenu embedCONTROL shared core</description>
-    <version>4.5.0</version>
+    <version>4.5.0-SNAPSHOT</version>
     <url>https://tcmenu.github.io/documentation/arduino-libraries/tc-menu/</url>
 
     <licenses>

tcMenuGenerator/pom.xml

@@ -12,7 +12,7 @@
     <name>menuEditorUI</name>
     <groupId>com.thecoderscorner.tcmenu</groupId>    
     <description>JavaFX based menu editor UI</description>
-    <version>4.5.0</version>
+    <version>4.5.0-SNAPSHOT</version>
 
     <properties>
         <timestamp>${maven.build.timestamp}</timestamp>

tcMenuGenerator/src/it/com/thecoderscorner/menu/uitests/EditFontTestCase.java

@@ -6,6 +6,7 @@
 import com.thecoderscorner.menu.editorui.generator.core.CreatorProperty;
 import com.thecoderscorner.menu.editorui.generator.core.SubSystem;
 import com.thecoderscorner.menu.editorui.generator.parameters.FontDefinition;
+import com.thecoderscorner.menu.editorui.generator.parameters.FontMode;
 import com.thecoderscorner.menu.editorui.generator.validation.CannedPropertyValidators;
 import com.thecoderscorner.menu.editorui.util.TestUtils;
 import javafx.scene.Node;
@@ -37,7 +38,7 @@ public void onStart(Stage stage) {
 
     @Test
     public void checkFontPropertyEditing(FxRobot robot) throws InterruptedException {
-        FontDefinition defaultFont = new FontDefinition(FontDefinition.FontMode.DEFAULT_FONT, "", 1);
+        FontDefinition defaultFont = new FontDefinition(FontMode.DEFAULT_FONT, "", 1);
         CreatorProperty prop = new CreatorProperty("Name", "Desc", "ExtDesc", defaultFont.toString(),
                 SubSystem.DISPLAY, CreatorProperty.PropType.TEXTUAL, CannedPropertyValidators.fontValidator(), new AlwaysApplicable());
         var dialogPane = createFontDialog(robot, prop);

tcMenuGenerator/src/it/com/thecoderscorner/menu/uitests/GenerateCodeDialogTest.java

@@ -8,6 +8,7 @@
 import com.thecoderscorner.menu.editorui.generator.core.CreatorProperty;
 import com.thecoderscorner.menu.editorui.generator.core.SubSystem;
 import com.thecoderscorner.menu.editorui.generator.parameters.FontDefinition;
+import com.thecoderscorner.menu.editorui.generator.parameters.FontMode;
 import com.thecoderscorner.menu.editorui.generator.parameters.IoExpanderDefinition;
 import com.thecoderscorner.menu.editorui.generator.parameters.IoExpanderDefinitionCollection;
 import com.thecoderscorner.menu.editorui.generator.plugin.*;
@@ -250,7 +251,7 @@ private void checkFontPropertyEditing(FxRobot robot, CreatorProperty prop, Strin
         withRetryOnFxThread(new TextFieldPredicate(robot, nodeName, latestValue), "nodeName check for " + latestValue);
 
         var oldValue = prop.getLatestValue();
-        FontDefinition numberedFont = new FontDefinition(FontDefinition.FontMode.NUMBERED, "", 22);
+        FontDefinition numberedFont = new FontDefinition(FontMode.NUMBERED, "", 22);
         when(editorUI.showFontEditorDialog(oldValue, false)).thenReturn(Optional.of(numberedFont.toString()));
 
         robot.clickOn(nodeName + "_btn");

tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/controller/ChooseFontController.java

@@ -4,6 +4,7 @@
 import com.thecoderscorner.menu.editorui.controller.fontsel.FontChoice;
 import com.thecoderscorner.menu.editorui.controller.fontsel.FontType;
 import com.thecoderscorner.menu.editorui.generator.parameters.FontDefinition;
+import com.thecoderscorner.menu.editorui.generator.parameters.FontMode;
 import com.thecoderscorner.menu.editorui.util.SafeNavigator;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
@@ -17,7 +18,7 @@
 import java.util.Optional;
 
 import static com.thecoderscorner.menu.editorui.dialog.AppInformationPanel.FONTS_GUIDE_URL;
-import static com.thecoderscorner.menu.editorui.generator.parameters.FontDefinition.FontMode.*;
+import static com.thecoderscorner.menu.editorui.generator.parameters.FontMode.*;
 
 public class ChooseFontController {
     public RadioButton adafruitFontSel;
@@ -89,7 +90,7 @@ public void initialise(String currentSelection, boolean tcUnicodeEnabled) {
         }
     }
 
-    private void prepareChoicesForMode(FontDefinition.FontMode fontMode) {
+    private void prepareChoicesForMode(FontMode fontMode) {
         if(tcUnicodeEnabled) {
             var allItems = new ArrayList<FontChoice>();
             allItems.addAll(DefaultFontChoices.getChoicesFor(FontType.TC_UNICODE));
@@ -129,7 +130,7 @@ public void onFontDefinitionsDocs(ActionEvent actionEvent) {
 
     @SuppressWarnings("unused")
     public void onCreatePressed(ActionEvent actionEvent) {
-        FontDefinition.FontMode mode = getFontMode();
+        FontMode mode = getFontMode();
 
         int mag;
         try {
@@ -155,8 +156,8 @@ public void onCreatePressed(ActionEvent actionEvent) {
         closeIt();
     }
 
-    private FontDefinition.FontMode getFontMode() {
-        FontDefinition.FontMode mode;
+    private FontMode getFontMode() {
+        FontMode mode;
         if(adafruitFontSel.isSelected()) mode = ADAFRUIT;
         else if(adafruitLocalFontSel.isSelected()) mode = ADAFRUIT_LOCAL;
         else if(largeNumSelect.isSelected()) mode = NUMBERED;

tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/generator/parameters/FontDefinition.java

@@ -6,7 +6,6 @@
 import java.util.regex.Pattern;
 
 public record FontDefinition(FontMode fontMode, String fontName, int fontNumber) {
-    public enum FontMode {DEFAULT_FONT, ADAFRUIT_LOCAL, ADAFRUIT, NUMBERED, AVAILABLE}
 
     public String getFontDef() {
         return switch (fontMode) {

tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/generator/parameters/FontMode.java

@@ -0,0 +1,3 @@
+package com.thecoderscorner.menu.editorui.generator.parameters;
+
+public enum FontMode {DEFAULT_FONT, ADAFRUIT_LOCAL, ADAFRUIT, NUMBERED, AVAILABLE}

tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/generator/plugin/CodePluginItem.java

@@ -22,7 +22,7 @@ public class CodePluginItem {
     private SubSystem subsystem;
     private String imageFileName;
     private String docsLink;
-    private boolean themeNeeded;
+    private ThemeDescription themeMode;
     private CodePluginConfig config;
     private List<CreatorProperty> properties;
     private List<CodeVariable> variables;
@@ -76,11 +76,11 @@ public void setSupportedPlatforms(List<EmbeddedPlatform> supportedPlatforms) {
     }
 
     public boolean isThemeNeeded() {
-        return themeNeeded;
+        return themeMode != null && themeMode.getThemeMode() != ThemeDescription.ThemeMode.NONE ;
     }
 
-    public void setThemeNeeded(boolean themeNeeded) {
-        this.themeNeeded = themeNeeded;
+    public void setThemeMode(ThemeDescription themeMode) {
+        this.themeMode = themeMode;
     }
 
     public SubSystem getSubsystem() {
@@ -195,7 +195,7 @@ public CodePluginItem deepCopy() {
         pluginCopy.setRequiredSourceFiles(requiredSourceFiles);
         pluginCopy.setSubsystem(subsystem);
         pluginCopy.setSupportedPlatforms(supportedPlatforms);
-        pluginCopy.setThemeNeeded(themeNeeded);
+        pluginCopy.setThemeMode(themeMode);
         pluginCopy.setManager(manager);
         pluginCopy.setJavaImpl(javaImpl);
         pluginCopy.setProperties(properties.stream().map(prop -> new CreatorProperty(
@@ -209,12 +209,12 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         CodePluginItem that = (CodePluginItem) o;
-        return themeNeeded == that.themeNeeded && Objects.equals(id, that.id) && Objects.equals(description, that.description) && Objects.equals(extendedDescription, that.extendedDescription) && Objects.equals(supportedPlatforms, that.supportedPlatforms) && Objects.equals(requiredLibraries, that.requiredLibraries) && subsystem == that.subsystem && Objects.equals(imageFileName, that.imageFileName) && Objects.equals(docsLink, that.docsLink) && Objects.equals(config, that.config);
+        return Objects.equals(themeMode, that.themeMode) && Objects.equals(id, that.id) && Objects.equals(description, that.description) && Objects.equals(extendedDescription, that.extendedDescription) && Objects.equals(supportedPlatforms, that.supportedPlatforms) && Objects.equals(requiredLibraries, that.requiredLibraries) && subsystem == that.subsystem && Objects.equals(imageFileName, that.imageFileName) && Objects.equals(docsLink, that.docsLink) && Objects.equals(config, that.config);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, description, extendedDescription, supportedPlatforms, requiredLibraries, subsystem, imageFileName, docsLink, themeNeeded, config);
+        return Objects.hash(id, description, extendedDescription, supportedPlatforms, requiredLibraries, subsystem, imageFileName, docsLink, themeMode, config);
     }
 
     public boolean isJavaPlugin() {

tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/generator/plugin/DefaultXmlPluginLoader.java

@@ -24,6 +24,7 @@
 import com.thecoderscorner.menu.persist.VersionInfo;
 import com.thecoderscorner.menu.persist.XMLDOMHelper;
 import javafx.scene.image.Image;
+import org.hsqldb.lib.StringUtil;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -36,6 +37,7 @@
 import java.nio.file.Paths;
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -544,7 +546,7 @@ private CodeApplicability toSingleApplicability(Element varElement) {
 
     private void generateDescriptionFromXml(Element root, CodePluginItem config) {
         config.setSubsystem(SubSystem.valueOf(root.getAttribute("subsystem")));
-        config.setThemeNeeded(Boolean.parseBoolean(getAttributeOrDefault(root, "needsTheme", "false")));
+        config.setThemeMode(themeFromAttribute(getAttributeOrDefault(root, "needsTheme", "false")));
         config.setId(root.getAttribute("id"));
         config.setDescription(withBundle(root.getAttribute("name")));
         config.setExtendedDescription(withBundle(textOfElementByName(root, "Description")));
@@ -555,6 +557,27 @@ private void generateDescriptionFromXml(Element root, CodePluginItem config) {
         if (docs != null) config.setDocsLink(docs.getAttribute("link"));
     }
 
+    private ThemeDescription themeFromAttribute(String attribute) {
+        if(StringUtil.isEmpty(attribute) || attribute.equals("false")) {
+            return ThemeDescription.NO_THEME;
+        } else if(attribute.equals("true") || attribute.equals("any")) {
+            return ThemeDescription.ANY_THEME;
+        } else if(attribute.startsWith("color")) {
+            return ThemeDescription.colorWithFont(pullFontInfo(attribute));
+        } else if(attribute.equals("mono")) {
+            return ThemeDescription.monoWithFont(pullFontInfo(attribute));
+        } else {
+            return ThemeDescription.NO_THEME;
+        }
+    }
+
+    private FontMode pullFontInfo(String attribute) {
+        Pattern pattern = Pattern.compile("(color|mono|palette)\\[(.*)]");
+        var matcher = pattern.matcher(attribute);
+        if(!matcher.matches()) return FontMode.DEFAULT_FONT;
+        return FontMode.valueOf(matcher.group(2));
+    }
+
     private List<EmbeddedPlatform> supportedPlatformsFromElement(Element sp) {
         var allWildcard = XMLDOMHelper.elementWithName(sp, "All");
         if(allWildcard != null) {

tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/generator/plugin/ThemeDescription.java

@@ -0,0 +1,34 @@
+package com.thecoderscorner.menu.editorui.generator.plugin;
+
+import com.thecoderscorner.menu.editorui.generator.parameters.FontMode;
+public class ThemeDescription {
+
+    public enum ThemeMode { MONO, COLOR, PALETTE, ANY, NONE}
+
+    private final ThemeMode themeMode;
+    private final FontMode fontMode;
+    private ThemeDescription(ThemeMode themeMode, FontMode fontMode) {
+        this.themeMode = themeMode;
+        this.fontMode = fontMode;
+    }
+
+    public static ThemeDescription NO_THEME = new ThemeDescription(ThemeMode.NONE, FontMode.DEFAULT_FONT);
+    public static ThemeDescription ANY_THEME = new ThemeDescription(ThemeMode.ANY, FontMode.DEFAULT_FONT);
+    public static ThemeDescription monoWithFont(FontMode fontMode) {
+        return new ThemeDescription(ThemeMode.MONO, fontMode);
+    }
+    public static ThemeDescription colorWithFont(FontMode fontMode) {
+        return new ThemeDescription(ThemeMode.COLOR, fontMode);
+    }
+    public static ThemeDescription paletteWithFont(FontMode fontMode) {
+        return new ThemeDescription(ThemeMode.COLOR, fontMode);
+    }
+
+    public ThemeMode getThemeMode() {
+        return themeMode;
+    }
+
+    public FontMode getFontMode() {
+        return fontMode;
+    }
+}