CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2617 from hpwamr/mui

Browse Source 
MUI - Consolidation of all PR before compiling a new version.
This commit is contained in:
Pairi Daiza 2020-08-05 22:51:09 +02:00 committed by GitHub
commit ebd4b81ae3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Build/Changes.txt
View File

@ -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).

2
Versions/day.txt
View File

@ -1 +1 @@
803
805

2
grepWinNP3/src/AboutDlg.cpp
View File

@ -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));

1
language/np3_ja_jp/lexer_ja_jp.rc
View File

@ -467,7 +467,6 @@ BEGIN
IDS_LEX_STR_63367 "Unicode-Point Hover"
IDS_LEX_STR_63368 "2nd Unicode-Point Hover"
END
END
STRINGTABLE
BEGIN

4
res/Notepad3.exe.manifest.conf
View File

@ -3,8 +3,8 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.803.1"
version="5.20.805.1"
type="win32"
/>
<description>Notepad3 BETA</description>
<description>Notepad3 beta</description>
</assembly>

6
src/Version.h
View File

@ -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)

4
src/VersionEx.h
View File

@ -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