Merge pull request #520 from TcMenu/main-cleanup

#519 small clean up of theme text, remove spurious error.
TcMenu · Sep 15, 2024 · 669b9da · 669b9da
2 parents b7ab079 + d44b5d3
commit 669b9da
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 11 deletions.
diff --git a/...ator/src/main/java/com/thecoderscorner/menu/editorui/controller/MenuEditorController.java b/...ator/src/main/java/com/thecoderscorner/menu/editorui/controller/MenuEditorController.java
@@ -206,14 +206,8 @@ public void checkOnClipboard() {
 
     private void populateAllMenus() {
         if(configStore.isUsingArduinoIDE()) {
-            boolean ok = populateMenu(examplesMenu, installer.findLibraryInstall("tcMenu"), "examples", 0);
-            ok = ok && populateMenu(menuSketches, installer.getArduinoDirectory(), "", 0);
-
-            if(!ok) {
-                editorUI.alertOnError(
-                        bundle.getString("core.arduino.or.libraries.missing"),
-                        "Please check the Arduino and libraries directory from menu 'Edit -> General Settings'");
-            }
+            populateMenu(examplesMenu, installer.findLibraryInstall("tcMenu"), "examples", 0);
+            populateMenu(menuSketches, installer.getArduinoDirectory(), "", 0);
         }
         darkModeMenuFlag.setSelected(BaseDialogSupport.getTheme().equals("darkMode"));
     }

diff --git a/xmlPlugins/core-display/adaMbedOled.xml b/xmlPlugins/core-display/adaMbedOled.xml
@@ -1,4 +1,4 @@
-<TcMenuPlugin name="%adafruit.mbed.oled.name"
+<TcMenuPlugin name="LEGACY Adafruit OLED for Mbed (see newer version)"
               id="8a15d500-410f-489d-b3dc-540b05e630ed" subsystem="DISPLAY"
               requiresDesigner="2.0" needsTheme="true"
               xmlns="https://www.thecoderscorner.com/libraries/tcmenuPluginItem"

diff --git a/xmlPlugins/core-display/adafruitTrueCpp.xml b/xmlPlugins/core-display/adafruitTrueCpp.xml
@@ -53,7 +53,17 @@
         </Property>
     </Properties>
 
-    <ApplicabilityDefs/>
+    <ApplicabilityDefs>
+        <ApplicabilityDef key="MBED_AND_SPI" mode="and">
+            <Applicability whenProperty="TARGET" isValue="MBED_RTOS"/>
+            <Applicability whenProperty="BUS_TYPE" isValue="SPI"/>
+        </ApplicabilityDef>
+
+        <ApplicabilityDef key="NOT_MBED_SPI" mode="and">
+            <Applicability whenProperty="TARGET" isNotValue="MBED_RTOS"/>
+            <Applicability whenProperty="BUS_TYPE" isValue="SPI"/>
+        </ApplicabilityDef>
+    </ApplicabilityDefs>
 
     <SourceFiles>
         <Replacement find="Adafruit_Header" replace="oled/AdafruitSSD1306I2c" whenProperty="BUS_TYPE" isValue="I2C"/>
@@ -71,8 +81,9 @@
 
     <GlobalVariables>
         <Variable name="${SERIAL_BUS}" type="WireType" export="only" whenProperty="BUS_TYPE" isValue="I2C"/>
+        <Variable name="${SERIAL_BUS}" type="SPI" export="only" applicabilityRef="MBED_AND_SPI" />
 
-        <Variable name="${DISPLAY_VARIABLE}" type="AdafruitSSD1306Spi" export="true" whenProperty="BUS_TYPE" isValue="SPI" useNew="true">
+        <Variable name="${DISPLAY_VARIABLE}" type="AdafruitSSD1306Spi" export="true" applicabilityRef="NOT_MBED_SPI" useNew="true">
             <Param value="SPIWithSettings(${SERIAL_BUS}, ${DISPLAY_CS_PIN}, ${DISPLAY_SPI_FREQ})" />
             <Param value="${DISPLAY_RS_PIN}"/>
             <Param value="${DISPLAY_RESET_PIN}"/>
@@ -81,6 +92,16 @@
             <Param value="${TEXT_ENCODING}"/>
             <Param value="${DISPLAY_TYPE}"/>
         </Variable>
+
+        <Variable name="${DISPLAY_VARIABLE}" type="AdafruitSSD1306Spi" export="true" applicabilityRef="MBED_AND_SPI" useNew="true">
+            <Param value="SPIWithSettings(&amp;${SERIAL_BUS}, ${DISPLAY_CS_PIN}, ${DISPLAY_SPI_FREQ})" />
+            <Param value="${DISPLAY_RS_PIN}"/>
+            <Param value="${DISPLAY_RESET_PIN}"/>
+            <Param value="${DISPLAY_HEIGHT}"/>
+            <Param value="${DISPLAY_WIDTH}"/>
+            <Param value="${TEXT_ENCODING}"/>
+            <Param value="${DISPLAY_TYPE}"/>
+        </Variable>
         <Variable name="${DISPLAY_VARIABLE}" type="AdafruitSSD1306I2c" export="true" whenProperty="BUS_TYPE" isValue="I2C" useNew="true">
             <Param value="${SERIAL_BUS}" />
             <Param value="${DISPLAY_RESET_PIN}"/>

diff --git a/xmlPlugins/core-themes/coolBlue/ThemeCoolBlueModernBuilder.h b/xmlPlugins/core-themes/coolBlue/ThemeCoolBlueModernBuilder.h
@@ -27,6 +27,7 @@ const color_t coolBlueActionPalette[] = {RGB(255, 255, 255), RGB(0,45,120), RGB(
 void installCoolBlueModernTheme(GraphicsDeviceRenderer& gr, const MenuFontDef& itemFont, const MenuFontDef& titleFont,
                                 bool needEditingIcons, BaseGraphicalRenderer::TitleMode titleMode, bool useUnicode) {
 
+    // See https://tcmenu.github.io/documentation/arduino-libraries/tc-menu/themes/rendering-with-themes-icons-grids/
     TcThemeBuilder themeBuilder(gr);
 
     themeBuilder.dimensionsFromRenderer()

diff --git a/xmlPlugins/core-themes/coolBlue/ThemeCoolBlueTraditionalBuilder.h b/xmlPlugins/core-themes/coolBlue/ThemeCoolBlueTraditionalBuilder.h
@@ -31,6 +31,7 @@ const color_t coolBlueItemPalette[] = {RGB(255, 255, 255), RGB(0,64,135), RGB(20
 void installCoolBlueTraditionalTheme(GraphicsDeviceRenderer& gr, const MenuFontDef& itemFont, const MenuFontDef& titleFont,
                                                                     bool needEditingIcons, BaseGraphicalRenderer::TitleMode titleMode, bool useUnicode) {
 
+    // See https://tcmenu.github.io/documentation/arduino-libraries/tc-menu/themes/rendering-with-themes-icons-grids/
     TcThemeBuilder themeBuilder(gr);
     bool medResOrBetter = gr.getWidth() > 160;
     MenuPadding titlePadding(medResOrBetter ? 4 : 2);

diff --git a/xmlPlugins/core-themes/darkMode/ThemeDarkModeModernBuilder.h b/xmlPlugins/core-themes/darkMode/ThemeDarkModeModernBuilder.h
@@ -28,6 +28,7 @@ const color_t darkModeActionPalette[] = {RGB(255, 255, 255), RGB(35,35,35), RGB(
 void installDarkModeModernTheme(GraphicsDeviceRenderer& gr, const MenuFontDef& itemFont, const MenuFontDef& titleFont,
                                 bool needEditingIcons, BaseGraphicalRenderer::TitleMode titleMode, bool useUnicode) {
 
+    // See https://tcmenu.github.io/documentation/arduino-libraries/tc-menu/themes/rendering-with-themes-icons-grids/
     TcThemeBuilder themeBuilder(gr);
 
     themeBuilder.dimensionsFromRenderer()

diff --git a/xmlPlugins/core-themes/darkMode/ThemeDarkModeTraditionalBuilder.h b/xmlPlugins/core-themes/darkMode/ThemeDarkModeTraditionalBuilder.h
@@ -25,6 +25,7 @@ const color_t darkModeActionPalette[] = {RGB(255, 255, 255), RGB(35,35,35), RGB(
 void installDarkModeTraditionalTheme(GraphicsDeviceRenderer& gr, const MenuFontDef& itemFont, const MenuFontDef& titleFont,
                                 bool needEditingIcons, BaseGraphicalRenderer::TitleMode titleMode, bool useUnicode) {
 
+    // See https://tcmenu.github.io/documentation/arduino-libraries/tc-menu/themes/rendering-with-themes-icons-grids/
     TcThemeBuilder themeBuilder(gr);
     bool medResOrBetter = gr.getWidth() > 160;
     MenuPadding titlePadding(medResOrBetter ? 4 : 2);

diff --git a/xmlPlugins/core-themes/monoThemes/ThemeMonoBorderedBuilder.h b/xmlPlugins/core-themes/monoThemes/ThemeMonoBorderedBuilder.h
@@ -18,6 +18,8 @@ color_t defaultItemPaletteMono[] = {WHITE, BLACK, WHITE, WHITE};
  */
 void installMonoBorderTitleTheme(GraphicsDeviceRenderer& gr, const MenuFontDef& itemFont, const MenuFontDef& titleFont,
                                  bool needEditingIcons, BaseGraphicalRenderer::TitleMode titleMode, bool useUnicode) {
+
+    // See https://tcmenu.github.io/documentation/arduino-libraries/tc-menu/themes/rendering-with-themes-icons-grids/
     TcThemeBuilder themeBuilder(gr);
     themeBuilder.withSelectedColors(0, 1)
             .dimensionsFromRenderer()

diff --git a/xmlPlugins/core-themes/monoThemes/ThemeMonoInverseBuilder.h b/xmlPlugins/core-themes/monoThemes/ThemeMonoInverseBuilder.h
@@ -19,6 +19,8 @@ color_t defaultTitlePaletteMono[] = {0, 1, 0, 0};
  */
 void installMonoInverseTitleTheme(GraphicsDeviceRenderer& gr, const MenuFontDef& itemFont, const MenuFontDef& titleFont,
                                   bool needEditingIcons, BaseGraphicalRenderer::TitleMode titleMode, bool useUnicode) {
+
+    // See https://tcmenu.github.io/documentation/arduino-libraries/tc-menu/themes/rendering-with-themes-icons-grids/
     TcThemeBuilder themeBuilder(gr);
     themeBuilder.withSelectedColors(0, 2)
             .dimensionsFromRenderer()