diff --git a/Build/Add-on/Add-Remove_Open_with_Notepad3/Add-Remove_Open_with_Notepad3.zip b/Build/Add-on/Add-Remove_Open_with_Notepad3/Add-Remove_Open_with_Notepad3.zip index 5185d73db..6f55c5f50 100644 Binary files a/Build/Add-on/Add-Remove_Open_with_Notepad3/Add-Remove_Open_with_Notepad3.zip and b/Build/Add-on/Add-Remove_Open_with_Notepad3/Add-Remove_Open_with_Notepad3.zip differ diff --git a/Build/Add-on/Replace-Restore_MS_Notepad/Replace with Notepad3.reg b/Build/Add-on/Replace-Restore_MS_Notepad/Replace with Notepad3.reg index 1be4b3e8c..f816f536e 100644 Binary files a/Build/Add-on/Replace-Restore_MS_Notepad/Replace with Notepad3.reg and b/Build/Add-on/Replace-Restore_MS_Notepad/Replace with Notepad3.reg differ diff --git a/Build/Add-on/Replace-Restore_MS_Notepad/Replace-Restore_MS_Notepad.zip b/Build/Add-on/Replace-Restore_MS_Notepad/Replace-Restore_MS_Notepad.zip index 73e71d86f..236fe0fda 100644 Binary files a/Build/Add-on/Replace-Restore_MS_Notepad/Replace-Restore_MS_Notepad.zip and b/Build/Add-on/Replace-Restore_MS_Notepad/Replace-Restore_MS_Notepad.zip differ diff --git a/Build/Add-on/Replace-Restore_MS_Notepad/Restore MS Notepad.reg b/Build/Add-on/Replace-Restore_MS_Notepad/Restore MS Notepad.reg index cc8afbd13..9a6bfb7a7 100644 Binary files a/Build/Add-on/Replace-Restore_MS_Notepad/Restore MS Notepad.reg and b/Build/Add-on/Replace-Restore_MS_Notepad/Restore MS Notepad.reg differ diff --git a/Build/Changes.txt b/Build/Changes.txt index 719c7fdfb..68c4cef9c 100644 --- 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.425.(build_#) (2021-04-25) +Current BETA/RC Version 5.21.427.(build_#) (2021-04-27) ======================================================== -------------------------------------------------------- NEW: -------------------------------------------------------- [.###.#]- . +[.426.1]- Prepare Application Manifest for to grant Identity for non-package desktop apps. [.425.1]- Add file/dir exists/not-found to hyperlink tooltip (if file-url). [.422.1]- Support Scintilla's new feature: indicator stroke width. [.420.1]- TXT file for Translators to comunicate Line Mumbers of the "Added/Modified" strings. @@ -68,6 +69,8 @@ NEW: CHANGES: -------------------------------------------------------- [.###.#]- . +[.427.1]- Color selection dialog: NP3 icon, positioning and dark-mode. +[.427.1]- Adjust standard colors for URL Hyperlink (better standard dark-mode visual). [.425.1]- New default for hyperlink tooltip is OFF. [.425.1]- Immediate indicator hover response (colordef-hotspot, hyperlink-tooltip, hex-code-tooltip). [.422.1]- Code cleanup for Font and Style Selection. @@ -113,6 +116,7 @@ CHANGES: FIXES: -------------------------------------------------------- [.###.#]- . +[.427.1]- Minor fixes around font redrawing. [.423.1]- Add thread COM initializations. [.423.1]- Adding DPI awareness to MiniPath (correct toolbar handling still open point). [.423.1]- minor corrections for customized font selection dialog (dark-mode and dpi-awareness). diff --git a/Build/notepad3_setup.iss b/Build/notepad3_setup.iss index e1dcbf212..8512c57c3 100644 --- a/Build/notepad3_setup.iss +++ b/Build/notepad3_setup.iss @@ -291,6 +291,7 @@ Type: dirifempty; Name: {app} [Code] const IFEO = 'SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\notepad.exe'; + APPH = 'SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\Notepad3.exe'; function InitializeSetup: Boolean; begin @@ -435,6 +436,8 @@ begin RegWriteStringValue(HKCR, 'Applications\notepad3.exe', 'AppUserModelID', 'Rizonesoft.Notepad3'); RegWriteStringValue(HKCR, 'Applications\notepad3.exe\shell\open\command', '', ExpandConstant('"{app}\Notepad3.exe" "%1"')); RegWriteStringValue(HKCR, '*\OpenWithList\notepad3.exe', '', ''); + RegWriteStringValue(HKLM, APPH, '', ExpandConstant('{app}\Notepad3.exe')); + RegWriteStringValue(HKLM, APPH, 'Path', ExpandConstant('{app}')); end; @@ -452,6 +455,9 @@ begin RegDeleteKeyIncludingSubkeys(HKCR, 'Applications\notepad3.exe'); RegDeleteKeyIncludingSubkeys(HKCR, '*\OpenWithList\notepad3.exe'); RegDeleteKeyIncludingSubkeys(HKCR, '*\shell\Open with Notepad3'); + RegDeleteValue(HKLM, APPH, 'Path'); + RegDeleteValue(HKLM, APPH, ''); + RegDeleteKeyIfEmpty(HKLM, APPH); end; diff --git a/Build/notepad3_x86_setup.iss b/Build/notepad3_x86_setup.iss index 08ddc6ec6..753a7ecea 100644 --- a/Build/notepad3_x86_setup.iss +++ b/Build/notepad3_x86_setup.iss @@ -227,6 +227,7 @@ Type: dirifempty; Name: {app} [Code] const IFEO = 'SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\notepad.exe'; + APPH = 'SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\Notepad3.exe'; function InitializeSetup: Boolean; begin @@ -371,6 +372,8 @@ begin RegWriteStringValue(HKCR, 'Applications\notepad3.exe', 'AppUserModelID', 'Rizonesoft.Notepad3'); RegWriteStringValue(HKCR, 'Applications\notepad3.exe\shell\open\command', '', ExpandConstant('"{app}\Notepad3.exe" "%1"')); RegWriteStringValue(HKCR, '*\OpenWithList\notepad3.exe', '', ''); + RegWriteStringValue(HKLM, APPH, '', ExpandConstant('{app}\Notepad3.exe')); + RegWriteStringValue(HKLM, APPH, 'Path', ExpandConstant('{app}')); end; @@ -388,6 +391,9 @@ begin RegDeleteKeyIncludingSubkeys(HKCR, 'Applications\notepad3.exe'); RegDeleteKeyIncludingSubkeys(HKCR, '*\OpenWithList\notepad3.exe'); RegDeleteKeyIncludingSubkeys(HKCR, '*\shell\Open with Notepad3'); + RegDeleteValue(HKLM, APPH, 'Path'); + RegDeleteValue(HKLM, APPH, ''); + RegDeleteKeyIfEmpty(HKLM, APPH); end; diff --git a/Versions/day.txt b/Versions/day.txt index 9f51d082f..d2a1e59f6 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -426 +427 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 7164d9939..0fd2e0fa4 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 beta diff --git a/src/VersionEx.h b/src/VersionEx.h index b50fe6ccc..90458af03 100644 --- 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 426 +#define VERSION_REV 427 #define VERSION_BUILD 1 #define SCINTILLA_VER 501 #define LEXILLA_VER 501 @@ -17,4 +17,4 @@ #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.1.0 #define VERSION_PATCH beta -#define VERSION_COMMIT_ID nebukadn +#define VERSION_COMMIT_ID dkt1-amr