[Monodevelop-patches-list] r1739 - in trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor: . Gui/Dialogs

[commit-watcher at mono-cvs.ximian.com]

Author: jba
Date: 2004-06-11 09:07:22 -0400 (Fri, 11 Jun 2004)
New Revision: 1739

Modified:
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs
Log:
crash and cosmetic fix for replace in files dialog

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2004-06-11 12:30:13 UTC (rev 1738)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2004-06-11 13:07:22 UTC (rev 1739)
@@ -1,3 +1,9 @@
+2004-06-10  John BouAntoun  <jba-mono at optusnet.com.au>
+	* Gui/Dialogs/ReplaceInFilesDialog.cs: Fix ReplaceInFilesDialog to 
+	make it show instead of crashing MD, also made the '...' browse 
+	button pick up current path or use default project path in the 
+	folder selection dialog it opens up.
+
 2004-06-10  Todd Berman  <tberman at sevenl.net>
 
 	* Gui/SourceEditorBuffer.cs: use the win32 dll name that gtk-sharp

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs	2004-06-11 12:30:13 UTC (rev 1738)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs	2004-06-11 13:07:22 UTC (rev 1739)
@@ -106,6 +106,7 @@
 				helpButtons.AddWidget(replaceHelpButton);
 				
 				replaceHelpButton.Sensitive = false;
+				ReplaceDialogPointer = this.ReplaceInFilesDialogWidget;
 			}
 			else
 			{
@@ -253,7 +254,21 @@
 		
 		void BrowseDirectoryEvent(object sender, EventArgs e)
 		{
+			PropertyService PropertyService = (PropertyService)ServiceManager.Services.GetService (typeof (PropertyService));			
 			FolderDialog fd = new FolderDialog(GettextCatalog.GetString ("Select directory"));
+
+			// set up the dialog to point to currently selected folder, or the default projects folder
+			string defaultFolder = this.directoryTextBox.Text;	
+			if (defaultFolder == string.Empty || defaultFolder == null) {
+				// only use the bew project default path if there is no path set
+				defaultFolder =	PropertyService.GetProperty (
+						"MonoDevelop.Gui.Dialogs.NewProjectDialog.DefaultPath", 
+						System.IO.Path.Combine (
+							System.Environment.GetEnvironmentVariable ("HOME"),
+							"MonoDevelopProjects")).ToString ();
+			}
+			fd.Complete (defaultFolder);
+
 			if (fd.Run() == (int)Gtk.ResponseType.Ok)
 			{
 				directoryTextBox.Text = fd.Filename;