[Winmerge-svn] SF.net SVN: winmerge:[6570] trunk

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

Revision: 6570
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6570&view=rev
Author:   kimmov
Date:     2009-03-15 17:30:19 +0000 (Sun, 15 Mar 2009)

Log Message:
-----------
Initialize folder selection dialog to currently selected folder in options dialog.

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Src/PropBackups.cpp
    trunk/Src/PropRegistry.cpp

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2009-03-15 14:33:03 UTC (rev 6569)
+++ trunk/Docs/Users/ChangeLog.txt	2009-03-15 17:30:19 UTC (rev 6570)
@@ -6,6 +6,8 @@
 WinMerge 2.13.5
   Remember last target folder for Copy/Move to in folder compare (#2659228)
   Add shortcut for Discard All in save confirmation dialog (#2559560)
+  Initialize folder selection dialog to currently selected folder in
+    options dialog (r6570)
   Bugfix: Filename extension column was empty for files (#2670046)
   Bugfix: Crash when selecting backup folder (#2686382)
   Translation updates:

Modified: trunk/Src/PropBackups.cpp
===================================================================
--- trunk/Src/PropBackups.cpp	2009-03-15 14:33:03 UTC (rev 6569)
+++ trunk/Src/PropBackups.cpp	2009-03-15 17:30:19 UTC (rev 6570)
@@ -113,7 +113,7 @@
 void CPropBackups::OnBnClickedBackupBrowse()
 {
 	CString path;
-	if (SelectFolder(path, NULL, 0, GetSafeHwnd()))
+	if (SelectFolder(path, m_sGlobalFolder, 0, GetSafeHwnd()))
 	{
 		SetDlgItemText(IDC_BACKUP_FOLDER, path);
 	}

Modified: trunk/Src/PropRegistry.cpp
===================================================================
--- trunk/Src/PropRegistry.cpp	2009-03-15 14:33:03 UTC (rev 6569)
+++ trunk/Src/PropRegistry.cpp	2009-03-15 17:30:19 UTC (rev 6570)
@@ -148,7 +148,7 @@
 void CPropRegistry::OnBrowseFilterPath()
 {
 	CString path;
-	if (SelectFolder(path, NULL, IDS_OPEN_TITLE, GetSafeHwnd()))
+	if (SelectFolder(path, m_strUserFilterPath, IDS_OPEN_TITLE, GetSafeHwnd()))
 	{
 		SetDlgItemText(IDC_FILTER_USER_PATH, path);
 	}
@@ -158,7 +158,7 @@
 void CPropRegistry::OnBrowseTmpFolder()
 {
 	CString path;
-	if (SelectFolder(path, NULL, NULL, GetSafeHwnd()))
+	if (SelectFolder(path, m_tempFolder, NULL, GetSafeHwnd()))
 	{
 		SetDlgItemText(IDC_TMPFOLDER_NAME, path);
 	}


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