PATCH: [ 1449892 ] Add compare method to configlog

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 4177756..26c28a2 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -2,6 +2,10 @@ Src\Changes.txt
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-03-19 Kimmo
+ PATCH: [ 1449892 ] Add compare method to configlog
+  Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
+
 2006-03-17 Tim
  PATCH: [ 1449571 ] Add '*.pm' and '*.plx' to Perl highlighter
   Src/editlib: ccrystaleditview.cpp

diff --git a/Src/ConfigLog.cpp b/Src/ConfigLog.cpp
index fadd5d1..ae4bdb2 100644 (file)
--- a/Src/ConfigLog.cpp
+++ b/Src/ConfigLog.cpp
@@ -434,6 +434,8 @@ BOOL CConfigLog::DoFile(bool writing, CString &sError)
        WriteItemWhitespace(2, _T("Whitespace compare"), &m_diffOptions.nIgnoreWhitespace);
 
        WriteItemYesNo(2, _T("Detect moved blocks"), &m_miscSettings.bMovedBlocks);
+       WriteItem(m_file, 2, _T("Compare method"), m_compareSettings.nCompareMethod);
+       WriteItemYesNo(2, _T("Stop after first diff"), &m_compareSettings.bStopAfterFirst);
 
        FileWriteString(_T("\n Other settings:\n"));
        WriteItemYesNo(2, _T("Automatic rescan"), &m_miscSettings.bAutomaticRescan);

diff --git a/Src/ConfigLog.h b/Src/ConfigLog.h
index 081fc85..9e6db97 100644 (file)
--- a/Src/ConfigLog.h
+++ b/Src/ConfigLog.h
@@ -28,6 +28,15 @@
 class CfgSettings;
 
 /** 
+ * @brief Compare-related settings.
+ */
+struct COMPARESETTINGS
+{
+       int nCompareMethod;
+       BOOL bStopAfterFirst;
+};
+
+/** 
  * @brief View settings for directory compare
  */
 struct VIEWSETTINGS
@@ -83,6 +92,7 @@ public:
        ~CConfigLog();
 
        DIFFOPTIONS m_diffOptions;
+       COMPARESETTINGS m_compareSettings;
        VIEWSETTINGS m_viewSettings;
        MISCSETTINGS m_miscSettings;
        CPSETTINGS m_cpSettings;

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 8e36747..d3bfe40 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -2279,7 +2279,9 @@ LoadConfigLog(CConfigLog & configLog, COptionsMgr & options, LOGFONT & lfDiff, C
        LoadConfigBoolSetting(&configLog.m_diffOptions.bIgnoreBlankLines, options, OPT_CMP_IGNORE_BLANKLINES, cfgdir);
        LoadConfigBoolSetting(&configLog.m_diffOptions.bIgnoreCase, options, OPT_CMP_IGNORE_CASE, cfgdir);
        LoadConfigBoolSetting(&configLog.m_diffOptions.bIgnoreEol, options, OPT_CMP_IGNORE_EOL, cfgdir);
-       
+       LoadConfigIntSetting(&configLog.m_compareSettings.nCompareMethod, options, OPT_CMP_METHOD, cfgdir);
+       LoadConfigBoolSetting(&configLog.m_compareSettings.bStopAfterFirst, options, OPT_CMP_STOP_AFTER_FIRST, cfgdir);
+
        LoadConfigBoolSetting(&configLog.m_viewSettings.bShowIdent, options, OPT_SHOW_IDENTICAL, cfgdir);
        LoadConfigBoolSetting(&configLog.m_viewSettings.bShowDiff, options, OPT_SHOW_DIFFERENT, cfgdir);
        LoadConfigBoolSetting(&configLog.m_viewSettings.bShowUniqueLeft, options, OPT_SHOW_UNIQUE_LEFT, cfgdir);