From 584ac8c883ec52587eeed985389fff6b6300413f Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Wed, 5 Aug 2020 22:33:05 +0200 Subject: [PATCH 1/3] MUI - Small correction in ja-JP and add (x86) in grepWinNP3 - AboutBox --- grepWinNP3/src/AboutDlg.cpp | 2 +- language/np3_ja_jp/lexer_ja_jp.rc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/grepWinNP3/src/AboutDlg.cpp b/grepWinNP3/src/AboutDlg.cpp index 4410ab676..e752d371e 100644 --- a/grepWinNP3/src/AboutDlg.cpp +++ b/grepWinNP3/src/AboutDlg.cpp @@ -78,7 +78,7 @@ LRESULT CAboutDlg::DlgFunc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam #if defined(_WIN64) _stprintf_s(buf, _countof(buf), L"grepWinNP3 (x64) version %ld.%ld.%ld.%ld", GREPWIN_VERMAJOR, GREPWIN_VERMINOR, GREPWIN_VERMICRO, GREPWIN_VERBUILD); #else - _stprintf_s(buf, _countof(buf), L"grepWinNP3 version %ld.%ld.%ld.%ld", GREPWIN_VERMAJOR, GREPWIN_VERMINOR, GREPWIN_VERMICRO, GREPWIN_VERBUILD); + _stprintf_s(buf, _countof(buf), L"grepWinNP3 (x86) version %ld.%ld.%ld.%ld", GREPWIN_VERMAJOR, GREPWIN_VERMINOR, GREPWIN_VERMICRO, GREPWIN_VERBUILD); #endif SetDlgItemText(*this, IDC_VERSIONINFO, buf); SetDlgItemText(*this, IDC_DATE, TEXT(GREPWIN_VERDATE)); diff --git a/language/np3_ja_jp/lexer_ja_jp.rc b/language/np3_ja_jp/lexer_ja_jp.rc index b7a7c304f..4e76fc856 100644 --- a/language/np3_ja_jp/lexer_ja_jp.rc +++ b/language/np3_ja_jp/lexer_ja_jp.rc @@ -467,7 +467,6 @@ BEGIN IDS_LEX_STR_63367 "Unicode-Point Hover" IDS_LEX_STR_63368 "2nd Unicode-Point Hover" END -END STRINGTABLE BEGIN From ee7c9952630ba0ab5f8ce24ca7930e07dbcadd6c Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Wed, 5 Aug 2020 22:34:19 +0200 Subject: [PATCH 2/3] + ver: VS2019 version update - VS 16.7.0 --- src/Version.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Version.h b/src/Version.h index 888310078..6e7a3ee12 100644 --- a/src/Version.h +++ b/src/Version.h @@ -73,7 +73,11 @@ #undef VER_CPL #if defined(_MSC_VER) - #if (_MSC_VER == 1926) + #if (_MSC_VER == 1927) + #if(_MSC_FULL_VER >= 192729110) + #define VER_CPL MS Visual C++ 2019 v16.7.0 + #endif + #elif (_MSC_VER == 1926) #if(_MSC_FULL_VER >= 192628806) #define VER_CPL MS Visual C++ 2019 v16.6.(1-5) #elif(_MSC_FULL_VER >= 192628805) From 1788623b7a288480c311603a776c61a49f6a34cb Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Wed, 5 Aug 2020 22:35:30 +0200 Subject: [PATCH 3/3] + upd: Version files and Changes.txt --- Build/Changes.txt | 9 +++++++-- Versions/day.txt | 2 +- res/Notepad3.exe.manifest.conf | 4 ++-- src/VersionEx.h | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index fddc2078e..48563a647 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -33,7 +33,7 @@ SUP - (S)et(UP) / Installer Package ===================================================== -Current BETA Version 5.20.803.(build_#) (2020-08-03) +Current BETA Version 5.20.805.(build_#) (2020-08-05) ===================================================== ----------------------------------------------------- @@ -50,6 +50,8 @@ NEW: CHANGES: ----------------------------------------------------- [.###.#]- +[.805.1]- "grepWinNP3": add OS architecture (x64) - AboutBox (GRE) +[.805.1]- Replace "64-bit"/"BETA" by "x64"/"beta" to shorter the version name. [.803.1]- Title font change DPI-Awareness for About and Customize Schemes dialog. [.802.1]- Resample scaling of info-box icons on DPI change. [.802.1]- Revert System's Message box for "save confirmation" (if message beeps are allowed). @@ -57,7 +59,7 @@ CHANGES: [.729.1]- DPI-Aware About & Custom.Scheme dialog. [.729.1]- Swap Shortcuts: "Search in Files" -> "Ctrl+Shift+F" and Toggle Folds -> "Ctrl+Alt+F". [.723.1]- Review document modified handler (dirty-flag). -[.724.1]- Update grepWinNP3 (GRE) version 2.1.3.21 (2020-07-24). +[.805.1]- Update grepWinNP3 (GRE) version 2.1.3.22 (2020-08-05). [.722.2]- Update Oniguruma Regex (ONI) engine version 6.9.6 (2020-07-05). [.724.1]- Update Scintilla Library (SCI) version 4.4.4 (2020-07-21). @@ -71,6 +73,9 @@ ENHANCEMENT: FIXES: ----------------------------------------------------- [.###.#]- +[.805.1]- Unicode Point detection and enhanced Color Tag contrast on hoover. +[.805.1]- DPI-Awareness of "Customize Schemes..." dialog icon eye sugar. +[.805.1]- DateTime and Timestamp handling. [.803.1]- No read-only file attribute if removed externally. [.802.1]- Some more DPI-Awareness issues. [.801.1]- Ensure selection visible (scroll to current position). diff --git a/Versions/day.txt b/Versions/day.txt index 25e1ae45f..cc34bb397 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -803 +805 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index ea293c0df..2f056df17 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,8 +3,8 @@ - Notepad3 BETA + Notepad3 beta diff --git a/src/VersionEx.h b/src/VersionEx.h index 8964a0225..5af5e6408 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,12 +8,12 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 20 -#define VERSION_REV 803 +#define VERSION_REV 805 #define VERSION_BUILD 1 #define SCINTILLA_VER 444 #define ONIGURUMA_REGEX_VER 6.9.5 #define UCHARDET_VER 2018.09.27 #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.1.0 -#define VERSION_PATCH BETA +#define VERSION_PATCH beta #define VERSION_COMMIT_ID dkt1-amr