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

[<ga...@us...>]

Revision: 4036
          http://svn.sourceforge.net/winmerge/?rev=4036&view=rev
Author:   galh
Date:     2007-01-12 01:11:08 -0800 (Fri, 12 Jan 2007)

Log Message:
-----------
PATCH: [ 1633194 ] Add editor tab setting to configuration 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	2007-01-11 19:51:37 UTC (rev 4035)
+++ branches/R2_6/Src/Changes.txt	2007-01-12 09:11:08 UTC (rev 4036)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2007-01-12 Gal
+ PATCH: [ 1633194 ] Add editor tab setting to configuration log
+  Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
+
 2007-01-11 Kimmo
  BUG: [ 1616838 ] Directory filter broken?
   Src: FileFilterMgr.cpp

Modified: branches/R2_6/Src/ConfigLog.cpp
===================================================================
--- branches/R2_6/Src/ConfigLog.cpp	2007-01-11 19:51:37 UTC (rev 4035)
+++ branches/R2_6/Src/ConfigLog.cpp	2007-01-12 09:11:08 UTC (rev 4036)
@@ -455,6 +455,8 @@
 	WriteItemYesNo(2, _T("Show linenumbers"), &m_miscSettings.bShowLinenumbers);
 	WriteItemYesNo(2, _T("Wrap lines"), &m_miscSettings.bWrapLines);
 	WriteItemYesNo(2, _T("Syntax Highlight"), &m_miscSettings.bSyntaxHighlight);
+	WriteItem(m_file, 2, _T("Tab size"), m_miscSettings.nTabSize);
+	WriteItemYesNoInverted(2, _T("Insert tabs"), &m_miscSettings.bInsertTabs);
 	
 // Font settings
 	FileWriteString(_T("\n Font:\n"));

Modified: branches/R2_6/Src/ConfigLog.h
===================================================================
--- branches/R2_6/Src/ConfigLog.h	2007-01-11 19:51:37 UTC (rev 4035)
+++ branches/R2_6/Src/ConfigLog.h	2007-01-12 09:11:08 UTC (rev 4036)
@@ -65,6 +65,8 @@
 	BOOL bWrapLines;
 	BOOL bMergeMode;
 	BOOL bSyntaxHighlight;
+	BOOL bInsertTabs;
+	INT  nTabSize;
 };
 
 /** 

Modified: branches/R2_6/Src/MainFrm.cpp
===================================================================
--- branches/R2_6/Src/MainFrm.cpp	2007-01-11 19:51:37 UTC (rev 4035)
+++ branches/R2_6/Src/MainFrm.cpp	2007-01-12 09:11:08 UTC (rev 4036)
@@ -2384,6 +2384,8 @@
 	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_miscSettings.bInsertTabs, options, OPT_TAB_TYPE, cfgdir);
+	LoadConfigIntSetting(&configLog.m_miscSettings.nTabSize, options, OPT_TAB_SIZE, 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.