[Winmerge-svn] SF.net SVN: winmerge: [3766] trunk/Src

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

Revision: 3766
          http://svn.sourceforge.net/winmerge/?rev=3766&view=rev
Author:   kimmov
Date:     2006-11-03 11:35:34 -0800 (Fri, 03 Nov 2006)

Log Message:
-----------
PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog

Modified Paths:
--------------
    trunk/Src/Changes.txt
    trunk/Src/MainFrm.cpp

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2006-11-03 19:30:14 UTC (rev 3765)
+++ trunk/Src/Changes.txt	2006-11-03 19:35:34 UTC (rev 3766)
@@ -5,6 +5,8 @@
 2006-11-03 Kimmo
  PATCH: [ 1589427 ] Add back read-only handling for project files
   Src: ProjectFile.cpp
+ PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog
+  Src: MainFrm.cpp
 
 2006-11-03 Tim
  PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter

Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp	2006-11-03 19:30:14 UTC (rev 3765)
+++ trunk/Src/MainFrm.cpp	2006-11-03 19:35:34 UTC (rev 3766)
@@ -3059,6 +3059,8 @@
 		left = pMergeDoc->m_filePaths.GetLeft();
 		right = pMergeDoc->m_filePaths.GetRight();
 		pathsDlg.SetPaths(left, right);
+		pathsDlg.m_bLeftPathReadOnly = pMergeDoc->m_ptBuf[0]->GetReadOnly();
+		pathsDlg.m_bRightPathReadOnly = pMergeDoc->m_ptBuf[1]->GetReadOnly();
 	}
 	else if (bDirFrame)
 	{
@@ -3072,6 +3074,9 @@
 		right = item.getRightFilepath(pDoc->GetRightBasePath());
 		right += "\\";
 		pathsDlg.SetPaths(left, right);
+		pathsDlg.m_bIncludeSubfolders = pDoc->GetRecursive();
+		pathsDlg.m_bLeftPathReadOnly = pDoc->GetReadOnly(TRUE);
+		pathsDlg.m_bRightPathReadOnly = pDoc->GetReadOnly(FALSE);
 	}
 
 	CString filterNameOrMask = theApp.m_globalFileFilter.GetFilterNameOrMask();


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