[Winmerge-svn] SF.net SVN: winmerge: [3875] branches/R2_6/Src

[<ki...@us...>]

Revision: 3875
          http://svn.sourceforge.net/winmerge/?rev=3875&view=rev
Author:   kimmov
Date:     2006-11-30 08:06:00 -0800 (Thu, 30 Nov 2006)

Log Message:
-----------
PATCH: [ 1605682 ] Add Syntax Highlight option to config log

Modified Paths:
--------------
    branches/R2_6/Src/Changes.txt
    branches/R2_6/Src/ConfigLog.cpp
    branches/R2_6/Src/ConfigLog.h
    branches/R2_6/Src/MainFrm.cpp

Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt	2006-11-30 16:03:39 UTC (rev 3874)
+++ branches/R2_6/Src/Changes.txt	2006-11-30 16:06:00 UTC (rev 3875)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-11-30 Kimmo
+ PATCH: [ 1605682 ] Add Syntax Highlight option to config log
+  Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
+
 2006-11-30 Takashi
  BUG: [ 1603230 ] DirView icons isn't shown correctly on NT4.0
   Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico

Modified: branches/R2_6/Src/ConfigLog.cpp
===================================================================
--- branches/R2_6/Src/ConfigLog.cpp	2006-11-30 16:03:39 UTC (rev 3874)
+++ branches/R2_6/Src/ConfigLog.cpp	2006-11-30 16:06:00 UTC (rev 3875)
@@ -454,6 +454,7 @@
 	WriteItemYesNo(2, _T("Merge Mode enabled"), &m_miscSettings.bMergeMode);
 	WriteItemYesNo(2, _T("Show linenumbers"), &m_miscSettings.bShowLinenumbers);
 	WriteItemYesNo(2, _T("Wrap lines"), &m_miscSettings.bWrapLines);
+	WriteItemYesNo(2, _T("Syntax Highlight"), &m_miscSettings.bSyntaxHighlight);
 	
 // Font settings
 	FileWriteString(_T("\n Font:\n"));

Modified: branches/R2_6/Src/ConfigLog.h
===================================================================
--- branches/R2_6/Src/ConfigLog.h	2006-11-30 16:03:39 UTC (rev 3874)
+++ branches/R2_6/Src/ConfigLog.h	2006-11-30 16:06:00 UTC (rev 3875)
@@ -64,6 +64,7 @@
 	BOOL bShowLinenumbers;
 	BOOL bWrapLines;
 	BOOL bMergeMode;
+	BOOL bSyntaxHighlight;
 };
 
 /** 

Modified: branches/R2_6/Src/MainFrm.cpp
===================================================================
--- branches/R2_6/Src/MainFrm.cpp	2006-11-30 16:03:39 UTC (rev 3874)
+++ branches/R2_6/Src/MainFrm.cpp	2006-11-30 16:06:00 UTC (rev 3875)
@@ -2382,6 +2382,7 @@
 	LoadConfigBoolSetting(&configLog.m_miscSettings.bShowLinenumbers, options, OPT_VIEW_LINENUMBERS, cfgdir);
 	LoadConfigBoolSetting(&configLog.m_miscSettings.bWrapLines, options, OPT_WORDWRAP, cfgdir);
 	LoadConfigBoolSetting(&configLog.m_miscSettings.bMergeMode, options, OPT_MERGE_MODE, cfgdir);
+	LoadConfigBoolSetting(&configLog.m_miscSettings.bSyntaxHighlight, options, OPT_SYNTAX_HIGHLIGHT, cfgdir);
 
 	LoadConfigIntSetting(&configLog.m_cpSettings.nDefaultMode, options, OPT_CP_DEFAULT_MODE, cfgdir);
 	LoadConfigIntSetting(&configLog.m_cpSettings.nDefaultCustomValue, options, OPT_CP_DEFAULT_CUSTOM, cfgdir);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.