diff --git a/Build/Changes.txt b/Build/Changes.txt index 6e4e52d18..1f72e4b0d 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -31,14 +31,14 @@ UCD - (UCD)ARDET is an Encoding Detector Library ===================================================== -Current RC3 Version 5.20.315.(build_#) (2020-03-15) +Current RC3 Version 5.20.316.(build_#) (2020-03-16) // Version 5.20.3xx.x (xx March 2020) ===================================================== ----------------------------------------------------- NEW: ----------------------------------------------------- -- remove scaling of Toolbar image for DPI (avoid blurry images) +- Remove scaling of Toolbar image for DPI (avoid blurry images). - "Open with Notepad3" Right-Click in Explorer Context Menu. - In About Resources: Data Sharing Service from https://workupload.com/. - Automatic scrolling when dragging text near window edge. @@ -58,7 +58,7 @@ NEW: CHANGES: ----------------------------------------------------- - Update "KeyboardShortcuts.txt". -- Split undo typing sequence by line-breaks default -> true +- Split undo typing sequence by line-breaks default -> true. - Add file history to to recent docs (taskbar) jumplist. - NP3 INI file read/write using file locking (shared read / exclusive write) for multiple instances. - Reset build-of-the-day number in AppVeyor on new day. diff --git a/Build/Docs/KeyboardShortcuts.txt b/Build/Docs/KeyboardShortcuts.txt index c0710f2cc..b5a2b601f 100644 --- a/Build/Docs/KeyboardShortcuts.txt +++ b/Build/Docs/KeyboardShortcuts.txt @@ -8,7 +8,7 @@ ================================================================================ -*** Keyboard Shortcuts *** date: 2020/03/15 +*** Keyboard Shortcuts *** date: 2020/03/16 --------------------------------------------------------- @@ -21,7 +21,7 @@ Ctrl+S Save file. F6 Save file as... Ctrl+F6 Save file Copy... - Ctrl+Alt+F6 Save with Original file &Date/Time. + Ctrl+Alt+F6 Save with Original file "Date/Time". Ctrl+P Print file... Ctrl+M Run MiniPath file Browser plugin... Ctrl+Alt+H Open Recent file (History)... diff --git a/Build/notepad3_setup.iss b/Build/notepad3_setup.iss index 5b27d505b..ac989443b 100644 --- a/Build/notepad3_setup.iss +++ b/Build/notepad3_setup.iss @@ -196,6 +196,7 @@ Source: {#bindir}\Release_x86_v142\lng\zh-CN\mplng.dll.mui; DestDir: {ap Source: {#bindir}\Release_x64_v142\lng\zh-CN\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: Is64BitInstallMode() Source: {#bindir}\Release_x86_v142\lng\zh-CN\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: Docs\KeyboardShortcuts.txt; DestDir: {app}\Docs; Flags: ignoreversion +Source: Docs\Oniguruma_RE.txt; DestDir: {app}\Docs; Flags: ignoreversion Source: Docs\Notepad3.txt; DestDir: {app}\Docs; Flags: ignoreversion Source: Docs\crypto\encryption-doc.txt; DestDir: {app}\Docs\crypto; Flags: ignoreversion Source: Docs\crypto\read_me.txt; DestDir: {app}\Docs\crypto; Flags: ignoreversion diff --git a/Build/notepad3_x86_setup.iss b/Build/notepad3_x86_setup.iss index cfa0cb7a8..7e888687d 100644 --- a/Build/notepad3_x86_setup.iss +++ b/Build/notepad3_x86_setup.iss @@ -152,6 +152,7 @@ Source: {#bindir}\Release_x86_v142\lng\sv-SE\np3lng.dll.mui; DestDir: {ap Source: {#bindir}\Release_x86_v142\lng\zh-CN\mplng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion Source: {#bindir}\Release_x86_v142\lng\zh-CN\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion Source: Docs\KeyboardShortcuts.txt; DestDir: {app}\Docs; Flags: ignoreversion +Source: Docs\Oniguruma_RE.txt; DestDir: {app}\Docs; Flags: ignoreversion Source: Docs\Notepad3.txt; DestDir: {app}\Docs; Flags: ignoreversion Source: Docs\crypto\encryption-doc.txt; DestDir: {app}\Docs\crypto; Flags: ignoreversion Source: Docs\crypto\read_me.txt; DestDir: {app}\Docs\crypto; Flags: ignoreversion diff --git a/Versions/build.txt b/Versions/build.txt index d00491fd7..0cfbf0888 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -1 +2 diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd index 5ba79a49d..4f403507f 100644 --- a/np3portableapp/build_np3portableapp.cmd +++ b/np3portableapp/build_np3portableapp.cmd @@ -94,6 +94,7 @@ copy "%NP3_DISTRIB_DIR%\License.txt" "%NP3_PORTAPP_DIR%\Other\Help\License.txt" copy "%NP3_DISTRIB_DIR%\Readme.txt" "%NP3_PORTAPP_DIR%\Other\Help\Readme.txt" /Y /V copy "%NP3_DOC_DIR%\Notepad3.txt" "%NP3_PORTAPP_DIR%\Other\Help\Notepad3.txt" /Y /V copy "%NP3_DOC_DIR%\KeyboardShortcuts.txt" "%NP3_PORTAPP_DIR%\Other\Help\KeyboardShortcuts.txt" /Y /V +copy "%NP3_DOC_DIR%\Oniguruma_RE.txt" "%NP3_PORTAPP_DIR%\Other\Help\Oniguruma_RE.txt" /Y /V copy "%NP3_DOC_DIR%\crypto\encryption-doc.txt" "%NP3_PORTAPP_DIR%\Other\Help\encryption-doc.txt" /Y /V diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index afc730e77..f4af70105 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 RC3 diff --git a/src/VersionEx.h b/src/VersionEx.h index 934d0e883..877c166f4 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,11 +9,11 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 20 #define VERSION_REV 316 -#define VERSION_BUILD 1 +#define VERSION_BUILD 2 #define SCINTILLA_VER 432 #define ONIGURUMA_REGEX_VER 6.9.4 #define UCHARDET_VER 2018.09.27 #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.1.0 #define VERSION_PATCH RC3 -#define VERSION_COMMIT_ID t7820-rk +#define VERSION_COMMIT_ID dkt1-amr