Skip to content

Commit 669b9da

Browse files
davetccdavetcc
authored
Merge pull request #520 from TcMenu/main-cleanup
#519 small clean up of theme text, remove spurious error.
2 parents b7ab079 + d44b5d3 commit 669b9da

File tree

9 files changed

+34
-11
lines changed

9 files changed

+34
-11
lines changed

‎tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/controller/MenuEditorController.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,8 @@ public void checkOnClipboard() {
206206

207207
private void populateAllMenus() {
208208
if(configStore.isUsingArduinoIDE()) {
209-
boolean ok = populateMenu(examplesMenu, installer.findLibraryInstall("tcMenu"), "examples", 0);
210-
ok = ok && populateMenu(menuSketches, installer.getArduinoDirectory(), "", 0);
211-
212-
if(!ok) {
213-
editorUI.alertOnError(
214-
bundle.getString("core.arduino.or.libraries.missing"),
215-
"Please check the Arduino and libraries directory from menu 'Edit -> General Settings'");
216-
}
209+
populateMenu(examplesMenu, installer.findLibraryInstall("tcMenu"), "examples", 0);
210+
populateMenu(menuSketches, installer.getArduinoDirectory(), "", 0);
217211
}
218212
darkModeMenuFlag.setSelected(BaseDialogSupport.getTheme().equals("darkMode"));
219213
}

‎xmlPlugins/core-display/adaMbedOled.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<TcMenuPlugin name="%adafruit.mbed.oled.name"
1+
<TcMenuPlugin name="LEGACY Adafruit OLED for Mbed (see newer version)"
22
id="8a15d500-410f-489d-b3dc-540b05e630ed" subsystem="DISPLAY"
33
requiresDesigner="2.0" needsTheme="true"
44
xmlns="https://www.thecoderscorner.com/libraries/tcmenuPluginItem"

‎xmlPlugins/core-display/adafruitTrueCpp.xml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,17 @@
5353
</Property>
5454
</Properties>
5555

56-
<ApplicabilityDefs/>
56+
<ApplicabilityDefs>
57+
<ApplicabilityDef key="MBED_AND_SPI" mode="and">
58+
<Applicability whenProperty="TARGET" isValue="MBED_RTOS"/>
59+
<Applicability whenProperty="BUS_TYPE" isValue="SPI"/>
60+
</ApplicabilityDef>
61+
62+
<ApplicabilityDef key="NOT_MBED_SPI" mode="and">
63+
<Applicability whenProperty="TARGET" isNotValue="MBED_RTOS"/>
64+
<Applicability whenProperty="BUS_TYPE" isValue="SPI"/>
65+
</ApplicabilityDef>
66+
</ApplicabilityDefs>
5767

5868
<SourceFiles>
5969
<Replacement find="Adafruit_Header" replace="oled/AdafruitSSD1306I2c" whenProperty="BUS_TYPE" isValue="I2C"/>
@@ -71,8 +81,9 @@
7181

7282
<GlobalVariables>
7383
<Variable name="${SERIAL_BUS}" type="WireType" export="only" whenProperty="BUS_TYPE" isValue="I2C"/>
84+
<Variable name="${SERIAL_BUS}" type="SPI" export="only" applicabilityRef="MBED_AND_SPI" />
7485

75-
<Variable name="${DISPLAY_VARIABLE}" type="AdafruitSSD1306Spi" export="true" whenProperty="BUS_TYPE" isValue="SPI" useNew="true">
86+
<Variable name="${DISPLAY_VARIABLE}" type="AdafruitSSD1306Spi" export="true" applicabilityRef="NOT_MBED_SPI" useNew="true">
7687
<Param value="SPIWithSettings(${SERIAL_BUS}, ${DISPLAY_CS_PIN}, ${DISPLAY_SPI_FREQ})" />
7788
<Param value="${DISPLAY_RS_PIN}"/>
7889
<Param value="${DISPLAY_RESET_PIN}"/>
@@ -81,6 +92,16 @@
8192
<Param value="${TEXT_ENCODING}"/>
8293
<Param value="${DISPLAY_TYPE}"/>
8394
</Variable>
95+
96+
<Variable name="${DISPLAY_VARIABLE}" type="AdafruitSSD1306Spi" export="true" applicabilityRef="MBED_AND_SPI" useNew="true">
97+
<Param value="SPIWithSettings(&amp;${SERIAL_BUS}, ${DISPLAY_CS_PIN}, ${DISPLAY_SPI_FREQ})" />
98+
<Param value="${DISPLAY_RS_PIN}"/>
99+
<Param value="${DISPLAY_RESET_PIN}"/>
100+
<Param value="${DISPLAY_HEIGHT}"/>
101+
<Param value="${DISPLAY_WIDTH}"/>
102+
<Param value="${TEXT_ENCODING}"/>
103+
<Param value="${DISPLAY_TYPE}"/>
104+
</Variable>
84105
<Variable name="${DISPLAY_VARIABLE}" type="AdafruitSSD1306I2c" export="true" whenProperty="BUS_TYPE" isValue="I2C" useNew="true">
85106
<Param value="${SERIAL_BUS}" />
86107
<Param value="${DISPLAY_RESET_PIN}"/>

‎xmlPlugins/core-themes/coolBlue/ThemeCoolBlueModernBuilder.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ const color_t coolBlueActionPalette[] = {RGB(255, 255, 255), RGB(0,45,120), RGB(
2727
void installCoolBlueModernTheme(GraphicsDeviceRenderer& gr, const MenuFontDef& itemFont, const MenuFontDef& titleFont,
2828
bool needEditingIcons, BaseGraphicalRenderer::TitleMode titleMode, bool useUnicode) {
2929

30+
// See https://tcmenu.github.io/documentation/arduino-libraries/tc-menu/themes/rendering-with-themes-icons-grids/
3031
TcThemeBuilder themeBuilder(gr);
3132

3233
themeBuilder.dimensionsFromRenderer()

‎xmlPlugins/core-themes/coolBlue/ThemeCoolBlueTraditionalBuilder.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ const color_t coolBlueItemPalette[] = {RGB(255, 255, 255), RGB(0,64,135), RGB(20
3131
void installCoolBlueTraditionalTheme(GraphicsDeviceRenderer& gr, const MenuFontDef& itemFont, const MenuFontDef& titleFont,
3232
bool needEditingIcons, BaseGraphicalRenderer::TitleMode titleMode, bool useUnicode) {
3333

34+
// See https://tcmenu.github.io/documentation/arduino-libraries/tc-menu/themes/rendering-with-themes-icons-grids/
3435
TcThemeBuilder themeBuilder(gr);
3536
bool medResOrBetter = gr.getWidth() > 160;
3637
MenuPadding titlePadding(medResOrBetter ? 4 : 2);

‎xmlPlugins/core-themes/darkMode/ThemeDarkModeModernBuilder.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ const color_t darkModeActionPalette[] = {RGB(255, 255, 255), RGB(35,35,35), RGB(
2828
void installDarkModeModernTheme(GraphicsDeviceRenderer& gr, const MenuFontDef& itemFont, const MenuFontDef& titleFont,
2929
bool needEditingIcons, BaseGraphicalRenderer::TitleMode titleMode, bool useUnicode) {
3030

31+
// See https://tcmenu.github.io/documentation/arduino-libraries/tc-menu/themes/rendering-with-themes-icons-grids/
3132
TcThemeBuilder themeBuilder(gr);
3233

3334
themeBuilder.dimensionsFromRenderer()

‎xmlPlugins/core-themes/darkMode/ThemeDarkModeTraditionalBuilder.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ const color_t darkModeActionPalette[] = {RGB(255, 255, 255), RGB(35,35,35), RGB(
2525
void installDarkModeTraditionalTheme(GraphicsDeviceRenderer& gr, const MenuFontDef& itemFont, const MenuFontDef& titleFont,
2626
bool needEditingIcons, BaseGraphicalRenderer::TitleMode titleMode, bool useUnicode) {
2727

28+
// See https://tcmenu.github.io/documentation/arduino-libraries/tc-menu/themes/rendering-with-themes-icons-grids/
2829
TcThemeBuilder themeBuilder(gr);
2930
bool medResOrBetter = gr.getWidth() > 160;
3031
MenuPadding titlePadding(medResOrBetter ? 4 : 2);

‎xmlPlugins/core-themes/monoThemes/ThemeMonoBorderedBuilder.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ color_t defaultItemPaletteMono[] = {WHITE, BLACK, WHITE, WHITE};
1818
*/
1919
void installMonoBorderTitleTheme(GraphicsDeviceRenderer& gr, const MenuFontDef& itemFont, const MenuFontDef& titleFont,
2020
bool needEditingIcons, BaseGraphicalRenderer::TitleMode titleMode, bool useUnicode) {
21+
22+
// See https://tcmenu.github.io/documentation/arduino-libraries/tc-menu/themes/rendering-with-themes-icons-grids/
2123
TcThemeBuilder themeBuilder(gr);
2224
themeBuilder.withSelectedColors(0, 1)
2325
.dimensionsFromRenderer()

‎xmlPlugins/core-themes/monoThemes/ThemeMonoInverseBuilder.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ color_t defaultTitlePaletteMono[] = {0, 1, 0, 0};
1919
*/
2020
void installMonoInverseTitleTheme(GraphicsDeviceRenderer& gr, const MenuFontDef& itemFont, const MenuFontDef& titleFont,
2121
bool needEditingIcons, BaseGraphicalRenderer::TitleMode titleMode, bool useUnicode) {
22+
23+
// See https://tcmenu.github.io/documentation/arduino-libraries/tc-menu/themes/rendering-with-themes-icons-grids/
2224
TcThemeBuilder themeBuilder(gr);
2325
themeBuilder.withSelectedColors(0, 2)
2426
.dimensionsFromRenderer()

0 commit comments

Comments
 (0)