Fixes for Formated Text Editor and Context Menu Handling

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

@@ -450,11 +450,11 @@ namespace ICSharpCode.WpfDesign.Designer
 
         #region ContextMenu
 
-        private Dictionary<ContextMenu, List<object>> contextMenusAndEntries = new Dictionary<ContextMenu, List<object>>();
+        private Dictionary<ContextMenu, Tuple<int,List<object>>> contextMenusAndEntries = new Dictionary<ContextMenu, Tuple<int,List<object>>>();
 
 	    public void AddContextMenu(ContextMenu contextMenu)
 	    {
-	        contextMenusAndEntries.Add(contextMenu, new List<object>(contextMenu.Items.Cast<object>()));
+	        contextMenusAndEntries.Add(contextMenu, new Tuple<int, List<object>>(contextMenusAndEntries.Count, new List<object>(contextMenu.Items.Cast<object>())));
             contextMenu.Items.Clear();
 
 	        UpdateContextMenu();
@@ -477,7 +477,7 @@ namespace ICSharpCode.WpfDesign.Designer
 	       
             this.ContextMenu.Items.Clear();
 
-            foreach (var entries in contextMenusAndEntries.Values)
+	        foreach (var entries in contextMenusAndEntries.Values.OrderBy(x => x.Item1).Select(x => x.Item2))
 	        {
 	            if (this.ContextMenu.Items.Count > 0)
 	                this.ContextMenu.Items.Add(new Separator());

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

@@ -1,11 +1,21 @@
-/*
- * Created by SharpDevelop.
- * User: trubra
- * Date: 2014-08-06
- * Time: 14:13
- * 
- * To change this template use Tools | Options | Coding | Edit Standard Headers.
- */
+// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team
+// 
+// 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.Generic;
 using System.Diagnostics;

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

@@ -3,8 +3,24 @@
              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" />
+	<MenuItem Header="{Binding SendToFrontText, Source={x:Static Translation:Translations.Instance}}" Click="Click_BringToFront">
+        <MenuItem.Icon>
+            <Image Source="/ICSharpCode.WpfDesign.Designer;component/Images/layers-stack-arrange.png" />
+        </MenuItem.Icon>
+    </MenuItem>
+	<MenuItem Header="{Binding SendForward, Source={x:Static Translation:Translations.Instance}}" Click="Click_Forward">
+        <MenuItem.Icon>
+            <Image Source="/ICSharpCode.WpfDesign.Designer;component/Images/layers-arrange.png" />
+        </MenuItem.Icon>
+    </MenuItem>
+	<MenuItem Header="{Binding SendBackward, Source={x:Static Translation:Translations.Instance}}" Click="Click_Backward">
+        <MenuItem.Icon>
+            <Image Source="/ICSharpCode.WpfDesign.Designer;component/Images/layers-arrange-back.png" />
+        </MenuItem.Icon>
+    </MenuItem>
+	<MenuItem Header="{Binding SendToBack, Source={x:Static Translation:Translations.Instance}}" Click="Click_SendToBack">
+        <MenuItem.Icon>
+            <Image Source="/ICSharpCode.WpfDesign.Designer;component/Images/layers-stack-arrange-back.png" />
+        </MenuItem.Icon>
+    </MenuItem>
 </ContextMenu>

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

@@ -31,7 +31,7 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 	/// <summary>
 	/// 
 	/// </summary>
-	[ExtensionServer(typeof(MultipleSelectedExtensionServer))]
+	[ExtensionServer(typeof(PrimarySelectionButOnlyWhenMultipleSelectedExtensionServer))]
 	[ExtensionFor(typeof(UIElement))]
 	public class RightClickMultipleItemsContextMenuExtension : SelectionAdornerProvider
     {

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

@@ -3,5 +3,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:Translation="clr-namespace:ICSharpCode.WpfDesign.Designer"
              >   
-    <MenuItem Header="EditFormatedText" Click="Click_EditFormatedText" />
+    <MenuItem Header="{Binding FormatedTextEditor, Source={x:Static Translation:Translations.Instance}}" Click="Click_EditFormatedText">
+        <MenuItem.Icon>
+            <Image Source="/ICSharpCode.WpfDesign.Designer;component/Images/edit.png" />
+        </MenuItem.Icon>
+    </MenuItem>
 </ContextMenu>

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

@@ -30,6 +30,7 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 {
     [ExtensionServer(typeof (OnlyOneItemSelectedExtensionServer))]
     [ExtensionFor(typeof (TextBlock))]
+    [Extension(Order = 10)]
     public class TextBlockRightClickContextMenuExtension : PrimarySelectionAdornerProvider
     {
         DesignPanel panel;

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

@@ -83,5 +83,15 @@ namespace ICSharpCode.WpfDesign.Designer
 				return "Wrap in Border";
 			}
 		}
+
+        public virtual string FormatedTextEditor
+        {
+            get
+            {
+                return "Formated Text Editor";
+            }
+        }
+
+        
     }
 }

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

@@ -393,7 +393,22 @@
   <ItemGroup>
     <Resource Include="Images\group2.png" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="Images\edit-bold.png" />
+    <Resource Include="Images\edit-color.png" />
+    <Resource Include="Images\edit-italic.png" />
+    <Resource Include="Images\edit-strike.png" />
+    <Resource Include="Images\layers-alignment-bottom.png" />
+    <Resource Include="Images\layers-alignment-center.png" />
+    <Resource Include="Images\layers-alignment-left.png" />
+    <Resource Include="Images\layers-alignment-middle.png" />
+    <Resource Include="Images\layers-alignment-right.png" />
+    <Resource Include="Images\layers-alignment.png" />
+    <Resource Include="Images\layers-arrange-back.png" />
+    <Resource Include="Images\layers-arrange.png" />
+    <Resource Include="Images\layers-stack-arrange-back.png" />
+    <Resource Include="Images\layers-stack-arrange.png" />
+  </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\Icons.16x16.Properties.Events.png" />
     <Resource Include="Images\Icons.16x16.WpfOutline.Eye.png" />
@@ -407,4 +422,7 @@
   <ItemGroup>
     <Resource Include="Images\lock.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\edit.png" />
+  </ItemGroup>
 </Project>

src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/Extensions/ExtensionAttribute.cs

@@ -0,0 +1,32 @@
+// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team
+// 
+// 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 ICSharpCode.WpfDesign.Extensions
+{
+	/// <summary>
+	/// Attribute to specify Properties of the Extension.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Class, AllowMultiple=false, Inherited=false)]
+	public sealed class ExtensionAttribute : Attribute
+	{
+	    //The Order in wich the Extensions are used
+        public int Order { get; set; }
+	}
+}

src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/Extensions/ExtensionManager.cs

@@ -65,12 +65,14 @@ namespace ICSharpCode.WpfDesign.Extensions
 			internal readonly Type ExtensionType;
 			internal readonly ExtensionServer Server;
 			internal readonly Type OverriddenExtensionType;
+            internal readonly int Order;
 
-			public ExtensionEntry(Type extensionType, ExtensionServer server, Type overriddenExtensionType)
+            public ExtensionEntry(Type extensionType, ExtensionServer server, Type overriddenExtensionType, int Order)
 			{
 				this.ExtensionType = extensionType;
 				this.Server = server;
 				this.OverriddenExtensionType = overriddenExtensionType;
+                this.Order = Order;
 			}
 		}
 		
@@ -104,7 +106,7 @@ namespace ICSharpCode.WpfDesign.Extensions
 					result.Add(entry);
 				}
 			}
-			return result;
+		    return result.OrderBy(x => x.Order).ToList();
 		}
 		
 		/// <summary>
@@ -184,7 +186,8 @@ namespace ICSharpCode.WpfDesign.Extensions
 				
 				foreach (ExtensionForAttribute designerFor in extensionForAttributes) {
 					ExtensionServer server = GetServerForExtension(type);
-					AddExtensionEntry(designerFor.DesignedItemType, new ExtensionEntry(type, server, designerFor.OverrideExtension));
+                    ExtensionAttribute extensionAttribute = type.GetCustomAttributes(typeof(ExtensionAttribute), false).FirstOrDefault() as ExtensionAttribute;
+                    AddExtensionEntry(designerFor.DesignedItemType, new ExtensionEntry(type, server, designerFor.OverrideExtension, extensionAttribute != null ? extensionAttribute.Order : 0));
 				}
 			}
 		}

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

@@ -74,6 +74,7 @@
     <Compile Include="Adorners\AdornerProviderClasses.cs" />
     <Compile Include="Adorners\RelativePlacement.cs" />
     <Compile Include="ExtensionMethods.cs" />
+    <Compile Include="Extensions\ExtensionAttribute.cs" />
     <Compile Include="HitTestType.cs" />
     <Compile Include="Metadata.cs" />
     <Compile Include="PlacementInformation.cs" />