From cd0d3875dc8fc2b5342f97d55f126dc4866d22d3 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 27 Apr 2021 21:57:31 +0200 Subject: [PATCH] + Upd: Version files and Changes.txt --- .../Add-Remove_Open_with_Notepad3.zip | Bin 7082 -> 7082 bytes .../Replace with Notepad3.reg | Bin 1566 -> 1552 bytes .../Replace-Restore_MS_Notepad.zip | Bin 954 -> 971 bytes .../Restore MS Notepad.reg | Bin 766 -> 700 bytes Build/Changes.txt | 6 +++++- Build/notepad3_setup.iss | 6 ++++++ Build/notepad3_x86_setup.iss | 6 ++++++ Versions/day.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 4 ++-- 10 files changed, 21 insertions(+), 5 deletions(-) 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 5185d73db2df3f7ffe9a64b9a65499effab746fd..6f55c5f507e7efdfaca9da3e2c11ecebaf2a7869 100644 GIT binary patch delta 97 zcmZ2wzRG;V0xAC6Z5!?uTVH21blm53neY1K^-^hK@&DGJKoVmN@MdI^XPDe0DKXhu f+EMLV@s`pOgchJQD;on4Fau!#BLjnr6o>}^kE$RW delta 97 zcmZ2wzRG;V0x5n2<|U^}bFVRmD)DS%^}jZGy;Pc5TiEmC%L?FPi~-(^O!5qqdn6?$ bJ4-vNp=kk1v$8P&0W%N=FfuT>NP&0&n^7Dp 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 1be4b3e8c974d19e804919436669b887a582168e..f816f536e4df534f41d48f9eac3646477f6a5240 100644 GIT binary patch delta 102 zcmbQoGl6HrEyl@S%mNeRq$V+i!C4-Yk1#!(yn$Ik(2=142o)Ft7!nyu7%~`&C%S7__Q4S25R1=;NoySM{^k z7-nd%n3{Uy?##KxX=&--f393SQSFuXmAOfgS*NZu#IA9fD0d-bL*I?oH@b5Z`+*Gq z8}GB6qkBTvO67tT8+SGVh>eB1c_ z!M(Y<>iFMr+1xuld!rm;^6MqwO+hdFJ`+1n}>Ql?w%<9 zS;}r-0DnugpNrb_B_HJOugaX5dVbHU3co);x&GFb#$_j+SK3&AVDp||Q9rhchwV(; zm7`!UUim9{S!Mj=nP>hT|1$meuI1hTeP(_Y{m0xad-C7scXzKOuiK>`0FSfXz&Nwb z-ty`fFs}A6F))aM7o}f!d!t7X8$BIfaN2z*NO-q>6J$n z+`6vZU^CJ5bopEPwPaMB!kL>(RQ2n;vbK!Zi;0t-W&Y%^N$j%&ok$??3y^d!He|n~_PL0aqGV0fra|D1b>kDV__e zgpomlLD25Q`7-P4j4;~Jai7y=zUz$0R$)dBvQ=AvnJg$3TSOt-QgB>}TNcMnTAp!Et5u@}FZ;5Vre1&X>3H~lS+U7W z*R<>D7fPJ7G)~`_pLXud>CMX*s=d;@vN!4Jm4F3yyCRHTt6YMQSUnLdI{#9rx~23) z?V;Lu>03!_vyMKAQnxz#+$(qIDvkAOt2?$FT(|k$(`?z5*<9CL<}Kt8@rWf5w3yu43(Hj!x*mpGe zw89_18oO(au0}zxuS?dpzLfu`y1l=Ch2iStxqEJ?+C6$T;qG-wd+|%R1>YYl$>TgG z$gweU^Z)Pj-s$qO|2NIm|M`?Fa@UiHhcT(;8>c$zJi2=%Y!RE>ueQupVXZ3rBzA7q zJmHsicGa_2edQBV?N0kFUcV`H;rax{{V7e8SM07h_pErf&;8@3=fBlAe&+pGd${k( zpNdlRuU~Sne!Wm(bwN(Y`q*vbdH+}Gum7bTfD%cioQd8)fRXc$iGe{397)9``9-M; zzQM340>#kPiN4;49YkEuM}4qQ(baf#eP2sg(k%zkW(m!p<5Cxvs0e;Nzk0cIVPL_+ z9TOiKettK1=l8wl^6yziP0LO8T$pH}XdwRjMP{Y2fZuzgD-9?Lz+FTHHR+0WohLMQZTnSntoBV_ z?X$-bsi!u7zhyD8F8AD0KL2YL;=Uy--l!ef9~ox-IraZn<BpQ~2P| zw>?*12>o+?K0m;lkx8BbSCUo%h8GAZfJrtvh5{f|UpT=82lLW8B!QhC&x3Yf>ZziF+B^( 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