From d44b5d395c244594695a3b7edd7317dd21e1b041 Mon Sep 17 00:00:00 2001 From: dave Date: Sun, 15 Sep 2024 10:26:22 +0100 Subject: [PATCH] #519 small clean up of theme text, remove spurious error. --- .../controller/MenuEditorController.java | 10 ++------ xmlPlugins/core-display/adaMbedOled.xml | 2 +- xmlPlugins/core-display/adafruitTrueCpp.xml | 25 +++++++++++++++++-- .../coolBlue/ThemeCoolBlueModernBuilder.h | 1 + .../ThemeCoolBlueTraditionalBuilder.h | 1 + .../darkMode/ThemeDarkModeModernBuilder.h | 1 + .../ThemeDarkModeTraditionalBuilder.h | 1 + .../monoThemes/ThemeMonoBorderedBuilder.h | 2 ++ .../monoThemes/ThemeMonoInverseBuilder.h | 2 ++ 9 files changed, 34 insertions(+), 11 deletions(-) diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/controller/MenuEditorController.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/controller/MenuEditorController.java index 98ef7a42..a2ab9e27 100644 --- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/controller/MenuEditorController.java +++ b/tcMenuGenerator/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 index 299d7129..ba84c478 100644 --- a/xmlPlugins/core-display/adaMbedOled.xml +++ b/xmlPlugins/core-display/adaMbedOled.xml @@ -1,4 +1,4 @@ - - + + + + + + + + + + + @@ -71,8 +81,9 @@ + - + @@ -81,6 +92,16 @@ + + + + + + + + + + diff --git a/xmlPlugins/core-themes/coolBlue/ThemeCoolBlueModernBuilder.h b/xmlPlugins/core-themes/coolBlue/ThemeCoolBlueModernBuilder.h index 2e969f5b..52153258 100644 --- 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 index e67c804a..30e70f97 100644 --- 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 index 9ac1aeb8..24e148f8 100644 --- 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 index 46b4bbc5..61dbc987 100644 --- 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 index b5d0ba95..1dcdff97 100644 --- 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 index ccbdb203..1ef2d8a6 100644 --- 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()