Merge branch 'WpfDesignerPropGrid'

Author: tbulle

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/OutlineView/OutlineNode.cs

@@ -30,6 +30,7 @@ public interface IOutlineNode
 		string Name { get; }
 		bool CanInsert(IEnumerable<IOutlineNode> nodes, IOutlineNode after, bool copy);
 		void Insert(IEnumerable<IOutlineNode> nodes, IOutlineNode after, bool copy);
+		ObservableCollection<IOutlineNode> Children{ get; }
 	}
 
 

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/OutlineView/OutlineTreeView.cs

@@ -13,30 +13,30 @@ public class OutlineTreeView : DragTreeView
 		protected override bool CanInsert(DragTreeViewItem target, DragTreeViewItem[] items, DragTreeViewItem after, bool copy)
 		{
 			UpdateCustomNodes(items);
-			return (target.DataContext as OutlineNode).CanInsert(_customOutlineNodes,
-			                                                     after == null ? null : after.DataContext as OutlineNode, copy);
+			return (target.DataContext as IOutlineNode).CanInsert(_customOutlineNodes,
+			                                                     after == null ? null : after.DataContext as IOutlineNode, copy);
 		}
 
 		protected override void Insert(DragTreeViewItem target, DragTreeViewItem[] items, DragTreeViewItem after, bool copy)
 		{
 			UpdateCustomNodes(items);
-			(target.DataContext as OutlineNode).Insert(_customOutlineNodes,
-			                                           after == null ? null : after.DataContext as OutlineNode, copy);
+			(target.DataContext as IOutlineNode).Insert(_customOutlineNodes,
+			                                           after == null ? null : after.DataContext as IOutlineNode, copy);
 		}
 
 		// Need to do this through a seperate List since previously LINQ queries apparently disconnected DataContext;bug in .NET 4.0
-		private List<OutlineNode> _customOutlineNodes;
+		private List<IOutlineNode> _customOutlineNodes;
 
 		void UpdateCustomNodes(IEnumerable<DragTreeViewItem> items)
 		{
-			_customOutlineNodes = new List<OutlineNode>();
+			_customOutlineNodes = new List<IOutlineNode>();
 			foreach (var item in items)
-				_customOutlineNodes.Add(item.DataContext as OutlineNode);
+				_customOutlineNodes.Add(item.DataContext as IOutlineNode);
 		}
 
 		public override bool ShouldItemBeVisible(DragTreeViewItem dragTreeViewitem)
 		{
-			var node = dragTreeViewitem.DataContext as OutlineNode;
+			var node = dragTreeViewitem.DataContext as IOutlineNode;
 
 			return string.IsNullOrEmpty(Filter) || node.Name.ToLower().Contains(Filter.ToLower());
 		}
@@ -45,7 +45,7 @@ protected override void SelectOnly(DragTreeViewItem item)
 		{
 			base.SelectOnly(item);
 
-			var node = item.DataContext as OutlineNode;
+			var node = item.DataContext as IOutlineNode;
 
 			var surface = node.DesignItem.View.TryFindParent<DesignSurface>();
 			if (surface != null)

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/OutlineView/HierarchyTests.cs

@@ -11,7 +11,7 @@ namespace ICSharpCode.WpfDesign.Tests.Designer.OutlineView
 	public class HierarchyTests : ModelTestHelper
 	{
 		private DesignItem _grid;
-		private OutlineNode _outline;
+		private IOutlineNode _outline;
 
 		[TestFixtureSetUp]
 		public void Intialize()

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/OutlineView/InsertTests.cs

@@ -11,15 +11,15 @@ namespace ICSharpCode.WpfDesign.Tests.Designer.OutlineView
 	public class CollectionElementsInsertTests : ModelTestHelper
 	{
 		private DesignItem _grid;
-		private OutlineNode _outline;
+		private IOutlineNode _outline;
 
 		private DesignItem _gridButton;
 		private DesignItem _stackPanel;
 		private DesignItem _stackPanelButton;
 
-		private OutlineNode _gridButtonNode;
-		private OutlineNode _stackPanelNode;
-		private OutlineNode _stackPanelButtonNode;
+		private IOutlineNode _gridButtonNode;
+		private IOutlineNode _stackPanelNode;
+		private IOutlineNode _stackPanelButtonNode;
 
 		[SetUp]
 		public void Intialize()
@@ -147,15 +147,15 @@ public void CheckElementsInDesignerWhenCopy()
 	public class ContentControlInsertTests : ModelTestHelper
 	{
 		private DesignItem _grid;
-		private OutlineNode _outline;
+		private IOutlineNode _outline;
 
 		private DesignItem _gridButton;
 		private DesignItem _stackPanel;
 		private DesignItem _stackPanelImage;
 
-		private OutlineNode _gridButtonNode;
-		private OutlineNode _stackPanelNode;
-		private OutlineNode _stackPanelImageNode;
+		private IOutlineNode _gridButtonNode;
+		private IOutlineNode _stackPanelNode;
+		private IOutlineNode _stackPanelImageNode;
 
 		[SetUp]
 		public void Intialize()

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/OutlineView/SelectionTests.cs

@@ -11,7 +11,7 @@ namespace ICSharpCode.WpfDesign.Tests.Designer.OutlineView
 	public class SelectionTests : ModelTestHelper
 	{
 		private DesignItem _grid;
-		private OutlineNode _outline;
+		private IOutlineNode _outline;
 
 		[SetUp]
 		public void Intialize()