Merge remote-tracking branch 'remotes/origin/master' into classbrowser

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/RightClickContextMenu.xaml

@@ -0,0 +1,10 @@
+<ContextMenu x:Class="ICSharpCode.WpfDesign.Designer.Extensions.RightClickContextMenu"
+             xmlns="http://schemas.microsoft.com/netfx/2007/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:Translation="clr-namespace:ICSharpCode.WpfDesign.Designer"
+             >
+	<MenuItem Header="{Binding SendToFrontText, Source={x:Static Translation:Translations.Instance}}" Click="Click_BringToFront" />
+	<MenuItem Header="{Binding SendForward, Source={x:Static Translation:Translations.Instance}}" Click="Click_Forward" />
+	<MenuItem Header="{Binding SendBackward, Source={x:Static Translation:Translations.Instance}}" Click="Click_Backward" />
+	<MenuItem Header="{Binding SendToBack, Source={x:Static Translation:Translations.Instance}}" Click="Click_SendToBack" />
+</ContextMenu>

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/RightClickContextMenu.xaml.cs

@@ -0,0 +1,63 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using ICSharpCode.WpfDesign.PropertyGrid;
+
+namespace ICSharpCode.WpfDesign.Designer.Extensions
+{
+	public partial class RightClickContextMenu
+	{
+		private DesignItem designItem;
+		
+		public RightClickContextMenu(DesignItem designItem)
+		{
+			this.designItem = designItem;
+			
+			InitializeComponent();
+		}
+
+		void Click_BringToFront(object sender, RoutedEventArgs e)
+		{
+			var collection = this.designItem.ParentProperty.CollectionElements;
+			collection.Remove(this.designItem);
+			collection.Add(this.designItem);
+		}
+
+		void Click_SendToBack(object sender, RoutedEventArgs e)
+		{
+			var collection = this.designItem.ParentProperty.CollectionElements;
+			collection.Remove(this.designItem);
+			collection.Insert(0, this.designItem);
+		}
+		
+		void Click_Backward(object sender, RoutedEventArgs e)
+		{
+			var collection = this.designItem.ParentProperty.CollectionElements;
+			var idx = collection.IndexOf(this.designItem);
+			collection.RemoveAt(idx);
+			collection.Insert((--idx < 0 ? 0: idx), this.designItem);
+		}
+
+		void Click_Forward(object sender, RoutedEventArgs e)
+		{
+			var collection = this.designItem.ParentProperty.CollectionElements;
+			var idx = collection.IndexOf(this.designItem);
+			collection.RemoveAt(idx);
+			var cnt = collection.Count;
+			collection.Insert((++idx > cnt ? cnt : idx), this.designItem);
+		}
+	}
+}

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/RightClickContextMenuExtension.cs

@@ -0,0 +1,38 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Shapes;
+
+using ICSharpCode.WpfDesign.Adorners;
+using ICSharpCode.WpfDesign.Extensions;
+using ICSharpCode.WpfDesign.Designer;
+
+namespace ICSharpCode.WpfDesign.Designer.Extensions
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[ExtensionFor(typeof(UIElement))]
+	public sealed class RightClickContextMenuExtension : PrimarySelectionAdornerProvider
+	{
+		DesignPanel panel;
+		
+		protected override void OnInitialized()
+		{
+			base.OnInitialized();
+			
+			panel = ExtendedItem.Context.Services.DesignPanel as DesignPanel;
+			panel.ContextMenu = new RightClickContextMenu(ExtendedItem);
+		}
+		
+		protected override void OnRemove()
+		{
+			panel.ContextMenu = null;
+			
+			base.OnRemove();
+		}
+	}
+}

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Translations.cs

@@ -21,6 +21,30 @@ namespace ICSharpCode.WpfDesign.Designer
 			}
 		}
 		
+		public virtual string SendToFrontText {
+			get {
+				return "Bring to front";
+			}
+		}
+		
+		public virtual string SendForward {
+			get {
+				return "Forward";
+			}
+		}
+		
+		public virtual string SendBackward {
+			get {
+				return "Backward";
+			}
+		}
+		
+		public virtual string SendToBack {
+			get {
+				return "Send to back";
+			}
+		}
+		
 		public virtual string PressAltText {
 			get {
 				return "Press \"Alt\" to Enter Container";

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj

@@ -81,7 +81,12 @@
       <Link>Configuration\GlobalAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="Controls\RenderTransformOriginThumb.cs" />
+    <Compile Include="Extensions\RightClickContextMenu.xaml.cs">
+      <DependentUpon>RightClickContextMenu.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Extensions\RenderTransformOriginExtension.cs" />
+    <Compile Include="Extensions\RightClickContextMenuExtension.cs" />
     <Compile Include="PropertyGrid\Editors\FlatCollectionEditor.xaml.cs">
       <DependentUpon>FlatCollectionEditor.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -243,6 +248,7 @@
     <Resource Include="Images\Tag.png" />
   </ItemGroup>
   <ItemGroup>
+    <Page Include="Extensions\RightClickContextMenu.xaml" />
     <Page Include="PropertyGrid\Editors\FlatCollectionEditor.xaml" />
     <Page Include="ThumbnailView\ThumbnailView.xaml" />
     <ProjectReference Include="..\..\..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj">

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTests.cs

@@ -398,6 +398,33 @@ namespace ICSharpCode.WpfDesign.Tests.Designer
 			AssertCanvasDesignerOutput(expectedXaml, checkBox.Context);
 			AssertLog("");
 		}
+		
+		[Test]
+		public void AddStringAsResource()
+		{
+			DesignItem textBlock = CreateCanvasContext("<TextBlock/>");
+			DesignItem canvas = textBlock.Parent;
+			
+			DesignItemProperty canvasResources = canvas.Properties.GetProperty("Resources");
+			
+			DesignItem str = canvas.Services.Component.RegisterComponentForDesigner("stringresource 1");
+			str.Key = "str1";
+			
+			Assert.IsTrue(canvasResources.IsCollection);
+			canvasResources.CollectionElements.Add(str);
+			
+			textBlock.Properties[TextBlock.TextProperty].SetValue(new StaticResourceExtension());
+			DesignItemProperty prop = textBlock.Properties[TextBlock.TextProperty];
+			prop.Value.Properties["ResourceKey"].SetValue("str1");
+			
+			string expectedXaml = "<Canvas.Resources>\n" +
+								  "  <Controls0:String x:Key=\"str1\">stringresource 1</Controls0:String>\n" +
+								  "</Canvas.Resources>\n" +
+								  "<TextBlock Text=\"{StaticResource ResourceKey=str1}\" />";
+			
+			AssertCanvasDesignerOutput(expectedXaml, textBlock.Context, "xmlns:Controls0=\"clr-namespace:System;assembly=mscorlib\"");
+			AssertLog("");
+		}
 	}
 	
 	public class MyMultiConverter : IMultiValueConverter

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlDocument.cs

@@ -199,6 +199,8 @@ namespace ICSharpCode.WpfDesign.XamlDom
 						}
 					}
 				}
+			} else if (instance is string) {
+				xml.InnerText = (string)instance;
 			}
 
 			return new XamlObject(this, xml, elementType, instance);