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 remote-tracking branch 'notepad3_orig_rizone/master' into grepWin_Integration

Browse Source
This commit is contained in:
Rainer Kottenhoff 2020-06-18 23:32:58 +02:00
commit cf33ebd0b2
7 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Build/Changes.txt
View File

@ -32,7 +32,7 @@ GRE - (GRE)pWinNP3 Search in Files Tool
=====================================================
Current RC1 Version 5.20.617.(build_#) (2020-06-17)
Current RC1 Version 5.20.618.(build_#) (2020-06-18)
=====================================================
-----------------------------------------------------
@ -99,6 +99,12 @@ ENHANCEMENT:
FIXES:
-----------------------------------------------------
-
- Printing scaling problem related to DPI awareness changes.
- System MessageBox "save before close" positioning.
- Reset of toolbar configuration dialog.
- Crash if "close after find" is enabled.
- Keep current line on reverting file.
- Hardening commit_id.txt file input for version string assembling.
- Limit length of (manual) commit ID.
- DPI Aware relative positioning of position managed dialog boxes.
- DPI: awareness for Find/Replace-Dlg (remove resize property).

6
Version.ps1
View File

@ -64,14 +64,14 @@ try
$CommitID = ([string]($env:computername)).substring(0,[math]::min($length,8)).ToLower()
}
else {
if (!$CommitID) { $CommitID = "---" }
$CommitID = $CommitID -replace '"', ''
$CommitID = $CommitID -replace "'", ''
$length = $CommitID.length
$CommitID = $CommitID.substring(0,[math]::min($length,8))
}
}
if (!$CommitID) { $CommitID = "---" }
$CommitID = $CommitID -replace '"', ''
$CommitID = $CommitID -replace "'", ''
if (!$CommitID) { $CommitID = "---" }
$Build | Set-Content "Versions\build.txt"
$CompleteVer = "$Major.$Minor.$Revis.$Build"

2
Versions/build.txt
View File

@ -1 +1 @@
2
1

2
Versions/day.txt
View File

@ -1 +1 @@
617
618

4
language/np3_en_gb/menu_en_gb.rc
View File

@ -374,7 +374,7 @@ BEGIN
MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR
MENUITEM SEPARATOR
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "&Customize Toolbar...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Customise Toolbar...", IDM_VIEW_CUSTOMIZETB
MENUITEM "To&ggle Toolbars", IDM_VIEW_TOGGLETB
MENUITEM "&DPI Scale Toolbar", IDM_VIEW_DPISCALETB
END
@ -512,7 +512,7 @@ BEGIN
MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR
MENUITEM SEPARATOR
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "&Customize Toolbar...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Customise Toolbar...", IDM_VIEW_CUSTOMIZETB
MENUITEM "To&ggle Toolbars", IDM_VIEW_TOGGLETB
MENUITEM "&DPI Scale Toolbar", IDM_VIEW_DPISCALETB
END

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

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.617.2"
version="5.20.618.1"
type="win32"
/>
<description>Notepad3 RC1</description>

4
src/VersionEx.h
View File

@ -8,8 +8,8 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 617
#define VERSION_BUILD 2
#define VERSION_REV 618
#define VERSION_BUILD 1
#define SCINTILLA_VER 443
#define ONIGURUMA_REGEX_VER 6.9.5
#define UCHARDET_VER 2018.09.27