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 Packages Projects Releases Wiki Activity

Merge pull request #513 from RaiKoHoff/DevMultiLingual

Browse Source 
German Strings and Bugfixes
This commit is contained in:
Rainer Kottenhoff 2018-06-06 16:36:48 +02:00 committed by GitHub
commit fc54f62b0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
46 changed files with 111 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Build/Notepad3.ini
View File

Binary file not shown.

5
Notepad3.sln
View File

@ -4,9 +4,11 @@ VisualStudioVersion = 15.0.26430.16
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad3", "src\Notepad3.vcxproj", "{BAAD32AB-CD47-12FD-873C-0BBC204B7641}"
ProjectSection(ProjectDependencies) = postProject
{9DC82B0D-2484-4925-92AD-1237C64CCB78} = {9DC82B0D-2484-4925-92AD-1237C64CCB78}
{5877B917-512B-49F5-B514-1B4159E7A9CA} = {5877B917-512B-49F5-B514-1B4159E7A9CA}
{146D0122-33C6-4C1B-9E7A-178DEC80842E} = {146D0122-33C6-4C1B-9E7A-178DEC80842E}
{C8E80B4C-C0FD-4119-A05A-AB372A61007F} = {C8E80B4C-C0FD-4119-A05A-AB372A61007F}
{9B31015C-CB08-4B4B-A957-313A93F862F5} = {9B31015C-CB08-4B4B-A957-313A93F862F5}
{EC255B64-2C2F-4CB6-9D40-4542893FE5E6} = {EC255B64-2C2F-4CB6-9D40-4542893FE5E6}
{3B8C289D-FF47-4237-AD7B-0702230F41A3} = {3B8C289D-FF47-4237-AD7B-0702230F41A3}
{ADCA49F0-D91B-4AB9-913A-5840DCA8C79E} = {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}
@ -43,6 +45,9 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_en_us", "language\np3_en_us\np3_en_us.vcxproj", "{9DC82B0D-2484-4925-92AD-1237C64CCB78}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_af_za", "language\np3_af_za\np3_af_za.vcxproj", "{C8E80B4C-C0FD-4119-A05A-AB372A61007F}"
ProjectSection(ProjectDependencies) = postProject
{9DC82B0D-2484-4925-92AD-1237C64CCB78} = {9DC82B0D-2484-4925-92AD-1237C64CCB78}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_nl_nl", "language\np3_nl_nl\np3_nl_nl.vcxproj", "{9B31015C-CB08-4B4B-A957-313A93F862F5}"
ProjectSection(ProjectDependencies) = postProject

7
Version.ps1
View File

@ -32,6 +32,7 @@ function DebugOutput($msg)
try
{
$AppName = "Notepad3"
$Major = 4
$Minor = [int]$(Get-Date -format yy)
$Revis = [int]$(Get-Date -format MMdd)
@ -53,6 +54,7 @@ try
if ($VerPatch) { $VerPatch = " $VerPatch" } # ensure space in front of string
Copy-Item -LiteralPath "Versions\VersionEx.h.tpl" -Destination "src\VersionEx.h" -Force
(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$APPNAME\$', "$AppName" } | Set-Content "src\VersionEx.h"
(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$MAJOR\$', "$Major" } | Set-Content "src\VersionEx.h"
(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$MINOR\$', "$Minor" } | Set-Content "src\VersionEx.h"
(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$MAINT\$', "$Revis" } | Set-Content "src\VersionEx.h"
@ -60,10 +62,11 @@ if ($VerPatch) { $VerPatch = " $VerPatch" } # ensure space in front of string
(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$SCIVER\$', "$SciVer" } | Set-Content "src\VersionEx.h"
(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$ONIGMOVER\$', "$OnigmoVer" } | Set-Content "src\VersionEx.h"
(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$VERPATCH\$', "$VerPatch" } | Set-Content "src\VersionEx.h"
(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$VERPATCH\$', "$VerPatch" } | Set-Content "src\VersionEx.h"
Copy-Item -LiteralPath "Versions\Notepad3.exe.manifest.tpl" -Destination "res\Notepad3.exe.manifest.conf" -Force
(Get-Content "res\Notepad3.exe.manifest.conf") | ForEach-Object { $_ -replace '\$VERSION\$', $CompleteVer } | Set-Content "res\Notepad3.exe.manifest.conf"
(Get-Content "res\Notepad3.exe.manifest.conf") | ForEach-Object { $_ -replace '\$APPNAME\$', "$AppName" } | Set-Content "res\Notepad3.exe.manifest.conf"
(Get-Content "res\Notepad3.exe.manifest.conf") | ForEach-Object { $_ -replace '\$VERPATCH\$', "$VerPatch" } | Set-Content "res\Notepad3.exe.manifest.conf"
(Get-Content "res\Notepad3.exe.manifest.conf") | ForEach-Object { $_ -replace '\$VERSION\$', "$CompleteVer" } | Set-Content "res\Notepad3.exe.manifest.conf"
if ($AppVeyorEnv) {
Update-AppveyorBuild -Version $CompleteVer
}

4
Versions/Notepad3.exe.manifest.tpl
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity
name="Notepad3"
name="$APPNAME$"
processorArchitecture="*"
version="$VERSION$"
type="win32"
/>
<description>Notepad3</description>
<description>$APPNAME$ $VERPATCH$</description>
</assembly>

BIN
Versions/VersionEx.h.tpl
View File

Binary file not shown.

2
Versions/build.txt
View File

@ -1 +1 @@
997
1002

5
language/common_res.h
View File

@ -627,6 +627,7 @@
#define IDS_LEX_MATLAB 63043
#define IDS_LEX_NIM_SRC 63044
#define IDS_LEX_R_STAT 63045
#define IDS_LEX_RUST_SRC 63046
#define IDS_LEX_STD_STYLE 63100
#define IDS_LEX_STD_MARGIN 63101
@ -872,5 +873,9 @@
#define IDS_LEX_STR_63340 63340
#define IDS_LEX_STR_63341 63341
#define IDS_LEX_STR_63342 63342
#define IDS_LEX_STR_63343 63343
#define IDS_LEX_STR_63344 63344
#define IDS_LEX_STR_63345 63345
#define IDS_LEX_STR_63346 63346
#endif //_COMMON_RES_H_

BIN
language/np3_af_za/lexer_af_za.rc
View File

Binary file not shown.

BIN
language/np3_af_za/menu_af_za.rc
View File

Binary file not shown.

BIN
language/np3_de_de/dialogs_de_de.rc
View File

Binary file not shown.

BIN
language/np3_de_de/lexer_de_de.rc
View File

Binary file not shown.

BIN
language/np3_de_de/menu_de_de.rc
View File

Binary file not shown.

BIN
language/np3_de_de/strings_de_de.rc
View File

Binary file not shown.

BIN
language/np3_en_uk/dialogs_en_uk.rc
View File

Binary file not shown.

BIN
language/np3_en_uk/lexer_en_uk.rc
View File

Binary file not shown.

BIN
language/np3_en_uk/menu_en_uk.rc
View File

Binary file not shown.

BIN
language/np3_en_us/dialogs_en_us.rc
View File

Binary file not shown.

BIN
language/np3_en_us/lexer_en_us.rc
View File

Binary file not shown.

BIN
language/np3_en_us/menu_en_us.rc
View File

Binary file not shown.

8
language/np3_en_us/np3_en_us.vcxproj
View File

@ -109,7 +109,7 @@
</Link>
<PostBuildEvent>
<Command>mkdir "$(TargetDir)..\en-US"
"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0809 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"</Command>
"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0409 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>MUI Split</Message>
@ -134,7 +134,7 @@
</Link>
<PostBuildEvent>
<Command>mkdir "$(TargetDir)..\en-US"
"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0809 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"</Command>
"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0409 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>MUI Split</Message>
@ -163,7 +163,7 @@
</Link>
<PostBuildEvent>
<Command>mkdir "$(TargetDir)..\en-US"
"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0809 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"</Command>
"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0409 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>MUI Split</Message>
@ -192,7 +192,7 @@
</Link>
<PostBuildEvent>
<Command>mkdir "$(TargetDir)..\en-US"
"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0809 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"</Command>
"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0409 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>MUI Split</Message>

BIN
language/np3_es_es/dialogs_es_es.rc
View File

Binary file not shown.

BIN
language/np3_es_es/lexer_es_es.rc
View File

Binary file not shown.

BIN
language/np3_es_es/menu_es_es.rc
View File

Binary file not shown.

BIN
language/np3_fr_fr/dialogs_fr_fr.rc
View File

Binary file not shown.

BIN
language/np3_fr_fr/lexer_fr_fr.rc
View File

Binary file not shown.

BIN
language/np3_fr_fr/menu_fr_fr.rc
View File

Binary file not shown.

BIN
language/np3_nl_nl/dialogs_nl_nl.rc
View File

Binary file not shown.

BIN
language/np3_nl_nl/lexer_nl_nl.rc
View File

Binary file not shown.

BIN
language/np3_nl_nl/menu_nl_nl.rc
View File

Binary file not shown.

16
language/np3_nl_nl/np3_nl_nl.vcxproj
View File

@ -109,7 +109,9 @@
</Link>
<PostBuildEvent>
<Command>mkdir "$(TargetDir)..\nl-NL"
"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\nl-NL\np3lng.dll.mui"</Command>
"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\nl-NL\np3lng.dll.mui"
"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\nl-NL\np3lng.dll.mui"
</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>MUI Split</Message>
@ -134,7 +136,9 @@
</Link>
<PostBuildEvent>
<Command>mkdir "$(TargetDir)..\nl-NL"
"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\nl-NL\np3lng.dll.mui"</Command>
"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\nl-NL\np3lng.dll.mui"
"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\nl-NL\np3lng.dll.mui"
</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>MUI Split</Message>
@ -163,7 +167,9 @@
</Link>
<PostBuildEvent>
<Command>mkdir "$(TargetDir)..\nl-NL"
"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\nl-NL\np3lng.dll.mui"</Command>
"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\nl-NL\np3lng.dll.mui"
"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\nl-NL\np3lng.dll.mui"
</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>MUI Split</Message>
@ -192,7 +198,9 @@
</Link>
<PostBuildEvent>
<Command>mkdir "$(TargetDir)..\nl-NL"
"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\nl-NL\np3lng.dll.mui"</Command>
"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\nl-NL\np3lng.dll.mui"
"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\nl-NL\np3lng.dll.mui"
</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>MUI Split</Message>

BIN
np3portableapp/Notepad3Portable/App/DefaultData/settings/Notepad3.ini
View File

Binary file not shown.

2
np3portableapp/build_np3portableapp.cmd
View File

@ -35,7 +35,7 @@ set PORTAPP_APP_COMPACTOR=%PORTAPP_ROOT_DIR%\PortableApps.comAppCompactor\Portab
set PORTAPP_LAUNCHER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe
set PORTAPP_INSTALLER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comInstaller\PortableApps.comInstaller.exe
set NP3_LANGUAGE_SET=af-ZA de-DE en-UK es-ES fr-FR
set NP3_LANGUAGE_SET=af-ZA de-DE en-UK es-ES fr-FR nl-NL
set NP3_DISTRIB_DIR=%SCRIPT_DIR%..\Build
set NP3_WIN32_DIR=%SCRIPT_DIR%..\Bin\Release_x86_v141

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

@ -3,8 +3,8 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="4.18.519.997"
version="4.18.606.1002"
type="win32"
/>
<description>Notepad3</description>
<description>Notepad3 X_MUI</description>
</assembly>

1
scintilla/Scintilla.vcxproj
View File

@ -297,6 +297,7 @@
<ClCompile Include="lexers\LexR.cxx" />
<ClCompile Include="lexers\LexRegistry.cxx" />
<ClCompile Include="lexers\LexRuby.cxx" />
<ClCompile Include="lexers\LexRust.cxx" />
<ClCompile Include="lexers\LexSQL.cxx" />
<ClCompile Include="lexers\LexTCL.cxx" />
<ClCompile Include="lexers\LexVB.cxx" />

3
scintilla/Scintilla.vcxproj.filters
View File

@ -450,6 +450,9 @@
<ClCompile Include="win32\ScintillaDLL.cxx">
<Filter>win32</Filter>
</ClCompile>
<ClCompile Include="lexers\LexRust.cxx">
<Filter>lexers</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="include\ILexer.h">

2
scintilla/src/Catalogue.cxx
View File

@ -167,7 +167,7 @@ int Scintilla_LinkLexers() {
//LINK_LEXER(lmREBOL);
LINK_LEXER(lmRegistry);
LINK_LEXER(lmRuby);
//LINK_LEXER(lmRust);
LINK_LEXER(lmRust);
//LINK_LEXER(lmScriptol);
//LINK_LEXER(lmSmalltalk);
//LINK_LEXER(lmSML);

6
src/Dialogs.c
View File

@ -447,7 +447,7 @@ INT_PTR CALLBACK AboutDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam
case WM_INITDIALOG:
{
{
SetDlgItemText(hwnd, IDC_VERSION, VERSION_FILEVERSION_LONG);
SetDlgItemText(hwnd, IDC_VERSION, L"" VERSION_FILEVERSION_LONG);
if (hFontTitle) { DeleteObject(hFontTitle); }
@ -599,7 +599,7 @@ INT_PTR CALLBACK AboutDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam
case IDC_COPYVERSTRG:
{
WCHAR wchVerInfo[1024] = { L'\0' };
StringCchCopy(wchVerInfo, COUNTOF(wchVerInfo), VERSION_FILEVERSION_LONG);
StringCchCopy(wchVerInfo, COUNTOF(wchVerInfo), L"" VERSION_FILEVERSION_LONG);
StringCchCat(wchVerInfo, COUNTOF(wchVerInfo), L"\n" VERSION_SCIVERSION);
StringCchCat(wchVerInfo, COUNTOF(wchVerInfo), L"\n" VERSION_COMPILER);
SetClipboardTextW(g_hwndMain, wchVerInfo);
@ -718,7 +718,7 @@ INT_PTR CALLBACK RunDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam)
ExpandEnvironmentStringsEx(arg1,COUNTOF(arg1));
ExtractFirstArgument(arg1,arg1,arg2,MAX_PATH);
if (StringCchCompareIN(arg1,COUNTOF(arg1),L"notepad3",-1) == 0 ||
if (StringCchCompareIN(arg1,COUNTOF(arg1), TSTRG(APPNAME),-1) == 0 ||
StringCchCompareIN(arg1,COUNTOF(arg1),L"notepad3.exe",-1) == 0) {
GetModuleFileName(NULL,arg1,COUNTOF(arg1));
bQuickExit = true;

4
src/Helpers.c
View File

@ -286,10 +286,10 @@ DWORD GetLastErrorToMsgBox(LPWSTR lpszFunction, DWORD dwErrID)
// Display the error message and exit the process
LPVOID lpDisplayBuf = (LPVOID)LocalAlloc(LMEM_ZEROINIT,
(lstrlen((LPCWSTR)lpMsgBuf) + lstrlen((LPCWSTR)lpszFunction) + 40) * sizeof(WCHAR));
(lstrlen((LPCWSTR)lpMsgBuf) + lstrlen((LPCWSTR)lpszFunction) + 80) * sizeof(WCHAR));
StringCchPrintf((LPWSTR)lpDisplayBuf, LocalSize(lpDisplayBuf) / sizeof(WCHAR),
L"Error: '%s' failed with error id %d:\n%s", lpszFunction, dwErrID, lpMsgBuf);
L"Error: '%s' failed with error id %d:\n%s.\n", lpszFunction, dwErrID, lpMsgBuf);
MessageBox(NULL, (LPCWSTR)lpDisplayBuf, L"Notepad3 - ERROR", MB_OK | MB_ICONEXCLAMATION);

14
src/Notepad3.c
View File

@ -47,12 +47,12 @@
#include "../uthash/utlist.h"
#include "encoding.h"
#include "helpers.h"
#include "VersionEx.h"
#include "SciCall.h"
#include "notepad3.h"
/******************************************************************************
*
* Local and global Variables for Notepad3.c
@ -348,7 +348,7 @@ int iSortOptions = 0;
int iAlignMode = 0;
bool flagIsElevated = false;
WCHAR wchWndClass[16] = WC_NOTEPAD3;
WCHAR wchWndClass[16] = L"" APPNAME;
HINSTANCE g_hInstance = NULL;
@ -1079,7 +1079,7 @@ HWND InitInstance(HINSTANCE hInstance,LPSTR pszCmdLine,int nCmdShow)
g_hwndMain = CreateWindowEx(
0,
wchWndClass,
L"Notepad3",
L"" APPNAME,
WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
g_WinInfo.x,
g_WinInfo.y,
@ -7012,7 +7012,7 @@ void ParseCommandLine()
lp1 + CSTRLEN(L"appid="),len - CSTRLEN(L"appid="));
StrTrim(g_wchAppUserModelID,L" ");
if (StringCchLenW(g_wchAppUserModelID,COUNTOF(g_wchAppUserModelID)) == 0)
StringCchCopy(g_wchAppUserModelID,COUNTOF(g_wchAppUserModelID),L"Notepad3");
StringCchCopy(g_wchAppUserModelID,COUNTOF(g_wchAppUserModelID), L"" APPNAME);
}
else if (StrCmpNI(lp1,L"sysmru=",CSTRLEN(L"sysmru=")) == 0) {
@ -7393,7 +7393,7 @@ void LoadFlags()
g_flagNoFileVariables = 1;
if (StringCchLenW(g_wchAppUserModelID,COUNTOF(g_wchAppUserModelID)) == 0) {
IniSectionGetString(pIniSection,L"ShellAppUserModelID",L"Notepad3",
IniSectionGetString(pIniSection,L"ShellAppUserModelID", L"" APPNAME,
g_wchAppUserModelID,COUNTOF(g_wchAppUserModelID));
}
@ -7461,7 +7461,7 @@ static bool __fastcall _CheckIniFile(LPWSTR lpszFile,LPCWSTR lpszModule)
static bool __fastcall _CheckIniFileRedirect(LPWSTR lpszFile,LPCWSTR lpszModule)
{
WCHAR tch[MAX_PATH] = { L'\0' };
if (GetPrivateProfileString(L"Notepad3",L"Notepad3.ini",L"",tch,COUNTOF(tch),lpszFile)) {
if (GetPrivateProfileString(L"" APPNAME, L"" APPNAME ".ini",L"",tch,COUNTOF(tch),lpszFile)) {
if (_CheckIniFile(tch,lpszModule)) {
StringCchCopy(lpszFile,MAX_PATH,tch);
return true;
@ -9611,7 +9611,7 @@ void ShowNotifyIcon(HWND hwnd,bool bAdd)
nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
nid.uCallbackMessage = WM_TRAYMESSAGE;
nid.hIcon = hIcon;
StringCchCopy(nid.szTip,COUNTOF(nid.szTip),L"Notepad3");
StringCchCopy(nid.szTip,COUNTOF(nid.szTip), L"" APPNAME);
if(bAdd)
Shell_NotifyIcon(NIM_ADD,&nid);

1
src/Notepad3.h
View File

@ -19,7 +19,6 @@
#include "TypeDefs.h"
//==== Main Window ============================================================
#define WC_NOTEPAD3 L"Notepad3"
#define ONLINE_HELP_WEBSITE L"https://www.rizonesoft.com/documents/notepad3/"

1
src/Notepad3.rc
View File

@ -75,6 +75,7 @@ BEGIN
"A", IDM_EDIT_SELECTALL, VIRTKEY, CONTROL, NOINVERT
"A", IDM_VIEW_MARKOCCUR_ONOFF, VIRTKEY, ALT, NOINVERT
"A", CMD_RECODEANSI, VIRTKEY, SHIFT, CONTROL, NOINVERT
"A", IDM_VIEW_ACCELWORDNAV, VIRTKEY, CONTROL, ALT, NOINVERT
"B", IDM_EDIT_FINDMATCHINGBRACE, VIRTKEY, CONTROL, NOINVERT
"B", IDM_EDIT_PADWITHSPACES, VIRTKEY, ALT, NOINVERT
"B", IDM_EDIT_SELTOMATCHINGBRACE, VIRTKEY, SHIFT, CONTROL, NOINVERT

10
src/Notepad3.ver
View File

@ -37,15 +37,15 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", APPNAMEA
VALUE "FileDescription", APPNAMEA
VALUE "InternalName", APPNAMEA
VALUE "ProductName", APPNAMEA
VALUE "Comments", APPNAME
VALUE "FileDescription", APPNAME
VALUE "InternalName", APPNAME
VALUE "ProductName", APPNAME
VALUE "CompanyName", VERSION_COMPANYNAME
VALUE "FileVersion", VERSION_FILEVERSION
VALUE "ProductVersion", VERSION_FILEVERSION
VALUE "LegalCopyright", VERSION_LEGALCOPYRIGHT
VALUE "OriginalFilename", APPNAMEA ".exe"
VALUE "OriginalFilename", APPNAME ".exe"
END
END
BLOCK "VarFileInfo"

46
src/Styles.c
View File

@ -2940,6 +2940,51 @@ EDITLEXER lexR = { SCLEX_R, IDS_LEX_R_STAT, L"R-S-SPlus Statistics Code", L"R",
KEYWORDLIST KeyWords_Rust = {
// Primary keywords and identifiers
"as be break const continue crate else enum extern false fn for "
"if impl in let loop match mod mut once pub ref return self "
"static struct super trait true type unsafe use while",
// Built in types
"bool char f32 f64 i16 i32 i64 i8 int str u16 u32 u64 u8 uint",
// Other keywords
"abstract alignof become box do final macro offsetof override "
"priv proc pure sizeof typeof unsized virtual yield",
// Keywords 4
"",
// Keywords 5
"",
// Keywords 6
"",
// Keywords 7
"",
// 0
"" };
EDITLEXER lexRust = { SCLEX_RUST, IDS_LEX_RUST_SRC, L"Rust Source Code", L"rs; rust", L"", &KeyWords_Rust,{
{ STYLE_DEFAULT, IDS_LEX_STR_63126, L"Default", L"", L"" },
//{ SCE_RUST_DEFAULT, IDS_LEX_STR_63126, L"Default", L"", L"" },
{ SCE_RUST_IDENTIFIER, IDS_LEX_STR_63129, L"Identifier", L"", L"" },
{ SCE_RUST_WORD, IDS_LEX_STR_63128, L"Keyword", L"bold; fore:#248112", L"" },
{ SCE_RUST_WORD2, IDS_LEX_STR_63343, L"Build-In Type", L"fore:#A9003D", L"" },
{ SCE_RUST_WORD3, IDS_LEX_STR_63345, L"Other Keyword", L"italic; fore:#248112", L"" },
//{ SCE_RUST_WORD4, IDS_LEX_STR_63128, L"Keyword 4", L"bold; fore:#0A246A", L"" },
//{ SCE_RUST_WORD5, IDS_LEX_STR_63128, L"Keyword 5", L"bold; fore:#0A246A", L"" },
//{ SCE_RUST_WORD6, IDS_LEX_STR_63128, L"Keyword 6", L"bold; fore:#0A246A", L"" },
//{ SCE_RUST_WORD7, IDS_LEX_STR_63128, L"Keyword 7", L"bold; fore:#0A246A", L"" },
{ SCE_RUST_NUMBER, IDS_LEX_STR_63130, L"Number", L"fore:#666666", L"" },
{ MULTI_STYLE(SCE_RUST_COMMENTBLOCK,SCE_RUST_COMMENTLINE,SCE_RUST_COMMENTBLOCKDOC,SCE_RUST_COMMENTLINEDOC), IDS_LEX_STR_63127, L"Comment", L"italic; fore:#488080", L"" },
{ MULTI_STYLE(SCE_RUST_STRING,SCE_RUST_STRINGR,SCE_RUST_CHARACTER,0), IDS_LEX_STR_63131, L"String", L"fore:#B31C1B", L"" },
{ SCE_RUST_OPERATOR, IDS_LEX_STR_63132, L"Operator", L"fore:#666666", L"" },
{ SCE_RUST_MACRO, IDS_LEX_STR_63280, L"Macro Definition", L"fore:#0A246A", L"" },
{ SCE_RUST_LIFETIME, IDS_LEX_STR_63346, L"Rust Lifetime", L"fore:#B000B0", L"" },
{ SCE_RUST_LEXERROR, IDS_LEX_STR_63252, L"Parsing Error", L"fore:#F0F0F0; back:#F00000", L"" },
{ MULTI_STYLE(SCE_RUST_BYTESTRING,SCE_RUST_BYTESTRINGR,SCE_RUST_BYTECHARACTER,0), IDS_LEX_STR_63344, L"Byte String", L"fore:#C0C0C0", L"" },
{ -1, 00000, L"", L"", L"" } } };
// This array holds all the lexers...
// Don't forget to change the number of the lexer for HTML and XML
// in Notepad2.c ParseCommandLine() if you change this array!
@ -2983,6 +3028,7 @@ static PEDITLEXER g_pLexArray[NUMLEXERS] =
&lexRC, // Resource Script
&lexR, // R Statistics Code
&lexRUBY, // Ruby Script
&lexRust, // Rust Script
&lexBASH, // Shell Script
&lexSQL, // SQL Query
&lexTCL, // Tcl Script

2
src/Styles.h
View File

@ -61,7 +61,7 @@ typedef struct _editlexer
// Number of Lexers in pLexArray
#define NUMLEXERS 47
#define NUMLEXERS 48
#define AVG_NUM_OF_STYLES_PER_LEXER 20

BIN
src/Version.h
View File

Binary file not shown.

8
src/VersionEx.h
View File

@ -3,11 +3,11 @@
// this file is generated - use template to apply changes //
// //
// //////////////////////////////////////////////////////////
#define APPNAME "Notepad3"
#define VERSION_MAJOR 4
#define VERSION_MINOR 18
#define VERSION_REV 519
#define VERSION_BUILD 997
#define VERSION_REV 606
#define VERSION_BUILD 1002
#define SCINTILLA_VER 405
#define ONIGMO_REGEX_VER 6.1.3
#define VERSION_PATCH L" X_MUI"
#define VERSIONA_PATCH " X_MUI"
#define VERSION_PATCH " X_MUI"