From 28079d3bfa07e8ff729ae4c0cbc3296aff2923ee Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Fri, 15 Apr 2022 23:28:11 +0200 Subject: [PATCH] MUI: Fix Minor adaption of "Sombra" scheme to correct Dark Blue color. --- Build/Changes.txt | 3 ++- Build/Themes/Sombra.ini | 2 -- Versions/day.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/StyleLexers/styleLexPROPS.c | 2 +- src/StyleLexers/styleLexPS.c | 2 +- src/StyleLexers/styleLexPY.c | 4 ++-- src/StyleLexers/styleLexXML.c | 2 +- src/VersionEx.h | 2 +- .../INI_Notepad3_01.ini | Bin .../INI_Old_Reg_01.ini | Bin 11 files changed, 10 insertions(+), 11 deletions(-) rename test/test_files/StyleLexers/{styleLexCONF => styleLexPROPS}/INI_Notepad3_01.ini (100%) rename test/test_files/StyleLexers/{styleLexCONF => styleLexPROPS}/INI_Old_Reg_01.ini (100%) diff --git a/Build/Changes.txt b/Build/Changes.txt index 9f8c0c6a1..6b7b71490 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -34,7 +34,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library ======================================================== -Current BETA/RC Version 5.22.414.(build_#) (2022-04-14) +Current BETA/RC Version 5.22.415.(build_#) (2022-04-15) ======================================================== -------------------------------------------------------- @@ -90,6 +90,7 @@ CHANGES Versions in Tools or Libraries: FIXES: -------------------------------------------------------- [.###.#]- . +[.415.1]- Minor adaption of "Sombra" scheme to correct Dark Blue color. [.414.1]- Dark mode color style scheme global from common base/2nd. [.414.1]- Writing wrong scheme to .ini-file. [.414.1]- Missing assert include for Win32/x86 compile config. diff --git a/Build/Themes/Sombra.ini b/Build/Themes/Sombra.ini index 9a82085bd..f2afe1d19 100644 --- a/Build/Themes/Sombra.ini +++ b/Build/Themes/Sombra.ini @@ -463,7 +463,6 @@ Keyword=bold; fore:#F8B076 String=fore:#61F75F Number=fore:#F20C0D Operator=bold -Variable=fore:#B4E1F5 Cmdlet=fore:#F8B076; back:#544604 Alias=bold; fore:#B4E1F5 [Python Script] @@ -641,7 +640,6 @@ ASP VBS Number=fore:#F20C0D XML Tag=fore:#E96EE1 XML Attribute=fore:#F7A163 XML Value=fore:#A2B7E7 -XML String=fore:#A2B7E7 XML Other Inside Tag=fore:#A2B7E7 XML Comment=fore:#999999 XML Entity=fore:#F651F6 diff --git a/Versions/day.txt b/Versions/day.txt index d1b9f6a9c..21c8d99fe 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -414 +415 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 41ea2f3e4..5cf3412ff 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 beta diff --git a/src/StyleLexers/styleLexPROPS.c b/src/StyleLexers/styleLexPROPS.c index 60d388e76..27f10b567 100644 --- a/src/StyleLexers/styleLexPROPS.c +++ b/src/StyleLexers/styleLexPROPS.c @@ -11,7 +11,7 @@ EDITLEXER lexPROPS = &KeyWords_PROPS, { { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_PROPS_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, - { {SCE_PROPS_KEY}, IDS_LEX_STR_63348, L"Key", L"fore:#00006D", L"" }, + { {SCE_PROPS_KEY}, IDS_LEX_STR_63348, L"Key", L"fore:#0089DB", L"" }, { {SCE_PROPS_COMMENT}, IDS_LEX_STR_63127, L"Comment", L"fore:#008000", L"" }, { {SCE_PROPS_SECTION}, IDS_LEX_STR_63232, L"Section", L"bold; fore:#000000; back:#FF8040; eolfilled", L"" }, { {SCE_PROPS_ASSIGNMENT}, IDS_LEX_STR_63233, L"Assignment", L"fore:#FF0000", L"" }, diff --git a/src/StyleLexers/styleLexPS.c b/src/StyleLexers/styleLexPS.c index 0a33b1479..bd3c6d661 100644 --- a/src/StyleLexers/styleLexPS.c +++ b/src/StyleLexers/styleLexPS.c @@ -66,7 +66,7 @@ EDITLEXER lexPS = { {MULTI_STYLE(SCE_POWERSHELL_STRING,SCE_POWERSHELL_CHARACTER,0,0)}, IDS_LEX_STR_63131, L"String", L"fore:#008000", L"" }, { {SCE_POWERSHELL_NUMBER}, IDS_LEX_STR_63130, L"Number", L"fore:#FF0000", L"" }, { {SCE_POWERSHELL_OPERATOR}, IDS_LEX_STR_63132, L"Operator", L"bold", L"" }, - { {SCE_POWERSHELL_VARIABLE}, IDS_LEX_STR_63249, L"Variable", L"fore:#0A246A", L"" }, + { {SCE_POWERSHELL_VARIABLE}, IDS_LEX_STR_63249, L"Variable", L"fore:#0089DB", L"" }, { {MULTI_STYLE(SCE_POWERSHELL_CMDLET,SCE_POWERSHELL_FUNCTION,0,0)}, IDS_LEX_STR_63250, L"Cmdlet", L"fore:#804000; back:#FFF1A8", L"" }, { {SCE_POWERSHELL_ALIAS}, IDS_LEX_STR_63251, L"Alias", L"bold; fore:#0A246A", L"" }, EDITLEXER_SENTINEL diff --git a/src/StyleLexers/styleLexPY.c b/src/StyleLexers/styleLexPY.c index ef089cc58..e85c5520c 100644 --- a/src/StyleLexers/styleLexPY.c +++ b/src/StyleLexers/styleLexPY.c @@ -36,8 +36,8 @@ EDITLEXER lexPY = { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_P_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, { {MULTI_STYLE(SCE_P_COMMENTLINE,SCE_P_COMMENTBLOCK,0,0)}, IDS_LEX_STR_63127, L"Comment", L"fore:#007F00", L"" }, - { {SCE_P_WORD}, IDS_LEX_STR_63128, L"Keyword", L"bold; fore:#00007F", L"" }, - { {SCE_P_WORD2}, IDS_LEX_STR_63260, L"Keyword 2nd", L"fore:#000088", L"" }, + { {SCE_P_WORD}, IDS_LEX_STR_63128, L"Keyword", L"bold; fore:#00006D", L"" }, + { {SCE_P_WORD2}, IDS_LEX_STR_63260, L"Keyword 2nd", L"fore:#0089DB", L"" }, { {SCE_P_IDENTIFIER}, IDS_LEX_STR_63129, L"Identifier", L"", L"" }, { {SCE_P_ATTRIBUTE}, IDS_LEX_STR_63337, L"Attribute", L"fore:#008E8E", L"" }, { {MULTI_STYLE(SCE_P_CHARACTER,SCE_P_FCHARACTER,0,0)}, IDS_LEX_STR_63212, L"String Single Quoted", L"fore:#008800", L"" }, diff --git a/src/StyleLexers/styleLexXML.c b/src/StyleLexers/styleLexXML.c index 8fc9f0567..d39eee32d 100644 --- a/src/StyleLexers/styleLexXML.c +++ b/src/StyleLexers/styleLexXML.c @@ -13,7 +13,7 @@ EDITLEXER lexXML = { {MULTI_STYLE(SCE_H_TAG,SCE_H_TAGUNKNOWN,SCE_H_TAGEND,0)}, IDS_LEX_STR_63187, L"XML Tag", L"fore:#881280", L"" }, { {MULTI_STYLE(SCE_H_ATTRIBUTE,SCE_H_ATTRIBUTEUNKNOWN,0,0)}, IDS_LEX_STR_63188, L"XML Attribute", L"fore:#994500", L"" }, { {SCE_H_VALUE}, IDS_LEX_STR_63189, L"XML Value", L"fore:#1A1AA6", L"" }, - { {MULTI_STYLE(SCE_H_DOUBLESTRING,SCE_H_SINGLESTRING,0,0)}, IDS_LEX_STR_63190, L"XML String", L"fore:#1A1AA6", L"" }, + { {MULTI_STYLE(SCE_H_DOUBLESTRING,SCE_H_SINGLESTRING,0,0)}, IDS_LEX_STR_63190, L"XML String", L"fore:#0089DB", L"" }, { {SCE_H_OTHER}, IDS_LEX_STR_63191, L"XML Other Inside Tag", L"fore:#1A1AA6", L"" }, { {MULTI_STYLE(SCE_H_COMMENT,SCE_H_XCCOMMENT,0,0)}, IDS_LEX_STR_63192, L"XML Comment", L"fore:#646464", L"" }, { {SCE_H_ENTITY}, IDS_LEX_STR_63193, L"XML Entity", L"fore:#B000B0", L"" }, diff --git a/src/VersionEx.h b/src/VersionEx.h index 18a33fa26..5faa7bc42 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,7 +8,7 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 22 -#define VERSION_REV 414 +#define VERSION_REV 415 #define VERSION_BUILD 1 #define SCINTILLA_VER 520 #define LEXILLA_VER 515 diff --git a/test/test_files/StyleLexers/styleLexCONF/INI_Notepad3_01.ini b/test/test_files/StyleLexers/styleLexPROPS/INI_Notepad3_01.ini similarity index 100% rename from test/test_files/StyleLexers/styleLexCONF/INI_Notepad3_01.ini rename to test/test_files/StyleLexers/styleLexPROPS/INI_Notepad3_01.ini diff --git a/test/test_files/StyleLexers/styleLexCONF/INI_Old_Reg_01.ini b/test/test_files/StyleLexers/styleLexPROPS/INI_Old_Reg_01.ini similarity index 100% rename from test/test_files/StyleLexers/styleLexCONF/INI_Old_Reg_01.ini rename to test/test_files/StyleLexers/styleLexPROPS/INI_Old_Reg_01.ini