From 86d14b0de74b1081557121b3c9ea0a01591bed75 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Thu, 21 Oct 2021 19:43:02 +0200 Subject: [PATCH 1/4] + Upd: Alpha Version files and Changes.txt (Xperimental) --- Build/Changes.txt | 5 ++++- Build/notepad3_setup.iss | 1 + Build/notepad3_x86_setup.iss | 1 + Versions/day.txt | 2 +- res/Notepad3.exe.manifest.conf | 4 ++-- src/VersionEx.h | 6 +++--- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index 28f3405b3..ecfb56e1b 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -33,7 +33,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library ======================================================== -Current ALPHA Version 5.21.1019.(build_#) (2021-10-19) +Current ALPHA Version 5.21.1021.(build_#) (2021-10-21) ======================================================== -------------------------------------------------------- @@ -46,6 +46,7 @@ NEW: CHANGES: -------------------------------------------------------- [.###.#]- . +[1021.1]- On file restore, do not notify immediately, but check against stored file attributes. [1015.2]- Some more DynStrg refactorings and LongPath handling. [1015.1]- Remove the max win version check for undocumented DarkMode UxTheme methods. [1015.1]- DarkMode enable up to Win11 build 22471. @@ -69,6 +70,8 @@ CHANGES Versions in Tools or Libraries: FIXES: -------------------------------------------------------- [.###.#]- . +[1021.1]- "grepWinNP3" not intended switching "AllSize" settings (GRE). +[1021.1]- Don't save default values for Caret and Whitespace. [1015.2]- Path_StripPath(). [1015.1]- SQL Lexer dark mode highlight default colors. [1015.1]- Disabled menu items if settings file itself is locked by file change notification. diff --git a/Build/notepad3_setup.iss b/Build/notepad3_setup.iss index 18afe1623..3d8fdf8ee 100644 --- a/Build/notepad3_setup.iss +++ b/Build/notepad3_setup.iss @@ -254,6 +254,7 @@ Filename: "{app}\Notepad3.ini"; Section: "Notepad3"; Key: "Notepad3.ini"; String Filename: "{app}\minipath.ini"; Section: "minipath"; Key: "minipath.ini"; String: "%APPDATA%\Rizonesoft\Notepad3\minipath.ini" [Registry] +Root: "HKLM"; Subkey: "SYSTEM\CurrentControlSet\Control\FileSystem"; ValueType: dword; ValueName: "LongPathsEnabled"; ValueData: "1" ;The following "Keys/Values" are required to allow a "Notepad3 Replacement" in Windows 11. Root: "HKLM"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\notepad.exe"; ValueType: dword; ValueName: "UseFilter"; ValueData: "1" Root: "HKCR"; Subkey: ".inf"; ValueType: string; ValueData: "inffile" diff --git a/Build/notepad3_x86_setup.iss b/Build/notepad3_x86_setup.iss index 7022573b7..783a3f94b 100644 --- a/Build/notepad3_x86_setup.iss +++ b/Build/notepad3_x86_setup.iss @@ -190,6 +190,7 @@ Filename: "{app}\Notepad3.ini"; Section: "Notepad3"; Key: "Notepad3.ini"; String Filename: "{app}\minipath.ini"; Section: "minipath"; Key: "minipath.ini"; String: "%APPDATA%\Rizonesoft\Notepad3\minipath.ini" [Registry] +Root: "HKLM"; Subkey: "SYSTEM\CurrentControlSet\Control\FileSystem"; ValueType: dword; ValueName: "LongPathsEnabled"; ValueData: "1" ;The following "Keys/Values" are required to allow a "Notepad3 Replacement" in Windows 11. Root: "HKLM"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\notepad.exe"; ValueType: dword; ValueName: "UseFilter"; ValueData: "1" Root: "HKCR"; Subkey: ".inf"; ValueType: string; ValueData: "inffile" diff --git a/Versions/day.txt b/Versions/day.txt index 1a8c1ea28..8463e0903 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -1019 +1021 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 9d6d68213..8f5da9732 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,8 +3,8 @@ - Notepad3 beta + Notepad3 alpha diff --git a/src/VersionEx.h b/src/VersionEx.h index ad8eef4d4..74871914f 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,13 +8,13 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 21 -#define VERSION_REV 1019 +#define VERSION_REV 1021 #define VERSION_BUILD 2 #define SCINTILLA_VER 513 #define LEXILLA_VER 512 #define ONIGURUMA_REGEX_VER 7.0.0 #define UCHARDET_VER 2018.09.27 #define TINYEXPR_VER 2018.05.11 -#define UTHASH_VER 2.1.0 -#define VERSION_PATCH beta +#define UTHASH_VER 2.3.0 +#define VERSION_PATCH alpha #define VERSION_COMMIT_ID dkt1-amr From 44e54a6b843035e4be9ec2409d9bd642cda8deab Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Thu, 21 Oct 2021 20:09:38 +0200 Subject: [PATCH 2/4] + Upd: Alpha Version files and Changes.txt (Xperimental) --- Versions/build.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Versions/build.txt b/Versions/build.txt index 0cfbf0888..00750edc0 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2 +3 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 8f5da9732..e218f466b 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 alpha diff --git a/src/VersionEx.h b/src/VersionEx.h index 74871914f..f5980bf45 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,7 +9,7 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 21 #define VERSION_REV 1021 -#define VERSION_BUILD 2 +#define VERSION_BUILD 3 #define SCINTILLA_VER 513 #define LEXILLA_VER 512 #define ONIGURUMA_REGEX_VER 7.0.0 From 1e914bef4de60d04aff379e566d87c84fca031b4 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Fri, 22 Oct 2021 11:53:46 +0200 Subject: [PATCH 3/4] + upd: Maintenance of the acknowledgments list. --- Readme.txt | 1 + language/common_res.rc | 1 + 2 files changed, 2 insertions(+) diff --git a/Readme.txt b/Readme.txt index 72dbf717c..ab8d8b02a 100644 --- a/Readme.txt +++ b/Readme.txt @@ -114,6 +114,7 @@ lhmouse https://github.com/lhmouse ltGuillaume https://github.com/ltGuillaume maboroshin https://github.com/maboroshin MadDogVachon https://github.com/MadDogVachon +MelchiorGaspar https://github.com/MelchiorGaspar Mitezuss https://github.com/Mitezuss RaffaeleBianc0 https://github.com/RaffaeleBianc0 RaiKoHoff https://github.com/RaiKoHoff diff --git a/language/common_res.rc b/language/common_res.rc index 0fa1fecc4..b4101873c 100644 --- a/language/common_res.rc +++ b/language/common_res.rc @@ -135,6 +135,7 @@ IDS_MUI_ABOUT_ACKNOWLEDGES "\ \\cf0 ltGuillaume\\tab https://github.com/ltGuillaume\\par\ \\cf0 maboroshin\\tab https://github.com/maboroshin\\par\ \\cf0 MadDogVachon\\tab https://github.com/MadDogVachon\\par\ +\\cf0 MelchiorGaspar\\tab https://github.com/MelchiorGaspar\\par\ \\cf0 Mitezuss\\tab https://github.com/Mitezuss\\par\ \\cf0 RaffaeleBianc0\\tab https://github.com/RaffaeleBianc0\\par\ \\cf0 RaiKoHoff\\tab https://github.com/RaiKoHoff\\par\ From 829bb67705e35ca8b03dc449ccb0a878d556d937 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Sat, 23 Oct 2021 11:43:32 +0200 Subject: [PATCH 4/4] +Fix: Key "Favorites=(path)" not added in "Setup" version --- Build/Changes.txt | 3 ++- Build/notepad3_setup.iss | 1 + Build/notepad3_x86_setup.iss | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index ecfb56e1b..67b55d460 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -33,7 +33,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library ======================================================== -Current ALPHA Version 5.21.1021.(build_#) (2021-10-21) +Current ALPHA Version 5.23.1021.(build_#) (2021-10-23) ======================================================== -------------------------------------------------------- @@ -70,6 +70,7 @@ CHANGES Versions in Tools or Libraries: FIXES: -------------------------------------------------------- [.###.#]- . +[1023.1]- Key "Favorites=(path)" not added in "Setup" version. [1021.1]- "grepWinNP3" not intended switching "AllSize" settings (GRE). [1021.1]- Don't save default values for Caret and Whitespace. [1015.2]- Path_StripPath(). diff --git a/Build/notepad3_setup.iss b/Build/notepad3_setup.iss index 3d8fdf8ee..88dbc9965 100644 --- a/Build/notepad3_setup.iss +++ b/Build/notepad3_setup.iss @@ -252,6 +252,7 @@ Name: "{#quick_launch}\{#app_name}"; Filename: "{app}\Notepad3.exe"; WorkingDir: [INI] Filename: "{app}\Notepad3.ini"; Section: "Notepad3"; Key: "Notepad3.ini"; String: "%APPDATA%\Rizonesoft\Notepad3\Notepad3.ini" Filename: "{app}\minipath.ini"; Section: "minipath"; Key: "minipath.ini"; String: "%APPDATA%\Rizonesoft\Notepad3\minipath.ini" +Filename: "{userappdata}\Rizonesoft\Notepad3\Notepad3.ini"; Section: "Settings"; Key: "Favorites"; String: "%APPDATA%\Rizonesoft\Notepad3\Favorites\" [Registry] Root: "HKLM"; Subkey: "SYSTEM\CurrentControlSet\Control\FileSystem"; ValueType: dword; ValueName: "LongPathsEnabled"; ValueData: "1" diff --git a/Build/notepad3_x86_setup.iss b/Build/notepad3_x86_setup.iss index 783a3f94b..7c0d95f23 100644 --- a/Build/notepad3_x86_setup.iss +++ b/Build/notepad3_x86_setup.iss @@ -188,6 +188,7 @@ Name: "{#quick_launch}\{#app_name}"; Filename: "{app}\Notepad3.exe"; WorkingDir: [INI] Filename: "{app}\Notepad3.ini"; Section: "Notepad3"; Key: "Notepad3.ini"; String: "%APPDATA%\Rizonesoft\Notepad3\Notepad3.ini" Filename: "{app}\minipath.ini"; Section: "minipath"; Key: "minipath.ini"; String: "%APPDATA%\Rizonesoft\Notepad3\minipath.ini" +Filename: "{userappdata}\Rizonesoft\Notepad3\Notepad3.ini"; Section: "Settings"; Key: "Favorites"; String: "%APPDATA%\Rizonesoft\Notepad3\Favorites\" [Registry] Root: "HKLM"; Subkey: "SYSTEM\CurrentControlSet\Control\FileSystem"; ValueType: dword; ValueName: "LongPathsEnabled"; ValueData: "1"