From f3eaace279c75eae3354c1a931154f01d0b3d1fc Mon Sep 17 00:00:00 2001
From: RaiKoHoff <rainer.kottenhoff@gmail.com>
Date: Wed, 16 Sep 2020 13:58:59 +0200
Subject: [PATCH] + enh: Set Light/Dark Mode for grepWinNP3 execution

---
 grepWinNP3/src/SearchDlg.cpp | 18 +++++++++---------
 grepWinNP3/src/Theme.cpp     |  4 ++--
 src/Dialogs.c                |  3 +++
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/grepWinNP3/src/SearchDlg.cpp b/grepWinNP3/src/SearchDlg.cpp
index 34263f75d..05a4cf915 100644
--- a/grepWinNP3/src/SearchDlg.cpp
+++ b/grepWinNP3/src/SearchDlg.cpp
@@ -281,7 +281,7 @@ LRESULT CSearchDlg::DlgFunc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
                 if (bPortable)
                 {
                     m_patternregex = g_iniFile.GetValue(L"global", L"pattern", L"");
-                    m_bUseRegexForPaths = !!_wtoi(g_iniFile.GetValue(L"global", L"UseFileMatchRegex", L""));
+                    m_bUseRegexForPaths = g_iniFile.GetBoolValue(L"global", L"UseFileMatchRegex", false);
                 }
                 else
                 {
@@ -384,15 +384,15 @@ LRESULT CSearchDlg::DlgFunc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
             if (!m_bSizeC)
             {
                 m_bAllSize = bPortable ? g_iniFile.GetBoolValue(L"global", L"AllSize", false) : !!DWORD(m_regAllSize);
-                m_sizeCmp = bPortable ? _wtoi(g_iniFile.GetValue(L"global", L"SizeCombo", L"0")) : (int)DWORD(m_regSizeCombo);
+                m_sizeCmp = bPortable ? g_iniFile.GetLongValue(L"global", L"SizeCombo", 0) : (int)DWORD(m_regSizeCombo);
             }
             if (!m_bDateLimitC)
             {
-                m_DateLimit = bPortable ? _wtoi(g_iniFile.GetValue(L"global", L"DateLimit", L"0")) : (int)DWORD(m_regDateLimit);
-                m_Date1.dwLowDateTime = bPortable ? wcstoul(g_iniFile.GetValue(L"global", L"Date1Low", L"0"), nullptr, 10) : DWORD(m_regDate1Low);
-                m_Date1.dwHighDateTime = bPortable ? wcstoul(g_iniFile.GetValue(L"global", L"Date1High", L"0"), nullptr, 10) : DWORD(m_regDate1High);
-                m_Date2.dwLowDateTime = bPortable ? wcstoul(g_iniFile.GetValue(L"global", L"Date2Low", L"0"), nullptr, 10) : DWORD(m_regDate2Low);
-                m_Date2.dwHighDateTime = bPortable ? wcstoul(g_iniFile.GetValue(L"global", L"Date2High", L"0"), nullptr, 10) : DWORD(m_regDate2High);
+                m_DateLimit = bPortable ? g_iniFile.GetLongValue(L"global", L"DateLimit", 0) : (int)DWORD(m_regDateLimit);
+                m_Date1.dwLowDateTime = bPortable ? g_iniFile.GetLongValue(L"global", L"Date1Low", 0) : DWORD(m_regDate1Low);
+                m_Date1.dwHighDateTime = bPortable ? g_iniFile.GetLongValue(L"global", L"Date1High", 0) : DWORD(m_regDate1High);
+                m_Date2.dwLowDateTime = bPortable ? g_iniFile.GetLongValue(L"global", L"Date2Low", 0) : DWORD(m_regDate2Low);
+                m_Date2.dwHighDateTime = bPortable ? g_iniFile.GetLongValue(L"global", L"Date2High", 0) : DWORD(m_regDate2High);
             }
 
             m_bUseRegex = (bPortable ? g_iniFile.GetBoolValue(L"global", L"UseRegex", false) : DWORD(m_regUseRegex));
@@ -554,7 +554,7 @@ LRESULT CSearchDlg::DlgFunc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 #ifdef NP3_ALLOW_UPDATE
             bool doCheck = true;
             if (bPortable)
-                doCheck = !!_wtoi(g_iniFile.GetValue(L"global", L"CheckForUpdates", L"1"));
+                doCheck = g_iniFile.GetBoolValue(L"global", L"CheckForUpdates", true));
             else
                 doCheck = !!DWORD(CRegStdDWORD(L"Software\\grepWin\\CheckForUpdates", 1));
             if (doCheck)
@@ -3952,7 +3952,7 @@ void CSearchDlg::CheckForUpdates(bool force)
     // check for newer versions
     bool doCheck = true;
     if (bPortable)
-        doCheck = !!_wtoi(g_iniFile.GetValue(L"global", L"CheckForUpdates", L"1"));
+        doCheck = g_iniFile.GetBoolValue(L"global", L"CheckForUpdates", true));
     else
         doCheck = !!DWORD(CRegStdDWORD(L"Software\\grepWin\\CheckForUpdates", 1));
     if (doCheck)
diff --git a/grepWinNP3/src/Theme.cpp b/grepWinNP3/src/Theme.cpp
index b7f2f3d61..d9b67f4cd 100644
--- a/grepWinNP3/src/Theme.cpp
+++ b/grepWinNP3/src/Theme.cpp
@@ -82,7 +82,7 @@ void CTheme::Load()
 {
     IsDarkModeAllowed();
     OnSysColorChanged();
-    auto setDarkMode = bPortable ? _wtoi(g_iniFile.GetValue(L"global", L"darkmode", L"0")) != 0 : !!m_regDarkTheme;
+    auto setDarkMode = bPortable ? g_iniFile.GetBoolValue(L"global", L"darkmode", false) : !!m_regDarkTheme;
     m_dark           = setDarkMode && IsDarkModeAllowed() && !IsHighContrastMode() && DarkModeHelper::Instance().ShouldAppsUseDarkMode();
     m_bLoaded        = true;
 }
@@ -933,7 +933,7 @@ void CTheme::OnSysColorChanged()
         RGBtoHSL(::GetSysColor(COLOR_WINDOW), h2, s2, l2);
         m_isHighContrastModeDark = l2 < l1;
     }
-    auto setDarkMode = bPortable ? _wtoi(g_iniFile.GetValue(L"global", L"darkmode", L"0")) != 0 : !!m_regDarkTheme;
+    auto setDarkMode = bPortable ? g_iniFile.GetBoolValue(L"global", L"darkmode", false) : !!m_regDarkTheme;
     m_dark           = setDarkMode && IsDarkModeAllowed() && !IsHighContrastMode() && DarkModeHelper::Instance().ShouldAppsUseDarkMode();
 }
 
diff --git a/src/Dialogs.c b/src/Dialogs.c
index c4e2ac3cf..eda7a7183 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -4606,6 +4606,9 @@ void DialogGrepWin(HWND hwnd, LPCWSTR searchPattern)
         }
       }
 
+      bool const bDarkMode = UseDarkMode(); // <- override usr ~ IniSectionGetBool(globalSection, L"darkmode", UseDarkMode());
+      IniSectionSetBool(globalSection, L"darkmode", bDarkMode);
+
       StringCchPrintf(tchTemp, COUNTOF(tchTemp), L"%s /%%mode%% \"%%pattern%%\" /g %%line%% - %%path%%", tchNotepad3Path);
       IniSectionSetString(globalSection, L"editorcmd", tchTemp);