From jacobilsoe at mono-cvs.ximian.com  Fri Jul  1 09:48:29 2005
From: jacobilsoe at mono-cvs.ximian.com (Jacob Ilsų Christensen <jacobilsoe@gmail.com>)
Date: Fri,  1 Jul 2005 09:48:29 -0400 (EDT)
Subject: [Monodevelop-patches-list] r2617 - in
	trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor:
	. CodeCompletion
Message-ID: <20050701134829.79CBF94766@mono-cvs.ximian.com>

Author: jacobilsoe
Date: 2005-07-01 09:48:29 -0400 (Fri, 01 Jul 2005)
New Revision: 2617

Modified:
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ListWindow.cs
Log:
Make sure the list window is no larger than necessary

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2005-06-30 18:30:47 UTC (rev 2616)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2005-07-01 13:48:29 UTC (rev 2617)
@@ -1,3 +1,8 @@
+2005-07-01  Jacob Ils? Christensen  <jacobilsoe at gmail.com>
+
+	* CodeCompletion/ListWindow.cs: Make sure the list
+	window is no larger than necessary.
+
 2005-06-28  Raja R Harinath  <rharinath at novell.com>
 
 	* Makefile.am (FILES): Move AssemblyInfo.cs ...

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ListWindow.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ListWindow.cs	2005-06-30 18:30:47 UTC (rev 2616)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ListWindow.cs	2005-07-01 13:48:29 UTC (rev 2617)
@@ -45,11 +45,19 @@
 		{
 			word = new StringBuilder ();
 			curPos = 0;
-			scrollbar.Adjustment.Lower = 0;
-			scrollbar.Adjustment.Upper = provider.ItemCount - list.VisibleRows;
-			scrollbar.Adjustment.PageIncrement = list.VisibleRows - 1;
-			scrollbar.Adjustment.StepIncrement = 1;
 			list.Reset ();
+
+			if (list.VisibleRows >= provider.ItemCount) {
+				this.scrollbar.Hide();
+			}
+			else {
+				scrollbar.Adjustment.Lower = 0;
+				scrollbar.Adjustment.Upper = provider.ItemCount - list.VisibleRows;
+				scrollbar.Adjustment.PageIncrement = list.VisibleRows - 1;
+				scrollbar.Adjustment.StepIncrement = 1;
+			}
+
+			this.Resize(this.list.WidthRequest, this.list.HeightRequest);
 		}
 		
 		public IListDataProvider DataProvider
@@ -421,7 +429,12 @@
 			rowHeight += padding;
 			visibleRows = (winHeight + padding - margin * 2) / rowHeight;
 			
-			int newHeight = (rowHeight * visibleRows) + margin * 2;
+			int newHeight;
+
+			if (this.win.DataProvider.ItemCount > this.visibleRows)
+				newHeight = (rowHeight * visibleRows) + margin * 2;
+			else
+				newHeight = (rowHeight * this.win.DataProvider.ItemCount) + margin * 2;
 			
 			if (lvWidth != listWidth || lvHeight != newHeight)
 				this.SetSizeRequest (listWidth, newHeight);



From jacobilsoe at mono-cvs.ximian.com  Fri Jul  1 09:54:30 2005
From: jacobilsoe at mono-cvs.ximian.com (Jacob Ilsų Christensen <jacobilsoe@gmail.com>)
Date: Fri,  1 Jul 2005 09:54:30 -0400 (EDT)
Subject: [Monodevelop-patches-list] r2618 - in trunk/MonoDevelop/Core/src:
	AddIns/DisplayBindings/SourceEditor
	AddIns/DisplayBindings/SourceEditor/Gui
	AddIns/DisplayBindings/SourceEditor/Gui/Dialogs
	MonoDevelop.Base MonoDevelop.Base/Gui/Pads
	MonoDevelop.Base/Gui/Pads/ClassPad
	MonoDevelop.Base/Gui/Search/SearchResult
	MonoDevelop.Base/Services/Tasks
Message-ID: <20050701135430.BF98B94767@mono-cvs.ximian.com>

Author: jacobilsoe
Date: 2005-07-01 09:54:30 -0400 (Fri, 01 Jul 2005)
New Revision: 2618

Modified:
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/GotoLineNumberDialog.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/ClassPad/ClassNodeBuilder.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/ClassPad/MemberNodeCommandHandler.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/OpenTaskView.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Search/SearchResult/DefaultSearchResult.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Tasks/Task.cs
Log:
Make lines and columns 1-based

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2005-07-01 13:48:29 UTC (rev 2617)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2005-07-01 13:54:30 UTC (rev 2618)
@@ -1,5 +1,11 @@
 2005-07-01  Jacob Ils? Christensen  <jacobilsoe at gmail.com>
 
+	* Gui/Dialogs/GotoLineNumberDialog.cs:
+	* Gui/SourceEditorDisplayBinding.cs:
+	Make lines and columns 1-based.
+	
+2005-07-01  Jacob Ils? Christensen  <jacobilsoe at gmail.com>
+
 	* CodeCompletion/ListWindow.cs: Make sure the list
 	window is no larger than necessary.
 

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/GotoLineNumberDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/GotoLineNumberDialog.cs	2005-07-01 13:48:29 UTC (rev 2617)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/GotoLineNumberDialog.cs	2005-07-01 13:54:30 UTC (rev 2618)
@@ -56,9 +56,9 @@
 				
 				
 				if (window != null && window.ViewContent is IPositionable) {			
-					int l = Math.Max (0, Int32.Parse(line_number_entry.Text) - 1);
+					int l = Math.Max (1, Int32.Parse(line_number_entry.Text));
 					
-					((IPositionable) window.ViewContent).JumpTo (l, 0);
+					((IPositionable) window.ViewContent).JumpTo (l, 1);
 				}
 			} catch (Exception) {
 				

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs	2005-07-01 13:48:29 UTC (rev 2617)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs	2005-07-01 13:54:30 UTC (rev 2618)
@@ -204,12 +204,12 @@
 
 		public void JumpTo (int line, int column)
 		{
-			// NOTE: 0 based!			
-			TextIter itr = se.Buffer.GetIterAtLine (line);
-			itr.LineOffset = column;
+			// NOTE: 1 based!			
+			TextIter itr = se.Buffer.GetIterAtLine (line - 1);
+			itr.LineOffset = column - 1;
 
 			se.Buffer.PlaceCursor (itr);		
-			se.Buffer.HighlightLine (line);	
+			se.Buffer.HighlightLine (line - 1);	
 			se.View.ScrollToMark (se.Buffer.InsertMark, 0.3, false, 0, 0);
 			GLib.Timeout.Add (20, new GLib.TimeoutHandler (changeFocus));
 		}

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-07-01 13:48:29 UTC (rev 2617)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-07-01 13:54:30 UTC (rev 2618)
@@ -1,3 +1,12 @@
+2005-07-01  Jacob Ils? Christensen  <jacobilsoe at gmail.com>
+
+	* Services/Tasks/Task.cs:
+	* Gui/Pads/OpenTaskView.cs:
+	* Gui/Pads/ClassPad/ClassNodeBuilder.cs:
+	* Gui/Pads/ClassPad/MemberNodeCommandHandler.cs:
+	* Gui/Search/SearchResult/DefaultSearchResult.cs:
+	Make lines and columns 1-based.
+
 2005-06-30  John Luke  <john.luke at gmail.com>
 
 	* Services/ParserService/AssembyInformation.cs: fix possible nullref

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/ClassPad/ClassNodeBuilder.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/ClassPad/ClassNodeBuilder.cs	2005-07-01 13:48:29 UTC (rev 2617)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/ClassPad/ClassNodeBuilder.cs	2005-07-01 13:54:30 UTC (rev 2618)
@@ -118,7 +118,7 @@
 			
 			IViewContent content = window.ViewContent;
 			if (content is IPositionable) {
-				((IPositionable)content).JumpTo (Math.Max (0, line), 0);
+				((IPositionable)content).JumpTo (Math.Max (1, line), 1);
 			}
 		}
 		

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/ClassPad/MemberNodeCommandHandler.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/ClassPad/MemberNodeCommandHandler.cs	2005-07-01 13:48:29 UTC (rev 2617)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/ClassPad/MemberNodeCommandHandler.cs	2005-07-01 13:54:30 UTC (rev 2618)
@@ -58,7 +58,7 @@
 			
 			IViewContent content = window.ViewContent;
 			if (content is IPositionable) {
-				((IPositionable)content).JumpTo (Math.Max (0, line), 0);
+				((IPositionable)content).JumpTo (Math.Max (1, line), 1);
 			}
 		}
 		

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/OpenTaskView.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/OpenTaskView.cs	2005-07-01 13:48:29 UTC (rev 2617)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/OpenTaskView.cs	2005-07-01 13:54:30 UTC (rev 2618)
@@ -258,7 +258,7 @@
 			
 			store.AppendValues (
 				stock,
-				t.Line + 1,
+				t.Line,
 				t.Description,
 				fileName,
 				path,

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Search/SearchResult/DefaultSearchResult.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Search/SearchResult/DefaultSearchResult.cs	2005-07-01 13:48:29 UTC (rev 2617)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Search/SearchResult/DefaultSearchResult.cs	2005-07-01 13:54:30 UTC (rev 2618)
@@ -20,8 +20,8 @@
 		public DefaultSearchResult (ITextIterator iter, int length)
 		{
 			offset = iter.Position;
-			line = iter.Line;
-			column = iter.Column;
+			line = iter.Line + 1;
+			column = iter.Column + 1;
 			this.length = length;
 			documentInformation = iter.DocumentInformation;
 		}

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Tasks/Task.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Tasks/Task.cs	2005-07-01 13:48:29 UTC (rev 2617)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Tasks/Task.cs	2005-07-01 13:54:30 UTC (rev 2618)
@@ -95,8 +95,8 @@
 		{
 			this.project = project;
 			type        = error.IsWarning ? error.ErrorNumber == "COMMENT" ? TaskType.Comment : TaskType.Warning : TaskType.Error;
-			column      = error.Column - 1;
-			line        = error.Line - 1;
+			column      = error.Column;
+			line        = error.Line;
 			description = error.ErrorText;
 			if (error.ErrorNumber != String.Empty)
 				description += "(" + error.ErrorNumber + ")";
@@ -137,7 +137,7 @@
 			}
 			IViewContent content = window.ViewContent;
 			if (content is IPositionable) {
-				((IPositionable)content).JumpTo(Math.Max(0, line), Math.Max(0, column));
+				((IPositionable)content).JumpTo(Math.Max(1, line), Math.Max(1, column));
 			}
 		}
 	}



From jluke at mono-cvs.ximian.com  Fri Jul  1 12:47:36 2005
From: jluke at mono-cvs.ximian.com (John Luke <jluke@cfl.rr.com>)
Date: Fri,  1 Jul 2005 12:47:36 -0400 (EDT)
Subject: [Monodevelop-patches-list] r2619 - in
	trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding:
	. SharpRefactoryVB
Message-ID: <20050701164736.DBAE694768@mono-cvs.ximian.com>

Author: jluke
Date: 2005-07-01 12:47:36 -0400 (Fri, 01 Jul 2005)
New Revision: 2619

Modified:
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/SharpRefactoryVB/Makefile.am
Log:
build directly to build/bin/


Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ChangeLog	2005-07-01 13:54:30 UTC (rev 2618)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ChangeLog	2005-07-01 16:47:36 UTC (rev 2619)
@@ -1,3 +1,9 @@
+2005-07-01  John Luke  <john.luke at gmail.com>
+
+	* SharpRefeactoryVB/Makefile.am:
+	build to MonoDevelop/build/bin so .mdb file goes to the right place
+	remove stray CSC definition
+
 2005-05-06  John Luke  <john.luke at gmail.com>
 
 	* Makefile.am: replace 'make' with $(MAKE)

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/SharpRefactoryVB/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/SharpRefactoryVB/Makefile.am	2005-07-01 13:54:30 UTC (rev 2618)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/SharpRefactoryVB/Makefile.am	2005-07-01 16:47:36 UTC (rev 2619)
@@ -1,5 +1,3 @@
-CSC = mcs /debug
-
 FILES = \
 src/AssemblyInfo.cs \
 src/CodeDom/CodeDOMVisitor.cs \
@@ -105,21 +103,20 @@
 
 build_sources = $(addprefix $(srcdir)/, $(FILES))
 
-DLL = ICSharpCode.SharpRefactory.VB.dll
+DLL = $(top_builddir)/build/bin/ICSharpCode.SharpRefactory.VB.dll
 
 REFS = /r:System.Drawing.dll
 
 all: $(DLL)
 
 $(DLL): $(FILES)
-	@ $(CSC) $(CSC_FLAGS) /out:$(DLL) /target:library $(REFS) $(build_sources) \
-	&& cp $(DLL) $(top_builddir)/build/bin/.
+	$(CSC) $(CSC_FLAGS) /out:$(DLL) /target:library $(REFS) $(build_sources)
 
 test-parser.exe : $(DLL) src/Main.cs
-	@ $(CSC) /out:$@ /r:$(DLL) src/Main.cs
+	$(CSC) /out:$@ /r:$(DLL) src/Main.cs
 
 run : test-parser.exe
-	@ MONO_PATH=`dirname $(DLL)` $(RUNTIME) test-parser.exe $(TEST_SOURCE)
+	MONO_PATH=`dirname $(DLL)` $(RUNTIME) test-parser.exe $(TEST_SOURCE)
 
 assemblydir = $(MD_ASSEMBLY_DIR)
 assembly_DATA = $(DLL)



From joshua at mono-cvs.ximian.com  Fri Jul  1 19:56:15 2005
From: joshua at mono-cvs.ximian.com (Joshua Tauberer)
Date: Fri,  1 Jul 2005 19:56:15 -0400 (EDT)
Subject: [Monodevelop-patches-list] r2620 - in
	trunk/MonoDevelop/Extras/VersionControl: . AddIn Diff
	DiffWidget VersionControl
Message-ID: <20050701235615.EE58694766@mono-cvs.ximian.com>

Author: joshua
Date: 2005-07-01 19:56:15 -0400 (Fri, 01 Jul 2005)
New Revision: 2620

Added:
   trunk/MonoDevelop/Extras/VersionControl/AddIn/AddIn.mdp
   trunk/MonoDevelop/Extras/VersionControl/AddIn/mds_postbuild.sh
   trunk/MonoDevelop/Extras/VersionControl/Diff/Diff.mdp
   trunk/MonoDevelop/Extras/VersionControl/DiffWidget/DiffWidget.mdp
   trunk/MonoDevelop/Extras/VersionControl/VersionControl.mds
   trunk/MonoDevelop/Extras/VersionControl/VersionControl/VersionControl.mdp
Modified:
   trunk/MonoDevelop/Extras/VersionControl/AddIn/Addin.cs
   trunk/MonoDevelop/Extras/VersionControl/AddIn/VersionControl.addin.xml
   trunk/MonoDevelop/Extras/VersionControl/ChangeLog
   trunk/MonoDevelop/Extras/VersionControl/VersionControl/Subversion.cs
Log:
    * Added MD solution files for VersionControl.
    * Project pad overlays now update when files
      are modified.
    * Project pad context menus enabled for
      folders and combines.
    * Subversion: Don't report diffs available
      for unchanged files.
    * This was committed with the addin!

Added: trunk/MonoDevelop/Extras/VersionControl/AddIn/AddIn.mdp
===================================================================
--- trunk/MonoDevelop/Extras/VersionControl/AddIn/AddIn.mdp	2005-07-01 16:47:36 UTC (rev 2619)
+++ trunk/MonoDevelop/Extras/VersionControl/AddIn/AddIn.mdp	2005-07-01 23:56:15 UTC (rev 2620)
@@ -0,0 +1,46 @@
+<Project name="AddIn" fileversion="2.0" language="C#" ctype="DotNetProject">
+  <Configurations>
+    <Configuration name="Debug" ctype="DotNetProjectConfiguration">
+      <Output directory="../../../build/AddIns/VersionControl" assembly="VersionControlAddIn" />
+      <Build executeAfterBuild="./mds_postbuild.sh" debugmode="True" target="Library" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
+      <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+    </Configuration>
+    <Configuration name="Release" ctype="DotNetProjectConfiguration">
+      <Output directory="../../../build/AddIns/VersionControl" assembly="VersionControlAddIn" />
+      <Build debugmode="False" target="Library" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
+      <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+    </Configuration>
+  </Configurations>
+  <References>
+    <ProjectReference type="Project" localcopy="True" refto="VersionControl" />
+    <ProjectReference type="Project" localcopy="True" refto="DiffWidget" />
+    <ProjectReference type="Project" localcopy="True" refto="Diff" />
+    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.6.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Assembly" localcopy="True" refto="../../../build/bin/MonoDevelop.Base.dll" />
+    <ProjectReference type="Assembly" localcopy="True" refto="../../../build/bin/MonoDevelop.Core.dll" />
+    <ProjectReference type="Assembly" localcopy="True" refto="../../../build/bin/MonoDevelop.Dock.dll" />
+    <ProjectReference type="Assembly" localcopy="True" refto="../../../build/bin/MonoDevelop.exe" />
+    <ProjectReference type="Assembly" localcopy="True" refto="../../../build/bin/MonoDevelop.Gui.Utils.dll" />
+    <ProjectReference type="Assembly" localcopy="True" refto="../../../build/bin/MonoDevelop.Gui.Widgets.dll" />
+    <ProjectReference type="Assembly" localcopy="True" refto="../../../build/bin/MonoDevelop.SourceEditor.dll" />
+  </References>
+  <DeploymentInformation strategy="File">
+    <excludeFiles />
+  </DeploymentInformation>
+  <Contents>
+    <File name="./Addin.cs" subtype="Code" buildaction="Compile" />
+    <File name="./Diffs.cs" subtype="Code" buildaction="Compile" />
+    <File name="./Logs.cs" subtype="Code" buildaction="Compile" />
+    <File name="./Statuses.cs" subtype="Code" buildaction="Compile" />
+    <File name="./Task.cs" subtype="Code" buildaction="Compile" />
+    <File name="./Update.cs" subtype="Code" buildaction="Compile" />
+    <File name="./VersionControl.addin.xml" subtype="Code" buildaction="Nothing" />
+    <File name="./overlay_added.png" subtype="Code" buildaction="EmbedAsResource" />
+    <File name="./overlay_conflicted.png" subtype="Code" buildaction="EmbedAsResource" />
+    <File name="./overlay_locked.png" subtype="Code" buildaction="EmbedAsResource" />
+    <File name="./overlay_modified.png" subtype="Code" buildaction="EmbedAsResource" />
+    <File name="./overlay_normal.png" subtype="Code" buildaction="EmbedAsResource" />
+  </Contents>
+</Project>
\ No newline at end of file

Modified: trunk/MonoDevelop/Extras/VersionControl/AddIn/Addin.cs
===================================================================
--- trunk/MonoDevelop/Extras/VersionControl/AddIn/Addin.cs	2005-07-01 16:47:36 UTC (rev 2619)
+++ trunk/MonoDevelop/Extras/VersionControl/AddIn/Addin.cs	2005-07-01 23:56:15 UTC (rev 2620)
@@ -7,6 +7,7 @@
 using MonoDevelop.Gui;
 using MonoDevelop.Core;
 using MonoDevelop.Gui.Pads;
+using MonoDevelop.Gui.Pads.ProjectPad;
 using MonoDevelop.Internal.Project;
 using MonoDevelop.Commands;
 using MonoDevelop.Services;
@@ -42,48 +43,97 @@
 	}
 	
 	public class VersionControlNodeExtension : NodeBuilderExtension {
+		Hashtable projectsWatched = new Hashtable();
+		Hashtable fileStatus = new Hashtable();
+	
 		public override bool CanBuildNode (Type dataType) {
 			//Console.Error.WriteLine(dataType);
 			return typeof(ProjectFile).IsAssignableFrom (dataType)
-				|| typeof(DotNetProject).IsAssignableFrom (dataType);
-				// TODO: Folders
+				|| typeof(DotNetProject).IsAssignableFrom (dataType)
+				|| typeof(ProjectFolder).IsAssignableFrom (dataType)
+				|| typeof(Combine).IsAssignableFrom (dataType);
 		}		
 		
 		public override void BuildNode (ITreeBuilder builder, object dataObject, ref string label, ref Gdk.Pixbuf icon, ref Gdk.Pixbuf closedIcon) {
 			// Add status overlays
 			
-			// TODO: Watch the files in some way to detect
-			// when the overlay should be changed.
-			
 			if (!(dataObject is ProjectFile)) return;
 			if (!builder.Options["ShowVersionControlOverlays"])
 				return;
 		
 			ProjectFile file = (ProjectFile) dataObject;
+			
+			WatchProject(file.Project);
+			
+			// When a file had a status and later has no status,
+			// for whatever reason, it needs to be removed from the hashtable.
+			fileStatus.Remove(file.FilePath);
+			
 			try {
-				foreach (VersionControlSystem vc in VersionControlService.Providers) {
-					if (vc.IsFileStatusAvailable(file.FilePath)) {
-						Node node = vc.GetFileStatus(file.FilePath, false);
-						
-						Gdk.Pixbuf overlay = VersionControlService.LoadIconForStatus(node.Status);
-						
-						double scale = (double)(2*icon.Width/3) / (double)overlay.Width;
-						int w = (int)(overlay.Width*scale);
-						int h = (int)(overlay.Height*scale);
-						icon = icon.Copy();
-						overlay.Composite(icon,
-							icon.Width-w,  icon.Height-h,
-							w, h,
-							icon.Width-w, icon.Height-h,
-							scale,scale, Gdk.InterpType.Bilinear, 255); 
-						break;
-					}
-				}
+				NodeStatus status = GetStatus(file.FilePath);
+				if (status == NodeStatus.Unknown) return;
+				
+				fileStatus[file.FilePath] = status;
+				
+				Gdk.Pixbuf overlay = VersionControlService.LoadIconForStatus(status);
+				
+				double scale = (double)(2*icon.Width/3) / (double)overlay.Width;
+				int w = (int)(overlay.Width*scale);
+				int h = (int)(overlay.Height*scale);
+				icon = icon.Copy();
+				overlay.Composite(icon,
+					icon.Width-w,  icon.Height-h,
+					w, h,
+					icon.Width-w, icon.Height-h,
+					scale,scale, Gdk.InterpType.Bilinear, 255); 
 			} catch (Exception e) {
-				Console.Error.WriteLine(e);
 			}
 		}
 		
+		NodeStatus GetStatus(string filepath) {
+			foreach (VersionControlSystem vc in VersionControlService.Providers) {
+				if (vc.IsFileStatusAvailable(filepath)) {
+					Node node = vc.GetFileStatus(filepath, false);
+					return node.Status;
+				}
+			}
+			return NodeStatus.Unknown;
+		}
+		
+		void WatchProject(Project project) {
+			if (projectsWatched.ContainsKey(project)) return;
+			projectsWatched[project] = projectsWatched;
+			project.FileChangedInProject += new ProjectFileEventHandler(Monitor);
+		}
+		
+		void Monitor(object sender, ProjectFileEventArgs args) {
+			// If the status of the file actually changed, then
+			// update the project pad so the overlays are updated.
+			
+			string file = args.ProjectFile.FilePath;
+			
+			NodeStatus newstatus = GetStatus(file);
+			if (newstatus == NodeStatus.Unknown && !fileStatus.ContainsKey(file))
+				return; // had no status before, has no status now
+
+			if (!fileStatus.ContainsKey(file)
+				|| (fileStatus.ContainsKey(file) 
+					&& (NodeStatus)fileStatus[file] != newstatus)) {
+				// No status before and has status now, or
+				// status changed.  Refresh the project pad.
+				ITreeBuilder builder = Context.GetTreeBuilder(args.ProjectFile);
+				if (builder != null)
+					builder.UpdateAll();
+			}
+		}
+		
+		public override void Dispose() {
+			foreach (Project p in projectsWatched.Keys)
+				p.FileChangedInProject -= new ProjectFileEventHandler(Monitor);
+			projectsWatched.Clear();
+		}
+		
+		
 		public override Type CommandHandlerType {
 			get { return typeof(AddinCommandHandler); }
 		}
@@ -144,7 +194,7 @@
 		private bool RunCommand(Commands cmd, bool test) {
 			string path;
 			bool isDir;
-		
+			
 			if (CurrentNode.DataItem is ProjectFile) {
 				ProjectFile file = (ProjectFile)CurrentNode.DataItem;
 				path = file.FilePath;
@@ -153,6 +203,14 @@
 				DotNetProject project = (DotNetProject)CurrentNode.DataItem;
 				path = project.BaseDirectory;
 				isDir = true;
+			} else if (CurrentNode.DataItem is ProjectFolder) {
+				ProjectFolder f = ((ProjectFolder)CurrentNode.DataItem);
+				path = f.Path;
+				isDir = true;				
+			} else if (CurrentNode.DataItem is Combine) {
+				Combine c = ((Combine)CurrentNode.DataItem);
+				path = c.BaseDirectory;
+				isDir = true;				
 			} else {
 				Console.Error.WriteLine(CurrentNode.DataItem);
 				return false;

Modified: trunk/MonoDevelop/Extras/VersionControl/AddIn/VersionControl.addin.xml
===================================================================
--- trunk/MonoDevelop/Extras/VersionControl/AddIn/VersionControl.addin.xml	2005-07-01 16:47:36 UTC (rev 2619)
+++ trunk/MonoDevelop/Extras/VersionControl/AddIn/VersionControl.addin.xml	2005-07-01 23:56:15 UTC (rev 2620)
@@ -46,5 +46,10 @@
 		<CommandItem id = "VersionControlPlugin.Commands.Status"/>
 		<CommandItem id = "VersionControlPlugin.Commands.Log"/>
 	</Extension>
+	<Extension path = "/SharpDevelop/Views/ProjectBrowser/ContextMenu/CombineBrowserNode">
+		<CommandItem id = "VersionControlPlugin.Commands.Update"/>
+		<CommandItem id = "VersionControlPlugin.Commands.Status"/>
+		<CommandItem id = "VersionControlPlugin.Commands.Log"/>
+	</Extension>
 </AddIn>
 	

Added: trunk/MonoDevelop/Extras/VersionControl/AddIn/mds_postbuild.sh
===================================================================
--- trunk/MonoDevelop/Extras/VersionControl/AddIn/mds_postbuild.sh	2005-07-01 16:47:36 UTC (rev 2619)
+++ trunk/MonoDevelop/Extras/VersionControl/AddIn/mds_postbuild.sh	2005-07-01 23:56:15 UTC (rev 2620)
@@ -0,0 +1,2 @@
+#!/bin/sh
+cp VersionControl.addin.xml ../../../build/AddIns/VersionControl


Property changes on: trunk/MonoDevelop/Extras/VersionControl/AddIn/mds_postbuild.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/MonoDevelop/Extras/VersionControl/ChangeLog
===================================================================
--- trunk/MonoDevelop/Extras/VersionControl/ChangeLog	2005-07-01 16:47:36 UTC (rev 2619)
+++ trunk/MonoDevelop/Extras/VersionControl/ChangeLog	2005-07-01 23:56:15 UTC (rev 2620)
@@ -1,3 +1,14 @@
+2005-07-01  Joshua Tauberer <tauberer at for.net>
+
+	* Added MD solution files for VersionControl.
+	* Project pad overlays now update when files
+	  are modified.
+	* Project pad context menus enabled for
+	  folders and combines.
+	* Subversion: Don't report diffs available
+	  for unchanged files.
+	* This was committed with the addin!
+
 2005-06-22  Joshua Tauberer <tauberer at for.net>
 
 	* Added VersionControl into repo (but sadly the addin

Added: trunk/MonoDevelop/Extras/VersionControl/Diff/Diff.mdp
===================================================================
--- trunk/MonoDevelop/Extras/VersionControl/Diff/Diff.mdp	2005-07-01 16:47:36 UTC (rev 2619)
+++ trunk/MonoDevelop/Extras/VersionControl/Diff/Diff.mdp	2005-07-01 23:56:15 UTC (rev 2620)
@@ -0,0 +1,28 @@
+<Project name="Diff" fileversion="2.0" language="C#" ctype="DotNetProject">
+  <Configurations>
+    <Configuration name="Debug" ctype="DotNetProjectConfiguration">
+      <Output directory="../../../build/AddIns/VersionControl" assembly="Diff" />
+      <Build debugmode="True" target="Library" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
+      <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+    </Configuration>
+    <Configuration name="Release" ctype="DotNetProjectConfiguration">
+      <Output directory="../../../build/AddIns/VersionControl" assembly="Diff" />
+      <Build debugmode="False" target="Exe" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
+      <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+    </Configuration>
+  </Configurations>
+  <References />
+  <DeploymentInformation strategy="File">
+    <excludeFiles />
+  </DeploymentInformation>
+  <Contents>
+    <File name="./Diff.cs" subtype="Code" buildaction="Compile" />
+    <File name="./Merge.cs" subtype="Code" buildaction="Compile" />
+    <File name="./Patch.cs" subtype="Code" buildaction="Compile" />
+    <File name="./StructuredDiff.cs" subtype="Code" buildaction="Compile" />
+    <File name="./TextDiff.cs" subtype="Code" buildaction="Compile" />
+    <File name="./UnifiedDiff.cs" subtype="Code" buildaction="Compile" />
+  </Contents>
+</Project>
\ No newline at end of file

Added: trunk/MonoDevelop/Extras/VersionControl/DiffWidget/DiffWidget.mdp
===================================================================
--- trunk/MonoDevelop/Extras/VersionControl/DiffWidget/DiffWidget.mdp	2005-07-01 16:47:36 UTC (rev 2619)
+++ trunk/MonoDevelop/Extras/VersionControl/DiffWidget/DiffWidget.mdp	2005-07-01 23:56:15 UTC (rev 2620)
@@ -0,0 +1,26 @@
+<Project name="DiffWidget" fileversion="2.0" language="C#" ctype="DotNetProject">
+  <Configurations>
+    <Configuration name="Debug" ctype="DotNetProjectConfiguration">
+      <Output directory="../../../build/AddIns/VersionControl" assembly="DiffWidget" />
+      <Build debugmode="True" target="Library" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
+      <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+    </Configuration>
+    <Configuration name="Release" ctype="DotNetProjectConfiguration">
+      <Output directory="../../../build/AddIns/VersionControl" assembly="DiffWidget" />
+      <Build debugmode="False" target="Library" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
+      <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+    </Configuration>
+  </Configurations>
+  <References>
+    <ProjectReference type="Project" localcopy="True" refto="Diff" />
+    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.6.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+  </References>
+  <DeploymentInformation strategy="File">
+    <excludeFiles />
+  </DeploymentInformation>
+  <Contents>
+    <File name="./widget.cs" subtype="Code" buildaction="Compile" />
+  </Contents>
+</Project>
\ No newline at end of file

Modified: trunk/MonoDevelop/Extras/VersionControl/VersionControl/Subversion.cs
===================================================================
--- trunk/MonoDevelop/Extras/VersionControl/VersionControl/Subversion.cs	2005-07-01 16:47:36 UTC (rev 2619)
+++ trunk/MonoDevelop/Extras/VersionControl/VersionControl/Subversion.cs	2005-07-01 23:56:15 UTC (rev 2620)
@@ -31,7 +31,9 @@
 		}
 		
 		public override bool IsDiffAvailable(string sourcefile) {
-			return File.Exists(GetTextBase(sourcefile));			
+			return File.Exists(GetTextBase(sourcefile))
+				&& IsFileStatusAvailable(sourcefile)
+				&& GetFileStatus(sourcefile, false).Status == NodeStatus.Modified;			
 		}
 		
 		public override bool IsHistoryAvailable(string sourcefile) {
@@ -39,7 +41,7 @@
 		}
 		
 		public override bool IsFileStatusAvailable(string sourcefile) {
-			return IsDiffAvailable(sourcefile);
+			return File.Exists(GetTextBase(sourcefile));
 		}
 
 		public override bool IsDirectoryStatusAvailable(string sourcepath) {

Added: trunk/MonoDevelop/Extras/VersionControl/VersionControl/VersionControl.mdp
===================================================================
--- trunk/MonoDevelop/Extras/VersionControl/VersionControl/VersionControl.mdp	2005-07-01 16:47:36 UTC (rev 2619)
+++ trunk/MonoDevelop/Extras/VersionControl/VersionControl/VersionControl.mdp	2005-07-01 23:56:15 UTC (rev 2620)
@@ -0,0 +1,24 @@
+<Project name="VersionControl" fileversion="2.0" language="C#" ctype="DotNetProject">
+  <Configurations>
+    <Configuration name="Debug" ctype="DotNetProjectConfiguration">
+      <Output directory="../../../build/AddIns/VersionControl" assembly="VersionControl" />
+      <Build debugmode="True" target="Library" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
+      <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+    </Configuration>
+    <Configuration name="Release" ctype="DotNetProjectConfiguration">
+      <Output directory="../../../build/AddIns/VersionControl" assembly="VersionControl" />
+      <Build debugmode="False" target="Library" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
+      <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+    </Configuration>
+  </Configurations>
+  <References />
+  <DeploymentInformation strategy="File">
+    <excludeFiles />
+  </DeploymentInformation>
+  <Contents>
+    <File name="./Subversion.cs" subtype="Code" buildaction="Compile" />
+    <File name="./VersionControl.cs" subtype="Code" buildaction="Compile" />
+  </Contents>
+</Project>
\ No newline at end of file

Added: trunk/MonoDevelop/Extras/VersionControl/VersionControl.mds
===================================================================
--- trunk/MonoDevelop/Extras/VersionControl/VersionControl.mds	2005-07-01 16:47:36 UTC (rev 2619)
+++ trunk/MonoDevelop/Extras/VersionControl/VersionControl.mds	2005-07-01 23:56:15 UTC (rev 2620)
@@ -0,0 +1,28 @@
+<Combine name="VersionControl" fileversion="2.0">
+  <Configurations>
+    <Configuration name="Debug" ctype="CombineConfiguration">
+      <Entry build="True" name="VersionControl" />
+      <Entry build="True" name="Diff" />
+      <Entry build="True" name="DiffWidget" />
+      <Entry build="True" name="AddIn" />
+    </Configuration>
+    <Configuration name="Release" ctype="CombineConfiguration">
+      <Entry build="True" name="VersionControl" />
+      <Entry build="True" name="Diff" />
+      <Entry build="True" name="DiffWidget" />
+      <Entry build="True" name="AddIn" />
+    </Configuration>
+  </Configurations>
+  <StartMode startupentry="VersionControl" single="True">
+    <Execute type="None" entry="VersionControl" />
+    <Execute type="None" entry="Diff" />
+    <Execute type="None" entry="DiffWidget" />
+    <Execute type="None" entry="AddIn" />
+  </StartMode>
+  <Entries>
+    <Entry filename="./VersionControl/VersionControl.mdp" />
+    <Entry filename="./Diff/Diff.mdp" />
+    <Entry filename="./DiffWidget/DiffWidget.mdp" />
+    <Entry filename="./AddIn/AddIn.mdp" />
+  </Entries>
+</Combine>
\ No newline at end of file



From joshua at mono-cvs.ximian.com  Sun Jul  3 08:59:25 2005
From: joshua at mono-cvs.ximian.com (Joshua Tauberer)
Date: Sun,  3 Jul 2005 08:59:25 -0400 (EDT)
Subject: [Monodevelop-patches-list] r2621 - in
	trunk/MonoDevelop/Core/src/MonoDevelop.Base: .
	Internal/Project/Project
Message-ID: <20050703125925.2908B94766@mono-cvs.ximian.com>

Author: joshua
Date: 2005-07-03 08:59:24 -0400 (Sun, 03 Jul 2005)
New Revision: 2621

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/Project.cs
Log:
Pre/post build steps have their working directories set to the project base path.

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-07-01 23:56:15 UTC (rev 2620)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-07-03 12:59:24 UTC (rev 2621)
@@ -1,3 +1,9 @@
+2005-07-01  Joshua Tauberer  <tauberer at for.net>
+
+	* Internal/Project/Project/Project.cs: Pre/Post build tasks
+	set up the ProcessStartInfo through the same function, set
+	the working directory to the project base path.
+
 2005-07-01  Jacob Ils? Christensen  <jacobilsoe at gmail.com>
 
 	* Services/Tasks/Task.cs:
@@ -28,7 +34,6 @@
 	* Makefile.am: Added new files.
 	* MonoDevelopCore.addin.xml: Registered search/replace commands.
 	
-
 2005-06-15  John Luke  <john.luke at gmail.com>
 
 	* Services/File/RecentFiles.cs: catch exception when writing to

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/Project.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/Project.cs	2005-07-01 23:56:15 UTC (rev 2620)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/Project.cs	2005-07-03 12:59:24 UTC (rev 2621)
@@ -434,9 +434,7 @@
 			
 			if (conf != null && conf.ExecuteBeforeBuild != "" && File.Exists(conf.ExecuteBeforeBuild)) {
 				monitor.Log.WriteLine (String.Format (GettextCatalog.GetString ("Executing: {0}"), conf.ExecuteBeforeBuild));
-				ProcessStartInfo ps = new ProcessStartInfo(conf.ExecuteBeforeBuild);
-				ps.UseShellExecute = false;
-				ps.RedirectStandardOutput = true;
+				ProcessStartInfo ps = GetBuildTaskStartInfo(conf.ExecuteBeforeBuild);
 				Process process = new Process();
 				process.StartInfo = ps;
 				process.Start();
@@ -457,9 +455,7 @@
 			if (conf != null && conf.ExecuteAfterBuild != "" && File.Exists(conf.ExecuteAfterBuild)) {
 				monitor.Log.WriteLine ();
 				monitor.Log.WriteLine (String.Format (GettextCatalog.GetString ("Executing: {0}"), conf.ExecuteAfterBuild));
-				ProcessStartInfo ps = new ProcessStartInfo(conf.ExecuteAfterBuild);
-				ps.UseShellExecute = false;
-				ps.RedirectStandardOutput = true;
+				ProcessStartInfo ps = GetBuildTaskStartInfo(conf.ExecuteAfterBuild);
 				Process process = new Process();
 				process.StartInfo = ps;
 				process.Start();
@@ -467,6 +463,14 @@
 			}
 		}
 		
+		private ProcessStartInfo GetBuildTaskStartInfo(string file) {
+			ProcessStartInfo ps = new ProcessStartInfo(file);
+			ps.UseShellExecute = false;
+			ps.RedirectStandardOutput = true;
+			ps.WorkingDirectory = BaseDirectory;
+			return ps;
+		}
+		
 		public override void Execute (IProgressMonitor monitor)
 		{
 			if (Runtime.TaskService.Errors != 0) return;



From jluke at mono-cvs.ximian.com  Thu Jul  7 23:31:24 2005
From: jluke at mono-cvs.ximian.com (John Luke <jluke@cfl.rr.com>)
Date: Thu,  7 Jul 2005 23:31:24 -0400 (EDT)
Subject: [Monodevelop-patches-list] r2622 -
	trunk/MonoDevelop/Core/src/MonoDevelop.Dock
Message-ID: <20050708033124.640DF94766@mono-cvs.ximian.com>

Author: jluke
Date: 2005-07-07 23:31:24 -0400 (Thu, 07 Jul 2005)
New Revision: 2622

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Dock/TODO
Log:
add a note to TODO


Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/TODO
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/TODO	2005-07-03 12:59:24 UTC (rev 2621)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/TODO	2005-07-08 03:31:24 UTC (rev 2622)
@@ -5,6 +5,7 @@
  - when we can use pango 1.6, use the built-in ellipsizing
  - audit event emitting frequency
  - use less ArrayLists
+ - doubleclick to toggle maximize/restore of a tab
 
 potential new features
  - restore size/position on de-iconify?



From jluke at mono-cvs.ximian.com  Fri Jul  8 16:42:34 2005
From: jluke at mono-cvs.ximian.com (John Luke <jluke@cfl.rr.com>)
Date: Fri,  8 Jul 2005 16:42:34 -0400 (EDT)
Subject: [Monodevelop-patches-list] r2623 - in trunk/MonoDevelop: .
	Core/src/MonoDevelop.Base
	Core/src/MonoDevelop.Base/Internal/Project/Combine
Message-ID: <20050708204234.F1EC494766@mono-cvs.ximian.com>

Author: jluke
Date: 2005-07-08 16:42:34 -0400 (Fri, 08 Jul 2005)
New Revision: 2623

Modified:
   trunk/MonoDevelop/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
   trunk/MonoDevelop/README
   trunk/MonoDevelop/configure.in
Log:
update what the deps are
and remove no longer needed Mono.Posix conditional stuff


Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog	2005-07-08 03:31:24 UTC (rev 2622)
+++ trunk/MonoDevelop/ChangeLog	2005-07-08 20:42:34 UTC (rev 2623)
@@ -1,3 +1,10 @@
+2005-07-08  John Luke  <john.luke at gmail.com>
+
+	* configure.in: update mono dep to >= 1.1.4
+	for various reasons and remove the MONO_POSIX_OEE
+	check
+	* README: update deps
+
 2005-06-28  John Luke  <john.luke at gmail.com>
 
 	* *.mdp:

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-07-08 03:31:24 UTC (rev 2622)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-07-08 20:42:34 UTC (rev 2623)
@@ -1,3 +1,8 @@
+2005-07-08  John Luke  <john.luke at gmail.com>
+
+	* Makefile.am: remove MONO_POSIX_OEE defines
+	* Internal/Project/Combine/Combine.cs: just use Mono.Unix now
+	
 2005-07-01  Joshua Tauberer  <tauberer at for.net>
 
 	* Internal/Project/Project/Project.cs: Pre/Post build tasks

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs	2005-07-08 03:31:24 UTC (rev 2622)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs	2005-07-08 20:42:34 UTC (rev 2623)
@@ -15,13 +15,8 @@
 using System.CodeDom.Compiler;
 using System.ComponentModel;
 
-#if MONO_POSIX_OEE
 using Mono.Unix;
 using FileMode = Mono.Unix.FilePermissions;
-#else
-using Mono.Posix;
-using FileMode = Mono.Posix.FileMode;
-#endif
 
 using MonoDevelop.Core.Services;
 

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am	2005-07-08 03:31:24 UTC (rev 2622)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am	2005-07-08 20:42:34 UTC (rev 2623)
@@ -525,7 +525,7 @@
 	$(PERL) -x$(srcdir)/../../../build/data/resources/icons -w $(srcdir)/Services/process-icons.pl > Services/StockIcons.cs
 
 $(ASSEMBLY): $(build_sources) $(srcdir)/Base.glade Services/StockIcons.cs
-	$(CSC) $(CSC_FLAGS) $(MONO_POSIX_OEE) -codepage:utf8 -out:$@ -target:library $(DLLS) \
+	$(CSC) $(CSC_FLAGS) -codepage:utf8 -out:$@ -target:library $(DLLS) \
 		-resource:$(srcdir)/Base.glade,Base.glade \
 		$(monodoc_libflags) $(build_sources) Services/StockIcons.cs
 

Modified: trunk/MonoDevelop/README
===================================================================
--- trunk/MonoDevelop/README	2005-07-08 03:31:24 UTC (rev 2622)
+++ trunk/MonoDevelop/README	2005-07-08 20:42:34 UTC (rev 2623)
@@ -36,12 +36,12 @@
 
 Dependencies
 ------------
-Mono >= 1.0
-Gtk# >= 1.9.3
+Mono >= 1.1.4
+Gtk# >= 1.9.5
 monodoc >= 1.0
 gtksourceview >= 1.0
-gecko-sharp >= 0.7
-gtksourceview-sharp >= 0.7
+gecko-sharp >= 0.10
+gtksourceview-sharp >= 0.10
 
 References
 ----------

Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in	2005-07-08 03:31:24 UTC (rev 2622)
+++ trunk/MonoDevelop/configure.in	2005-07-08 20:42:34 UTC (rev 2623)
@@ -36,10 +36,9 @@
         AC_MSG_ERROR([You need to install pkg-config])
 fi
 
-MONO_REQUIRED_VERSION=1.0
+MONO_REQUIRED_VERSION=1.1.4
 PKG_CHECK_MODULES(UNMANAGED_DEPENDENCIES_MONO,mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
 PKG_CHECK_MODULES(UNMANAGED_DEPENDENCIES_MINT,mint >= $MONO_REQUIRED_VERSION, has_mint=true, has_mint=false)
-PKG_CHECK_MODULES(OEE_CHECK,mono >= 1.1.2.99, MONO_POSIX_OEE=-d:MONO_POSIX_OEE, MONO_POSIX_OEE=)
 
 if test "x$has_mono" = "xtrue"; then
     if test `uname -s` = "Darwin"; then
@@ -164,7 +163,6 @@
 AC_SUBST(LIB_SUFFIX)
 AC_SUBST(LIB_PREFIX)
 AC_SUBST(ASSEMBLY_VERSION)
-AC_SUBST(MONO_POSIX_OEE)
 AC_SUBST(SQLITE_XML)
 AC_SUBST(CSC_FLAGS)
 



From lluis at mono-cvs.ximian.com  Mon Jul 11 10:12:47 2005
From: lluis at mono-cvs.ximian.com (Lluis Sanchez <lluis@ximian.com>)
Date: Mon, 11 Jul 2005 10:12:47 -0400 (EDT)
Subject: [Monodevelop-patches-list] r2624 - in
	trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets: . Commands
Message-ID: <20050711141247.DC58894767@mono-cvs.ximian.com>

Author: lluis
Date: 2005-07-11 10:12:47 -0400 (Mon, 11 Jul 2005)
New Revision: 2624

Added:
   trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Commands/CommandRouterContainer.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Commands/ICommandDelegatorRouter.cs
Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Commands/CommandEntry.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Commands/CommandManager.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am
Log:
2005-07-11  Lluis Sanchez Gual  <lluis at novell.com>

	* Commands/ICommandDelegatorRouter.cs: New command routing interface.
	* Commands/CommandRouterContainer: An implementation of
	ICommandDelegatorRouter.
	* Commands/CommandManager.cs: Implemented support for
	ICommandDelegatorRouter.



Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog	2005-07-08 20:42:34 UTC (rev 2623)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog	2005-07-11 14:12:47 UTC (rev 2624)
@@ -1,3 +1,11 @@
+2005-07-11  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* Commands/ICommandDelegatorRouter.cs: New command routing interface.
+	* Commands/CommandRouterContainer: An implementation of
+	ICommandDelegatorRouter.
+	* Commands/CommandManager.cs: Implemented support for
+	ICommandDelegatorRouter.
+
 2005-06-28  Raja R Harinath  <rharinath at novell.com>
 
 	* Makefile.am (FILES): Move AssemblyInfo.cs ...

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Commands/CommandEntry.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Commands/CommandEntry.cs	2005-07-08 20:42:34 UTC (rev 2623)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Commands/CommandEntry.cs	2005-07-11 14:12:47 UTC (rev 2624)
@@ -59,6 +59,11 @@
 				Gtk.Widget child = (Gtk.Widget) Activator.CreateInstance (((CustomCommand)cmd).WidgetType);
 				Gtk.ToolItem ti = new Gtk.ToolItem ();
 				ti.Child = child;
+				if (cmd.Text != null && cmd.Text.Length > 0) {
+					Gtk.Tooltips tips = new Gtk.Tooltips ();
+					ti.SetTooltip (tips, cmd.Text, cmd.Text);
+					tips.Enable ();
+				}
 				return ti;
 			}
 			

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Commands/CommandManager.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Commands/CommandManager.cs	2005-07-08 20:42:34 UTC (rev 2623)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Commands/CommandManager.cs	2005-07-11 14:12:47 UTC (rev 2624)
@@ -42,6 +42,7 @@
 		ArrayList toolbars = new ArrayList ();
 		ArrayList globalHandlers = new ArrayList ();
 		ArrayList commandUpdateErrors = new ArrayList ();
+		Stack delegatorStack = new Stack ();
 		
 		Gtk.AccelGroup accelGroup;
 		
@@ -320,7 +321,11 @@
 					return null;
 			}
 			
-			if (cmdTarget is ICommandRouter)
+			if (cmdTarget is ICommandDelegatorRouter) {
+				delegatorStack.Push (cmdTarget);
+				cmdTarget = ((ICommandDelegatorRouter)cmdTarget).GetDelegatedCommandTarget ();
+			}
+			else if (cmdTarget is ICommandRouter)
 				cmdTarget = ((ICommandRouter)cmdTarget).GetNextCommandTarget ();
 			else if (cmdTarget is Gtk.Widget)
 				cmdTarget = ((Gtk.Widget)cmdTarget).Parent;
@@ -328,6 +333,12 @@
 				cmdTarget = null;
 			
 			if (cmdTarget == null) {
+				if (delegatorStack.Count > 0) {
+					ICommandDelegatorRouter del = (ICommandDelegatorRouter) delegatorStack.Pop ();
+					cmdTarget = del.GetNextCommandTarget ();
+					if (cmdTarget != null)
+						return cmdTarget;
+				}
 				if (globalHandlers.Count == 0) return null;
 				globalPos = 0;
 				return globalHandlers [0];

Added: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Commands/CommandRouterContainer.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Commands/CommandRouterContainer.cs	2005-07-08 20:42:34 UTC (rev 2623)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Commands/CommandRouterContainer.cs	2005-07-11 14:12:47 UTC (rev 2624)
@@ -0,0 +1,56 @@
+//
+// CommandRouterContainer.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace MonoDevelop.Commands
+{
+	public class CommandRouterContainer: Gtk.EventBox, ICommandDelegatorRouter
+	{
+		object endTarget;
+		object delegated;
+		
+		public CommandRouterContainer (Gtk.Widget child, object target, bool continueToParent)
+		{
+			Add (child);
+			delegated = target;
+			if (continueToParent)
+				endTarget = Parent;
+		}
+		
+		public object GetNextCommandTarget ()
+		{
+			return endTarget;
+		}
+		
+		public object GetDelegatedCommandTarget ()
+		{
+			return delegated;
+		}
+	}
+}

Added: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Commands/ICommandDelegatorRouter.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Commands/ICommandDelegatorRouter.cs	2005-07-08 20:42:34 UTC (rev 2623)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Commands/ICommandDelegatorRouter.cs	2005-07-11 14:12:47 UTC (rev 2624)
@@ -0,0 +1,41 @@
+//
+// ICommandDelegatorRouter.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace MonoDevelop.Commands
+{
+	// Redirects the command route to the object returned by
+	// GetDelegatedCommandTarget and when done, continues with
+	// GetNextCommandTarget.
+	public interface ICommandDelegatorRouter
+	{
+		object GetNextCommandTarget (); 
+		object GetDelegatedCommandTarget (); 
+	}
+}

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am	2005-07-08 20:42:34 UTC (rev 2623)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am	2005-07-11 14:12:47 UTC (rev 2624)
@@ -40,12 +40,14 @@
 Commands/CommandMenuBar.cs \
 Commands/CommandMenu.cs \
 Commands/CommandMenuItem.cs \
+Commands/CommandRouterContainer.cs \
 Commands/CommandSystemCommands.cs \
 Commands/CommandToggleToolButton.cs \
 Commands/CommandToolbar.cs \
 Commands/CommandToolButton.cs \
 Commands/CustomCommand.cs \
 Commands/CustomMenuItem.cs \
+Commands/ICommandDelegatorRouter.cs \
 Commands/ICommandMenuItem.cs \
 Commands/ICommandRouter.cs \
 Commands/ICommandUserItem.cs \



From lluis at mono-cvs.ximian.com  Mon Jul 11 10:19:57 2005
From: lluis at mono-cvs.ximian.com (Lluis Sanchez <lluis@ximian.com>)
Date: Mon, 11 Jul 2005 10:19:57 -0400 (EDT)
Subject: [Monodevelop-patches-list] r2625 - in
	trunk/MonoDevelop/Core/src/MonoDevelop.Base: .
	Services/ParserService
Message-ID: <20050711141957.C93CB94767@mono-cvs.ximian.com>

Author: lluis
Date: 2005-07-11 10:19:57 -0400 (Mon, 11 Jul 2005)
New Revision: 2625

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/AssemblyCodeCompletionDatabase.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/CodeCompletionDatabase.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/DefaultParserService.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/IParserService.cs
Log:
2005-07-11  Lluis Sanchez Gual  <lluis at novell.com> 

	* Services/ParserService/AssemblyCodeCompletionDatabase.cs:
	Load referenced assemblies in an external process. gtk# 1.0 projects
	should work again.
	* Services/ParserService/IParserService.cs:
	* Services/ParserService/DefaultParserService.cs: Added GetProjectContents
	method.
	* Services/ParserService/CodeCompletionDatabase.cs: Added GetClassList
	method (to support GetProjectContents).



Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-07-11 14:12:47 UTC (rev 2624)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-07-11 14:19:57 UTC (rev 2625)
@@ -1,3 +1,14 @@
+2005-07-11  Lluis Sanchez Gual  <lluis at novell.com> 
+
+	* Services/ParserService/AssemblyCodeCompletionDatabase.cs:
+	Load referenced assemblies in an external process. gtk# 1.0 projects
+	should work again.
+	* Services/ParserService/IParserService.cs:
+	* Services/ParserService/DefaultParserService.cs: Added GetProjectContents
+	method.
+	* Services/ParserService/CodeCompletionDatabase.cs: Added GetClassList
+	method (to support GetProjectContents).
+
 2005-07-08  John Luke  <john.luke at gmail.com>
 
 	* Makefile.am: remove MONO_POSIX_OEE defines

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/AssemblyCodeCompletionDatabase.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/AssemblyCodeCompletionDatabase.cs	2005-07-11 14:12:47 UTC (rev 2624)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/AssemblyCodeCompletionDatabase.cs	2005-07-11 14:19:57 UTC (rev 2625)
@@ -34,6 +34,7 @@
 using MonoDevelop.Internal.Project;
 using MonoDevelop.Internal.Parser;
 using System.Reflection;
+using MonoDevelop.Core.Services;
 
 namespace MonoDevelop.Services
 {	
@@ -47,39 +48,14 @@
 		: base (parserService)
 		{
 			string assemblyFile;
+			string[] refUris;
 			string name;
-			Assembly asm = null;
 			
-			if (assemblyName.ToLower().EndsWith (".dll")) 
+			using (AssemblyDatabaseHelper helper = GetExternalHelper (true))
 			{
-				name = assemblyName.Substring (0, assemblyName.Length - 4);
-				name = name.Replace(',','_').Replace(" ","").Replace('/','_');
-				assemblyFile = assemblyName;
-				try {
-					asm = Assembly.LoadFrom (assemblyFile);
-				}
-				catch {}
-				
-				if (asm == null) {
-					Runtime.LoggingService.Info ("Could not load assembly: " + assemblyFile);
-					return;
-				}
+				helper.GetAssemblyInfo (assemblyName, out this.assemblyName, out assemblyFile, out name, out refUris);
 			}
-			else 
-			{
-				asm = FindAssembly (assemblyName);
-				
-				if (asm == null) {
-					Runtime.LoggingService.Info ("Could not load assembly: " + assemblyName);
-					return;
-				}
-				
-				assemblyName = asm.GetName().FullName;
-				name = EncodeGacAssemblyName (assemblyName);
-				assemblyFile = asm.Location;
-			}
 			
-			this.assemblyName = assemblyName;
 			this.baseDir = baseDir;
 			
 			SetLocation (baseDir, name);
@@ -94,8 +70,7 @@
 			// Update references to other assemblies
 			
 			Hashtable rs = new Hashtable ();
-			foreach (AssemblyName aname in asm.GetReferencedAssemblies ()) {
-				string uri = "Assembly:" + aname.ToString();
+			foreach (string uri in refUris) {
 				rs[uri] = null;
 				if (!HasReference (uri))
 					AddReference (uri);
@@ -112,53 +87,12 @@
 		
 		public static string GetFullAssemblyName (string s)
 		{
-			if (s.ToLower().EndsWith (".dll")) 
-				return s;
-				
-			Assembly asm = FindAssembly (s);
-			
-			if (asm != null)
-				return asm.GetName().FullName;
-			else
-				return s;
-		}
-		
-		public static Assembly FindAssembly (string name)
-		{
-			Assembly asm = null;
-			try {
-				asm = Assembly.Load (name);
+			using (AssemblyDatabaseHelper helper = GetExternalHelper (true))
+			{
+				return helper.GetFullAssemblyName (s);
 			}
-			catch {}
-			
-			if (asm == null) {
-				try {
-					asm = Assembly.LoadWithPartialName (name);
-				}
-				catch {}
-			}
-			return asm;
 		}
 		
-		string EncodeGacAssemblyName (string assemblyName)
-		{
-			string[] assemblyPieces = assemblyName.Split(',');
-			string res = "";
-			foreach (string item in assemblyPieces) {
-				string[] pieces = item.Trim ().Split (new char[] { '=' }, 2);
-				if(pieces.Length == 1)
-					res += pieces[0];
-				else if (!(pieces[0] == "Culture" && pieces[1] != "Neutral"))
-					res += "_" + pieces[1];
-			}
-			return res;
-		}
-		
-		public string AssemblyName
-		{
-			get { return assemblyName; }
-		}
-		
 		protected override void ParseFile (string fileName, IProgressMonitor parentMonitor)
 		{
 			IProgressMonitor monitor = parentMonitor;
@@ -168,10 +102,11 @@
 				monitor.BeginTask ("Parsing assembly: " + Path.GetFileName (fileName), 1);
 				if (useExternalProcess)
 				{
-					string dbgen = Path.Combine (AppDomain.CurrentDomain.BaseDirectory, "dbgen.exe");
-					Process proc = Process.Start ("mono " + dbgen, "\"" + baseDir + "\" \"" + assemblyName + "\"");
-					proc.WaitForExit ();
-					Read ();
+					using (AssemblyDatabaseHelper helper = GetExternalHelper (true))
+					{
+						helper.GenerateDatabase (baseDir, assemblyName);
+						Read ();
+					}
 				}
 				else
 				{
@@ -203,5 +138,122 @@
 				Runtime.LoggingService.Info ("Deleted " + dataFile);
 			}
 		}
+		
+		
+		static AssemblyDatabaseHelper GetExternalHelper (bool share)
+		{
+			if (Runtime.ProcessService != null)
+				return (AssemblyDatabaseHelper) Runtime.ProcessService.CreateExternalProcessObject (typeof(AssemblyDatabaseHelper), share);
+			else
+				return new AssemblyDatabaseHelper ();
+		}
 	}
+	
+	public class AssemblyDatabaseHelper: RemoteProcessObject
+	{
+		public bool GetAssemblyInfo (string assemblyName, out string realAssemblyName, out string assemblyFile, out string name, out string[] references)
+		{
+			name = null;
+			assemblyFile = null;
+			realAssemblyName = null;
+			references = null;
+			
+			Assembly asm = null;
+			
+			if (assemblyName.ToLower().EndsWith (".dll")) 
+			{
+				name = assemblyName.Substring (0, assemblyName.Length - 4);
+				name = name.Replace(',','_').Replace(" ","").Replace('/','_');
+				assemblyFile = assemblyName;
+				try {
+					asm = Assembly.LoadFrom (assemblyFile);
+				}
+				catch {}
+				
+				if (asm == null) {
+					Console.WriteLine ("Could not load assembly: " + assemblyFile);
+					return false;
+				}
+			}
+			else 
+			{
+				asm = FindAssembly (assemblyName);
+				
+				if (asm == null) {
+					Console.WriteLine ("Could not load assembly: " + assemblyName);
+					return false;
+				}
+				
+				assemblyName = asm.GetName().FullName;
+				name = EncodeGacAssemblyName (assemblyName);
+				assemblyFile = asm.Location;
+			}
+			
+			realAssemblyName = assemblyName;
+
+			// Update references to other assemblies
+			
+			AssemblyName[] names = asm.GetReferencedAssemblies ();
+			references = new string [names.Length];
+
+			for (int n=0; n<names.Length; n++)
+				references [n] = "Assembly:" + names [n].ToString();
+				
+			return true;
+		}	
+	
+		public string GetFullAssemblyName (string s)
+		{
+			if (s.ToLower().EndsWith (".dll")) 
+				return s;
+				
+			Assembly asm = FindAssembly (s);
+			
+			if (asm != null)
+				return asm.GetName().FullName;
+			else
+				return s;
+		}
+		
+		public void GenerateDatabase (string baseDir, string assemblyName)
+		{
+			if (ServiceManager.GetService (typeof(MonodocService)) == null)
+				ServiceManager.AddService (new MonodocService());
+
+			DefaultParserService parserService = new DefaultParserService ();
+			parserService.GenerateAssemblyDatabase (baseDir, assemblyName);
+		}
+		
+		Assembly FindAssembly (string name)
+		{
+			Assembly asm = null;
+			try {
+				asm = Assembly.Load (name);
+			}
+			catch {}
+			
+			if (asm == null) {
+				try {
+					asm = Assembly.LoadWithPartialName (name);
+				}
+				catch {}
+			}
+			return asm;
+		}
+
+		string EncodeGacAssemblyName (string assemblyName)
+		{
+			string[] assemblyPieces = assemblyName.Split(',');
+			string res = "";
+			foreach (string item in assemblyPieces) {
+				string[] pieces = item.Trim ().Split (new char[] { '=' }, 2);
+				if(pieces.Length == 1)
+					res += pieces[0];
+				else if (!(pieces[0] == "Culture" && pieces[1] != "Neutral"))
+					res += "_" + pieces[1];
+			}
+			return res;
+		}
+	}
+	
 }

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/CodeCompletionDatabase.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/CodeCompletionDatabase.cs	2005-07-11 14:12:47 UTC (rev 2624)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/CodeCompletionDatabase.cs	2005-07-11 14:19:57 UTC (rev 2625)
@@ -594,6 +594,22 @@
 			}
 		}
 		
+		public IClass[] GetClassList ()
+		{
+			lock (rwlock)
+			{
+				ArrayList list = new ArrayList ();
+				foreach (FileEntry fe in files.Values) {
+					ClassEntry ce = fe.FirstClass;
+					while (ce != null) {
+						list.Add (GetClass (ce));
+						ce = ce.NextInFile;
+					}
+				}
+				return (IClass[]) list.ToArray (typeof(IClass));
+			}
+		}
+		
 		public void GetNamespaceList (ArrayList list, string subNameSpace, bool caseSensitive)
 		{
 			lock (rwlock)

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/DefaultParserService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/DefaultParserService.cs	2005-07-11 14:12:47 UTC (rev 2624)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/DefaultParserService.cs	2005-07-11 14:19:57 UTC (rev 2625)
@@ -783,6 +783,15 @@
 			return null;
 		}
 		
+		public IClass[] GetProjectContents (Project project)
+		{
+			CodeCompletionDatabase db = GetProjectDatabase (project);
+			if (db != null)
+				return db.GetClassList ();
+			else
+				return new IClass[0];
+		}
+		
 		public string[] GetClassList (Project project, string subNameSpace, bool includeReferences)
 		{
 			return GetClassList (project, subNameSpace, includeReferences, true);

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/IParserService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/IParserService.cs	2005-07-11 14:12:47 UTC (rev 2624)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/IParserService.cs	2005-07-11 14:19:57 UTC (rev 2625)
@@ -68,6 +68,7 @@
 		IEnumerable GetClassInheritanceTree (Project project, IClass cls);
 		
 		IClass[] GetFileContents (Project project, string fileName);
+		IClass[] GetProjectContents (Project project);
 		
 		////////////////////////////////////////////
 



From lluis at mono-cvs.ximian.com  Mon Jul 11 10:51:40 2005
From: lluis at mono-cvs.ximian.com (Lluis Sanchez <lluis@ximian.com>)
Date: Mon, 11 Jul 2005 10:51:40 -0400 (EDT)
Subject: [Monodevelop-patches-list] r2626 - in
	trunk/MonoDevelop/Core/src/MonoDevelop.Base: .
	Internal/Codons/Commands Internal/Codons/LanguageBinding
	Internal/Project/Combine Internal/Project/Project
	Internal/Serialization
Message-ID: <20050711145140.6B70A94767@mono-cvs.ximian.com>

Author: lluis
Date: 2005-07-11 10:51:40 -0400 (Mon, 11 Jul 2005)
New Revision: 2626

Added:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntryCollection.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/ConfigurationCollection.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/ConfigurationEventHandler.cs
Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Codons/Commands/CommandCodon.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Codons/LanguageBinding/ILanguageBinding.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineConfiguration.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntry.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/AbstractConfiguration.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/AbstractProjectConfiguration.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/DotNetProject.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/DotNetProjectConfiguration.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/IConfiguration.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Serialization/ClassDataType.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Serialization/ItemProperty.cs
Log:
2005-07-11  Lluis Sanchez Gual  <lluis at novell.com>

	* Internal/Codons/Commands/CommandCodon.cs: Set the text and description
	for custom commands.
	* Internal/Codons/LanguageBinding/ILanguageBinding.cs:
	CreateCompilationParameters now returns an ICloneable.
	
	* Internal/Project/IConfiguration.cs: Added CopyFrom method.
	* Internal/Project/AbstractConfiguration.cs:
	* Internal/Project/AbstractProjectConfiguration.cs
	* Internal/Project/DotNetProjectConfiguration.cs: Implement CopyFrom.
	
	* Internal/Combine/Combine.cs: Added CreateConfiguration method.
	When the active configuration is changed, propagate the change to all
	children entries. When building a combine, build the child entries which
	have the build flag in the active configuration.
	* Internal/Project/DotNetProject.cs: CreateConfiguration is now defined
	in CombineEntry.
	* Internal/Combine/CombineEntry.cs: Make it extensible by implementing
	IExtendedDataItem. Use the new ConfigurationCollection collection.
	Added CreateConfiguration abtract method. Added ActiveConfigurationChanged
	event. Moved CombineEntryCollection to its own file.
	* Internal/Combine/ConfigurationCollection.cs: New class.
	* Internal/Combine/CombineConfiguration.cs: Renamed the Config class to
	CombineConfigurationEntry and made it public. Implemented CopyFrom.
	* Internal/Combine/ConfigurationEventHandler.cs: New handler.
	* Internal/Combine/CombineEntryCollection.cs: Moved from CombineEntry.cs.
	
	* Internal/Serialization/ClassDataType.cs: Properties dynamically added
	to a class must also be added to its subclasses.
	* Internal/Serialization/ItemProperty.cs: Avoid crash in HasSetter for
	properties not linked to a member (extended properties).



Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-07-11 14:19:57 UTC (rev 2625)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-07-11 14:51:40 UTC (rev 2626)
@@ -1,3 +1,36 @@
+2005-07-11  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* Internal/Codons/Commands/CommandCodon.cs: Set the text and description
+	for custom commands.
+	* Internal/Codons/LanguageBinding/ILanguageBinding.cs:
+	CreateCompilationParameters now returns an ICloneable.
+	
+	* Internal/Project/IConfiguration.cs: Added CopyFrom method.
+	* Internal/Project/AbstractConfiguration.cs:
+	* Internal/Project/AbstractProjectConfiguration.cs
+	* Internal/Project/DotNetProjectConfiguration.cs: Implement CopyFrom.
+	
+	* Internal/Combine/Combine.cs: Added CreateConfiguration method.
+	When the active configuration is changed, propagate the change to all
+	children entries. When building a combine, build the child entries which
+	have the build flag in the active configuration.
+	* Internal/Project/DotNetProject.cs: CreateConfiguration is now defined
+	in CombineEntry.
+	* Internal/Combine/CombineEntry.cs: Make it extensible by implementing
+	IExtendedDataItem. Use the new ConfigurationCollection collection.
+	Added CreateConfiguration abtract method. Added ActiveConfigurationChanged
+	event. Moved CombineEntryCollection to its own file.
+	* Internal/Combine/ConfigurationCollection.cs: New class.
+	* Internal/Combine/CombineConfiguration.cs: Renamed the Config class to
+	CombineConfigurationEntry and made it public. Implemented CopyFrom.
+	* Internal/Combine/ConfigurationEventHandler.cs: New handler.
+	* Internal/Combine/CombineEntryCollection.cs: Moved from CombineEntry.cs.
+	
+	* Internal/Serialization/ClassDataType.cs: Properties dynamically added
+	to a class must also be added to its subclasses.
+	* Internal/Serialization/ItemProperty.cs: Avoid crash in HasSetter for
+	properties not linked to a member (extended properties).
+
 2005-07-11  Lluis Sanchez Gual  <lluis at novell.com> 
 
 	* Services/ParserService/AssemblyCodeCompletionDatabase.cs:

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Codons/Commands/CommandCodon.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Codons/Commands/CommandCodon.cs	2005-07-11 14:19:57 UTC (rev 2625)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Codons/Commands/CommandCodon.cs	2005-07-11 14:51:40 UTC (rev 2626)
@@ -120,6 +120,8 @@
 					throw new InvalidOperationException ("Array custom commands are not allowed.");
 					
 				CustomCommand ccmd = new CustomCommand ();
+				ccmd.Text = label;
+				ccmd.Description = description;
 				ccmd.WidgetType = AddIn.GetType (widget);
 				if (ccmd.WidgetType == null)
 					throw new InvalidOperationException ("Could not find command type '" + widget + "'.");

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Codons/LanguageBinding/ILanguageBinding.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Codons/LanguageBinding/ILanguageBinding.cs	2005-07-11 14:19:57 UTC (rev 2625)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Codons/LanguageBinding/ILanguageBinding.cs	2005-07-11 14:51:40 UTC (rev 2626)
@@ -38,7 +38,7 @@
 		
 		void GenerateMakefile (Project project, Combine parentCombine);
 		
-		object CreateCompilationParameters (XmlElement projectOptions);
+		ICloneable CreateCompilationParameters (XmlElement projectOptions);
 
 		/// <summary>
 		/// Used by Comment and Uncomment operations and by Centaurus Addin.

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs	2005-07-11 14:19:57 UTC (rev 2625)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs	2005-07-11 14:51:40 UTC (rev 2626)
@@ -151,6 +151,22 @@
 			referenceRemovedFromProjectHandler = new ProjectReferenceEventHandler (NotifyReferenceRemovedFromProject);
 		}
 		
+		public override IConfiguration CreateConfiguration (string name)
+		{
+			CombineConfiguration cc = new CombineConfiguration ();
+			cc.Name = name;
+			return cc;
+		}
+		
+		protected override void OnActiveConfigurationChanged (ConfigurationEventArgs args)
+		{
+			foreach (CombineConfigurationEntry cce in ((CombineConfiguration)ActiveConfiguration).Entries) {
+				IConfiguration conf = cce.Entry.GetConfiguration (cce.ConfigurationName);
+				cce.Entry.ActiveConfiguration = conf;
+			}
+			base.OnActiveConfigurationChanged  (args);
+		}
+		
 		internal void NotifyEntryAdded (CombineEntry entry)
 		{
 			if (StartupEntry == null)
@@ -419,6 +435,29 @@
 			}
 		}
 		
+		public CombineEntryCollection GetAllBuildableEntries (string configuration)
+		{
+			CombineEntryCollection list = new CombineEntryCollection();
+			GetAllBuildableEntries (list, configuration);
+			return list;
+		}
+		
+		void GetAllBuildableEntries (CombineEntryCollection list, string configuration)
+		{
+			CombineConfiguration conf = (CombineConfiguration) GetConfiguration (configuration);
+			if (conf == null)
+				return;
+
+			foreach (CombineConfigurationEntry entry in conf.Entries) {
+				if (!entry.Build)
+					continue;
+				if (entry.Entry is Combine)
+					((Combine)entry.Entry).GetAllBuildableEntries (list, configuration);
+				else if (entry.Entry is Project)
+					list.Add (entry.Entry);
+			}
+		}
+		
 		public Project GetProjectEntryContaining (string fileName) 
 		{
 			CombineEntryCollection projects = GetAllProjects ();
@@ -471,19 +510,19 @@
 		
 		public override void Clean ()
 		{
-			foreach (CombineEntry entry in Entries)
-				entry.Clean ();
+			foreach (CombineConfigurationEntry cce in ((CombineConfiguration)ActiveConfiguration).Entries)
+				cce.Entry.Clean ();
 		}
 		
 		public override ICompilerResult Build (IProgressMonitor monitor)
 		{
-			CombineEntryCollection allProjects = GetAllProjects ();
-			monitor.BeginTask ("Building Combine " + Name, allProjects.Count);
+			CombineEntryCollection allProjects = GetAllBuildableEntries (ActiveConfiguration.Name);
+			monitor.BeginTask (string.Format (GettextCatalog.GetString ("Building Solution {0}"), Name), allProjects.Count);
 			try {
 				CompilerResults cres = new CompilerResults (null);
 				
 				try {
-					allProjects = TopologicalSort(allProjects);
+					allProjects = TopologicalSort (allProjects);
 				} catch (CyclicBuildOrderException) {
 					monitor.ReportError (GettextCatalog.GetString ("Cyclic dependencies can not be built with this version.\nBut we are working on it."), null);
 					return new DefaultCompilerResult (cres, "", 1, 1);

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineConfiguration.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineConfiguration.cs	2005-07-11 14:19:57 UTC (rev 2625)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineConfiguration.cs	2005-07-11 14:51:40 UTC (rev 2626)
@@ -24,40 +24,9 @@
 	public class CombineConfiguration : AbstractConfiguration
 	{
 		[ExpandedCollection]
-		[ItemProperty ("Entry", ValueType=typeof(Config))]
+		[ItemProperty ("Entry", ValueType=typeof(CombineConfigurationEntry))]
 		ArrayList configurations = new ArrayList();
 		
-		[DataItem ("Entry")]
-		public class Config 
-		{
-			string entryName;
-			
-			[ItemProperty ("name")]
-			string EntryName {
-				get { return Entry != null ? Entry.Name : entryName; }
-				set { entryName = value; }
-			}
-			
-			public CombineEntry entry;
-			
-			//[ItemProperty ("configurationname")]
-			public string ConfigurationName;
-			
-			[ItemProperty ("build")]
-			public bool Build;
-			
-			public CombineEntry Entry {
-				get { return entry; }
-				set { entry = value; if (entry != null) entryName = entry.Name; }
-			}
-			
-			internal void SetCombine (Combine combine)
-			{
-				if (entryName != null)
-					Entry = combine.Entries [entryName];
-			}
-		}
-		
 		public CombineConfiguration ()
 		{
 		}
@@ -69,33 +38,41 @@
 		
 		internal void SetCombine (Combine combine)
 		{
-			foreach (Config conf in configurations)
+			foreach (CombineConfigurationEntry conf in configurations) {
 				conf.SetCombine (combine);
+				if (conf.ConfigurationName == null)
+					conf.ConfigurationName = Name;
+			}
 		}
 		
-		public Config GetConfiguration(int number)
+		public ICollection Entries {
+			get { return configurations; }
+		}
+		
+		public CombineConfigurationEntry GetConfiguration(int number)
 		{
 			if (number < configurations.Count) {
-				return (Config)configurations[number];
+				return (CombineConfigurationEntry)configurations[number];
 			} 
 			Debug.Assert(false, "Configuration number " + number + " not found.\n" + configurations.Count + " configurations avaiable.");
 			return null;
 		}
 		
-		public void AddEntry (CombineEntry combine)
+		public CombineConfigurationEntry AddEntry (CombineEntry combine)
 		{
-			Config conf = new Config();
+			CombineConfigurationEntry conf = new CombineConfigurationEntry();
 			conf.Entry = combine;
 			conf.ConfigurationName = combine.ActiveConfiguration != null ? combine.ActiveConfiguration.Name : String.Empty;
 			conf.Build = true;
 			configurations.Add(conf);
+			return conf;
 		}
 		
 		public void RemoveEntry (CombineEntry entry)
 		{
-			Config removeConfig = null;
+			CombineConfigurationEntry removeConfig = null;
 			
-			foreach (Config config in configurations) {
+			foreach (CombineConfigurationEntry config in configurations) {
 				if (config.Entry == entry) {
 					removeConfig = config;
 					break;
@@ -105,5 +82,51 @@
 			Debug.Assert(removeConfig != null);
 			configurations.Remove(removeConfig);
 		}
+		
+		public override void CopyFrom (IConfiguration configuration)
+		{
+			base.CopyFrom (configuration);
+			CombineConfiguration conf = (CombineConfiguration) configuration;
+			
+			configurations.Clear ();
+			foreach (CombineConfigurationEntry cce in conf.configurations) {
+				CombineConfigurationEntry nc = new CombineConfigurationEntry ();
+				nc.Entry = cce.Entry;
+				nc.ConfigurationName = cce.ConfigurationName;
+				nc.Build = cce.Build;
+				configurations.Add (nc);
+			}
+		}
 	}
+	
+	[DataItem ("Entry")]
+	public class CombineConfigurationEntry 
+	{
+		string entryName;
+		
+		[ItemProperty ("name")]
+		string EntryName {
+			get { return Entry != null ? Entry.Name : entryName; }
+			set { entryName = value; }
+		}
+		
+		public CombineEntry entry;
+		
+		[ItemProperty ("configuration")]
+		public string ConfigurationName;
+		
+		[ItemProperty ("build")]
+		public bool Build;
+		
+		public CombineEntry Entry {
+			get { return entry; }
+			set { entry = value; if (entry != null) entryName = entry.Name; }
+		}
+		
+		internal void SetCombine (Combine combine)
+		{
+			if (entryName != null)
+				Entry = combine.Entries [entryName];
+		}
+	}
 }

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntry.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntry.cs	2005-07-11 14:19:57 UTC (rev 2625)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntry.cs	2005-07-11 14:51:40 UTC (rev 2626)
@@ -23,11 +23,12 @@
 
 namespace MonoDevelop.Internal.Project
 {
-	public abstract class CombineEntry : ICustomDataItem, IDisposable
+	public abstract class CombineEntry : ICustomDataItem, IDisposable, IExtendedDataItem
 	{
 		[ItemProperty ("Configurations")]
 		[ItemProperty ("Configuration", ValueType=typeof(IConfiguration), Scope=1)]
-		ArrayList configurations = new ArrayList();
+		ConfigurationCollection configurations = new ConfigurationCollection ();
+		Hashtable extendedProperties;
 
 		Combine parentCombine;
 		IConfiguration activeConfiguration;
@@ -37,7 +38,16 @@
 		IFileFormat fileFormat;
 		
 		public event CombineEntryRenamedEventHandler NameChanged;
+		public event ConfigurationEventHandler ActiveConfigurationChanged;
 		
+		IDictionary IExtendedDataItem.ExtendedProperties {
+			get {
+				if (extendedProperties == null)
+					extendedProperties = new Hashtable ();
+				return extendedProperties;
+			}
+		}
+		
 		[ItemProperty ("name")]
 		public virtual string Name {
 			get {
@@ -116,7 +126,7 @@
 			parentCombine = combine;
 		}
 		
-		public ArrayList Configurations {
+		public ConfigurationCollection Configurations {
 			get {
 				return configurations;
 			}
@@ -130,7 +140,10 @@
 				return activeConfiguration;
 			}
 			set {
-				activeConfiguration = value;
+				if (activeConfiguration != value) {
+					activeConfiguration = value;
+					OnActiveConfigurationChanged (new ConfigurationEventArgs (this, value));
+				}
 			}
 		}
 		
@@ -158,6 +171,8 @@
 				activeConfiguration = GetConfiguration (ac.Value);
 		}
 		
+		public abstract IConfiguration CreateConfiguration (string name);
+		
 		public IConfiguration GetConfiguration (string name)
 		{
 			if (configurations != null) {
@@ -207,6 +222,12 @@
 			}
 		}
 		
+		protected virtual void OnActiveConfigurationChanged (ConfigurationEventArgs args)
+		{
+			if (ActiveConfigurationChanged != null)
+				ActiveConfigurationChanged (this, args);
+		}
+		
 		public abstract void Clean ();
 		public abstract ICompilerResult Build (IProgressMonitor monitor);
 		public abstract void Execute (IProgressMonitor monitor);
@@ -216,88 +237,5 @@
 		public virtual void GenerateMakefiles (Combine parentCombine)
 		{
 		}
-		
 	}
-	
-	public interface ICombineEntryCollection: IEnumerable
-	{
-		int Count { get; }
-		CombineEntry this [int n] { get; }
-	}
-	
-	public class CombineEntryCollection: ICombineEntryCollection
-	{
-		ArrayList list = new ArrayList ();
-		Combine parentCombine;
-		
-		internal CombineEntryCollection ()
-		{
-		}
-		
-		internal CombineEntryCollection (Combine combine)
-		{
-			parentCombine = combine;
-		}
-		
-		public int Count
-		{
-			get { return list.Count; }
-		}
-		
-		public CombineEntry this [int n]
-		{
-			get { return (CombineEntry) list[n]; }
-		}
-		
-		public CombineEntry this [string name]
-		{
-			get {
-			for (int n=0; n<list.Count; n++)
-				if (((CombineEntry)list[n]).Name == name)
-					return (CombineEntry)list[n];
-			return null;
-			}
-		}
-		
-		public IEnumerator GetEnumerator ()
-		{
-			return list.GetEnumerator ();
-		}
-		
-		public void Add (CombineEntry entry)
-		{
-			list.Add (entry);
-			if (parentCombine != null) {
-				entry.SetParentCombine (parentCombine);
-				parentCombine.NotifyEntryAdded (entry);
-			}
-		}
-		
-		public void Remove (CombineEntry entry)
-		{
-			list.Remove (entry);
-			if (parentCombine != null) {
-				entry.SetParentCombine (null);
-				parentCombine.NotifyEntryRemoved (entry);
-			}
-		}
-		
-		public int IndexOf (CombineEntry entry)
-		{
-			return list.IndexOf (entry);
-		}
-		
-		public int IndexOf (string name)
-		{
-			for (int n=0; n<list.Count; n++)
-				if (((CombineEntry)list[n]).Name == name)
-					return n;
-			return -1;
-		}
-		
-		public void Clear ()
-		{
-			list.Clear ();
-		}
-	}
 }

Added: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntryCollection.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntryCollection.cs	2005-07-11 14:19:57 UTC (rev 2625)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntryCollection.cs	2005-07-11 14:51:40 UTC (rev 2626)
@@ -0,0 +1,95 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Mike Kr?ger" email="mike at icsharpcode.net"/>
+//     <version value="$version"/>
+// </file>
+
+using System;
+using System.Collections;
+using MonoDevelop.Internal.Project;
+
+namespace MonoDevelop.Internal.Project
+{
+	public interface ICombineEntryCollection: IEnumerable
+	{
+		int Count { get; }
+		CombineEntry this [int n] { get; }
+	}
+	
+	public class CombineEntryCollection: ICombineEntryCollection
+	{
+		ArrayList list = new ArrayList ();
+		Combine parentCombine;
+		
+		internal CombineEntryCollection ()
+		{
+		}
+		
+		internal CombineEntryCollection (Combine combine)
+		{
+			parentCombine = combine;
+		}
+		
+		public int Count
+		{
+			get { return list.Count; }
+		}
+		
+		public CombineEntry this [int n]
+		{
+			get { return (CombineEntry) list[n]; }
+		}
+		
+		public CombineEntry this [string name]
+		{
+			get {
+			for (int n=0; n<list.Count; n++)
+				if (((CombineEntry)list[n]).Name == name)
+					return (CombineEntry)list[n];
+			return null;
+			}
+		}
+		
+		public IEnumerator GetEnumerator ()
+		{
+			return list.GetEnumerator ();
+		}
+		
+		public void Add (CombineEntry entry)
+		{
+			list.Add (entry);
+			if (parentCombine != null) {
+				entry.SetParentCombine (parentCombine);
+				parentCombine.NotifyEntryAdded (entry);
+			}
+		}
+		
+		public void Remove (CombineEntry entry)
+		{
+			list.Remove (entry);
+			if (parentCombine != null) {
+				entry.SetParentCombine (null);
+				parentCombine.NotifyEntryRemoved (entry);
+			}
+		}
+		
+		public int IndexOf (CombineEntry entry)
+		{
+			return list.IndexOf (entry);
+		}
+		
+		public int IndexOf (string name)
+		{
+			for (int n=0; n<list.Count; n++)
+				if (((CombineEntry)list[n]).Name == name)
+					return n;
+			return -1;
+		}
+		
+		public void Clear ()
+		{
+			list.Clear ();
+		}
+	}
+}

Added: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/ConfigurationCollection.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/ConfigurationCollection.cs	2005-07-11 14:19:57 UTC (rev 2625)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/ConfigurationCollection.cs	2005-07-11 14:51:40 UTC (rev 2626)
@@ -0,0 +1,77 @@
+//
+// ConfigurationCollection.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+using System;
+using System.Collections;
+
+using MonoDevelop.Internal.Project;
+using MonoDevelop.Internal.Serialization;
+
+using MonoDevelop.Core.Properties;
+
+namespace MonoDevelop.Internal.Project
+{
+	public class ConfigurationCollection : CollectionBase
+	{
+		public int Add (IConfiguration config)
+		{
+			return List.Add (config);
+		}
+		
+		public new IConfiguration this [int index] {
+			get {
+				return (IConfiguration) List [index];
+			}
+		}
+		
+		public IConfiguration this [string name] {
+			get {
+				foreach (IConfiguration c in this)
+					if (c.Name == name)
+						return c;
+				return null;
+			}
+		}
+		
+		public void Remove (IConfiguration config)
+		{
+			List.Remove (config);
+		}
+		
+		public void Remove (string name)
+		{
+			for (int n=0; n<Count; n++) {
+				if (this [n].Name == name) {
+					List.RemoveAt (n);
+					return;
+				}
+			}
+		}
+	}
+}

Added: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/ConfigurationEventHandler.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/ConfigurationEventHandler.cs	2005-07-11 14:19:57 UTC (rev 2625)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/ConfigurationEventHandler.cs	2005-07-11 14:51:40 UTC (rev 2626)
@@ -0,0 +1,52 @@
+//
+// ConfigurationEventHandler.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+using System;
+using MonoDevelop.Internal.Project;
+
+namespace MonoDevelop.Internal.Project
+{
+	public delegate void ConfigurationEventHandler (object sender, ConfigurationEventArgs e);
+	
+	public class ConfigurationEventArgs : CombineEntryEventArgs
+	{
+		IConfiguration configuration;
+		
+		public ConfigurationEventArgs (CombineEntry entry, IConfiguration configuration): base (entry)
+		{
+			this.configuration = configuration;
+		}
+
+		public IConfiguration Configuration {
+			get {
+				return configuration;
+			}
+		}
+	}
+}

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/AbstractConfiguration.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/AbstractConfiguration.cs	2005-07-11 14:19:57 UTC (rev 2625)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/AbstractConfiguration.cs	2005-07-11 14:51:40 UTC (rev 2626)
@@ -5,6 +5,7 @@
 //     <version value="$version"/>
 // </file>
 
+using System;
 using System.Xml;
 using MonoDevelop.Internal.Project;
 using MonoDevelop.Internal.Serialization;
@@ -26,9 +27,28 @@
 
 		public object Clone()
 		{
-			return MemberwiseClone();
+			IConfiguration conf = (IConfiguration) System.Activator.CreateInstance (GetType());
+			conf.Name = Name;
+			conf.CopyFrom (this);
+			return conf;
 		}
 		
+		public virtual void CopyFrom (IConfiguration configuration)
+		{
+			AbstractConfiguration other = (AbstractConfiguration) configuration;
+			if (other.properties != null) {
+				properties = new Hashtable ();
+				foreach (DictionaryEntry e in other.properties) {
+					if (e.Value is ICloneable)
+						properties [e.Key] = ((ICloneable)e.Value).Clone ();
+					else
+						properties [e.Key] = e.Value;
+				}
+			}
+			else
+				properties = null;
+		}
+		
 		public override string ToString()
 		{
 			return name;

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/AbstractProjectConfiguration.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/AbstractProjectConfiguration.cs	2005-07-11 14:19:57 UTC (rev 2625)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/AbstractProjectConfiguration.cs	2005-07-11 14:51:40 UTC (rev 2626)
@@ -99,5 +99,21 @@
 			get { return pauseconsoleoutput; }
 			set { pauseconsoleoutput = value; }
 		}
+		
+		public override void CopyFrom (IConfiguration configuration)
+		{
+			base.CopyFrom (configuration);
+			AbstractProjectConfiguration conf = (AbstractProjectConfiguration) configuration;
+			
+			directory = conf.directory;
+			executeScript = conf.executeScript;
+			executeBeforeBuild = conf.executeBeforeBuild;
+			executeAfterBuild = conf.executeAfterBuild;
+			runWithWarnings = conf.runWithWarnings;
+			debugmode = conf.debugmode;
+			commandLineParameters = conf.commandLineParameters;
+			externalConsole = conf.externalConsole;
+			pauseconsoleoutput = conf.pauseconsoleoutput;
+		}
 	}
 }

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/DotNetProject.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/DotNetProject.cs	2005-07-11 14:19:57 UTC (rev 2625)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/DotNetProject.cs	2005-07-11 14:51:40 UTC (rev 2626)
@@ -57,13 +57,11 @@
 			language = languageName;
 			languageBinding = FindLanguage (language);
 			
-			DotNetProjectConfiguration configuration = CreateConfiguration ();
-			configuration.Name = "Debug";
+			DotNetProjectConfiguration configuration = (DotNetProjectConfiguration) CreateConfiguration ("Debug");
 			configuration.CompilationParameters = languageBinding.CreateCompilationParameters (projectOptions);
 			Configurations.Add (configuration);
 			
-			configuration = CreateConfiguration ();
-			configuration.Name = "Release";
+			configuration = (DotNetProjectConfiguration) CreateConfiguration ("Release");
 			configuration.DebugMode = false;
 			configuration.CompilationParameters = languageBinding.CreateCompilationParameters (projectOptions);
 			Configurations.Add (configuration);
@@ -97,9 +95,12 @@
 			return binding;
 		}
 
-		protected virtual DotNetProjectConfiguration CreateConfiguration ()
+		public override IConfiguration CreateConfiguration (string name)
 		{
-			return new DotNetProjectConfiguration ();
+			DotNetProjectConfiguration conf = new DotNetProjectConfiguration ();
+			conf.Name = name;
+			conf.CompilationParameters = languageBinding.CreateCompilationParameters (null);
+			return conf;
 		}
 		
 		protected override ICompilerResult DoBuild (IProgressMonitor monitor)

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/DotNetProjectConfiguration.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/DotNetProjectConfiguration.cs	2005-07-11 14:19:57 UTC (rev 2625)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/DotNetProjectConfiguration.cs	2005-07-11 14:51:40 UTC (rev 2626)
@@ -57,7 +57,7 @@
 		CompileTarget compiletarget = CompileTarget.Exe;
 		
 		[ItemProperty ("CodeGeneration")]
-		object compilationParameters;
+		ICloneable compilationParameters;
 		
 		string sourcePath;
 
@@ -76,7 +76,7 @@
 			set { compiletarget = value; }
 		}
 		
-		public object CompilationParameters {
+		public ICloneable CompilationParameters {
 			get { return compilationParameters; }
 			set { compilationParameters = value; }
 		}
@@ -89,5 +89,17 @@
 			get { return sourcePath; }
 			set { sourcePath = value; }
 		}
+		
+		public override void CopyFrom (IConfiguration configuration)
+		{
+			base.CopyFrom (configuration);
+			DotNetProjectConfiguration conf = (DotNetProjectConfiguration) configuration;
+			
+			assembly = conf.assembly;
+			netRuntime = conf.netRuntime;
+			compiletarget = conf.compiletarget;
+			sourcePath = conf.sourcePath;
+			compilationParameters = conf.compilationParameters != null ? (ICloneable)conf.compilationParameters.Clone () : null;
+		}
 	}
 }

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/IConfiguration.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/IConfiguration.cs	2005-07-11 14:19:57 UTC (rev 2625)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/IConfiguration.cs	2005-07-11 14:51:40 UTC (rev 2626)
@@ -22,5 +22,7 @@
 			get;
 			set;
 		}
+		
+		void CopyFrom (IConfiguration configuration);
 	}
 }

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Serialization/ClassDataType.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Serialization/ClassDataType.cs	2005-07-11 14:19:57 UTC (rev 2625)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Serialization/ClassDataType.cs	2005-07-11 14:51:40 UTC (rev 2626)
@@ -141,6 +141,11 @@
 				throw new InvalidOperationException ("Duplicate property '" + prop.Name + "' in class '" + ValueType);
 			properties.Add (prop.Name, prop);
 			sortedPoperties.Add (prop);
+			
+			if (subtypes != null && subtypes.Count > 0) {
+				foreach (ClassDataType subtype in subtypes)
+					subtype.AddProperty (prop);
+			}
 		}
 		
 		Exception CreateNestedConflictException (ItemProperty p1, ItemProperty p2)
@@ -294,9 +299,9 @@
 							object pval = GetPropValue (prop, obj);
 							if (pval == null) {
 								if (prop.HasSetter)
-									throw new InvalidOperationException ("The property is null and a new instance of '" + prop.PropertyType + "' can't be created.");
+									throw new InvalidOperationException ("The property '" + prop.Name + "' is null and a new instance of '" + prop.PropertyType + "' can't be created.");
 								else
-									throw new InvalidOperationException ("The property is null and it does not have a setter.");
+									throw new InvalidOperationException ("The property '" + prop.Name + "' is null and it does not have a setter.");
 							}
 							prop.Deserialize (serCtx, value, pval);
 						} else {

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Serialization/ItemProperty.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Serialization/ItemProperty.cs	2005-07-11 14:19:57 UTC (rev 2625)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Serialization/ItemProperty.cs	2005-07-11 14:51:40 UTC (rev 2626)
@@ -169,7 +169,7 @@
 		}
 		
 		internal bool HasSetter {
-			get { return (member is FieldInfo) || ((member is PropertyInfo) && ((PropertyInfo)member).CanWrite); }
+			get { return member == null || (member is FieldInfo) || ((member is PropertyInfo) && ((PropertyInfo)member).CanWrite); }
 		}
 
 		internal DataNode Serialize (SerializationContext serCtx, object value)



From lluis at mono-cvs.ximian.com  Mon Jul 11 10:52:07 2005
From: lluis at mono-cvs.ximian.com (Lluis Sanchez <lluis@ximian.com>)
Date: Mon, 11 Jul 2005 10:52:07 -0400 (EDT)
Subject: [Monodevelop-patches-list] r2627 - in
	trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding:
	. Project
Message-ID: <20050711145207.4E9C794767@mono-cvs.ximian.com>

Author: lluis
Date: 2005-07-11 10:52:07 -0400 (Mon, 11 Jul 2005)
New Revision: 2627

Modified:
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpLanguageBinding.cs
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpCompilerParameters.cs
Log:
2005-07-11  Lluis Sanchez Gual  <lluis at novell.com>

	* Project/CSharpCompilerParameters.cs: Implement ICloneable.
	* CSharpLanguageBinding.cs: CreateCompilationParameters now returns an
	ICloneable.



Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpLanguageBinding.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpLanguageBinding.cs	2005-07-11 14:51:40 UTC (rev 2626)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpLanguageBinding.cs	2005-07-11 14:52:07 UTC (rev 2627)
@@ -56,7 +56,7 @@
 			compilerManager.GenerateMakefile (project, parentCombine);
 		}
 		
-		public object CreateCompilationParameters (XmlElement projectOptions)
+		public ICloneable CreateCompilationParameters (XmlElement projectOptions)
 		{
 			return new CSharpCompilerParameters();
 		}

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog	2005-07-11 14:51:40 UTC (rev 2626)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog	2005-07-11 14:52:07 UTC (rev 2627)
@@ -1,3 +1,9 @@
+2005-07-11  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* Project/CSharpCompilerParameters.cs: Implement ICloneable.
+	* CSharpLanguageBinding.cs: CreateCompilationParameters now returns an
+	ICloneable.
+
 2005-05-15  Lluis Sanchez Gual  <lluis at novell.com> 
 
 	* CSharp.glade: Several fixes to make the dialogs more conforming

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpCompilerParameters.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpCompilerParameters.cs	2005-07-11 14:51:40 UTC (rev 2626)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpCompilerParameters.cs	2005-07-11 14:52:07 UTC (rev 2627)
@@ -23,7 +23,7 @@
 	/// <summary>
 	/// This class handles project specific compiler parameters
 	/// </summary>
-	public class CSharpCompilerParameters
+	public class CSharpCompilerParameters: ICloneable
 	{
 		// Configuration parameters
 		
@@ -57,6 +57,11 @@
 		[ProjectPathItemProperty ("win32Icon", DefaultValue = "")]
 		string         win32Icon     = String.Empty;
 		
+		public object Clone ()
+		{
+			return MemberwiseClone ();
+		}
+		
 		[Browsable(false)]
 		public CsharpCompiler CsharpCompiler {
 			get {



From lluis at mono-cvs.ximian.com  Mon Jul 11 10:52:36 2005
From: lluis at mono-cvs.ximian.com (Lluis Sanchez <lluis@ximian.com>)
Date: Mon, 11 Jul 2005 10:52:36 -0400 (EDT)
Subject: [Monodevelop-patches-list] r2628 - in
	trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding:
	. Project
Message-ID: <20050711145236.A93D294767@mono-cvs.ximian.com>

Author: lluis
Date: 2005-07-11 10:52:36 -0400 (Mon, 11 Jul 2005)
New Revision: 2628

Modified:
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleLanguageBinding.cs
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleParameters.cs
Log:
2005-07-11  Lluis Sanchez Gual  <lluis at novell.com>

	* Project/NemerleParameters.cs: Implement ICloneable.
	* NemerleLanguageBinding.cs: CreateCompilationParameters now returns an
	ICloneable.



Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ChangeLog	2005-07-11 14:52:07 UTC (rev 2627)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ChangeLog	2005-07-11 14:52:36 UTC (rev 2628)
@@ -1,3 +1,9 @@
+2005-07-11  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* Project/NemerleParameters.cs: Implement ICloneable.
+	* NemerleLanguageBinding.cs: CreateCompilationParameters now returns an
+	ICloneable.
+
 2005-04-17  John Luke  <john.luke at gmail.com>
 
 	* Makefile.am: fix distcheck

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleLanguageBinding.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleLanguageBinding.cs	2005-07-11 14:52:07 UTC (rev 2627)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleLanguageBinding.cs	2005-07-11 14:52:36 UTC (rev 2628)
@@ -46,7 +46,7 @@
 			compilerServices.GenerateMakefile(project, parentCombine);
 		}
 		
-		public object CreateCompilationParameters (XmlElement projectOptions)
+		public ICloneable CreateCompilationParameters (XmlElement projectOptions)
 		{
 			return new NemerleParameters ();
 		}

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleParameters.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleParameters.cs	2005-07-11 14:52:07 UTC (rev 2627)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleParameters.cs	2005-07-11 14:52:36 UTC (rev 2628)
@@ -7,7 +7,7 @@
 
 namespace NemerleBinding
 {
-	public class NemerleParameters
+	public class NemerleParameters: ICloneable
 	{
 		[ItemProperty("nostdmacros")]
 		public bool nostdmacros = false;
@@ -30,6 +30,11 @@
 		[ItemProperty("parameters")]
 		public string parameters = String.Empty;
 		
+		public object Clone ()
+		{
+			return MemberwiseClone ();
+		}
+		
 		public bool Nostdmacros
 		{
 			get { return nostdmacros; }



From lluis at mono-cvs.ximian.com  Mon Jul 11 10:52:52 2005
From: lluis at mono-cvs.ximian.com (Lluis Sanchez <lluis@ximian.com>)
Date: Mon, 11 Jul 2005 10:52:52 -0400 (EDT)
Subject: [Monodevelop-patches-list] r2629 - in
	trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding:
	. Project
Message-ID: <20050711145252.922EC94767@mono-cvs.ximian.com>

Author: lluis
Date: 2005-07-11 10:52:52 -0400 (Mon, 11 Jul 2005)
New Revision: 2629

Modified:
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ILAsmLanguageBinding.cs
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmCompilerParameters.cs
Log:
2005-07-11  Lluis Sanchez Gual  <lluis at novell.com>

	* Project/ILAsmCompilerParameters.cs: Implement ICloneable.
	* ILAsmLanguageBinding.cs: CreateCompilationParameters now returns an
	ICloneable.



Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ChangeLog	2005-07-11 14:52:36 UTC (rev 2628)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ChangeLog	2005-07-11 14:52:52 UTC (rev 2629)
@@ -1,3 +1,9 @@
+2005-07-11  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* Project/ILAsmCompilerParameters.cs: Implement ICloneable.
+	* ILAsmLanguageBinding.cs: CreateCompilationParameters now returns an
+	ICloneable.
+
 2005-04-17  John Luke  <john.luke at gmail.com>
 
 	* Makefile.am: fix distcheck

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ILAsmLanguageBinding.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ILAsmLanguageBinding.cs	2005-07-11 14:52:36 UTC (rev 2628)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ILAsmLanguageBinding.cs	2005-07-11 14:52:52 UTC (rev 2629)
@@ -57,7 +57,7 @@
 			// Not supported
 		}
 		
-		public object CreateCompilationParameters (XmlElement projectOptions)
+		public ICloneable CreateCompilationParameters (XmlElement projectOptions)
 		{
 			return new ILAsmCompilerParameters();
 		}

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmCompilerParameters.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmCompilerParameters.cs	2005-07-11 14:52:36 UTC (rev 2628)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmCompilerParameters.cs	2005-07-11 14:52:52 UTC (rev 2629)
@@ -20,8 +20,13 @@
 	/// <summary>
 	/// This class handles project specific compiler parameters
 	/// </summary>
-	public class ILAsmCompilerParameters
+	public class ILAsmCompilerParameters: ICloneable
 	{
 		// Add options here
+		
+		public object Clone ()
+		{
+			return MemberwiseClone ();
+		}
 	}
 }



From lluis at mono-cvs.ximian.com  Mon Jul 11 10:53:08 2005
From: lluis at mono-cvs.ximian.com (Lluis Sanchez <lluis@ximian.com>)
Date: Mon, 11 Jul 2005 10:53:08 -0400 (EDT)
Subject: [Monodevelop-patches-list] r2630 - in
	trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding:
	. Project
Message-ID: <20050711145308.8189494767@mono-cvs.ximian.com>

Author: lluis
Date: 2005-07-11 10:53:08 -0400 (Mon, 11 Jul 2005)
New Revision: 2630

Modified:
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Project/VBCompilerParameters.cs
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBLanguageBinding.cs
Log:
2005-07-11  Lluis Sanchez Gual  <lluis at novell.com>

	* Project/VBCompilerParameters.cs: Implement ICloneable.
	* VBLanguageBinding.cs: CreateCompilationParameters now returns an
	ICloneable.



Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ChangeLog	2005-07-11 14:52:52 UTC (rev 2629)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ChangeLog	2005-07-11 14:53:08 UTC (rev 2630)
@@ -1,3 +1,9 @@
+2005-07-11  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* Project/VBCompilerParameters.cs: Implement ICloneable.
+	* VBLanguageBinding.cs: CreateCompilationParameters now returns an
+	ICloneable.
+
 2005-07-01  John Luke  <john.luke at gmail.com>
 
 	* SharpRefeactoryVB/Makefile.am:

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Project/VBCompilerParameters.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Project/VBCompilerParameters.cs	2005-07-11 14:52:52 UTC (rev 2629)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Project/VBCompilerParameters.cs	2005-07-11 14:53:08 UTC (rev 2630)
@@ -23,7 +23,7 @@
 	/// <summary>
 	/// This class handles project specific compiler parameters
 	/// </summary>
-	public class VBCompilerParameters
+	public class VBCompilerParameters: ICloneable
 	{
 		[ItemProperty("compilerversion")]
 		string vbCompilerVersion = String.Empty;
@@ -79,6 +79,11 @@
 		[ItemProperty("VBDOC-commentprefix")]
 		string commentprefix = "'";
 		
+		public object Clone ()
+		{
+			return MemberwiseClone ();
+		}
+		
 		[Browsable(false)]
 		public string VBCompilerVersion
 		{

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBLanguageBinding.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBLanguageBinding.cs	2005-07-11 14:52:52 UTC (rev 2629)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBLanguageBinding.cs	2005-07-11 14:53:08 UTC (rev 2630)
@@ -52,7 +52,7 @@
 			compilerServices.GenerateMakefile (project, parentCombine);
 		}
 		
-		public object CreateCompilationParameters (XmlElement projectOptions)
+		public ICloneable CreateCompilationParameters (XmlElement projectOptions)
 		{
 			return new VBCompilerParameters ();
 		}



From lluis at mono-cvs.ximian.com  Mon Jul 11 10:56:08 2005
From: lluis at mono-cvs.ximian.com (Lluis Sanchez <lluis@ximian.com>)
Date: Mon, 11 Jul 2005 10:56:08 -0400 (EDT)
Subject: [Monodevelop-patches-list] r2631 - in
	trunk/MonoDevelop/Extras/JavaBinding: . Project
Message-ID: <20050711145608.3683094767@mono-cvs.ximian.com>

Author: lluis
Date: 2005-07-11 10:56:08 -0400 (Mon, 11 Jul 2005)
New Revision: 2631

Modified:
   trunk/MonoDevelop/Extras/JavaBinding/ChangeLog
   trunk/MonoDevelop/Extras/JavaBinding/JavaLanguageBinding.cs
   trunk/MonoDevelop/Extras/JavaBinding/Project/JavaCompilerParameters.cs
Log:
2005-07-11  Lluis Sanchez Gual  <lluis at novell.com>

	* Project/JavaCompilerParameters.cs: Implement ICloneable.
	* JavaLanguageBinding.cs	: CreateCompilationParameters now returns an
	ICloneable.



Modified: trunk/MonoDevelop/Extras/JavaBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Extras/JavaBinding/ChangeLog	2005-07-11 14:53:08 UTC (rev 2630)
+++ trunk/MonoDevelop/Extras/JavaBinding/ChangeLog	2005-07-11 14:56:08 UTC (rev 2631)
@@ -1,3 +1,9 @@
+2005-07-11  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* Project/JavaCompilerParameters.cs: Implement ICloneable.
+	* JavaLanguageBinding.cs	: CreateCompilationParameters now returns an
+	ICloneable.
+
 2005-06-11  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* Gui/ProjectConfigurationPropertyPanel.cs: Fix build.

Modified: trunk/MonoDevelop/Extras/JavaBinding/JavaLanguageBinding.cs
===================================================================
--- trunk/MonoDevelop/Extras/JavaBinding/JavaLanguageBinding.cs	2005-07-11 14:53:08 UTC (rev 2630)
+++ trunk/MonoDevelop/Extras/JavaBinding/JavaLanguageBinding.cs	2005-07-11 14:56:08 UTC (rev 2631)
@@ -64,7 +64,7 @@
 			// throw new NotImplementedException ();
 		}
 		
-		public object CreateCompilationParameters (XmlElement projectOptions)
+		public ICloneable CreateCompilationParameters (XmlElement projectOptions)
 		{
 			JavaCompilerParameters parameters = new JavaCompilerParameters ();
 			parameters.ClassPath = Path.Combine (Path.Combine (Properties.IkvmPath, "classpath"), "mscorlib.jar");

Modified: trunk/MonoDevelop/Extras/JavaBinding/Project/JavaCompilerParameters.cs
===================================================================
--- trunk/MonoDevelop/Extras/JavaBinding/Project/JavaCompilerParameters.cs	2005-07-11 14:53:08 UTC (rev 2630)
+++ trunk/MonoDevelop/Extras/JavaBinding/Project/JavaCompilerParameters.cs	2005-07-11 14:56:08 UTC (rev 2631)
@@ -17,7 +17,7 @@
 	/// <summary>
 	/// This class handles project specific compiler parameters
 	/// </summary>
-	public class JavaCompilerParameters
+	public class JavaCompilerParameters: ICloneable
 	{
 		[ItemProperty("deprecation")]
 		bool deprecation = true;
@@ -43,6 +43,11 @@
 		[ItemProperty("genwarnings")]
 		bool genwarnings = false;
 		
+		public object Clone ()
+		{
+			return MemberwiseClone ();
+		}
+		
 		public bool GenWarnings {
 			get {
 				return genwarnings;



From lluis at mono-cvs.ximian.com  Mon Jul 11 11:03:17 2005
From: lluis at mono-cvs.ximian.com (Lluis Sanchez <lluis@ximian.com>)
Date: Mon, 11 Jul 2005 11:03:17 -0400 (EDT)
Subject: [Monodevelop-patches-list] r2632 - in
	trunk/MonoDevelop/Extras/BooBinding: . Project
Message-ID: <20050711150317.ABD1C94767@mono-cvs.ximian.com>

Author: lluis
Date: 2005-07-11 11:03:17 -0400 (Mon, 11 Jul 2005)
New Revision: 2632

Modified:
   trunk/MonoDevelop/Extras/BooBinding/BooLanguageBinding.boo
   trunk/MonoDevelop/Extras/BooBinding/ChangeLog
   trunk/MonoDevelop/Extras/BooBinding/Project/BooCompilerParameters.boo
Log:
2005-07-11  Lluis Sanchez Gual  <lluis at novell.com>

	* Project/BooCompilerParameters.boo: Implement ICloneable.
	* BooLanguageBinding.boo: CreateCompilationParameters now returns an
	ICloneable.



Modified: trunk/MonoDevelop/Extras/BooBinding/BooLanguageBinding.boo
===================================================================
--- trunk/MonoDevelop/Extras/BooBinding/BooLanguageBinding.boo	2005-07-11 14:56:08 UTC (rev 2631)
+++ trunk/MonoDevelop/Extras/BooBinding/BooLanguageBinding.boo	2005-07-11 15:03:17 UTC (rev 2632)
@@ -56,7 +56,7 @@
 		// throw NotImplementedException ()
 		return
 	
-	public def CreateCompilationParameters (projectOptions as XmlElement) as object:
+	public def CreateCompilationParameters (projectOptions as XmlElement) as ICloneable:
 		parameters = BooCompilerParameters ()
 		return parameters
 	

Modified: trunk/MonoDevelop/Extras/BooBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Extras/BooBinding/ChangeLog	2005-07-11 14:56:08 UTC (rev 2631)
+++ trunk/MonoDevelop/Extras/BooBinding/ChangeLog	2005-07-11 15:03:17 UTC (rev 2632)
@@ -1,3 +1,9 @@
+2005-07-11  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* Project/BooCompilerParameters.boo: Implement ICloneable.
+	* BooLanguageBinding.boo: CreateCompilationParameters now returns an
+	ICloneable.
+
 2005-06-04  Peter Johanson <latexer at gentoo.org>
 
 	* Gui/OptionPanels/CodeCompilationPanel.boo:

Modified: trunk/MonoDevelop/Extras/BooBinding/Project/BooCompilerParameters.boo
===================================================================
--- trunk/MonoDevelop/Extras/BooBinding/Project/BooCompilerParameters.boo	2005-07-11 14:56:08 UTC (rev 2631)
+++ trunk/MonoDevelop/Extras/BooBinding/Project/BooCompilerParameters.boo	2005-07-11 15:03:17 UTC (rev 2632)
@@ -26,7 +26,7 @@
 import MonoDevelop.Internal.Project
 import MonoDevelop.Internal.Serialization
 
-public class BooCompilerParameters:
+public class BooCompilerParameters(ICloneable):
 	[ItemProperty("genwarnings")]
 	genwarnings = false
 	
@@ -36,6 +36,9 @@
 	[ItemProperty("culture")]
 	culture = "" 
 
+	public def Clone () as object:
+		return MemberwiseClone ()
+		
 	public GenWarnings as bool:
 		get:
 			return genwarnings



From lluis at mono-cvs.ximian.com  Mon Jul 11 11:19:45 2005
From: lluis at mono-cvs.ximian.com (Lluis Sanchez <lluis@ximian.com>)
Date: Mon, 11 Jul 2005 11:19:45 -0400 (EDT)
Subject: [Monodevelop-patches-list] r2633 - in
	trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Gui
	Gui/Dialogs Gui/Dialogs/CombineConfiguration
	Gui/Pads/SolutionPad Gui/ToolWidgets Gui/Workbench/Layouts
	Services/File Services/ProcessService Services/Project
Message-ID: <20050711151945.8CD6794767@mono-cvs.ximian.com>

Author: lluis
Date: 2005-07-11 11:19:45 -0400 (Mon, 11 Jul 2005)
New Revision: 2633

Added:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineEntryConfigurationsPanel.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineOptionsDialog.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/ToolWidgets/
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/ToolWidgets/ConfigurationComboBox.cs
Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Base.glade
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineConfigurationPanel.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TreeViewOptions.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/SolutionPad/ITreeBuilderContext.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/SolutionPad/TreeViewPad.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/MonoDevelopCore.addin.xml
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/File/DefaultFileService.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/File/IFileService.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ProcessService/ProcessService.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Project/ProjectService.cs
Log:
2005-07-11  Lluis Sanchez Gual  <lluis at novell.com> 

	* Services/File/IFileService.cs: 
	* Services/File/DefaultFileService.cs: Added OpenFile overload to open
	a file at place the cursor at a given line at column.
	
	* Services/ProcessService/ProcessService.cs: Provide the assembly location
	when creating an out of process object.
	
	* Services/Project/ProjectService.cs: Use the new combine options dialog.
	Store and restore the active configuration of the root combine.
	
	* Gui/Dialogs/CombineConfiguration/CombineConfigurationPanel.cs:
	Implemented.
	* Gui/Dialogs/CombineConfiguration/CombineEntryConfigurationsPanel.cs:
	new option panel that shows the list of configurations of a combine.
	
	* Gui/Dialogs/TreeViewOptions.cs: Added new overridable methods to
	make costumization easier.
	* Gui/Dialogs/CombineOptionsDialog.cs: New dialog that shows the options
	for a combine.
	* Gui/Workbench/Layouts/SdiWorkspaceLayout.cs: Include the IPadContent
	in the command route.
	* Gui/Pads/SolutionPad/TreeViewPad.cs: Use the new ICommandDelegatorRouter
	interface. Made some methods virtual. The key for GetComposedIcon is now
	an object, instead of an string.
	
	* Gui/Pads/SolutionPad/ITreeBuilderContext.cs:The key for GetComposedIcon
	is now an object, instead of an string.
	
	* Gui/ToolWidgets/ConfigurationComboBox.cs: Toolbar widget that shows
	the active configuration.
	
	* Base.glade: Added new combine configuration dialogs.
	* MonoDevelopCore.addin.xml: Added the ConfigurationSelector command and
	the new combine configuration panels.



Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Base.glade
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Base.glade	2005-07-11 15:03:17 UTC (rev 2632)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Base.glade	2005-07-11 15:19:45 UTC (rev 2633)
@@ -20,7 +20,6 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
@@ -97,10 +96,6 @@
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="mnemonic_widget">TreeView</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -127,9 +122,6 @@
 		      <property name="rules_hint">False</property>
 		      <property name="reorderable">False</property>
 		      <property name="enable_search">True</property>
-		      <property name="fixed_height_mode">False</property>
-		      <property name="hover_selection">False</property>
-		      <property name="hover_expand">False</property>
 		      <signal name="button_release_event" handler="OnButtonRelease" last_modification_time="Thu, 04 Mar 2004 06:11:16 GMT"/>
 		    </widget>
 		  </child>
@@ -196,10 +188,6 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -266,10 +254,6 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="type">label_item</property>
@@ -295,10 +279,6 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="type">tab</property>
@@ -342,7 +322,6 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
@@ -419,10 +398,6 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -466,9 +441,6 @@
 				  <property name="rules_hint">False</property>
 				  <property name="reorderable">False</property>
 				  <property name="enable_search">True</property>
-				  <property name="fixed_height_mode">False</property>
-				  <property name="hover_selection">False</property>
-				  <property name="hover_expand">False</property>
 				</widget>
 			      </child>
 			    </widget>
@@ -510,10 +482,6 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
 			    </widget>
 			  </child>
 			</widget>
@@ -564,10 +532,6 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -595,10 +559,6 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -630,10 +590,6 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">txt_name</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -654,7 +610,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char">*</property>
+			  <property name="invisible_char" translatable="yes">*</property>
 			  <property name="activates_default">False</property>
 			  <signal name="changed" handler="PathChanged" last_modification_time="Sat, 17 Jan 2004 17:21:33 GMT"/>
 			</widget>
@@ -680,10 +636,6 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -709,10 +661,6 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">txt_subdirectory</propert