Did a scripted search and replace to replace 40 existing theme colors with 11 new theme colors.
This commit is contained in:
jfrickmann
committed by
Raphael Coeffic
Raphael Coeffic
parent
5db5783be5
commit
95b87db3e0
@@ -85,7 +85,7 @@ Clear the LCD screen
|
||||
static int luaLcdClear(lua_State * L)
|
||||
{
|
||||
if (luaLcdAllowed && luaLcdBuffer) {
|
||||
LcdFlags color = luaL_optunsigned(L, 1, DEFAULT_BGCOLOR_INDEX << 16u);
|
||||
LcdFlags color = luaL_optunsigned(L, 1, COLOR_THEME_SECONDARY3_INDEX << 16u);
|
||||
luaLcdBuffer->clear(COLOR(COLOR_VAL(color)));
|
||||
}
|
||||
return 0;
|
||||
@@ -256,8 +256,8 @@ static int luaLcdDrawText(lua_State *L)
|
||||
luaLcdBuffer->drawSolidFilledRect(
|
||||
ix, y - INVERT_BOX_MARGIN,
|
||||
width + 2 * INVERT_BOX_MARGIN, height + 2 * INVERT_BOX_MARGIN,
|
||||
FOCUS_BGCOLOR);
|
||||
att = (att & 0xFFFF) | FOCUS_COLOR;
|
||||
COLOR_THEME_FOCUS);
|
||||
att = (att & 0xFFFF) | COLOR_THEME_PRIMARY2;
|
||||
}
|
||||
|
||||
luaLcdBuffer->drawText(x, y, s, att);
|
||||
@@ -375,8 +375,8 @@ static int luaLcdDrawNumber(lua_State *L)
|
||||
luaLcdBuffer->drawSolidFilledRect(
|
||||
ix, y - INVERT_BOX_MARGIN,
|
||||
width + 2 * INVERT_BOX_MARGIN, height + 2 * INVERT_BOX_MARGIN,
|
||||
FOCUS_BGCOLOR);
|
||||
att = (att & 0xFFFF) | FOCUS_COLOR;
|
||||
COLOR_THEME_FOCUS);
|
||||
att = (att & 0xFFFF) | COLOR_THEME_PRIMARY2;
|
||||
}
|
||||
|
||||
if ((att & SHADOWED) && !(att & INVERS)) {
|
||||
@@ -766,30 +766,30 @@ Set a color for specific area
|
||||
* `TEXT_BGCOLOR`
|
||||
* `TEXT_INVERTED_COLOR`
|
||||
* `TEXT_INVERTED_BGCOLOR`
|
||||
* `LINE_COLOR`
|
||||
* `COLOR_THEME_PRIMARY3`
|
||||
* `SCROLLBOX_COLOR`
|
||||
* `MENU_TITLE_BGCOLOR`
|
||||
* `COLOR_THEME_SECONDARY1_THEME_SECONDARY1`
|
||||
* `MENU_TITLE_COLOR`
|
||||
* `MENU_TITLE_DISABLE_COLOR`
|
||||
* `HEADER_COLOR`
|
||||
* `ALARM_COLOR`
|
||||
* `COLOR_THEME_PRIMARY3`
|
||||
* `COLOR_THEME_SECONDARY1`
|
||||
* `COLOR_THEME_WARNING`
|
||||
* `WARNING_COLOR`
|
||||
* `TEXT_DISABLE_COLOR`
|
||||
* `CURVE_AXIS_COLOR`
|
||||
* `CURVE_COLOR`
|
||||
* `CURVE_CURSOR_COLOR`
|
||||
* `TITLE_BGCOLOR`
|
||||
* `TRIM_BGCOLOR`
|
||||
* `TRIM_SHADOW_COLOR`
|
||||
* `HEADER_BGCOLOR`
|
||||
* `HEADER_ICON_BGCOLOR`
|
||||
* `HEADER_CURRENT_BGCOLOR`
|
||||
* `MAINVIEW_PANES_COLOR`
|
||||
* `MAINVIEW_GRAPHICS_COLOR`
|
||||
* `OVERLAY_COLOR`
|
||||
* `BARGRAPH1_COLOR`
|
||||
* `BARGRAPH2_COLOR`
|
||||
* `BARGRAPH_BGCOLOR`
|
||||
* `COLOR_THEME_DISABLED`
|
||||
* `COLOR_THEME_SECONDARY2`
|
||||
* `COLOR_THEME_SECONDARY1`
|
||||
* `COLOR_THEME_WARNING`
|
||||
* `COLOR_THEME_SECONDARY1`
|
||||
* `COLOR_THEME_FOCUS`
|
||||
* `COLOR_THEME_PRIMARY1`
|
||||
* `COLOR_THEME_FOCUS`
|
||||
* `COLOR_THEME_SECONDARY1`
|
||||
* `COLOR_THEME_FOCUS`
|
||||
* `COLOR_THEME_PRIMARY2`
|
||||
* `COLOR_THEME_SECONDARY1`
|
||||
* `COLOR_THEME_PRIMARY1`
|
||||
* `COLOR_THEME_SECONDARY1`
|
||||
* `COLOR_THEME_SECONDARY2`
|
||||
* `COLOR_THEME_SECONDARY3`
|
||||
* `CUSTOM_COLOR`
|
||||
|
||||
@param color (number) color in 5/6/5 rgb format. The following prefined colors are available
|
||||
|
||||
@@ -1903,62 +1903,27 @@ const luaR_value_entry opentxConstants[] = {
|
||||
{ "COLOR", ZoneOption::Color },
|
||||
{ "BOOL", ZoneOption::Bool },
|
||||
{ "STRING", ZoneOption::String },
|
||||
{ "MENU_HEADER_HEIGHT", COLOR2FLAGS(MENU_HEADER_HEIGHT) },
|
||||
|
||||
// Colors gui/colorlcd/colors.h
|
||||
{ "OS_COLOR_PRIMARY1", COLOR2FLAGS(OS_COLOR_PRIMARY1_INDEX) },
|
||||
{ "OS_COLOR_PRIMARY2", COLOR2FLAGS(OS_COLOR_PRIMARY2_INDEX) },
|
||||
{ "OS_COLOR_PRIMARY3", COLOR2FLAGS(OS_COLOR_PRIMARY3_INDEX) },
|
||||
{ "OS_COLOR_SECONDARY1", COLOR2FLAGS(OS_COLOR_SECONDARY1_INDEX) },
|
||||
{ "OS_COLOR_SECONDARY2", COLOR2FLAGS(OS_COLOR_SECONDARY2_INDEX) },
|
||||
{ "OS_COLOR_SECONDARY3", COLOR2FLAGS(OS_COLOR_SECONDARY3_INDEX) },
|
||||
{ "OS_COLOR_FOCUS", COLOR2FLAGS(OS_COLOR_FOCUS_INDEX) },
|
||||
{ "OS_COLOR_EDIT", COLOR2FLAGS(OS_COLOR_EDIT_INDEX) },
|
||||
{ "OS_COLOR_ACTIVE", COLOR2FLAGS(OS_COLOR_ACTIVE_INDEX) },
|
||||
{ "OS_COLOR_WARNING", COLOR2FLAGS(OS_COLOR_WARNING_INDEX) },
|
||||
|
||||
{ "ALARM_COLOR", COLOR2FLAGS(ALARM_COLOR_INDEX) },
|
||||
{ "BARGRAPH1_COLOR", COLOR2FLAGS(BARGRAPH1_COLOR_INDEX) },
|
||||
{ "BARGRAPH2_COLOR", COLOR2FLAGS(BARGRAPH2_COLOR_INDEX) },
|
||||
{ "BARGRAPH_BGCOLOR", COLOR2FLAGS(BARGRAPH_BGCOLOR_INDEX) },
|
||||
{ "BATTERY_CHARGE_COLOR", COLOR2FLAGS(BATTERY_CHARGE_COLOR_INDEX) },
|
||||
{ "CHECKBOX_COLOR", COLOR2FLAGS(CHECKBOX_COLOR_INDEX) },
|
||||
{ "CURVE_AXIS_COLOR", COLOR2FLAGS(CURVE_AXIS_COLOR_INDEX) },
|
||||
{ "CURVE_COLOR", COLOR2FLAGS(CURVE_COLOR_INDEX) },
|
||||
{ "CURVE_CURSOR_COLOR", COLOR2FLAGS(CURVE_CURSOR_COLOR_INDEX) },
|
||||
{ "COLOR_THEME_PRIMARY1", COLOR2FLAGS(COLOR_THEME_PRIMARY1_INDEX) },
|
||||
{ "COLOR_THEME_PRIMARY2", COLOR2FLAGS(COLOR_THEME_PRIMARY2_INDEX) },
|
||||
{ "COLOR_THEME_PRIMARY3", COLOR2FLAGS(COLOR_THEME_PRIMARY3_INDEX) },
|
||||
{ "COLOR_THEME_SECONDARY1", COLOR2FLAGS(COLOR_THEME_SECONDARY1_INDEX) },
|
||||
{ "COLOR_THEME_SECONDARY2", COLOR2FLAGS(COLOR_THEME_SECONDARY2_INDEX) },
|
||||
{ "COLOR_THEME_SECONDARY3", COLOR2FLAGS(COLOR_THEME_SECONDARY3_INDEX) },
|
||||
{ "COLOR_THEME_FOCUS", COLOR2FLAGS(COLOR_THEME_FOCUS_INDEX) },
|
||||
{ "COLOR_THEME_EDIT", COLOR2FLAGS(COLOR_THEME_EDIT_INDEX) },
|
||||
{ "COLOR_THEME_ACTIVE", COLOR2FLAGS(COLOR_THEME_ACTIVE_INDEX) },
|
||||
{ "COLOR_THEME_WARNING", COLOR2FLAGS(COLOR_THEME_WARNING_INDEX) },
|
||||
{ "COLOR_THEME_DISABLED", COLOR2FLAGS(COLOR_THEME_DISABLED_INDEX) },
|
||||
{ "CUSTOM_COLOR", COLOR2FLAGS(CUSTOM_COLOR_INDEX) },
|
||||
{ "DEFAULT_BGCOLOR", COLOR2FLAGS(DEFAULT_BGCOLOR_INDEX) },
|
||||
{ "DEFAULT_COLOR", COLOR2FLAGS(DEFAULT_COLOR_INDEX) },
|
||||
{ "DISABLE_COLOR", COLOR2FLAGS(DISABLE_COLOR_INDEX) },
|
||||
{ "FOCUS_BGCOLOR", COLOR2FLAGS(FOCUS_BGCOLOR_INDEX) },
|
||||
{ "FOCUS_COLOR", COLOR2FLAGS(FOCUS_COLOR_INDEX) },
|
||||
{ "HEADER_BGCOLOR", COLOR2FLAGS(HEADER_BGCOLOR_INDEX) },
|
||||
{ "HEADER_COLOR", COLOR2FLAGS(HEADER_COLOR_INDEX) },
|
||||
{ "HEADER_CURRENT_BGCOLOR", COLOR2FLAGS(HEADER_CURRENT_BGCOLOR_INDEX) },
|
||||
{ "HEADER_ICON_BGCOLOR", COLOR2FLAGS(HEADER_ICON_BGCOLOR_INDEX) },
|
||||
//{ "HEADER_SEPARATOR_COLOR", COLOR2FLAGS(HEADER_SEPARATOR_COLOR_INDEX) },
|
||||
{ "HIGHLIGHT_COLOR", COLOR2FLAGS(HIGHLIGHT_COLOR_INDEX) },
|
||||
{ "LINE_COLOR", COLOR2FLAGS(LINE_COLOR_INDEX) },
|
||||
{ "MAINVIEW_GRAPHICS_COLOR", COLOR2FLAGS(MAINVIEW_GRAPHICS_COLOR_INDEX) },
|
||||
{ "MAINVIEW_PANES_COLOR", COLOR2FLAGS(MAINVIEW_PANES_COLOR_INDEX) },
|
||||
{ "MENU_BGCOLOR", COLOR2FLAGS(MENU_BGCOLOR_INDEX) },
|
||||
{ "MENU_COLOR", COLOR2FLAGS(MENU_COLOR_INDEX) },
|
||||
{ "MENU_HEADER_HEIGHT", COLOR2FLAGS(MENU_HEADER_HEIGHT) },
|
||||
{ "MENU_HIGHLIGHT_BGCOLOR", COLOR2FLAGS(MENU_HIGHLIGHT_BGCOLOR_INDEX) },
|
||||
{ "MENU_HIGHLIGHT_COLOR", COLOR2FLAGS(MENU_HIGHLIGHT_COLOR_INDEX) },
|
||||
{ "MENU_LINE_COLOR", COLOR2FLAGS(MENU_LINE_COLOR_INDEX) },
|
||||
//{ "MENU_TITLE_BGCOLOR", COLOR2FLAGS(MENU_TITLE_BGCOLOR) },
|
||||
{ "OVERLAY_COLOR", COLOR2FLAGS(OVERLAY_COLOR_INDEX) },
|
||||
{ "SCROLLBAR_COLOR", COLOR2FLAGS(SCROLLBAR_COLOR_INDEX) },
|
||||
{ "TABLE_BGCOLOR", COLOR2FLAGS(TABLE_BGCOLOR_INDEX) },
|
||||
{ "TABLE_HEADER_BGCOLOR", COLOR2FLAGS(TABLE_HEADER_BGCOLOR_INDEX) },
|
||||
{ "TEXT_DISABLE_COLOR", COLOR2FLAGS(TEXT_DISABLE_COLOR_INDEX) },
|
||||
{ "TEXT_STATUSBAR_COLOR", COLOR2FLAGS(TEXT_STATUSBAR_COLOR_INDEX) },
|
||||
{ "TITLE_BGCOLOR", COLOR2FLAGS(TITLE_BGCOLOR_INDEX) },
|
||||
|
||||
// TO DO: Old style theme color constants
|
||||
// Synonyms of the above colors
|
||||
{ "TEXT_COLOR", COLOR2FLAGS(DEFAULT_COLOR_INDEX) },
|
||||
{ "TEXT_BGCOLOR", COLOR2FLAGS(DEFAULT_BGCOLOR_INDEX) },
|
||||
{ "WARNING_COLOR", COLOR2FLAGS(HIGHLIGHT_COLOR_INDEX) },
|
||||
{ "TEXT_COLOR", COLOR2FLAGS(COLOR_THEME_SECONDARY1_INDEX) },
|
||||
{ "TEXT_BGCOLOR", COLOR2FLAGS(COLOR_THEME_SECONDARY3_INDEX) },
|
||||
{ "WARNING_COLOR", COLOR2FLAGS(COLOR_THEME_ACTIVE_INDEX) },
|
||||
|
||||
{ "WHITE", (double)WHITE },
|
||||
{ "GREY", (double)GREY },
|
||||
|
||||
+31
-31
@@ -53,7 +53,7 @@ static int luaLcdClear(lua_State *L)
|
||||
{
|
||||
if (luaLcdAllowed) {
|
||||
#if defined(COLORLCD)
|
||||
LcdFlags color = luaL_optunsigned(L, 1, DEFAULT_BGCOLOR);
|
||||
LcdFlags color = luaL_optunsigned(L, 1, COLOR_THEME_SECONDARY3);
|
||||
lcd->clear(color);
|
||||
#else
|
||||
lcdClear();
|
||||
@@ -810,36 +810,36 @@ Set a color for specific area
|
||||
|
||||
@param area (unsigned number) specific screen area in the list bellow
|
||||
* `CUSTOM_COLOR`
|
||||
* `DEFAULT_COLOR`
|
||||
* `DEFAULT_BGCOLOR`
|
||||
* `FOCUS_COLOR`
|
||||
* `FOCUS_BGCOLOR`
|
||||
* `LINE_COLOR`
|
||||
* `CHECKBOX_COLOR`
|
||||
* `MENU_BGCOLOR`
|
||||
* `MENU_COLOR`
|
||||
* `MENU_TITLE_DISABLE_COLOR`
|
||||
* `HEADER_COLOR`
|
||||
* `ALARM_COLOR`
|
||||
* `HIGHLIGHT_COLOR`
|
||||
* `TEXT_DISABLE_COLOR`
|
||||
* `HEADER_COLOR`
|
||||
* `DISABLE_COLOR`
|
||||
* `CURVE_CURSOR_COLOR`
|
||||
* `TITLE_BGCOLOR`
|
||||
* `TRIM_BGCOLOR`
|
||||
* `TRIM_SHADOW_COLOR`
|
||||
* `MAINVIEW_PANES_COLOR`
|
||||
* `MAINVIEW_GRAPHICS_COLOR`
|
||||
* `MENU_BGCOLOR`
|
||||
* `HEADER_ICON_BGCOLOR`
|
||||
* `HEADER_CURRENT_BGCOLOR`
|
||||
* `MAINVIEW_PANES_COLOR`
|
||||
* `MAINVIEW_GRAPHICS_COLOR`
|
||||
* `OVERLAY_COLOR`
|
||||
* `BARGRAPH1_COLOR`
|
||||
* `BARGRAPH2_COLOR`
|
||||
* `BARGRAPH_BGCOLOR`
|
||||
* `COLOR_THEME_SECONDARY1`
|
||||
* `COLOR_THEME_SECONDARY3`
|
||||
* `COLOR_THEME_PRIMARY2`
|
||||
* `COLOR_THEME_FOCUS`
|
||||
* `COLOR_THEME_PRIMARY3`
|
||||
* `COLOR_THEME_FOCUS`
|
||||
* `COLOR_THEME_PRIMARY2`
|
||||
* `COLOR_THEME_SECONDARY1`
|
||||
* `COLOR_THEME_PRIMARY3`
|
||||
* `COLOR_THEME_SECONDARY1`
|
||||
* `COLOR_THEME_WARNING`
|
||||
* `COLOR_THEME_ACTIVE`
|
||||
* `COLOR_THEME_DISABLED`
|
||||
* `COLOR_THEME_SECONDARY1`
|
||||
* `COLOR_THEME_DISABLED`
|
||||
* `COLOR_THEME_WARNING`
|
||||
* `COLOR_THEME_SECONDARY1`
|
||||
* `COLOR_THEME_FOCUS`
|
||||
* `COLOR_THEME_PRIMARY1`
|
||||
* `COLOR_THEME_PRIMARY2`
|
||||
* `COLOR_THEME_SECONDARY1`
|
||||
* `COLOR_THEME_PRIMARY2`
|
||||
* `COLOR_THEME_SECONDARY1`
|
||||
* `COLOR_THEME_FOCUS`
|
||||
* `COLOR_THEME_PRIMARY2`
|
||||
* `COLOR_THEME_SECONDARY1`
|
||||
* `COLOR_THEME_PRIMARY1`
|
||||
* `COLOR_THEME_SECONDARY1`
|
||||
* `COLOR_THEME_SECONDARY2`
|
||||
* `COLOR_THEME_SECONDARY3`
|
||||
* `CUSTOM_COLOR`
|
||||
|
||||
@param color (number) color in 5/6/5 rgb format. The following prefined colors are available
|
||||
|
||||
Reference in New Issue
Block a user