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

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

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

Log Message:
-----------
PATCH: [ 1589427 ] Add back read-only handling for project files

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

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2006-11-03 16:33:28 UTC (rev 3764)
+++ trunk/Src/Changes.txt	2006-11-03 19:30:14 UTC (rev 3765)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-11-03 Kimmo
+ PATCH: [ 1589427 ] Add back read-only handling for project files
+  Src: ProjectFile.cpp
+
 2006-11-03 Tim
  PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter
   Src\editlib: basic.cpp

Modified: trunk/Src/ProjectFile.cpp
===================================================================
--- trunk/Src/ProjectFile.cpp	2006-11-03 16:33:28 UTC (rev 3764)
+++ trunk/Src/ProjectFile.cpp	2006-11-03 19:30:14 UTC (rev 3765)
@@ -34,6 +34,8 @@
 const TCHAR Right_element_name[] = _T("right");
 const TCHAR Filter_element_name[] = _T("filter");
 const TCHAR Subfolders_element_name[] = _T("subfolders");
+const TCHAR Left_ro_element_name[] = _T("left-readonly");
+const TCHAR Right_ro_element_name[] = _T("right-readonly");
 
 /** 
  * @brief Standard constructor.
@@ -134,11 +136,15 @@
 		scew_element *right = NULL;
 		scew_element *filter = NULL;
 		scew_element *subfolders = NULL;
+		scew_element *left_ro = NULL;
+		scew_element *right_ro = NULL;
 
 		left = scew_element_by_name(paths, Left_element_name);
 		right = scew_element_by_name(paths, Right_element_name);
 		filter = scew_element_by_name(paths, Filter_element_name);
 		subfolders = scew_element_by_name(paths, Subfolders_element_name);
+		left_ro = scew_element_by_name(paths, Left_ro_element_name);
+		right_ro = scew_element_by_name(paths, Right_ro_element_name);
 
 		if (left)
 		{
@@ -164,6 +170,18 @@
 			folders = scew_element_contents(subfolders);
 			m_subfolders = _ttoi(folders);
 		}
+		if (left_ro)
+		{
+			LPCTSTR readonly = NULL;
+			readonly = scew_element_contents(left_ro);
+			m_bLeftReadOnly = (_ttoi(readonly) != 0);
+		}
+		if (right_ro)
+		{
+			LPCTSTR readonly = NULL;
+			readonly = scew_element_contents(right_ro);
+			m_bRightReadOnly = (_ttoi(readonly) != 0);
+		}
 	}
 }
 
@@ -269,16 +287,24 @@
 		m_filter.ReleaseBuffer();
 	}
 
-	LPCTSTR path;
 	element = scew_element_add(parent, Subfolders_element_name);
 	if (m_subfolders != 0)
-	{
 		scew_element_set_contents(element, _T("1"));
-	}
 	else
-	{
 		scew_element_set_contents(element, _T("0"));
-	}
+
+	element = scew_element_add(parent, Left_ro_element_name);
+	if (m_bLeftReadOnly)
+		scew_element_set_contents(element, _T("1"));
+	else
+		scew_element_set_contents(element, _T("0"));
+
+	element = scew_element_add(parent, Right_ro_element_name);
+	if (m_bRightReadOnly)
+		scew_element_set_contents(element, _T("1"));
+	else
+		scew_element_set_contents(element, _T("0"));
+
 	return TRUE;
 }
 


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