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

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

Revision: 3706
          http://svn.sourceforge.net/winmerge/?rev=3706&view=rev
Author:   kimmov
Date:     2006-10-11 08:46:09 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
PATCH: [ 1574696 ] Fix problem in saving filefilter to project file

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

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2006-10-10 18:21:23 UTC (rev 3705)
+++ trunk/Src/Changes.txt	2006-10-11 15:46:09 UTC (rev 3706)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-10-11 Kimmo
+ PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
+  Src: ProjectFilePathsDlg.cpp
+
 2006-10-10 Takashi
  BUG: [ 1573240 ] Crash in subversion trunk
   Src: MainFrm.cpp MainFrm.h OptionsInit.cpp

Modified: trunk/Src/ProjectFilePathsDlg.cpp
===================================================================
--- trunk/Src/ProjectFilePathsDlg.cpp	2006-10-10 18:21:23 UTC (rev 3705)
+++ trunk/Src/ProjectFilePathsDlg.cpp	2006-10-11 15:46:09 UTC (rev 3706)
@@ -158,6 +158,13 @@
 {
 	UpdateData(TRUE);
 
+	m_sLeftFile.TrimLeft();
+	m_sLeftFile.TrimRight();
+	m_sLeftFile.TrimLeft();
+	m_sLeftFile.TrimRight();
+	m_sFilter.TrimLeft();
+	m_sFilter.TrimRight();
+
 	CString fileName = AskProjectFileName(FALSE);
 	if (fileName.IsEmpty())
 		return;
@@ -169,7 +176,17 @@
 	if (!m_sRightFile.IsEmpty())
 		project.SetRight(m_sRightFile, &m_bRightPathReadOnly);
 	if (!m_sFilter.IsEmpty())
+	{
+		// Remove possbile prefix from the filter name
+		CString prefix = LoadResString(IDS_FILTER_PREFIX);
+		int ind = m_sFilter.Find(prefix, 0);
+		if (ind == 0)
+		{
+			m_sFilter.Delete(0, prefix.GetLength());
+		}
+		m_sFilter.TrimLeft();
 		project.SetFilter(m_sFilter);
+	}
 	project.SetSubfolders(m_bIncludeSubfolders);
 
 	CString sErr;


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