[Monodevelop-patches-list] r2328 - in trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Internal/Project/Project Services/Project

[Lluis Sanchez <lluis@ximian.com>]

Author: lluis
Date: 2005-03-11 06:46:33 -0500 (Fri, 11 Mar 2005)
New Revision: 2328

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/Project.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Project/ProjectService.cs
Log:
2005-03-11  Lluis Sanchez Gual  <lluis at novell.com>

	* Services/Project/ProjectService.cs: Search for new files after the
	whole combine has been loaded.
	* Internal/Project/Project/Project.cs: Don't show the include file
	dialog because it doesn't work. It will work with the new solution
	pad. All this partially fixes bug #71688.



Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-03-11 06:38:16 UTC (rev 2327)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-03-11 11:46:33 UTC (rev 2328)
@@ -1,3 +1,11 @@
+2005-03-11  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* Services/Project/ProjectService.cs: Search for new files after the
+	whole combine has been loaded.
+	* Internal/Project/Project/Project.cs: Don't show the include file
+	dialog because it doesn't work. It will work with the new solution
+	pad. All this partially fixes bug #71688.
+
 2005-03-10  Todd Berman  <tberman at off.net>
 
 	* Gui/Dialogs/SplashScreen.cs: Use an alignment, not labels.

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/Project.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/Project.cs	2005-03-11 06:38:16 UTC (rev 2327)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/Project.cs	2005-03-11 11:46:33 UTC (rev 2328)
@@ -192,16 +192,16 @@
 			}
 			
 			if (newFiles.Count > 0) {
-				if (newFileSearch == NewFileSearch.OnLoadAutoInsert) {
+//				if (newFileSearch == NewFileSearch.OnLoadAutoInsert) {
 					foreach (string file in newFiles) {
 						ProjectFile newFile = new ProjectFile(file);
 						newFile.BuildAction = IsCompileable(file) ? BuildAction.Compile : BuildAction.Nothing;
 						ProjectFiles.Add(newFile);
 					}
-				} else {
-					new IncludeFilesDialog(this, newFiles).ShowDialog();
+/*				} else {
+					Runtime.DispatchService.GuiSyncDispatch (new MessageHandler (new IncludeFilesDialog (BaseDirectory, this, newFiles).ShowDialog));
 				}
-			}
+*/			}
 		}
 		
 		public static Project LoadProject (string filename, IProgressMonitor monitor)
@@ -216,7 +216,6 @@
 		public override void Deserialize (ITypeSerializer handler, DataCollection data)
 		{
 			base.Deserialize (handler, data);
-			SearchNewFiles();
 			projectReferences.SetProject (this);
 		}
 

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Project/ProjectService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Project/ProjectService.cs	2005-03-11 06:38:16 UTC (rev 2327)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Project/ProjectService.cs	2005-03-11 11:46:33 UTC (rev 2328)
@@ -267,6 +267,8 @@
 				openCombine.ReferenceAddedToProject += new ProjectReferenceEventHandler (NotifyReferenceAddedToProject);
 				openCombine.ReferenceRemovedFromProject += new ProjectReferenceEventHandler (NotifyReferenceRemovedFromProject);
 		
+				SearchForNewFiles ();
+		
 				OnCombineOpened(new CombineEventArgs(openCombine));
 				
 				RestoreCombinePreferences (CurrentOpenCombine);
@@ -279,6 +281,14 @@
 			}
 		}
 		
+		void SearchForNewFiles ()
+		{
+			foreach (Project p in openCombine.GetAllProjects()) {
+				if (p.NewFileSearch != NewFileSearch.None)
+					p.SearchNewFiles ();
+			}
+		}
+		
 		public void SaveCombine()
 		{
 			IProgressMonitor monitor = Runtime.TaskService.GetSaveProgressMonitor ();