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

+ enh: option to equalize inconsistent line-breaks after loading

Browse Source
This commit is contained in:
Rainer Kottenhoff 2018-10-23 13:59:28 +02:00
parent 3f8c199e19
commit cda4804d01
11 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
language/np3_af_za/strings_af_za.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_gb/strings_en_gb.rc
View File

Binary file not shown.

BIN
language/np3_en_us/strings_en_us.rc
View File

Binary file not shown.

BIN
language/np3_es_es/strings_es_es.rc
View File

Binary file not shown.

BIN
language/np3_fr_fr/strings_fr_fr.rc
View File

Binary file not shown.

BIN
language/np3_ja_jp/strings_ja_jp.rc
View File

Binary file not shown.

BIN
language/np3_nl_nl/strings_nl_nl.rc
View File

Binary file not shown.

BIN
language/np3_zh_cn/strings_zh_cn.rc
View File

Binary file not shown.

20
src/Edit.c
View File

@ -884,7 +884,7 @@ void EditDetectEOLMode(LPCSTR lpData, DWORD cbData, EditFileIOStatus* status)
++linesCount[SC_EOL_CRLF];
}
else {
++linesCount[SC_EOL_LF];
++linesCount[SC_EOL_CR];
}
break;
default:
@ -895,16 +895,14 @@ void EditDetectEOLMode(LPCSTR lpData, DWORD cbData, EditFileIOStatus* status)
DocLn const linesMax = max_ln(max_ln(linesCount[0], linesCount[1]), linesCount[2]);
if (linesMax != linesCount[iEOLMode]) {
if (linesMax == linesCount[SC_EOL_CRLF]) {
iEOLMode = SC_EOL_CRLF;
}
else if (linesMax == linesCount[SC_EOL_LF]) {
iEOLMode = SC_EOL_LF;
}
else {
iEOLMode = SC_EOL_CR;
}
if (linesMax == linesCount[SC_EOL_CRLF]) {
iEOLMode = SC_EOL_CRLF;
}
else if (linesMax == linesCount[SC_EOL_CR]) {
iEOLMode = SC_EOL_CR;
}
else {
iEOLMode = SC_EOL_LF;
}
status->iEOLMode = iEOLMode;

15
src/Notepad3.c
View File

@ -9403,8 +9403,19 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload, bool bSkipUnicodeDetect,
MsgBoxLng(MBWARN, IDS_MUI_ERR_UNICODE);
}
// Show inconsistent line endings warning
if (fioStatus.bInconsistent && Settings.WarnInconsistEOLs) {
MsgBoxLng(MBWARN, IDS_MUI_WARN_INCONSIST_EOLS);
if (fioStatus.bInconsistent && Settings.WarnInconsistEOLs)
{
WCHAR szDefault[32];
WCHAR szStatistic[80];
int const eolm = Globals.iEOLMode; //Settings.DefaultEOLMode;
StringCchPrintf(szDefault, COUNTOF(szDefault), L"%s",
((eolm == SC_EOL_CRLF) ? L"CRLF (\\r\\n)" : ((eolm == SC_EOL_CR) ? L"CR (\\r)" : L"LF (\\n)")));
StringCchPrintf(szStatistic, COUNTOF(szStatistic), L">>> #CRLF = %i, #CR = %i, #LF = %i <<<",
fioStatus.linesCount[SC_EOL_CRLF], fioStatus.linesCount[SC_EOL_CR], fioStatus.linesCount[SC_EOL_LF]);
int const res = MsgBoxLng(MBYESNOWARN, IDS_MUI_WARN_INCONSIST_EOLS, szStatistic, szDefault);
if (res == IDYES) {
SciCall_ConvertEOLs(eolm);
}
}
}
else if (!(fioStatus.bFileTooBig || fioStatus.bUnknownExt)) {