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
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);
class CfgSettings;
/**
+ * @brief Compare-related settings.
+ */
+struct COMPARESETTINGS
+{
+ int nCompareMethod;
+ BOOL bStopAfterFirst;
+};
+
+/**
* @brief View settings for directory compare
*/
struct VIEWSETTINGS
~CConfigLog();
DIFFOPTIONS m_diffOptions;
+ COMPARESETTINGS m_compareSettings;
VIEWSETTINGS m_viewSettings;
MISCSETTINGS m_miscSettings;
CPSETTINGS m_cpSettings;
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);