[Winmerge-svn] SF.net SVN: winmerge:[6326] branches/R2_12/Src

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

Revision: 6326
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6326&view=rev
Author:   kimmov
Date:     2009-01-14 18:43:50 +0000 (Wed, 14 Jan 2009)

Log Message:
-----------
Add tree-view option to config log.

Modified Paths:
--------------
    branches/R2_12/Src/ConfigLog.cpp
    branches/R2_12/Src/ConfigLog.h
    branches/R2_12/Src/MainFrm.cpp

Modified: branches/R2_12/Src/ConfigLog.cpp
===================================================================
--- branches/R2_12/Src/ConfigLog.cpp	2009-01-14 18:42:16 UTC (rev 6325)
+++ branches/R2_12/Src/ConfigLog.cpp	2009-01-14 18:43:50 UTC (rev 6326)
@@ -482,13 +482,14 @@
 	WriteItemYesNo(2, _T("Automatic scroll to 1st difference"), &m_miscSettings.bScrollToFirst);
 	WriteItemYesNo(2, _T("Backup original file"), &m_miscSettings.bBackup);
 
-	FileWriteString(_T("\n Show:\n"));
+	FileWriteString(_T("\n Folder compare:\n"));
 	WriteItemYesNo(2, _T("Identical files"), &m_viewSettings.bShowIdent);
 	WriteItemYesNo(2, _T("Different files"), &m_viewSettings.bShowDiff);
 	WriteItemYesNo(2, _T("Left Unique files"), &m_viewSettings.bShowUniqueLeft);
 	WriteItemYesNo(2, _T("Right Unique files"), &m_viewSettings.bShowUniqueRight);
 	WriteItemYesNo(2, _T("Binary files"), &m_viewSettings.bShowBinaries);
 	WriteItemYesNo(2, _T("Skipped files"), &m_viewSettings.bShowSkipped);
+	WriteItemYesNo(2, _T("Tree-mode enabled"), &m_viewSettings.bTreeView);
 
 	FileWriteString(_T("\n Editor settings:\n"));
 	WriteItemYesNo(2, _T("View Whitespace"), &m_miscSettings.bViewWhitespace);

Modified: branches/R2_12/Src/ConfigLog.h
===================================================================
--- branches/R2_12/Src/ConfigLog.h	2009-01-14 18:42:16 UTC (rev 6325)
+++ branches/R2_12/Src/ConfigLog.h	2009-01-14 18:43:50 UTC (rev 6326)
@@ -47,6 +47,7 @@
 	bool bShowUniqueRight;
 	bool bShowBinaries;
 	bool bShowSkipped;
+	bool bTreeView;
 };
 
 /** 

Modified: branches/R2_12/Src/MainFrm.cpp
===================================================================
--- branches/R2_12/Src/MainFrm.cpp	2009-01-14 18:42:16 UTC (rev 6325)
+++ branches/R2_12/Src/MainFrm.cpp	2009-01-14 18:43:50 UTC (rev 6326)
@@ -2412,6 +2412,7 @@
 	LoadConfigBoolSetting(&configLog.m_viewSettings.bShowUniqueRight, options, OPT_SHOW_UNIQUE_RIGHT, cfgdir);
 	LoadConfigBoolSetting(&configLog.m_viewSettings.bShowBinaries, options, OPT_SHOW_BINARIES, cfgdir);
 	LoadConfigBoolSetting(&configLog.m_viewSettings.bShowSkipped, options, OPT_SHOW_SKIPPED, cfgdir);
+	LoadConfigBoolSetting(&configLog.m_viewSettings.bTreeView, options, OPT_TREE_MODE, cfgdir);
 
 	LoadConfigBoolSetting(&configLog.m_miscSettings.bAutomaticRescan, options, OPT_AUTOMATIC_RESCAN, cfgdir);
 	LoadConfigBoolSetting(&configLog.m_miscSettings.bAllowMixedEol, options, OPT_ALLOW_MIXED_EOL, cfgdir);


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