Set svn:ignore for all directories.

Update MonoDevelop projects. A few minor fixes. svn path=/trunk/aspeditor/; revision=59937
2006-04-26 18:32:18 +00:00 · 2006-04-26 18:32:18 +00:00 · 84ec92428c
--- a/5
+++ b/5
@ -1,3 +1,8 @@
+2006-04-26  Michael Hutchinson <m.j.hutchinson@gmail.com> 
+
+	* Makefile.am, script.in: Use the MOZILLA_HOME determined by configure
+	script.
+
 2006-01-16 Michael Hutchinson <m.j.hutchinson@gmail.com>

 	* config.in, INSTALL: update dependencies for new Toolbox
--- a/Makefile.am
+++ b/Makefile.am
@ -6,6 +6,7 @@ REWRITE = \
        sed -e "s|\@prefix\@|$(prefix)|g"               \
            -e "s|\@pkglibdir\@|$(pkglibdir)|g"         \
            -e "s|\@bindir\@|$(bindir)|g"		\
+            -e "s|\@MOZILLA_HOME\@|$(MOZILLA_HOME)|g"		\
 	    -e "s|\@MONO\@|$(MONO)|g" 

 $(bin_SCRIPTS): $(srcdir)/script.in Makefile
--- a/aspnetedit.mds
+++ b/aspnetedit.mds
@ -1,16 +1,16 @@
 <Combine name="aspnetedit" fileversion="2.0">
  <Configurations active="Debug">
    <Configuration name="Debug" ctype="CombineConfiguration">
-      <Entry configuration="Debug" build="True" name="aspnetedit" />
-      <Entry configuration="Debug" build="True" name="editor" />
-      <Entry configuration="Debug" build="True" name="propertygrid" />
-      <Entry configuration="Debug" build="True" name="jscall" />
+      <Entry build="True" name="aspnetedit" configuration="Debug" />
+      <Entry build="True" name="editor" configuration="Debug" />
+      <Entry build="True" name="propertygrid" configuration="Debug" />
+      <Entry build="True" name="jscall" configuration="Debug" />
    </Configuration>
    <Configuration name="Release" ctype="CombineConfiguration">
-      <Entry configuration="Release" build="True" name="aspnetedit" />
-      <Entry configuration="Release" build="True" name="editor" />
-      <Entry configuration="Release" build="True" name="propertygrid" />
-      <Entry configuration="Release" build="True" name="jscall" />
+      <Entry build="True" name="aspnetedit" configuration="Release" />
+      <Entry build="True" name="editor" configuration="Release" />
+      <Entry build="True" name="propertygrid" configuration="Release" />
+      <Entry build="True" name="jscall" configuration="Release" />
    </Configuration>
  </Configurations>
  <StartMode startupentry="aspnetedit" single="True">
--- a/script.in
+++ b/script.in
@ -1,2 +1,2 @@
 #!/bin/sh
-LD_LIBRARY_PATH=@prefix@/lib/aspnetedit:$LD_LIBRARY_PATH exec @MONO@ --debug @prefix@/lib/aspnetedit/aspnetedit.exe $MONO_EXTRA_ARGS "$@"
+LD_LIBRARY_PATH=`echo @prefix@/lib/aspnetedit:$LD_LIBRARY_PATH:@MOZILLA_HOME@ | sed 's/^://g'` exec @MONO@ --debug @prefix@/lib/aspnetedit/aspnetedit.exe $MONO_EXTRA_ARGS "$@"
--- a/src/aspnetedit/aspnetedit.mdp
+++ b/src/aspnetedit/aspnetedit.mdp
@ -1,15 +1,15 @@
-<Project name="aspnetedit" fileversion="2.0" newfilesearch="OnLoad" language="C#" ctype="DotNetProject">
+<Project name="aspnetedit" fileversion="2.0" newfilesearch="OnLoad" language="C#" clr-version="Net_1_1" ctype="DotNetProject">
  <Configurations active="Debug">
    <Configuration name="Debug" ctype="DotNetProjectConfiguration">
      <Output directory="../../build/lib" assembly="aspnetedit" />
      <Build debugmode="True" target="Exe" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1" />
      <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/lib" assembly="aspnetedit" />
      <Build debugmode="False" target="Exe" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1" />
      <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
    </Configuration>
  </Configurations>
--- a/src/editor/Makefile.am
+++ b/src/editor/Makefile.am
@ -20,41 +20,48 @@ EDITOR_REFERENCES =						\
 EDITOR_CSFILES =									\
 	$(srcdir)/AssemblyInfo.cs \
 	$(srcdir)/AspNetEdit.Editor.ComponentModel/DesignContainer.cs \
-	$(srcdir)/AspNetEdit.Editor.ComponentModel/SelectionService.cs			\
 	$(srcdir)/AspNetEdit.Editor.ComponentModel/DesignerHost.cs \
-	$(srcdir)/AspNetEdit.Editor.ComponentModel/ToolboxService.cs			\
+	$(srcdir)/AspNetEdit.Editor.ComponentModel/Document.cs \
+	$(srcdir)/AspNetEdit.Editor.ComponentModel/DocumentDirective.cs \
 	$(srcdir)/AspNetEdit.Editor.ComponentModel/EventBindingService.cs \
-	$(srcdir)/AspNetEdit.Editor.ComponentModel/Transaction.cs			\
 	$(srcdir)/AspNetEdit.Editor.ComponentModel/ExtenderListService.cs \
-	$(srcdir)/AspNetEdit.Editor.ComponentModel/TypeDescriptorFilterService.cs	\
 	$(srcdir)/AspNetEdit.Editor.ComponentModel/MenuCommandService.cs \
+	$(srcdir)/AspNetEdit.Editor.ComponentModel/NameCreationService.cs \
+	$(srcdir)/AspNetEdit.Editor.ComponentModel/RootDesigner.cs \
+	$(srcdir)/AspNetEdit.Editor.ComponentModel/SelectionService.cs \
+	$(srcdir)/AspNetEdit.Editor.ComponentModel/TextToolboxItem.cs \
+	$(srcdir)/AspNetEdit.Editor.ComponentModel/ToolboxService.cs \
+	$(srcdir)/AspNetEdit.Editor.ComponentModel/Transaction.cs \
+	$(srcdir)/AspNetEdit.Editor.ComponentModel/TypeDescriptorFilterService.cs \
 	$(srcdir)/AspNetEdit.Editor.ComponentModel/TypeResolutionService.cs \
 	$(srcdir)/AspNetEdit.Editor.ComponentModel/WebFormPage.cs \
 	$(srcdir)/AspNetEdit.Editor.ComponentModel/WebFormReferenceManager.cs \
-	$(srcdir)/AspNetEdit.Editor.ComponentModel/RootDesigner.cs			\
-	$(srcdir)/AspNetEdit.Editor.ComponentModel/NameCreationService.cs		\
-	$(srcdir)/AspNetEdit.Editor.UI/PropertyGrid.cs					\
-	$(srcdir)/AspNetEdit.Editor.UI/RootDesignerView.cs				\
-	$(srcdir)/AspNetEdit.Editor.UI/Toolbox.cs					\
-	$(srcdir)/AspNetEdit.Editor.UI/ToolboxItemBox.cs				\
 	$(srcdir)/AspNetEdit.Editor.Persistence/AspParser.cs \
 	$(srcdir)/AspNetEdit.Editor.Persistence/AspTokenizer.cs \
 	$(srcdir)/AspNetEdit.Editor.Persistence/ControlPersister.cs \
+	$(srcdir)/AspNetEdit.Editor.Persistence/DesignTimeParser.cs \
 	$(srcdir)/AspNetEdit.Editor.Persistence/Directive.cs \
+	$(srcdir)/AspNetEdit.Editor.Persistence/HtmlParsingObject.cs \
 	$(srcdir)/AspNetEdit.Editor.Persistence/ILocation.cs \
 	$(srcdir)/AspNetEdit.Editor.Persistence/Location.cs \
 	$(srcdir)/AspNetEdit.Editor.Persistence/ParseException.cs \
 	$(srcdir)/AspNetEdit.Editor.Persistence/ParsingObject.cs \
-	$(srcdir)/AspNetEdit.Editor.Persistence/DesignTimeParser.cs			\
-	$(srcdir)/AspNetEdit.Editor.Persistence/HtmlParsingObject.cs			\
 	$(srcdir)/AspNetEdit.Editor.Persistence/RootParsingObject.cs \
 	$(srcdir)/AspNetEdit.Editor.Persistence/ServerControlParsingObject.cs \
 	$(srcdir)/AspNetEdit.Editor.Persistence/StrUtils.cs \
 	$(srcdir)/AspNetEdit.Editor.Persistence/TagAttributes.cs \
 	$(srcdir)/AspNetEdit.Editor.Persistence/TagType.cs \
-	$(srcdir)/AspNetEdit.Editor.ComponentModel/Document.cs				\
-	$(srcdir)/AspNetEdit.Editor.ComponentModel/DocumentDirective.cs			\
-	$(srcdir)/AspNetEdit.Editor.ComponentModel/TextToolboxItem.cs
+	$(srcdir)/AspNetEdit.Editor.UI/PropertyGrid.cs \
+	$(srcdir)/AspNetEdit.Editor.UI/RootDesignerView.cs \
+	$(srcdir)/AspNetEdit.Gui.Toolbox/BaseToolboxNode.cs \
+	$(srcdir)/AspNetEdit.Gui.Toolbox/CategoryToolboxNode.cs \
+	$(srcdir)/AspNetEdit.Gui.Toolbox/ItemToolboxNode.cs \
+	$(srcdir)/AspNetEdit.Gui.Toolbox/TextToolboxNode.cs \
+	$(srcdir)/AspNetEdit.Gui.Toolbox/Toolbox.cs \
+	$(srcdir)/AspNetEdit.Gui.Toolbox/ToolboxItemToolboxNode.cs \
+	$(srcdir)/AspNetEdit.Gui.Toolbox/ToolboxNodeManager.cs \
+	$(srcdir)/AspNetEdit.Gui.Toolbox/ToolboxStore.cs
+

 $(ASSEMBLY): $(EDITOR_CSFILES)
 	$(MCS) $(MCS_OPTIONS) $(EDITOR_REFERENCES) -debug -target:library -out:$@ $(EDITOR_CSFILES)
--- a/src/editor/editor.mdp
+++ b/src/editor/editor.mdp
@ -1,15 +1,15 @@
-<Project name="editor" fileversion="2.0" newfilesearch="OnLoad" language="C#" ctype="DotNetProject">
+<Project name="editor" fileversion="2.0" newfilesearch="OnLoad" language="C#" clr-version="Net_1_1" ctype="DotNetProject">
  <Configurations active="Debug">
    <Configuration name="Debug" ctype="DotNetProjectConfiguration">
      <Output directory="../../build/lib" assembly="editor" />
      <Build debugmode="True" target="Library" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1" />
      <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/lib" assembly="editor" />
      <Build debugmode="False" target="Library" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1" />
      <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
    </Configuration>
  </Configurations>
@ -34,14 +34,12 @@
    <File name="./AspNetEdit.Editor.ComponentModel/NameCreationService.cs" subtype="Code" buildaction="Compile" />
    <File name="./AspNetEdit.Editor.ComponentModel/RootDesigner.cs" subtype="Code" buildaction="Compile" />
    <File name="./AspNetEdit.Editor.ComponentModel/SelectionService.cs" subtype="Code" buildaction="Compile" />
-    <File name="./AspNetEdit.Editor.ComponentModel/ToolboxService.cs" subtype="Code" buildaction="Compile" />
    <File name="./AspNetEdit.Editor.ComponentModel/Transaction.cs" subtype="Code" buildaction="Compile" />
    <File name="./AspNetEdit.Editor.ComponentModel/TypeDescriptorFilterService.cs" subtype="Code" buildaction="Compile" />
    <File name="./AspNetEdit.Editor.ComponentModel/TypeResolutionService.cs" subtype="Code" buildaction="Compile" />
    <File name="./AspNetEdit.Editor.ComponentModel/WebFormPage.cs" subtype="Code" buildaction="Compile" />
    <File name="./AspNetEdit.Editor.ComponentModel/WebFormReferenceManager.cs" subtype="Code" buildaction="Compile" />
    <File name="./AspNetEdit.Editor.UI/RootDesignerView.cs" subtype="Code" buildaction="Compile" />
-    <File name="./AspNetEdit.Editor.UI/Toolbox.cs" subtype="Code" buildaction="Compile" />
    <File name="./AspNetEdit.Editor.ComponentModel/Document.cs" subtype="Code" buildaction="Compile" />
    <File name="./AspNetEdit.Editor.ComponentModel/DocumentDirective.cs" subtype="Code" buildaction="Compile" />
    <File name="./AspNetEdit.Editor.Persistence/AspParser.cs" subtype="Code" buildaction="Compile" />
@ -64,7 +62,17 @@
    <File name="./AspNetEdit.Editor.ComponentModel/ChangeLog" subtype="Code" buildaction="Exclude" />
    <File name="./AspNetEdit.Editor.Persistence/ChangeLog" subtype="Code" buildaction="Exclude" />
    <File name="./AspNetEdit.Editor.UI/ChangeLog" subtype="Code" buildaction="Exclude" />
-    <File name="./AspNetEdit.Editor.UI/ToolboxItemStore.cs" subtype="Code" buildaction="Compile" />
+    <File name="./AspNetEdit.Gui.Toolbox" subtype="Directory" buildaction="Compile" />
+    <File name="./AspNetEdit.Gui.Toolbox/ToolboxStore.cs" subtype="Code" buildaction="Compile" />
+    <File name="./AspNetEdit.Gui.Toolbox/ToolboxNodeManager.cs" subtype="Code" buildaction="Compile" />
+    <File name="./AspNetEdit.Gui.Toolbox/ToolboxItemToolboxNode.cs" subtype="Code" buildaction="Compile" />
+    <File name="./AspNetEdit.Gui.Toolbox/Toolbox.cs" subtype="Code" buildaction="Compile" />
+    <File name="./AspNetEdit.Gui.Toolbox/TextToolboxNode.cs" subtype="Code" buildaction="Compile" />
+    <File name="./AspNetEdit.Gui.Toolbox/CategoryToolboxNode.cs" subtype="Code" buildaction="Compile" />
+    <File name="./AspNetEdit.Gui.Toolbox/BaseToolboxNode.cs" subtype="Code" buildaction="Compile" />
+    <File name="./AspNetEdit.Gui.Toolbox/ItemToolboxNode.cs" subtype="Code" buildaction="Compile" />
+    <File name="./AspNetEdit.Editor.ComponentModel/ToolboxService.cs" subtype="Code" buildaction="Compile" />
+    <File name="./AspNetEdit.Gui.Toolbox/ChangeLog" subtype="Code" buildaction="Nothing" />
  </Contents>
  <References>
    <ProjectReference type="Project" localcopy="True" refto="jscall" />
--- a/src/jscall/jscall.mdp
+++ b/src/jscall/jscall.mdp
@ -1,15 +1,15 @@
-<Project name="jscall" fileversion="2.0" newfilesearch="OnLoad" language="C#" ctype="DotNetProject">
+<Project name="jscall" fileversion="2.0" newfilesearch="OnLoad" language="C#" clr-version="Net_1_1" ctype="DotNetProject">
  <Configurations active="Debug">
    <Configuration name="Debug" ctype="DotNetProjectConfiguration">
      <Output directory="../../build/lib" assembly="jscall" />
      <Build debugmode="True" target="Library" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1" />
      <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/lib" assembly="jscall" />
      <Build debugmode="False" target="Library" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1" />
      <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
    </Configuration>
  </Configurations>
--- a/src/propertygrid/AspNetEdit.UI.Editors/ChangeLog
+++ b/src/propertygrid/AspNetEdit.UI.Editors/ChangeLog
@ -0,0 +1,3 @@
+2006-01-16 Michael Hutchinson <m.j.hutchinson@gmail.com>
+
+	* StringEditor.cs: write helpful trace message after swallowing PropertyConverter failure
--- a/src/propertygrid/AspNetEdit.UI/ChangeLog
+++ b/src/propertygrid/AspNetEdit.UI/ChangeLog
@ -0,0 +1,4 @@
+2006-04-26  Michael Hutchinson <m.j.hutchinson@gmail.com> 
+
+	* PropertyGrid.cs:	Add Refresh method as interim workaround for not being
+	able to track externally changed values of properties.
--- a/src/propertygrid/AspNetEdit.UI/PropertyGrid.cs
+++ b/src/propertygrid/AspNetEdit.UI/PropertyGrid.cs
@ -327,6 +327,11 @@ public class PropertyGrid : Gtk.VBox
 		expanderBox.ShowAll ();
 	}
 	
+	//TODO: add more intelligence for editing state etc. Maybe need to know which property has changed, then just update that
+	public void Refresh ()
+	{
+		Populate ();
+	}

 	private Table BuildTable (ArrayList arr)
 	{
--- a/src/propertygrid/propertygrid.mdp
+++ b/src/propertygrid/propertygrid.mdp
@ -1,15 +1,15 @@
-<Project name="propertygrid" fileversion="2.0" newfilesearch="OnLoad" language="C#" ctype="DotNetProject">
+<Project name="propertygrid" fileversion="2.0" newfilesearch="OnLoad" language="C#" clr-version="Net_1_1" ctype="DotNetProject">
  <Configurations active="Debug">
    <Configuration name="Debug" ctype="DotNetProjectConfiguration">
      <Output directory="../../build/lib" assembly="propertygrid" />
      <Build debugmode="True" target="Library" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1" />
      <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/lib" assembly="propertygrid" />
      <Build debugmode="False" target="Library" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1" />
      <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
    </Configuration>
  </Configurations>