CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-11 21:03:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2684 from RaiKoHoff/Dev_NewFeatures

Browse Source 
Convenient message box text for normalizing EOLs
This commit is contained in:
Pairi Daiza 2020-08-19 19:36:18 +02:00 committed by GitHub
commit bbc15196d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
language/common_res.h
View File

@ -88,7 +88,8 @@
#define IDS_MUI_EOLMODENAME_CRLF 13020
#define IDS_MUI_EOLMODENAME_CR 13021
#define IDS_MUI_EOLMODENAME_LF 13022
#define IDS_MUI_INF_PRSVFILEMODTM 13023
#define IDS_MUI_WARN_NORMALIZE_EOLS 13023
#define IDS_MUI_INF_PRSVFILEMODTM 13024
#define IDS_MUI_SELRECT 14000
#define IDS_MUI_BUFFERTOOSMALL 14001

2
language/np3_de_de/strings_de_de.rc
View File

@ -158,6 +158,8 @@ BEGIN
IDS_MUI_EOLMODENAME_CRLF "Windows (CR+LF)"
IDS_MUI_EOLMODENAME_LF "Unix/Mac (LF)"
IDS_MUI_EOLMODENAME_CR "Old Mac (CR)"
IDS_MUI_WARN_NORMALIZE_EOLS
"Alle Zeilenumbrüche angleichen auf '%s'?"
END
STRINGTABLE

2
language/np3_en_us/strings_en_us.rc
View File

@ -158,6 +158,8 @@ BEGIN
IDS_MUI_EOLMODENAME_CRLF "Windows (CR+LF)"
IDS_MUI_EOLMODENAME_LF "Unix/Mac (LF)"
IDS_MUI_EOLMODENAME_CR "Old Mac (CR)"
IDS_MUI_WARN_NORMALIZE_EOLS
"Do you want to normalize all line endings to be '%s'?"
END
STRINGTABLE

4
src/Notepad3.c
View File

@ -7668,7 +7668,9 @@ LRESULT MsgNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)
UINT const msgid = (eol_mode == SC_EOL_CRLF) ? IDS_MUI_EOLMODENAME_CRLF :
((eol_mode == SC_EOL_CR) ? IDS_MUI_EOLMODENAME_CR : IDS_MUI_EOLMODENAME_LF);
INT_PTR const answer = InfoBoxLng(MB_YESNO | MB_ICONWARNING, NULL, msgid);
WCHAR wch[64] = {L'\0'};
GetLngString(msgid, wch, COUNTOF(wch));
INT_PTR const answer = InfoBoxLng(MB_YESNO | MB_ICONWARNING, NULL, IDS_MUI_WARN_NORMALIZE_EOLS, wch);
if ((IDOK == answer) || (IDYES == answer))
{