Merge pull request #3208 from hpwamr/mui

+ Upd: Version files and Changes.txt
2026-06-17 21:03:19 +08:00 · 2021-03-23 18:57:35 +01:00 · 2021-03-23 18:57:35 +01:00 · b099dcb418
commit b099dcb418
parent 0f300d001d 81d285ec11
28 changed files with 129 additions and 6 deletions
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@ -33,13 +33,14 @@ UCD - (UCD)ARDET is an Encoding Detector Library


 ========================================================
-Current BETA/RC Version 5.21.321.(build_#) (2021-03-21)
+Current BETA/RC Version 5.21.323.(build_#) (2021-03-23)
 ========================================================

 --------------------------------------------------------
 NEW:
 --------------------------------------------------------
 [.###.#]- .
+[.323.1]- Decorator styling for Python files.
 [.321.1]- Experimental DarkMode support for Win10 Insider 21Hx Dev-Preview.
 [.321.1]- Exclusive File Lock option.
 [.301.1]- About Dlg: version info for split-off Lexilla component.
@ -51,6 +52,7 @@ NEW:
 CHANGES:
 --------------------------------------------------------
 [.###.#]- .
+[.323.1]- Style color for triple strings in Python Lexer.
 [.316.1]- Cleanup lexilla component.
 [.311.1]- Using some more Scintilla direct call methods instead of SendMessage() thread independent calls. (SCI).
 [.311.1]- Refactoring for splitting Lexilla from Scintilla (SCI).
@ -69,8 +71,9 @@ CHANGES:
 FIXES:
 --------------------------------------------------------
 [.###.#]- .
-[.321.1]- "Regression with vertical slope definition.
-[.321.1]- "Some regressions around external file change notification.
+[.323.1]- Lexer "Python": fixing Format-Strings (f-strings).
+[.321.1]- Regression with vertical slope definition.
+[.321.1]- Some regressions around external file change notification.
 [.316.1]- "grepWinNP3" Language-ID "[xx-YY]" exceeds 5 chars (e.g. [es-419]) (MUI).
 [.312.2]- Limit ChooseFont Dlg to CF_SCALABLEONLY for DirectWrite Technology.
 [.312.1]- Rectangular selection typing issue.
--- a/Versions/day.txt
+++ b/Versions/day.txt
@ -1 +1 @@
-321
+323
--- a/language/np3_af_za/lexer_af_za.rc
+++ b/language/np3_af_za/lexer_af_za.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Kommentaar op Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Kolom 0"
--- a/language/np3_be_by/lexer_be_by.rc
+++ b/language/np3_be_by/lexer_be_by.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Comment Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Слупок 0"
--- a/language/np3_el_gr/lexer_el_gr.rc
+++ b/language/np3_el_gr/lexer_el_gr.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Comment Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Column 0"
--- a/language/np3_en_gb/lexer_en_gb.rc
+++ b/language/np3_en_gb/lexer_en_gb.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Comment Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Column 0"
--- a/language/np3_es_419/lexer_es_419.rc
+++ b/language/np3_es_419/lexer_es_419.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Comment Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Columna 0"
--- a/language/np3_es_es/lexer_es_es.rc
+++ b/language/np3_es_es/lexer_es_es.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Comment Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Columna 0"
--- a/language/np3_fr_fr/lexer_fr_fr.rc
+++ b/language/np3_fr_fr/lexer_fr_fr.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Comment Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Colonne 0"
--- a/language/np3_hi_in/lexer_hi_in.rc
+++ b/language/np3_hi_in/lexer_hi_in.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Comment Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "खंड 0"
--- a/language/np3_hu_hu/lexer_hu_hu.rc
+++ b/language/np3_hu_hu/lexer_hu_hu.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Comment Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Oszlop 0"
--- a/language/np3_id_id/lexer_id_id.rc
+++ b/language/np3_id_id/lexer_id_id.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Comment Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Column 0"
--- a/language/np3_it_it/lexer_it_it.rc
+++ b/language/np3_it_it/lexer_it_it.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Comment Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Colonna 0"
--- a/language/np3_ja_jp/lexer_ja_jp.rc
+++ b/language/np3_ja_jp/lexer_ja_jp.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "コメント Doc 用語"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "列 0"
--- a/language/np3_ko_kr/lexer_ko_kr.rc
+++ b/language/np3_ko_kr/lexer_ko_kr.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "주석 문서 단어"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "열 0"
--- a/language/np3_nl_nl/lexer_nl_nl.rc
+++ b/language/np3_nl_nl/lexer_nl_nl.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Comment Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Kolom 0"
--- a/language/np3_pl_pl/lexer_pl_pl.rc
+++ b/language/np3_pl_pl/lexer_pl_pl.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Komentarz Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Kolumna 0"
--- a/language/np3_pt_br/lexer_pt_br.rc
+++ b/language/np3_pt_br/lexer_pt_br.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Comentário Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Coluna 0"
--- a/language/np3_pt_pt/lexer_pt_pt.rc
+++ b/language/np3_pt_pt/lexer_pt_pt.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Comment Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Coluna 0"
--- a/language/np3_ru_ru/lexer_ru_ru.rc
+++ b/language/np3_ru_ru/lexer_ru_ru.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Comment Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Колонка 0"
--- a/language/np3_sk_sk/lexer_sk_sk.rc
+++ b/language/np3_sk_sk/lexer_sk_sk.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Comment Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Stĺpec 0"
--- a/language/np3_sv_se/lexer_sv_se.rc
+++ b/language/np3_sv_se/lexer_sv_se.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Kommentera Doc ord"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Kolumn 0"
--- a/language/np3_tr_tr/lexer_tr_tr.rc
+++ b/language/np3_tr_tr/lexer_tr_tr.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Comment Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Column 0"
--- a/language/np3_vi_vn/lexer_vi_vn.rc
+++ b/language/np3_vi_vn/lexer_vi_vn.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Comment Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Column 0"
--- a/language/np3_zh_cn/lexer_zh_cn.rc
+++ b/language/np3_zh_cn/lexer_zh_cn.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Comment Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Column 0"
--- a/language/np3_zh_tw/lexer_zh_tw.rc
+++ b/language/np3_zh_tw/lexer_zh_tw.rc
@ -473,6 +473,11 @@ BEGIN
    IDS_LEX_STR_63371       "Comment Doc Word"
 END

+STRINGTABLE
+BEGIN
+    IDS_LEX_STR_63372       "Decorator"
+END
+
 STRINGTABLE
 BEGIN
    IDS_LEX_CSV_COL_0       "Column 0"
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@ -3,7 +3,7 @@
  <assemblyIdentity
    name="Notepad3"
    processorArchitecture="*"
-    version="5.21.321.1"
+    version="5.21.323.1"
    type="win32"
  />
  <description>Notepad3 beta</description>
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@ -8,7 +8,7 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 21
-#define VERSION_REV 321
+#define VERSION_REV 323
 #define VERSION_BUILD 1
 #define SCINTILLA_VER 500
 #define LEXILLA_VER 500