From df51084168b727b97f838ae8b5c12ec21154fdb8 Mon Sep 17 00:00:00 2001 From: Eran Ifrah Date: Thu, 28 Nov 2024 00:49:27 +0200 Subject: [PATCH] Moved basic colour API to clColours Signed-off-by: Eran Ifrah --- Plugin/ThemeImporters/ThemeImporterBase.cpp | 72 +----- Plugin/ThemeImporters/ThemeImporterBase.hpp | 9 - Plugin/ThemeImporters/ThemeImporterDiff.cpp | 16 +- .../ThemeImporters/ThemeImporterErrorlist.cpp | 87 ++++--- Plugin/clColours.cpp | 75 ++++++ Plugin/clColours.h | 11 + .../wxTerminalCtrl/wxTerminalOutputCtrl.cpp | 3 + Runtime/lexers/lexers.json | 232 +++++++++--------- 8 files changed, 258 insertions(+), 247 deletions(-) diff --git a/Plugin/ThemeImporters/ThemeImporterBase.cpp b/Plugin/ThemeImporters/ThemeImporterBase.cpp index a0a8c1f133..d263f86a04 100644 --- a/Plugin/ThemeImporters/ThemeImporterBase.cpp +++ b/Plugin/ThemeImporters/ThemeImporterBase.cpp @@ -70,59 +70,9 @@ wxString adjust_colour(const wxString& col, bool is_dark) } } -wxColour dark_black; -wxColour dark_red; -wxColour dark_green; -wxColour dark_yellow; -wxColour dark_blue; -wxColour dark_magenta; -wxColour dark_cyan; -wxColour dark_grey; -wxColour dark_white; - -wxColour black; -wxColour red; -wxColour green; -wxColour yellow; -wxColour blue; -wxColour magenta; -wxColour cyan; -wxColour grey; -wxColour white; - -void initialize_base_colours() -{ - static bool initialise = true; - - if (initialise) { - // dark theme colours - dark_black = wxColour("#0E1415"); - dark_red = wxColour("#e25d56"); - dark_green = wxColour("#73ca50"); - dark_yellow = wxColour("#e9bf57"); - dark_blue = wxColour("#4a88e4"); - dark_magenta = wxColour("#915caf"); - dark_cyan = wxColour("#23acdd"); - dark_white = wxColour("#f0f0f0"); - dark_grey = "LIGHT GREY"; - - // normal colours - black = wxColour("#000000"); - red = wxColour("#AA3731"); - green = wxColour("#448C27"); - yellow = wxColour("#CB9000"); - blue = wxColour("#325CC0"); - magenta = wxColour("#7A3E9D"); - cyan = wxColour("#0083B2"); - white = wxColour("#BBBBBB"); - grey = "GREY"; - - initialise = false; - } -} } // namespace -ThemeImporterBase::ThemeImporterBase() { initialize_base_colours(); } +ThemeImporterBase::ThemeImporterBase() {} ThemeImporterBase::~ThemeImporterBase() {} @@ -683,23 +633,3 @@ LexerConf::Ptr_t ThemeImporterBase::ImportVSCodeJSON(const wxFileName& theme_fil m_javadocKeyword = m_klass; return lexer; } - -#define RETURN_COLOUR(name) \ - wxColour colour = name; \ - if (dark_theme) { \ - colour = dark_##name; \ - } \ - if (bright) { \ - colour = colour.ChangeLightness(110); \ - } \ - return colour - -wxColour ThemeImporterBase::Black(bool dark_theme, bool bright) { RETURN_COLOUR(black); } -wxColour ThemeImporterBase::Red(bool dark_theme, bool bright) { RETURN_COLOUR(red); } -wxColour ThemeImporterBase::Green(bool dark_theme, bool bright) { RETURN_COLOUR(green); } -wxColour ThemeImporterBase::Yellow(bool dark_theme, bool bright) { RETURN_COLOUR(yellow); } -wxColour ThemeImporterBase::Blue(bool dark_theme, bool bright) { RETURN_COLOUR(blue); } -wxColour ThemeImporterBase::Magenta(bool dark_theme, bool bright) { RETURN_COLOUR(magenta); } -wxColour ThemeImporterBase::Cyan(bool dark_theme, bool bright) { RETURN_COLOUR(cyan); } -wxColour ThemeImporterBase::Grey(bool dark_theme, bool bright) { RETURN_COLOUR(grey); } -wxColour ThemeImporterBase::White(bool dark_theme, bool bright) { RETURN_COLOUR(white); } diff --git a/Plugin/ThemeImporters/ThemeImporterBase.hpp b/Plugin/ThemeImporters/ThemeImporterBase.hpp index 12c4cd19e7..a18a9de95f 100644 --- a/Plugin/ThemeImporters/ThemeImporterBase.hpp +++ b/Plugin/ThemeImporters/ThemeImporterBase.hpp @@ -271,15 +271,6 @@ class WXDLLIMPEXP_SDK ThemeImporterBase * @param codeliteXml [output] the output file name */ virtual LexerConf::Ptr_t Import(const wxFileName& theme_file) = 0; - wxColour Black(bool dark_theme, bool bright = false); - wxColour Red(bool dark_theme, bool bright = false); - wxColour Green(bool dark_theme, bool bright = false); - wxColour Yellow(bool dark_theme, bool bright = false); - wxColour Blue(bool dark_theme, bool bright = false); - wxColour Magenta(bool dark_theme, bool bright = false); - wxColour Cyan(bool dark_theme, bool bright = false); - wxColour Grey(bool dark_theme, bool bright = false); - wxColour White(bool dark_theme, bool bright = false); }; #endif // ECLIPSETHEMEIMPORTERBASE_H diff --git a/Plugin/ThemeImporters/ThemeImporterDiff.cpp b/Plugin/ThemeImporters/ThemeImporterDiff.cpp index 97ff05a110..081503f946 100644 --- a/Plugin/ThemeImporters/ThemeImporterDiff.cpp +++ b/Plugin/ThemeImporters/ThemeImporterDiff.cpp @@ -1,5 +1,7 @@ #include "ThemeImporterDiff.hpp" +#include "clColours.h" + #include ThemeImporterDiff::ThemeImporterDiff() { SetFileExtensions("*.diff;*.patch;Diff;*.Diff"); } @@ -16,18 +18,8 @@ LexerConf::Ptr_t ThemeImporterDiff::Import(const wxFileName& theme_file) AddProperty(lexer, wxSTC_DIFF_COMMAND, "Command", m_klass); AddProperty(lexer, wxSTC_DIFF_HEADER, "Header", m_keyword); AddProperty(lexer, wxSTC_DIFF_POSITION, "Position", m_function); - - // Use pink and forest green - if (IsDarkTheme()) { - // Use more appropriate diff colours - AddProperty(lexer, wxSTC_DIFF_DELETED, "Line Deleted", - wxColour("RED").ChangeLightness(120).GetAsString(wxC2S_HTML_SYNTAX), m_editor.bg_colour, true); - AddProperty(lexer, wxSTC_DIFF_ADDED, "Line Added", - wxColour("GREEN").ChangeLightness(120).GetAsString(wxC2S_HTML_SYNTAX), m_editor.bg_colour, true); - } else { - AddProperty(lexer, wxSTC_DIFF_DELETED, "Line Deleted", "RED", m_editor.bg_colour, true); - AddProperty(lexer, wxSTC_DIFF_ADDED, "Line Added", "rgb(0, 128, 64)", m_editor.bg_colour, true); - } + AddProperty(lexer, wxSTC_DIFF_DELETED, "Line Deleted", clColours::Red(lexer->IsDark()), m_editor.bg_colour, true); + AddProperty(lexer, wxSTC_DIFF_ADDED, "Line Added", clColours::Green(lexer->IsDark()), m_editor.bg_colour, true); FinalizeImport(lexer); return lexer; } diff --git a/Plugin/ThemeImporters/ThemeImporterErrorlist.cpp b/Plugin/ThemeImporters/ThemeImporterErrorlist.cpp index 9336bb5c53..f15c91af0f 100644 --- a/Plugin/ThemeImporters/ThemeImporterErrorlist.cpp +++ b/Plugin/ThemeImporters/ThemeImporterErrorlist.cpp @@ -1,5 +1,6 @@ #include "ThemeImporterErrorlist.hpp" +#include "clColours.h" #include "drawingutils.h" ThemeImporterErrorlist::ThemeImporterErrorlist() @@ -15,55 +16,63 @@ LexerConf::Ptr_t ThemeImporterErrorlist::Import(const wxFileName& theme_file) bool is_dark = DrawingUtils::IsDark(m_editor.bg_colour); AddProperty(lexer, wxSTC_ERR_DEFAULT, "Default", m_editor); - AddProperty(lexer, wxSTC_ERR_PYTHON, "Python error message", Red(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_GCC, "GCC like error message", Red(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_MS, "MSVC error message", Red(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_CMD, "CMD error message", Red(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_BORLAND, "Borland error message", Red(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_PERL, "Perl error message", Red(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_NET, ".NET error message", Red(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_LUA, "LUA error message", Red(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_CTAG, "CTags line", Cyan(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_DIFF_CHANGED, "Diff line changed", Yellow(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_DIFF_ADDITION, "Diff line added", Green(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_DIFF_DELETION, "Diff line deleted", Red(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_DIFF_MESSAGE, "Diff line message", Cyan(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_PHP, "PHP error message", Red(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_ELF, "Essential Lahey Fortran error message", Red(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_IFC, "Intel Fortran Compiler error/warning message", Red(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_IFORT, "Intel Fortran Compiler v8.0 error/warning message", Red(is_dark), + AddProperty(lexer, wxSTC_ERR_PYTHON, "Python error message", clColours::Red(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_GCC, "GCC like error message", clColours::Red(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_MS, "MSVC error message", clColours::Red(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_CMD, "CMD error message", clColours::Red(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_BORLAND, "Borland error message", clColours::Red(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_PERL, "Perl error message", clColours::Red(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_NET, ".NET error message", clColours::Red(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_LUA, "LUA error message", clColours::Red(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_CTAG, "CTags line", clColours::Cyan(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_DIFF_CHANGED, "Diff line changed", clColours::Yellow(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_DIFF_ADDITION, "Diff line added", clColours::Green(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_DIFF_DELETION, "Diff line deleted", clColours::Red(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_DIFF_MESSAGE, "Diff line message", clColours::Cyan(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_PHP, "PHP error message", clColours::Red(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_ELF, "Essential Lahey Fortran error message", clColours::Red(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_ABSF, "Absoft Pro Fortran 90/95 v8.2 error and/or warning message", Red(is_dark), + AddProperty(lexer, wxSTC_ERR_IFC, "Intel Fortran Compiler error/warning message", clColours::Red(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_TIDY, "HTML tidy style", Red(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_JAVA_STACK, "Java stack", Cyan(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_IFORT, "Intel Fortran Compiler v8.0 error/warning message", clColours::Red(is_dark), + m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_ABSF, "Absoft Pro Fortran 90/95 v8.2 error and/or warning message", + clColours::Red(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_TIDY, "HTML tidy style", clColours::Red(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_JAVA_STACK, "Java stack", clColours::Cyan(is_dark), m_editor.bg_colour); AddProperty(lexer, wxSTC_ERR_VALUE, "Value", m_editor); - AddProperty(lexer, wxSTC_ERR_GCC_INCLUDED_FROM, "GCC 'included from'", Grey(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_GCC_INCLUDED_FROM, "GCC 'included from'", clColours::Grey(is_dark), + m_editor.bg_colour); AddProperty(lexer, wxSTC_ERR_ESCSEQ, "ANSI escape sequence", m_editor); - AddProperty(lexer, wxSTC_ERR_ESCSEQ_UNKNOWN, "ANSI escape sequence unknown", Red(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_ESCSEQ_UNKNOWN, "ANSI escape sequence unknown", clColours::Red(is_dark), + m_editor.bg_colour); #if wxCHECK_VERSION(3, 3, 0) - AddProperty(lexer, wxSTC_ERR_GCC_EXCERPT, "GCC code excerpt and pointer to issue", Cyan(is_dark), + AddProperty(lexer, wxSTC_ERR_GCC_EXCERPT, "GCC code excerpt and pointer to issue", clColours::Cyan(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_BASH, "Bash diagnostic line", Red(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_BASH, "Bash diagnostic line", clColours::Red(is_dark), m_editor.bg_colour); #endif - AddProperty(lexer, wxSTC_ERR_ES_BLACK, "ANSI escape black", Black(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_ES_RED, "ANSI escape red", Red(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_ES_GREEN, "ANSI escape green", Green(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_ES_BROWN, "ANSI escape brown", Yellow(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_ES_BLUE, "ANSI escape blue", Blue(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_ES_MAGENTA, "ANSI escape magenta", Magenta(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_ES_CYAN, "ANSI escape cyan", Cyan(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_ES_GRAY, "ANSI escape grey", Grey(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_ES_YELLOW, "ANSI escape yellow", Yellow(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_ES_DARK_GRAY, "ANSI escape dark grey", Grey(is_dark), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_ES_BRIGHT_RED, "ANSI escape bright red", Red(is_dark, true), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_ES_BRIGHT_GREEN, "ANSI escape bright green", Green(is_dark, true), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_ES_BRIGHT_BLUE, "ANSI escape bright blue", Blue(is_dark, true), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_ES_BRIGHT_MAGENTA, "ANSI escape bright magenta", Magenta(is_dark, true), + AddProperty(lexer, wxSTC_ERR_ES_BLACK, "ANSI escape black", clColours::Black(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_ES_RED, "ANSI escape red", clColours::Red(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_ES_GREEN, "ANSI escape green", clColours::Green(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_ES_BROWN, "ANSI escape brown", clColours::Yellow(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_ES_BLUE, "ANSI escape blue", clColours::Blue(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_ES_MAGENTA, "ANSI escape magenta", clColours::Magenta(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_ES_CYAN, "ANSI escape cyan", clColours::Cyan(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_ES_GRAY, "ANSI escape grey", clColours::Grey(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_ES_YELLOW, "ANSI escape yellow", clColours::Yellow(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_ES_DARK_GRAY, "ANSI escape dark grey", clColours::Grey(is_dark), m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_ES_BRIGHT_RED, "ANSI escape bright red", clColours::Red(is_dark, true), + m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_ES_BRIGHT_GREEN, "ANSI escape bright green", clColours::Green(is_dark, true), + m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_ES_BRIGHT_BLUE, "ANSI escape bright blue", clColours::Blue(is_dark, true), + m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_ES_BRIGHT_MAGENTA, "ANSI escape bright magenta", clColours::Magenta(is_dark, true), + m_editor.bg_colour); + AddProperty(lexer, wxSTC_ERR_ES_BRIGHT_CYAN, "ANSI escape bright cyan", clColours::Cyan(is_dark, true), m_editor.bg_colour); - AddProperty(lexer, wxSTC_ERR_ES_BRIGHT_CYAN, "ANSI escape bright cyan", Cyan(is_dark, true), m_editor.bg_colour); FinalizeImport(lexer); return lexer; } diff --git a/Plugin/clColours.cpp b/Plugin/clColours.cpp index ff14b0ac61..682891161e 100644 --- a/Plugin/clColours.cpp +++ b/Plugin/clColours.cpp @@ -108,3 +108,78 @@ void clColours::FromLexer(LexerConf::Ptr_t lexer) } void clColours::InitFromColour(const wxColour& baseColour) { init_from_colour(this, baseColour); } + +wxColour dark_black; +wxColour dark_red; +wxColour dark_green; +wxColour dark_yellow; +wxColour dark_blue; +wxColour dark_magenta; +wxColour dark_cyan; +wxColour dark_grey; +wxColour dark_white; + +wxColour black; +wxColour red; +wxColour green; +wxColour yellow; +wxColour blue; +wxColour magenta; +wxColour cyan; +wxColour grey; +wxColour white; + +namespace +{ +void initialize_base_colours() +{ + static bool initialise = true; + + if (initialise) { + // dark theme colours + dark_black = wxColour("#0E1415"); + dark_red = wxColour("#e25d56"); + dark_green = wxColour("#73ca50"); + dark_yellow = wxColour("#e9bf57"); + dark_blue = wxColour("#4a88e4"); + dark_magenta = wxColour("#915caf"); + dark_cyan = wxColour("#23acdd"); + dark_white = wxColour("#f0f0f0"); + dark_grey = "LIGHT GREY"; + + // normal colours + black = wxColour("#000000"); + red = wxColour("#AA3731"); + green = wxColour("#448C27"); + yellow = wxColour("#CB9000"); + blue = wxColour("#325CC0"); + magenta = wxColour("#7A3E9D"); + cyan = wxColour("#0083B2"); + white = wxColour("#BBBBBB"); + grey = "GREY"; + + initialise = false; + } +} +} // namespace + +#define RETURN_COLOUR(name) \ + initialize_base_colours(); \ + wxColour colour = name; \ + if (dark_theme) { \ + colour = dark_##name; \ + } \ + if (bright) { \ + colour = colour.ChangeLightness(110); \ + } \ + return colour + +wxColour clColours::Black(bool dark_theme, bool bright) { RETURN_COLOUR(black); } +wxColour clColours::Red(bool dark_theme, bool bright) { RETURN_COLOUR(red); } +wxColour clColours::Green(bool dark_theme, bool bright) { RETURN_COLOUR(green); } +wxColour clColours::Yellow(bool dark_theme, bool bright) { RETURN_COLOUR(yellow); } +wxColour clColours::Blue(bool dark_theme, bool bright) { RETURN_COLOUR(blue); } +wxColour clColours::Magenta(bool dark_theme, bool bright) { RETURN_COLOUR(magenta); } +wxColour clColours::Cyan(bool dark_theme, bool bright) { RETURN_COLOUR(cyan); } +wxColour clColours::Grey(bool dark_theme, bool bright) { RETURN_COLOUR(grey); } +wxColour clColours::White(bool dark_theme, bool bright) { RETURN_COLOUR(white); } \ No newline at end of file diff --git a/Plugin/clColours.h b/Plugin/clColours.h index 474f149e8d..231337f0c2 100644 --- a/Plugin/clColours.h +++ b/Plugin/clColours.h @@ -93,6 +93,17 @@ class WXDLLIMPEXP_SDK clColours this->selItemTextColourNoFocus = selItemTextColourNoFocus; } const wxColour& GetSelItemTextColourNoFocus() const { return selItemTextColourNoFocus; } + + // Return common colours suitable for dark or light theme + static wxColour Black(bool dark_theme, bool bright = false); + static wxColour Red(bool dark_theme, bool bright = false); + static wxColour Green(bool dark_theme, bool bright = false); + static wxColour Yellow(bool dark_theme, bool bright = false); + static wxColour Blue(bool dark_theme, bool bright = false); + static wxColour Magenta(bool dark_theme, bool bright = false); + static wxColour Cyan(bool dark_theme, bool bright = false); + static wxColour Grey(bool dark_theme, bool bright = false); + static wxColour White(bool dark_theme, bool bright = false); }; #endif // CLCOLOURS_H diff --git a/Plugin/wxTerminalCtrl/wxTerminalOutputCtrl.cpp b/Plugin/wxTerminalCtrl/wxTerminalOutputCtrl.cpp index da852a8f0a..24af2a7321 100644 --- a/Plugin/wxTerminalCtrl/wxTerminalOutputCtrl.cpp +++ b/Plugin/wxTerminalCtrl/wxTerminalOutputCtrl.cpp @@ -4,6 +4,7 @@ #include "FontUtils.hpp" #include "Platform/Platform.hpp" #include "StringUtils.h" +#include "ThemeImporters/ThemeImporterBase.hpp" #include "clIdleEventThrottler.hpp" #include "clModuleLogger.hpp" #include "clSystemSettings.h" @@ -95,7 +96,9 @@ void wxTerminalOutputCtrl::Initialise(const wxFont& font, const wxColour& bg_col auto lexer = ColoursAndFontsManager::Get().GetLexer("errorlist"); if (lexer) { lexer->Apply(m_ctrl); + m_ctrl->IndicatorSetForeground(INDICATOR_HYPERLINK, clColours::Blue(lexer->IsDark())); } + GetSizer()->Add(m_ctrl, 1, wxEXPAND); GetSizer()->Fit(this); CallAfter(&wxTerminalOutputCtrl::ReloadSettings); diff --git a/Runtime/lexers/lexers.json b/Runtime/lexers/lexers.json index 401dc7c19c..13b1dfcf7c 100644 --- a/Runtime/lexers/lexers.json +++ b/Runtime/lexers/lexers.json @@ -146096,7 +146096,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -146330,7 +146330,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -146564,7 +146564,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -146798,7 +146798,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -147032,7 +147032,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -147266,7 +147266,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -147500,7 +147500,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -147734,7 +147734,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -147968,7 +147968,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -148202,7 +148202,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -148436,7 +148436,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -148670,7 +148670,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -148904,7 +148904,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -149138,7 +149138,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -149372,7 +149372,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -149606,7 +149606,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -149840,7 +149840,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -150074,7 +150074,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -150308,7 +150308,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -150542,7 +150542,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -150776,7 +150776,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -151010,7 +151010,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -151244,7 +151244,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -151478,7 +151478,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -151712,7 +151712,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -151946,7 +151946,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -152180,7 +152180,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -152414,7 +152414,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -152648,7 +152648,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -152882,7 +152882,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -153116,7 +153116,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -153350,7 +153350,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -153584,7 +153584,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -153818,7 +153818,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -154052,7 +154052,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -154286,7 +154286,7 @@ "KeyWords2": "a addindex addtogroup anchor arg attention author b brief bug c callergraph callgraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem", "KeyWords3": "Array Date Math NumberObject URL document window", "KeyWords4": "", - "Extensions": "*.js;*.javascript;*.qml;*.ts;*.tsx", + "Extensions": "*.javascript;*.js;*.qml;*.ts;*.tsx;*.wxcp", "SubstyleBase": 11, "WordSet": [{ "index": 3, @@ -175732,7 +175732,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#282C34", "Size": -1 }, { @@ -176166,7 +176166,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#7A3E9D", + "Colour": "#CB9000", "BgColour": "#FFFFFF", "Size": -1 }, { @@ -176600,7 +176600,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#7A3E9D", + "Colour": "#CB9000", "BgColour": "#FFFFFF", "Size": -1 }, { @@ -177034,7 +177034,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#7A3E9D", + "Colour": "#CB9000", "BgColour": "#FFFFFF", "Size": -1 }, { @@ -177468,7 +177468,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#3F3F3F", "Size": -1 }, { @@ -177902,7 +177902,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#2B2B2B", "Size": -1 }, { @@ -178336,7 +178336,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#234059", "Size": -1 }, { @@ -178770,7 +178770,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#2F4F4F", "Size": -1 }, { @@ -179204,7 +179204,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#2E3436", "Size": -1 }, { @@ -179638,7 +179638,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#7A3E9D", + "Colour": "#CB9000", "BgColour": "#FFFFFF", "Size": -1 }, { @@ -180072,7 +180072,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#000000", "Size": -1 }, { @@ -180506,7 +180506,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#1E1E1E", "Size": -1 }, { @@ -180940,7 +180940,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#101020", "Size": -1 }, { @@ -181374,7 +181374,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#7A3E9D", + "Colour": "#CB9000", "BgColour": "#F5F5F5", "Size": -1 }, { @@ -181808,7 +181808,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#272822", "Size": -1 }, { @@ -182242,7 +182242,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#1D1F21", "Size": -1 }, { @@ -182676,7 +182676,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#262626", "Size": -1 }, { @@ -183110,7 +183110,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#151515", "Size": -1 }, { @@ -183544,7 +183544,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#282C34", "Size": -1 }, { @@ -183978,7 +183978,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#000000", "Size": -1 }, { @@ -184412,7 +184412,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#7A3E9D", + "Colour": "#CB9000", "BgColour": "#E0E0E0", "Size": -1 }, { @@ -184846,7 +184846,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#222324", "Size": -1 }, { @@ -185280,7 +185280,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#12100F", "Size": -1 }, { @@ -185714,7 +185714,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#7A3E9D", + "Colour": "#CB9000", "BgColour": "#FFFFFF", "Size": -1 }, { @@ -186148,7 +186148,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#36312C", "Size": -1 }, { @@ -186582,7 +186582,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#22272E", "Size": -1 }, { @@ -187016,7 +187016,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#292828", "Size": -1 }, { @@ -187450,7 +187450,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#383838", "Size": -1 }, { @@ -187884,7 +187884,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#080A0C", "Size": -1 }, { @@ -188318,7 +188318,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#7A3E9D", + "Colour": "#CB9000", "BgColour": "#FFFFFF", "Size": -1 }, { @@ -188752,7 +188752,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#212933", "Size": -1 }, { @@ -189186,7 +189186,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#002B36", "Size": -1 }, { @@ -189620,7 +189620,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#2E3434", "Size": -1 }, { @@ -190054,7 +190054,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#7A3E9D", + "Colour": "#CB9000", "BgColour": "#FAF1DC", "Size": -1 }, { @@ -190488,7 +190488,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#24283B", "Size": -1 }, { @@ -190922,7 +190922,7 @@ "Name": "ANSI escape brown", "Flags": 0, "FontDesc": "", - "Colour": "#915CAF", + "Colour": "#E9BF57", "BgColour": "#343D46", "Size": -1 }, { @@ -243798,7 +243798,7 @@ "Name": "Line Deleted", "Flags": 2, "FontDesc": "", - "Colour": "RED", + "Colour": "#AA3731", "BgColour": "#FFFFFF", "Size": -1 }, { @@ -243806,7 +243806,7 @@ "Name": "Line Added", "Flags": 2, "FontDesc": "", - "Colour": "rgb(0, 128, 64)", + "Colour": "#448C27", "BgColour": "#FFFFFF", "Size": -1 }, { @@ -243952,7 +243952,7 @@ "Name": "Line Deleted", "Flags": 2, "FontDesc": "", - "Colour": "RED", + "Colour": "#AA3731", "BgColour": "#FFFFFF", "Size": -1 }, { @@ -243960,7 +243960,7 @@ "Name": "Line Added", "Flags": 2, "FontDesc": "", - "Colour": "rgb(0, 128, 64)", + "Colour": "#448C27", "BgColour": "#FFFFFF", "Size": -1 }, { @@ -244106,7 +244106,7 @@ "Name": "Line Deleted", "Flags": 2, "FontDesc": "", - "Colour": "RED", + "Colour": "#AA3731", "BgColour": "#FFFFFF", "Size": -1 }, { @@ -244114,7 +244114,7 @@ "Name": "Line Added", "Flags": 2, "FontDesc": "", - "Colour": "rgb(0, 128, 64)", + "Colour": "#448C27", "BgColour": "#FFFFFF", "Size": -1 }, { @@ -244877,7 +244877,7 @@ "Flags": 2, "FontDesc": "", "Colour": "#FF3333", - "BgColour": "#2e3436", + "BgColour": "#2E3436", "Size": -1 }, { "Id": 6, @@ -244885,7 +244885,7 @@ "Flags": 2, "FontDesc": "", "Colour": "#33FF33", - "BgColour": "#2e3436", + "BgColour": "#2E3436", "Size": -1 }, { "Id": 34, @@ -245030,7 +245030,7 @@ "Name": "Line Deleted", "Flags": 2, "FontDesc": "", - "Colour": "RED", + "Colour": "#AA3731", "BgColour": "#FFFFFF", "Size": -1 }, { @@ -245038,7 +245038,7 @@ "Name": "Line Added", "Flags": 2, "FontDesc": "", - "Colour": "rgb(0, 128, 64)", + "Colour": "#448C27", "BgColour": "#FFFFFF", "Size": -1 }, { @@ -245646,7 +245646,7 @@ "Name": "Line Deleted", "Flags": 2, "FontDesc": "", - "Colour": "RED", + "Colour": "#AA3731", "BgColour": "#F5F5F5", "Size": -1 }, { @@ -245654,7 +245654,7 @@ "Name": "Line Added", "Flags": 2, "FontDesc": "", - "Colour": "rgb(0, 128, 64)", + "Colour": "#448C27", "BgColour": "#F5F5F5", "Size": -1 }, { @@ -246417,7 +246417,7 @@ "Flags": 2, "FontDesc": "", "Colour": "#FF3333", - "BgColour": "#282c34", + "BgColour": "#282C34", "Size": -1 }, { "Id": 6, @@ -246425,7 +246425,7 @@ "Flags": 2, "FontDesc": "", "Colour": "#33FF33", - "BgColour": "#282c34", + "BgColour": "#282C34", "Size": -1 }, { "Id": 34, @@ -246724,16 +246724,16 @@ "Name": "Line Deleted", "Flags": 2, "FontDesc": "", - "Colour": "RED", - "BgColour": "#e0e0e0", + "Colour": "#AA3731", + "BgColour": "#E0E0E0", "Size": -1 }, { "Id": 6, "Name": "Line Added", "Flags": 2, "FontDesc": "", - "Colour": "rgb(0, 128, 64)", - "BgColour": "#e0e0e0", + "Colour": "#448C27", + "BgColour": "#E0E0E0", "Size": -1 }, { "Id": 34, @@ -247033,7 +247033,7 @@ "Flags": 2, "FontDesc": "", "Colour": "#FF3333", - "BgColour": "#12100f", + "BgColour": "#12100F", "Size": -1 }, { "Id": 6, @@ -247041,7 +247041,7 @@ "Flags": 2, "FontDesc": "", "Colour": "#33FF33", - "BgColour": "#12100f", + "BgColour": "#12100F", "Size": -1 }, { "Id": 34, @@ -247186,16 +247186,16 @@ "Name": "Line Deleted", "Flags": 2, "FontDesc": "", - "Colour": "RED", - "BgColour": "#ffffff", + "Colour": "#AA3731", + "BgColour": "#FFFFFF", "Size": -1 }, { "Id": 6, "Name": "Line Added", "Flags": 2, "FontDesc": "", - "Colour": "rgb(0, 128, 64)", - "BgColour": "#ffffff", + "Colour": "#448C27", + "BgColour": "#FFFFFF", "Size": -1 }, { "Id": 34, @@ -247341,7 +247341,7 @@ "Flags": 2, "FontDesc": "", "Colour": "#FF3333", - "BgColour": "#36312c", + "BgColour": "#36312C", "Size": -1 }, { "Id": 6, @@ -247349,7 +247349,7 @@ "Flags": 2, "FontDesc": "", "Colour": "#33FF33", - "BgColour": "#36312c", + "BgColour": "#36312C", "Size": -1 }, { "Id": 34, @@ -247495,7 +247495,7 @@ "Flags": 2, "FontDesc": "", "Colour": "#FF3333", - "BgColour": "#22272e", + "BgColour": "#22272E", "Size": -1 }, { "Id": 6, @@ -247503,7 +247503,7 @@ "Flags": 2, "FontDesc": "", "Colour": "#33FF33", - "BgColour": "#22272e", + "BgColour": "#22272E", "Size": -1 }, { "Id": 34, @@ -247957,7 +247957,7 @@ "Flags": 2, "FontDesc": "", "Colour": "#FF3333", - "BgColour": "#080a0c", + "BgColour": "#080A0C", "Size": -1 }, { "Id": 6, @@ -247965,7 +247965,7 @@ "Flags": 2, "FontDesc": "", "Colour": "#33FF33", - "BgColour": "#080a0c", + "BgColour": "#080A0C", "Size": -1 }, { "Id": 34, @@ -248110,16 +248110,16 @@ "Name": "Line Deleted", "Flags": 2, "FontDesc": "", - "Colour": "RED", - "BgColour": "#ffffff", + "Colour": "#AA3731", + "BgColour": "#FFFFFF", "Size": -1 }, { "Id": 6, "Name": "Line Added", "Flags": 2, "FontDesc": "", - "Colour": "rgb(0, 128, 64)", - "BgColour": "#ffffff", + "Colour": "#448C27", + "BgColour": "#FFFFFF", "Size": -1 }, { "Id": 34, @@ -248573,7 +248573,7 @@ "Flags": 2, "FontDesc": "", "Colour": "#FF3333", - "BgColour": "#2e3434", + "BgColour": "#2E3434", "Size": -1 }, { "Id": 6, @@ -248581,7 +248581,7 @@ "Flags": 2, "FontDesc": "", "Colour": "#33FF33", - "BgColour": "#2e3434", + "BgColour": "#2E3434", "Size": -1 }, { "Id": 34, @@ -248726,16 +248726,16 @@ "Name": "Line Deleted", "Flags": 2, "FontDesc": "", - "Colour": "RED", - "BgColour": "#faf1dc", + "Colour": "#AA3731", + "BgColour": "#FAF1DC", "Size": -1 }, { "Id": 6, "Name": "Line Added", "Flags": 2, "FontDesc": "", - "Colour": "rgb(0, 128, 64)", - "BgColour": "#faf1dc", + "Colour": "#448C27", + "BgColour": "#FAF1DC", "Size": -1 }, { "Id": 34, @@ -248881,7 +248881,7 @@ "Flags": 2, "FontDesc": "", "Colour": "#FF3333", - "BgColour": "#24283b", + "BgColour": "#24283B", "Size": -1 }, { "Id": 6, @@ -248889,7 +248889,7 @@ "Flags": 2, "FontDesc": "", "Colour": "#33FF33", - "BgColour": "#24283b", + "BgColour": "#24283B", "Size": -1 }, { "Id": 34, @@ -249035,7 +249035,7 @@ "Flags": 2, "FontDesc": "", "Colour": "#FF3333", - "BgColour": "#343d46", + "BgColour": "#343D46", "Size": -1 }, { "Id": 6, @@ -249043,7 +249043,7 @@ "Flags": 2, "FontDesc": "", "Colour": "#33FF33", - "BgColour": "#343d46", + "BgColour": "#343D46", "Size": -1 }, { "Id": 34,