2.4 continued (#8092)

Quite a bit of work on 2.4

Co-authored-by: 3djc <Th1sisfmyofmyo>

radio/src/lua/api_general.cpp

@@ -1745,16 +1745,25 @@ const luaL_Reg opentxLib[] = {
 
 const luaR_value_entry opentxConstants[] = {
   { "FULLSCALE", RESX },
+#if defined(COLORLCD)
+  { "XXLSIZE", FONT(XXL) },
+  { "DBLSIZE", FONT(XL) },
+  { "MIDSIZE", FONT(L) },
+  { "SMLSIZE", FONT(XS) },
+  { "TINSIZE", FONT(XXS) },
+#else
   { "XXLSIZE", XXLSIZE },
   { "DBLSIZE", DBLSIZE },
   { "MIDSIZE", MIDSIZE },
   { "SMLSIZE", SMLSIZE },
-#if defined(COLORLCD)
-  { "TINSIZE", TINSIZE },
-#endif
-  { "INVERS", INVERS },
-  { "BOLD", BOLD },
   { "BLINK", BLINK },
+  { "INVERS", INVERS },
+#endif
+#if defined(COLORLCD)
+  { "BOLD", FONT(BOLD) },
+#else
+  { "BOLD", BOLD },
+#endif
   { "RIGHT", RIGHT },
   { "LEFT", LEFT },
   { "CENTER", CENTERED },
@@ -1789,32 +1798,24 @@ const luaR_value_entry opentxConstants[] = {
   { "COLOR", ZoneOption::Color },
   { "BOOL", ZoneOption::Bool },
   { "STRING", ZoneOption::String },
-  { "CUSTOM_COLOR", CUSTOM_COLOR },
   { "DEFAULT_COLOR", DEFAULT_COLOR },
   { "DEFAULT_BGCOLOR", DEFAULT_BGCOLOR },
   { "FOCUS_COLOR", FOCUS_COLOR },
   { "FOCUS_BGCOLOR", FOCUS_BGCOLOR },
-  { "LINE_COLOR", LINE_COLOR },
-  { "CHECKBOX_COLOR", CHECKBOX_COLOR },
-  { "MENU_BGCOLOR", MENU_BGCOLOR },
-  { "MENU_COLOR", MENU_COLOR },
-  { "MENU_TITLE_DISABLE_COLOR", MENU_TITLE_DISABLE_COLOR },
-  { "ALARM_COLOR", ALARM_COLOR },
-  { "HIGHLIGHT_COLOR", HIGHLIGHT_COLOR },
-  { "TEXT_DISABLE_COLOR", TEXT_DISABLE_COLOR },
-  { "HEADER_COLOR", HEADER_COLOR },
   { "DISABLE_COLOR", DISABLE_COLOR },
-  { "CURVE_COLOR", CURVE_COLOR },
-  { "CURVE_CURSOR_COLOR", CURVE_CURSOR_COLOR },
-  { "TITLE_BGCOLOR", TITLE_BGCOLOR },
-  { "TRIM_BGCOLOR", TRIM_BGCOLOR },
-  { "TRIM_SHADOW_COLOR", TRIM_SHADOW_COLOR },
-  { "MAINVIEW_PANES_COLOR", MAINVIEW_PANES_COLOR },
-  { "MAINVIEW_GRAPHICS_COLOR", MAINVIEW_GRAPHICS_COLOR },
-  { "HEADER_BGCOLOR", HEADER_BGCOLOR },
-  { "HEADER_ICON_BGCOLOR", HEADER_ICON_BGCOLOR },
-  { "HEADER_CURRENT_BGCOLOR", HEADER_CURRENT_BGCOLOR },
+  { "HIGHLIGHT_COLOR", HIGHLIGHT_COLOR },
+  { "CHECKBOX_COLOR", CHECKBOX_COLOR },
+  { "SCROLLBAR_COLOR", SCROLLBAR_COLOR },
+  { "MENU_COLOR", MENU_COLOR },
+  { "MENU_BGCOLOR", MENU_BGCOLOR },
+  // TODO : FIX { "MENU_TITLE_BGCOLOR", MENU_TITLE_BGCOLOR },
+  { "MENU_LINE_COLOR", MENU_LINE_COLOR },
+  { "MENU_HIGHLIGHT_COLOR", MENU_HIGHLIGHT_COLOR },
+  { "MENU_HIGHLIGHT_BGCOLOR", MENU_HIGHLIGHT_BGCOLOR },
   { "OVERLAY_COLOR", OVERLAY_COLOR },
+  { "TABLE_BGCOLOR", TABLE_BGCOLOR },
+  { "TABLE_HEADER_BGCOLOR", TABLE_HEADER_BGCOLOR },
+  { "CUSTOM_COLOR", CUSTOM_COLOR },
   { "MENU_HEADER_HEIGHT", MENU_HEADER_HEIGHT },
   { "WHITE", (double)WHITE },
   { "GREY", (double)GREY },