From ca487d490953bed48935457f310ebefd1ff0183a Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Wed, 6 Mar 2019 12:00:59 +0100 Subject: [PATCH] + add: support (internal) development debug mode by [Settings2] (DevDebugMode=1) --- Build/Notepad3.ini | Bin 5862 -> 5896 bytes src/Edit.c | 5 +++-- src/Notepad3.c | 4 ++++ src/TypeDefs.h | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Build/Notepad3.ini b/Build/Notepad3.ini index 81e2ae7bfe2d4b4410881e320edbc02bf0330e62..d1b1603fb12325655f9417c68b150cc2d745041a 100644 GIT binary patch delta 42 tcmaE++o881fK%3*!G$4}p$tqWF_bc-Gx##(Go%2;Y#9tTdvng_1pwn83DN)n delta 12 TcmeCsd#1Y~fOB&Z=QLgbA$SC& diff --git a/src/Edit.c b/src/Edit.c index 5d05574e0..41f9201f7 100644 --- a/src/Edit.c +++ b/src/Edit.c @@ -1335,8 +1335,9 @@ bool EditLoadFile( /////////////////////////////////////////////////////////////////////////////////////////////////////////////// - // UCHARDET - _SetEncodingTitleInfo(origUCHARDET, iAnalyzedEncoding_UCD, confidence_UCD, iAnalyzedEncoding_CED, bIsReliable); + if (Flags.bDevDebugMode) { + _SetEncodingTitleInfo(origUCHARDET, iAnalyzedEncoding_UCD, confidence_UCD, iAnalyzedEncoding_CED, bIsReliable); + } /////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/Notepad3.c b/src/Notepad3.c index bb634819c..0c1e87673 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -457,6 +457,7 @@ static void _InitGlobals() Globals.FindReplaceMatchFoundState = FND_NOP; + DefaultFlags.bDevDebugMode = false; DefaultFlags.bStickyWindowPosition = false; DefaultFlags.bReuseWindow = false; DefaultFlags.bSingleFileInstance = true; @@ -6812,6 +6813,8 @@ void LoadSettings() LoadIniSection(L"Settings2", pIniSection, cchIniSection); // -------------------------------------------------------------------------- + + Defaults2.PreferredLanguageLocaleName[0] = L'\0'; IniSectionGetString(pIniSection, L"PreferredLanguageLocaleName", Defaults2.PreferredLanguageLocaleName, Settings2.PreferredLanguageLocaleName, COUNTOF(Settings2.PreferredLanguageLocaleName)); @@ -7930,6 +7933,7 @@ void LoadFlags() { LoadIniSection(L"Settings2", pIniSection, cchIniSection); + Flags.bDevDebugMode = IniSectionGetBool(pIniSection, L"DevDebugMode", DefaultFlags.bDevDebugMode); Flags.bStickyWindowPosition = IniSectionGetBool(pIniSection, L"StickyWindowPosition", DefaultFlags.bStickyWindowPosition); Flags.bReuseWindow = IniSectionGetBool(pIniSection, L"ReuseWindow", DefaultFlags.bReuseWindow); Flags.bSingleFileInstance = IniSectionGetBool(pIniSection, L"SingleFileInstance", DefaultFlags.bSingleFileInstance); diff --git a/src/TypeDefs.h b/src/TypeDefs.h index 3f64df81a..9b6ec7a6c 100644 --- a/src/TypeDefs.h +++ b/src/TypeDefs.h @@ -420,6 +420,7 @@ extern SETTINGS_T Settings; typedef struct _flags_t { + bool bDevDebugMode; bool bStickyWindowPosition; bool bReuseWindow; bool bSingleFileInstance;