Merge remote-tracking branch 'remotes/sd/master'

.gitignore

@@ -21,3 +21,4 @@ bin/
 /src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/AnalyticsMonitor.AppProperties.cs
 
 /src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/lib
+/packages/

src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/DomMenuCommand.cs

@@ -41,16 +41,13 @@ namespace ICSharpCode.Profiler.AddIn.Commands
 			if (name == null || c == null)
 				return null;
 			
-			if (name == ".ctor" || name == ".cctor") // Constructor
+			if (name.StartsWith("get_", StringComparison.Ordinal) || name.StartsWith("set_", StringComparison.Ordinal)) {
-				name = name.Replace('.', '#');
-			
-			if (name.StartsWith("get_") || name.StartsWith("set_")) {
 				// Property Getter or Setter
 				name = name.Substring(4);
 				IProperty prop = c.Properties.FirstOrDefault(p => p.Name == name);
 				if (prop != null)
 					return prop;
-			} else if (name.StartsWith("add_") || name.StartsWith("remove_")) {
+			} else if (name.StartsWith("add_", StringComparison.Ordinal) || name.StartsWith("remove_", StringComparison.Ordinal)) {
 				name = name.Substring(4);
 				IEvent ev = c.Events.FirstOrDefault(e => e.Name == name);
 				if (ev != null)

src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/GoToDefinition.cs

@@ -39,7 +39,7 @@ namespace ICSharpCode.Profiler.AddIn.Commands
 				ITypeDefinition c = GetClassFromName(selectedItem.FullyQualifiedClassName);
 				if (c != null) {
 					IMember member = GetMemberFromName(c, selectedItem.MethodName, selectedItem.Parameters);
-					if (!member.Region.IsEmpty && !string.IsNullOrEmpty(member.Region.FileName)) {
+					if (member != null && !member.Region.IsEmpty && !string.IsNullOrEmpty(member.Region.FileName)) {
 						FileName fn = new FileName(member.Region.FileName);
 						SD.FileService.JumpToFilePosition(fn, member.Region.BeginLine, member.Region.BeginColumn);
 					}

src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/CSharpFormattingOptionsContainer.cs

@@ -127,7 +127,6 @@ namespace CSharpBinding.FormattingStrategy
 			if ((e.PropertyName == "Parent") || (e.PropertyName == null)) {
 				// All properties might have changed -> update everything
 				cachedOptions = CreateCachedOptions();
-				OnPropertyChanged(e.PropertyName);
 			} else {
 				// Some other property has changed, check if we have our own value for it
 				if (!activeOptions.Contains(e.PropertyName)) {
@@ -136,7 +135,6 @@ namespace CSharpBinding.FormattingStrategy
 					if (propertyInfo != null) {
 						var val = GetEffectiveOption(e.PropertyName);
 						propertyInfo.SetValue(cachedOptions, val);
-						OnPropertyChanged(e.PropertyName);
 					}
 				}
 			}
@@ -265,6 +263,7 @@ namespace CSharpBinding.FormattingStrategy
 			if (parentProperties == null)
 				throw new ArgumentNullException("parentProperties");
 			
+			if (parentProperties.Contains("CSharpFormatting")) {
 				Properties formatProperties = parentProperties.NestedProperties("CSharpFormatting");
 				if (formatProperties != null) {
 					foreach (var key in formatProperties.Keys) {
@@ -277,6 +276,7 @@ namespace CSharpBinding.FormattingStrategy
 					}
 				}
 			}
+		}
 		
 		public void Save(Properties parentProperties)
 		{

src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpDesignerGenerator.cs

@@ -182,7 +182,7 @@ namespace CSharpBinding.FormsDesigner
 			
 			string newline = DocumentUtilities.GetLineTerminator(script.OriginalDocument, bodyRegion.BeginLine);
 			string indentation = DocumentUtilities.GetIndentation(script.OriginalDocument, bodyRegion.BeginLine);
-			string code = "{" + newline + GenerateInitializeComponents(codeMethod, indentation, newline) + indentation + "}";
+			string code = "{" + newline + GenerateInitializeComponents(codeMethod, indentation, newline) + newline + indentation + "}";
 			
 			int startOffset = script.GetCurrentOffset(bodyRegion.Begin);
 			int endOffset = script.GetCurrentOffset(bodyRegion.End);
@@ -284,7 +284,7 @@ namespace CSharpBinding.FormsDesigner
 				return false;
 			}
 			
-			return oldType.ReflectionName != newType.BaseType;
+			return oldType.GetDefinition().ReflectionName != newType.BaseType;
 		}
 		
 		string GenerateField(CodeMemberField newField)

src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpEventBindingService.cs

@@ -57,6 +57,8 @@ namespace CSharpBinding.FormsDesigner
 		string GetComponentName(IComponent component)
 		{
 			string siteName = component.Site.Name;
+			if (GeneralOptionsPanel.GenerateVisualStudioStyleEventHandlers)
+				return siteName;
 			return Char.ToUpper(siteName[0]) + siteName.Substring(1);
 		}
 		

src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/SecondaryDisplayBinding.cs

@@ -64,7 +64,8 @@ namespace CSharpBinding.FormsDesigner
 			foreach (var baseType in c.GetNonInterfaceBaseTypes()) {
 				var baseTypeName = baseType.FullName;
 				if (baseTypeName == "System.Windows.Forms.Form"
-				    || baseTypeName == "System.Windows.Forms.UserControl")
+				    || baseTypeName == "System.Windows.Forms.UserControl"
+				    || baseTypeName == "System.ComponentModel.Component")
 				{
 					return true;
 				}

src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/CSharpFormattingOptionPanel.xaml.cs

@@ -64,6 +64,7 @@ namespace CSharpBinding.OptionPanels
 	internal partial class CSharpFormattingOptionPanel : OptionPanel
 	{
 		readonly CSharpFormattingOptionsPersistence persistenceHelper;
+		bool isDirty;
 		
 		public CSharpFormattingOptionPanel(CSharpFormattingOptionsPersistence persistenceHelper, bool allowPresets)
 		{
@@ -71,6 +72,7 @@ namespace CSharpBinding.OptionPanels
 				throw new ArgumentNullException("persistenceHelper");
 			
 			this.persistenceHelper = persistenceHelper;
+			this.isDirty = false;
 			InitializeComponent();			
 			
 			formattingEditor.AllowPresets = allowPresets;
@@ -80,11 +82,19 @@ namespace CSharpBinding.OptionPanels
 		{
 			base.LoadOptions();
 			formattingEditor.OptionsContainer = persistenceHelper.StartEditing();
+			formattingEditor.OptionsContainer.PropertyChanged += ContainerPropertyChanged;
+		}
+
+		void ContainerPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+		{
+			isDirty = true;
 		}
 		
 		public override bool SaveOptions()
 		{
-			return persistenceHelper.Save() && base.SaveOptions();
+			// Only save container, if some option really has changed
+			formattingEditor.OptionsContainer.PropertyChanged -= ContainerPropertyChanged;
+			return (!isDirty || persistenceHelper.Save()) && base.SaveOptions();
 		}
 	}
 }

src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataGenerator.cs

@@ -122,15 +122,26 @@ namespace ICSharpCode.XamlBinding
 		{
 			if (context.ParseInformation == null)
 				return EmptyList<ICompletionItem>.Instance;
+			
 			List<ICompletionItem> result = new List<ICompletionItem>();
 			AXmlElement last = context.ParentElement;
 			ITextEditor editor = context.Editor;
 			compilation = SD.ParserService.GetCompilationForFile(editor.FileName);
 			IUnresolvedFile file = context.ParseInformation.UnresolvedFile;
-			var items = GetClassesFromContext(context);
+			
+			foreach (string item in XamlConst.GetAllowedItems(context)) {
+				result.Add(new XamlCompletionItem(item));
+			}
+			
 			IType rt = null;
 
 			if (last != null) {
+				if (string.Equals(last.Prefix, context.XamlNamespacePrefix, StringComparison.OrdinalIgnoreCase)) {
+					if (string.Equals(last.LocalName, "Members", StringComparison.OrdinalIgnoreCase))
+						return result;
+					if (string.Equals(last.LocalName, "Code", StringComparison.OrdinalIgnoreCase))
+						return result;
+				}
 				// If we have an element that is not a property or an incomplete
 				// definition => interpret element as a type.
 				XamlResolver resolver = new XamlResolver(compilation);
@@ -172,6 +183,8 @@ namespace ICSharpCode.XamlBinding
 					.ToList();
 			}
 			
+			var items = GetClassesFromContext(context);
+			
 			foreach (var ns in items) {
 				foreach (ITypeDefinition td in ns.Value) {
 					if (td.Kind != TypeKind.Class && (!includeAbstract || td.Kind != TypeKind.Interface))
@@ -198,15 +211,6 @@ namespace ICSharpCode.XamlBinding
 //					result.Add(new XamlCodeCompletionItem(itemClass, last.Prefix));
 //			}
 			
-			var xamlItems = XamlConst.XamlNamespaceAttributes.AsEnumerable();
-			
-			if (XamlConst.EnableXaml2009)
-				xamlItems = XamlConst.XamlBuiltInTypes.Concat(xamlItems);
-			
-			foreach (string item in xamlItems) {
-				result.Add(new XamlCompletionItem(context.XamlNamespacePrefix + ":" + item));
-			}
-			
 			return result;
 		}
 		
@@ -266,8 +270,11 @@ namespace ICSharpCode.XamlBinding
 			string xamlPrefix = context.XamlNamespacePrefix;
 			string xKey = string.IsNullOrEmpty(xamlPrefix) ? "" : xamlPrefix + ":";
 			
-			if (lastElement.Prefix == context.XamlNamespacePrefix && XamlConst.IsBuiltin(lastElement.LocalName))
+			if (context.Description == XamlContextDescription.InTag)
-				return EmptyList<ICompletionItem>.Instance;
+				list.AddRange(XamlConst.GetAllowedItems(context).Select(item => new XamlCompletionItem(item)));
+			
+			if (string.Equals(lastElement.Prefix, context.XamlNamespacePrefix, StringComparison.OrdinalIgnoreCase) && XamlConst.IsBuiltin(lastElement.LocalName))
+				return list;
 			
 			if (lastElement.LocalName.EndsWith(".", StringComparison.OrdinalIgnoreCase) || context.PressedKey == '.') {
 				if (type.Kind == TypeKind.Unknown)
@@ -279,16 +286,9 @@ namespace ICSharpCode.XamlBinding
 				}
 				AddAttachedProperties(type.GetDefinition(), list);
 			} else {
-				if (type.Kind == TypeKind.Unknown) {
+				if (type.Kind != TypeKind.Unknown) {
-					list.Add(new XamlCompletionItem(xKey + "Uid"));
-				} else {
 					AddAttributes(type, list, includeEvents);
 					list.AddRange(GetListOfAttached(context, null, includeEvents, true));
-					list.AddRange(
-						XamlConst.XamlNamespaceAttributes
-						.Where(localName => XamlConst.IsAttributeAllowed(context.InRoot, localName))
-						.Select(item => new XamlCompletionItem(xKey + item))
-					);
 				}
 			}
 			
@@ -384,11 +384,11 @@ namespace ICSharpCode.XamlBinding
 			ITextEditor editor = context.Editor;
 			compilation = SD.ParserService.GetCompilationForFile(editor.FileName);
 			
+			string xamlPrefix = context.XamlNamespacePrefix;
+			string xKey = string.IsNullOrEmpty(xamlPrefix) ? "" : xamlPrefix + ":";
+			
 			if (type.Name == typeof(System.Nullable<>).Name) {
-				string nullExtensionName = "Null";
+				yield return new XamlCompletionItem("{" + xKey + "Null}");
-				if (!string.IsNullOrEmpty(context.XamlNamespacePrefix))
-					nullExtensionName = context.XamlNamespacePrefix + ":" + nullExtensionName;
-				yield return new XamlCompletionItem("{" + nullExtensionName + "}");
 				type = type.TypeArguments.FirstOrDefault();
 				if (type == null) yield break;
 			}
@@ -397,6 +397,18 @@ namespace ICSharpCode.XamlBinding
 			
 			if (definition == null) yield break;
 			
+			definition.IsCollectionType();
+			
+			switch (definition.KnownTypeCode) {
+				case KnownTypeCode.Array:
+				case KnownTypeCode.ICollection:
+				case KnownTypeCode.ICollectionOfT:
+				case KnownTypeCode.IEnumerable:
+				case KnownTypeCode.IEnumerableOfT:
+					yield return new XamlCompletionItem("{" + xKey + "Array}");
+					break;
+			}
+			
 			switch (definition.Kind) {
 				case TypeKind.Class:
 					IType typeName;

src/AddIns/BackendBindings/XamlBinding/XamlBinding/Extensions.cs

@@ -398,6 +398,17 @@ namespace ICSharpCode.XamlBinding
 			return thisValue.GetAllBaseTypeDefinitions().Any(t => t.FullName == "System.Collections.IList");
 		}
 		
+		public static bool Implements(this IType thisValue, IType interfaceType)
+		{
+			if (thisValue == null)
+				throw new ArgumentNullException("thisValue");
+			if (interfaceType == null)
+				throw new ArgumentNullException("interfaceType");
+			if (interfaceType.Kind != TypeKind.Interface)
+				throw new ArgumentException("must be TypeKind.Interface", "interfaceType");
+			return thisValue.GetAllBaseTypes().Any(t => t.Equals(interfaceType));
+		}
+		
 		public static bool HasAttached(this ITypeDefinition thisValue, bool lookForProperties, bool lookForEvents)
 		{
 			if (!lookForProperties && !lookForEvents)

src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItemList.cs

@@ -83,10 +83,12 @@ namespace ICSharpCode.XamlBinding
 					XamlCompletionItem cItem = item as XamlCompletionItem;
 					
 					if (xamlContext.Description == XamlContextDescription.InTag) {
+						if (cItem.Entity == null || cItem.Entity.SymbolKind == SymbolKind.Property || cItem.Entity.SymbolKind == SymbolKind.Event) {
 							context.Editor.Document.Insert(context.EndOffset, "=\"\"");
 							context.CompletionCharHandled = context.CompletionChar == '=';
 							context.Editor.Caret.Offset--;
 							new XamlCodeCompletionBinding().CtrlSpace(context.Editor);
+						}
 					} else if (xamlContext.Description == XamlContextDescription.InMarkupExtension && !string.IsNullOrEmpty(xamlContext.RawAttributeValue)) {
 						string valuePart = xamlContext.RawAttributeValue.Substring(0, xamlContext.ValueStartOffset);
 						AttributeValue value = MarkupExtensionParser.ParseValue(valuePart);

src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlConst.cs

@@ -20,6 +20,11 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Windows;
+using System.Xml.Serialization;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.SharpDevelop;
 
 namespace ICSharpCode.XamlBinding
 {
@@ -28,33 +33,22 @@ namespace ICSharpCode.XamlBinding
 	/// </summary>
 	public static class XamlConst
 	{
-		public const bool EnableXaml2009 = true;
-		
 		// [XAML 2009]
 		public static readonly List<string> XamlBuiltInTypes = new List<string> {
 			"Object", "Boolean", "Char", "String", "Decimal", "Single", "Double",
 			"Int16", "Int32", "Int64", "TimeSpan", "Uri", "Byte", "Array", "List", "Dictionary",
-			// This is no built in type, but a markup extension
 			"Reference"
 		};
 		
 		public static readonly ReadOnlyCollection<string> XamlNamespaceAttributes = new List<string> {
-			"Class", "ClassModifier", "FieldModifier", "Name", "Subclass", "TypeArguments", "Uid", "Key"
+			"Class", "ClassModifier", "FieldModifier", "Name", "Subclass", "TypeArguments", "Uid", "Key", "Shared"
-		}.AsReadOnly();
-		
-		public static readonly ReadOnlyCollection<string> RootOnlyElements = new List<string> {
-			"Class", "ClassModifier", "Subclass"
-		}.AsReadOnly();
-		
-		public static readonly ReadOnlyCollection<string> ChildOnlyElements = new List<string> {
-			"FieldModifier"
 		}.AsReadOnly();
 		
 		/// <summary>
 		/// values: http://schemas.microsoft.com/winfx/2006/xaml/presentation,
 		/// http://schemas.microsoft.com/netfx/2007/xaml/presentation
 		/// </summary>
-		public static readonly string[] WpfXamlNamespaces = new[] {
+		public static readonly string[] WpfXamlNamespaces = {
 			"http://schemas.microsoft.com/winfx/2006/xaml/presentation",
 			"http://schemas.microsoft.com/netfx/2007/xaml/presentation"
 		};
@@ -88,11 +82,86 @@ namespace ICSharpCode.XamlBinding
 		}
 		
 		/// <summary>
-		/// Returns true if the given attribute is allowed in the current element.
+		/// Returns the list of allow XAML2009 completion items.
 		/// </summary>
-		public static bool IsAttributeAllowed(bool inRoot, string localName)
+		public static IEnumerable<string> GetAllowedItems(XamlCompletionContext context)
 		{
-			return inRoot ? !ChildOnlyElements.Contains(localName) : !RootOnlyElements.Contains(localName);
+			string xamlPrefix = context.XamlNamespacePrefix;
+			string xKey = string.IsNullOrEmpty(xamlPrefix) ? "" : xamlPrefix + ":";
+			var compilation = SD.ParserService.GetCompilationForFile(context.Editor.FileName);
+			var resolver = new XamlAstResolver(compilation, context.ParseInformation);
+			// TODO : add support for x:Key as attribute element (XAML 2009 only)
+			
+			switch (context.Description) {
+				case XamlContextDescription.AtTag:
+					if (context.ParentElement != null && string.Equals(context.ParentElement.Name, xKey + "Members", StringComparison.OrdinalIgnoreCase)) {
+						yield return xKey + "Member";
+						yield return xKey + "Property";
+					} else if (context.ParentElement == context.RootElement && context.RootElement.Attributes.Any(attr => string.Equals(attr.Name, xKey + "Class", StringComparison.OrdinalIgnoreCase))) {
+						yield return xKey + "Code";
+						yield return xKey + "Members";
+					} else {
+						if (context.ParentElement != null && string.Equals(context.ParentElement.Name, xKey + "Code", StringComparison.OrdinalIgnoreCase))
+							yield break;
+						yield return xKey + "Array";
+						yield return xKey + "Boolean";
+						yield return xKey + "Byte";
+						yield return xKey + "Char";
+						yield return xKey + "Decimal";
+						yield return xKey + "Dictionary";
+						yield return xKey + "Double";
+						yield return xKey + "Int16";
+						yield return xKey + "Int32";
+						yield return xKey + "Int64";
+						yield return xKey + "List";
+						yield return xKey + "Object";
+						yield return xKey + "Reference";
+						yield return xKey + "Single";
+						yield return xKey + "String";
+						yield return xKey + "TimeSpan";
+						yield return xKey + "Uri";
+						if (context.RootElement.Attributes.Any(attr => string.Equals(attr.Name, xKey + "Class", StringComparison.OrdinalIgnoreCase)))
+							yield return xKey + "Members";
+					}
+					break;
+				case XamlContextDescription.InTag:
+					yield return xKey + "Uid";
+					if (context.InRoot) {
+						yield return xKey + "Class";
+						yield return xKey + "ClassModifier";
+						yield return xKey + "Subclass";
+						yield return xKey + "Name";
+					} else {
+						var resourceDictionaryType = compilation.FindType(typeof(ResourceDictionary));
+						if (context.ActiveElement != null && string.Equals(context.ActiveElement.Name, xKey + "Array", StringComparison.OrdinalIgnoreCase)) {
+							yield return "Type";
+						} else if (context.ActiveElement != null && string.Equals(context.ActiveElement.Name, xKey + "Member", StringComparison.OrdinalIgnoreCase)) {
+							yield return "Name";
+						} else if (context.ActiveElement != null && string.Equals(context.ActiveElement.Name, xKey + "Property", StringComparison.OrdinalIgnoreCase)) {
+							yield return "Name";
+							yield return "Type";
+						} else if (context.RootElement.Attributes.Any(attr => string.Equals(attr.Name, xKey + "Class", StringComparison.OrdinalIgnoreCase))) {
+							yield return xKey + "FieldModifier";
+							yield return xKey + "Name";
+						} else {
+							yield return xKey + "Name";
+						}
+						
+						if (context.ParentElement != null) {
+							var rr = resolver.ResolveElement(context.ParentElement);
+							if (rr != null) {
+								if (rr.Type.Equals(resourceDictionaryType)) {
+									yield return xKey + "Key";
+									yield return xKey + "Shared";
+								} else if (rr.Type.TypeParameterCount > 0) {
+									yield return xKey + "TypeArguments";
+								}
+							}
+						}
+					}
+					break;
+			}
+			yield break;
 		}
 	}
 }

src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlContext.cs

@@ -94,6 +94,7 @@ namespace ICSharpCode.XamlBinding
 	{
 		public AXmlElement ActiveElement { get; set; }
 		public AXmlElement ParentElement { get; set; }
+		public AXmlElement RootElement { get; set; }
 		public ReadOnlyCollection<AXmlElement> Ancestors { get; set; }
 		public AXmlAttribute Attribute { get; set; }
 		public AttributeValue AttributeValue { get; set; }
@@ -131,6 +132,7 @@ namespace ICSharpCode.XamlBinding
 			this.AttributeValue = context.AttributeValue;
 			this.Description = context.Description;
 			this.ParentElement = context.ParentElement;
+			this.RootElement = context.RootElement;
 			this.ParseInformation = context.ParseInformation;
 			this.RawAttributeValue = context.RawAttributeValue;
 			this.ValueStartOffset = context.ValueStartOffset;

src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlContextResolver.cs

@@ -59,6 +59,7 @@ namespace ICSharpCode.XamlBinding
 			string xamlNamespacePrefix = string.Empty;
 			
 			var item = currentData;
+			AXmlElement root = null;
 			
 			while (item != document) {
 				if (item is AXmlElement) {
@@ -78,8 +79,11 @@ namespace ICSharpCode.XamlBinding
 							xamlNamespacePrefix = attr.LocalName;
 					}
 					
-					if (!wasAXmlElement && item.Parent is AXmlDocument)
+					if (element.Parent is AXmlDocument) {
+						root = element;
+						if (!wasAXmlElement)
 							isRoot = true;
+					}
 					
 					wasAXmlElement = true;
 				}
@@ -140,6 +144,7 @@ namespace ICSharpCode.XamlBinding
 				Description         = description,
 				ActiveElement       = active,
 				ParentElement       = parent,
+				RootElement         = root,
 				Ancestors           = ancestors.AsReadOnly(),
 				Attribute           = xAttribute,
 				InRoot              = isRoot,

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/XmlDoc/XmlDocTooltipProvider.cs

@@ -80,6 +80,17 @@ namespace ICSharpCode.AvalonEdit.AddIn.XmlDoc
 				base.OnLostKeyboardFocus(e);
 				this.IsOpen = false;
 			}
+			
+			protected override void OnMouseLeave(MouseEventArgs e)
+			{
+				base.OnMouseLeave(e);
+				// When the mouse is over the popup, it is possible for SharpDevelop to be minimized,
+				// or moved into the background, and yet the popup stays open.
+				// We don't have a good method here to check whether the mouse moved back into the text area
+				// or somewhere else, so we'll just close the popup.
+				if (CloseWhenMouseMovesAway)
+					this.IsOpen = false;
+			}
 		}
 		
 		object CreateTooltip(IType type)

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/FormKeyHandler.cs

@@ -24,6 +24,7 @@ using System.ComponentModel.Design;
 using System.Reflection;
 using System.Windows.Forms;
 using System.Windows.Forms.Design;
+using System.Linq;
 
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop;
@@ -134,6 +135,16 @@ namespace ICSharpCode.FormsDesigner
 					selectionService.SetSelectedComponents(components);
 				}
 				return true;
+			} else if (keyPressed == Keys.Escape) {
+				ISelectionService selectionService = (ISelectionService)formDesigner.Host.GetService(typeof(ISelectionService));
+				ICollection components = selectionService.GetSelectedComponents();
+				if (components.Count == 1) {
+					Control ctrl = components.OfType<Control>().FirstOrDefault();
+					if (ctrl != null && ctrl.Parent != null) {
+						selectionService.SetSelectedComponents(new IComponent[] { ctrl.Parent }, SelectionTypes.Primary);
+					}
+				}
+				return true;
 			}
 			
 			return false;

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

@@ -368,8 +368,7 @@ namespace ICSharpCode.WpfDesign.Designer
 		
 		void DesignPanel_KeyDown(object sender, KeyEventArgs e)
 		{
-			if (e.Key == Key.Left || e.Key == Key.Right || e.Key == Key.Up || e.Key == Key.Down)
+			if (e.Key == Key.Left || e.Key == Key.Right || e.Key == Key.Up || e.Key == Key.Down) {
-			{
 				e.Handled = true;
 				
 				if (placementOp == null) {
@@ -379,32 +378,38 @@ namespace ICSharpCode.WpfDesign.Designer
 				}
 				
 				
-				dx += (e.Key == Key.Left) ? Keyboard.IsKeyDown(Key.LeftShift) ? -10 : -1 : 0;
+				dx = (e.Key == Key.Left) ? Keyboard.IsKeyDown(Key.LeftShift) ? -10 : -1 : 0;
-				dy += (e.Key == Key.Up) ? Keyboard.IsKeyDown(Key.LeftShift) ? -10 : -1 : 0;
+				dy = (e.Key == Key.Up) ? Keyboard.IsKeyDown(Key.LeftShift) ? -10 : -1 : 0;
-				dx += (e.Key == Key.Right) ? Keyboard.IsKeyDown(Key.LeftShift) ? 10 : 1 : 0;
+				dx = (e.Key == Key.Right) ? Keyboard.IsKeyDown(Key.LeftShift) ? 10 : 1 : (dx != 0 ? dx : 0);
-				dy += (e.Key == Key.Down) ? Keyboard.IsKeyDown(Key.LeftShift) ? 10 : 1 : 0;
+                dy = (e.Key == Key.Down) ? Keyboard.IsKeyDown(Key.LeftShift) ? 10 : 1 : (dy != 0 ? dy : 0);
+				double left, top;
 				foreach (PlacementInformation info in placementOp.PlacedItems)
 				{
-					if (!Keyboard.IsKeyDown(Key.LeftCtrl))
+                    //Let canvas position preceed bounds definition since there can be a discrepancy between them.
-					{
+				    left = IsPropertySet(info.Item.View,Canvas.LeftProperty)?(double)info.Item.Properties.GetAttachedProperty(Canvas.LeftProperty).ValueOnInstance: info.OriginalBounds.Left;
-						info.Bounds = new Rect(info.OriginalBounds.Left + dx,
+
-							info.OriginalBounds.Top + dy,
+                    top = IsPropertySet(info.Item.View, Canvas.TopProperty) ? (double)info.Item.Properties.GetAttachedProperty(Canvas.TopProperty).ValueOnInstance : info.OriginalBounds.Top;
+					if (!Keyboard.IsKeyDown(Key.LeftCtrl)) {
+						info.Bounds = new Rect(left + dx,
+							top + dy,
 							info.OriginalBounds.Width,
 							info.OriginalBounds.Height);
-					}
+					} else {
-					else
+						info.Bounds = new Rect(left,
-					{
+							top,
-						info.Bounds = new Rect(info.OriginalBounds.Left,
-							info.OriginalBounds.Top,
 							info.OriginalBounds.Width + dx,
 							info.OriginalBounds.Height + dy);
 					}
-					
 					placementOp.CurrentContainerBehavior.SetPosition(info);
 				}
 			}
 		}
 		
+		static bool IsPropertySet(UIElement element, DependencyProperty d)
+        {
+            return element.ReadLocalValue(d) != DependencyProperty.UnsetValue;
+        }
+		
 		protected override void OnQueryCursor(QueryCursorEventArgs e)
 		{
 			base.OnQueryCursor(e);

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

@@ -115,12 +115,13 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 			if (Snap(horizontalInput, horizontalMap, Accuracy, out drawLines, out delta)) {
 				
 				if (operation.Type == PlacementType.Resize) {
-					if (info.ResizeThumbAlignment.Vertical == VerticalAlignment.Top) {
+					if (info.ResizeThumbAlignment != null && info.ResizeThumbAlignment.Value.Vertical == VerticalAlignment.Top) {
 						bounds.Y += delta;
 						bounds.Height = Math.Max(0, bounds.Height - delta);
 					} else {
 						bounds.Height = Math.Max(0, bounds.Height + delta);
 					}
+					bounds.Height = Math.Max(0, bounds.Height - delta);
 					info.Bounds = bounds;
 				} else {
 					foreach (var item in operation.PlacedItems) {
@@ -138,12 +139,13 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 			if (Snap(verticalInput, verticalMap, Accuracy, out drawLines, out delta)) {
 				
 				if (operation.Type == PlacementType.Resize) {
-					if (info.ResizeThumbAlignment.Horizontal == HorizontalAlignment.Left) {
+					if (info.ResizeThumbAlignment != null && info.ResizeThumbAlignment.Value.Horizontal == HorizontalAlignment.Left) {
 						bounds.X += delta;
 						bounds.Width = Math.Max(0, bounds.Width - delta);
 					} else {
 						bounds.Width = Math.Max(0, bounds.Width + delta);
 					}
+					bounds.Width = Math.Max(0, bounds.Width - delta);
 					info.Bounds = bounds;
 				} else {
 					foreach (var item in operation.PlacedItems) {

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlModelProperty.cs

@@ -121,6 +121,18 @@ namespace ICSharpCode.WpfDesign.Designer.Xaml
 			}
 		}
 		
+		public override string TextValue
+		{
+			get {
+				var xamlTextValue = _property.PropertyValue as XamlTextValue;
+				if (xamlTextValue != null) {
+					return xamlTextValue.Text;
+				}
+
+				return null;
+			}
+		}
+		
 		// There may be multiple XamlModelProperty instances for the same property,
 		// so this class may not have any mutable fields / events - instead,
 		// we forward all event handlers to the XamlProperty.

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

@@ -0,0 +1,132 @@
+// 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.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows.Markup;
+using NUnit.Framework;
+
+namespace ICSharpCode.WpfDesign.Tests.Designer
+{
+	[TestFixture]
+	public class MarkupExtensionModelTests : ModelTestHelper
+	{
+		private const string PathWithCommasAndSpaces = "C:\\Folder A\\Sub,Folder,A\\SubFolderB\\file,with,commas and spaces.txt";
+		private const string Simple = "AbcDef";
+		
+		[Test]
+		public void ElementMarkupExtensionWithSimpleString()
+		{
+			TestMarkupExtensionPrinter(Simple, true);
+		}
+		
+		[Test]
+		public void ShorthandMarkupExtensionWithSimpleString()
+		{
+			TestMarkupExtensionPrinter(Simple, false);
+		}
+		
+		[Test]
+		public void ElementMarkupExtensionWithFilePathString()
+		{
+			TestMarkupExtensionPrinter(PathWithCommasAndSpaces, true);
+		}
+		
+		[Test]
+		public void ShorthandMarkupExtensionWithFilePathString()
+		{
+			TestMarkupExtensionPrinter(PathWithCommasAndSpaces, false);
+		}
+		
+		private void TestMarkupExtensionPrinter(string s, bool useElementStyle)
+		{
+			var checkBoxItem = CreateCanvasContext("<CheckBox/>");
+			var tagProp = checkBoxItem.Properties["Tag"];
+			
+			tagProp.SetValue(new DataExtension());
+			tagProp.Value.Properties["Data"].SetValue(s);
+			
+			string expectedXaml;
+			
+			if (useElementStyle) {
+				// Setting this should force element style
+				tagProp.Value.Properties["Object"].SetValue(new ExampleClass());
+				
+				expectedXaml = @"<CheckBox>
+  <CheckBox.Tag>
+    <t:DataExtension Data=""" + s + @""">
+      <t:DataExtension.Object>
+        <t:ExampleClass />
+      </t:DataExtension.Object>
+    </t:DataExtension>
+  </CheckBox.Tag>
+</CheckBox>";
+			} else {
+				StringBuilder sb = new StringBuilder("<CheckBox Tag=\"{t:Data Data=");
+				
+				bool containsSpace = s.Contains(' ');
+				
+				if(containsSpace) {
+					sb.Append('\'');
+				}
+				
+				sb.Append(s.Replace("\\", "\\\\"));
+				
+				if(containsSpace) {
+					sb.Append('\'');
+				}
+				
+				sb.Append("}\" />");
+				
+				expectedXaml = sb.ToString();
+			}
+			
+			AssertCanvasDesignerOutput(expectedXaml, checkBoxItem.Context);
+			AssertLog("");
+			
+			// The following tests that the official XamlReader is parsing the resulting xaml into the
+			// same string that we are testing, regardless if element or shorthand style is being used.
+			
+			string xaml = expectedXaml.Insert("<CheckBox".Length, " xmlns=\"http://schemas.microsoft.com/winfx/2006/xaml/presentation\" " +
+			                                  "xmlns:x=\"http://schemas.microsoft.com/winfx/2006/xaml\" " +
+			                                  "xmlns:t=\"" + DesignerTestsNamespace + "\"");
+			
+			var checkBox = (CheckBox)System.Windows.Markup.XamlReader.Parse(xaml);
+			
+			Assert.AreEqual(s, (string)checkBox.Tag);
+		}
+	}
+	
+	public class DataExtension : MarkupExtension
+	{
+		public DataExtension()
+		{
+		}
+
+		public override object ProvideValue(IServiceProvider serviceProvider)
+		{
+			return Data;
+		}
+		
+		public string Data { get; set; }
+		
+		public object Object { get; set; }
+	}
+}

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

@@ -667,32 +667,75 @@ namespace ICSharpCode.WpfDesign.Tests.Designer
 			AssertLog("");
 		}
 		
-		[Test]
+		public void AddNativeTypeAsResource(object component, string expectedXamlValue)
-		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");
+			DesignItem componentItem = canvas.Services.Component.RegisterComponentForDesigner(component);
-			str.Key = "str1";
+			componentItem.Key = "res1";
 			
 			Assert.IsTrue(canvasResources.IsCollection);
-			canvasResources.CollectionElements.Add(str);
+			canvasResources.CollectionElements.Add(componentItem);
 			
-			textBlock.Properties[TextBlock.TextProperty].SetValue(new StaticResourceExtension());
+			DesignItemProperty prop = textBlock.Properties[TextBlock.TagProperty];
-			DesignItemProperty prop = textBlock.Properties[TextBlock.TextProperty];
+			prop.SetValue(new StaticResourceExtension());
-			prop.Value.Properties["ResourceKey"].SetValue("str1");
+			prop.Value.Properties["ResourceKey"].SetValue("res1");
+			
+			string typeName = component.GetType().Name;
 			
 			string expectedXaml = "<Canvas.Resources>\n" +
-								  "  <Controls0:String x:Key=\"str1\">stringresource 1</Controls0:String>\n" +
+								  "  <Controls0:" + typeName + " x:Key=\"res1\">" + expectedXamlValue + "</Controls0:" + typeName + ">\n" +
 								  "</Canvas.Resources>\n" +
-								  "<TextBlock Text=\"{StaticResource ResourceKey=str1}\" />";
+								  "<TextBlock Tag=\"{StaticResource ResourceKey=res1}\" />";
 			
 			AssertCanvasDesignerOutput(expectedXaml, textBlock.Context, "xmlns:Controls0=\"clr-namespace:System;assembly=mscorlib\"");
 			AssertLog("");
 		}
+		
+		[Test]
+		public void TestTextValue()
+		{
+			// An invalid path (in this case containing a question mark), or a path to a file that does not exist, will give the same result.
+			// It will cause the typeconverter to fail and no value can be get from neither ValueOnInstance nor Value from the Image.Source DesignItemProperty.
+			// TextValue was added to have a way of getting the xaml value.
+			string sourceTextValue = "file:///C:/Folder/image?.bmp";
+			
+			string xaml = "<Image Source=\"" + sourceTextValue + "\" />";
+			DesignItem image = CreateCanvasContext(xaml);
+			
+			var sourceProp = image.Properties[Image.SourceProperty];
+			
+			Assert.IsNull(sourceProp.ValueOnInstance);
+			Assert.IsNull(sourceProp.Value);
+			Assert.IsNotNull(sourceProp.TextValue);
+			Assert.AreEqual(sourceTextValue, sourceProp.TextValue);
+			
+			string expectedXaml = xaml;
+			AssertCanvasDesignerOutput(expectedXaml, image.Context);
+			AssertLog("");
+		}
+		
+		[Test]
+		public void AddStringAsResource()
+		{
+			AddNativeTypeAsResource("stringresource 1", "stringresource 1");
+		}
+		
+		[Test]
+		public void AddDoubleAsResource()
+		{
+			AddNativeTypeAsResource(0.0123456789d, "0.0123456789");
+		}
+		
+		[Test]
+		public void AddInt32AsResource()
+		{
+			const int i = 123;
+			AddNativeTypeAsResource(i, "123");
+		}
 	}
 	
 	public class MyMultiConverter : IMultiValueConverter

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

@@ -62,6 +62,7 @@
     <Compile Include="Designer\EditOperationTests.cs" />
     <Compile Include="Designer\FocusNavigatorTests.cs" />
     <Compile Include="Designer\MarginHandleTests.cs" />
+    <Compile Include="Designer\MarkupExtensionModelTests.cs" />
     <Compile Include="Designer\MockFocusNavigator.cs" />
     <Compile Include="Designer\ModelTestHelper.cs" />
     <Compile Include="Designer\ModelTests.cs" />

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/MarkupExtensionTests.cs

@@ -27,6 +27,10 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 	[TestFixture]
 	public class MarkupExtensionTests : TestHelper
 	{
+		private const string PathWithSpaces = @"C:\\Folder A\\SubFolder A\\SubFolder B\\file with spaces.txt";
+		private const string PathWithoutSpaces = @"C:\\FolderA\\SubFolderA\\SubFolderB\\file.txt";
+		private const string PathWithCommasAndSpaces = @"C:\\Folder A\\Sub,Folder,A\\SubFolderB\\file,with,commas and spaces.txt";
+		
 		[Test]
 		public void Test1()
 		{
@@ -85,6 +89,36 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 			TestMarkupExtension("Content=\"{x:Static t:MyStaticClass.StaticString}\"");
 		}
 		
+		[Test]
+		public void TestPathWithSpaces()
+		{
+			TestMarkupExtension("Content=\"{t:String " + PathWithSpaces + "}\"");
+		}
+		
+		[Test]
+		public void TestQuotedPathWithSpaces()
+		{
+			TestMarkupExtension("Content=\"{t:String '" + PathWithSpaces + "'}\"");
+		}
+		
+		[Test]
+		public void TestPathWithoutSpaces()
+		{
+			TestMarkupExtension("Content=\"{t:String " + PathWithoutSpaces + "}\"");
+		}
+		
+		[Test]
+		public void TestQuotedPathWithoutSpaces()
+		{
+			TestMarkupExtension("Content=\"{t:String '" + PathWithoutSpaces + "'}\"");
+		}
+		
+		[Test]
+		public void TestQuotedPathWithCommasAndSpaces()
+		{
+			TestMarkupExtension("Content=\"{t:String '" + PathWithCommasAndSpaces + "'}\"");
+		}
+
 //        [Test]
 //        public void Test10()
 //        {
@@ -115,6 +149,23 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		public static string StaticString = "a";
 	}
 	
+	public class StringExtension : MarkupExtension
+	{
+		readonly string s;
+		
+		public StringExtension(string s)
+		{
+			TestHelperLog.Log(this.GetType().Name + " " + s);
+			
+			this.s = s;
+		}
+
+		public override object ProvideValue(IServiceProvider serviceProvider)
+		{
+			return s;
+		}
+	}
+
 	public class MyExtension : MarkupExtension
 	{
 		public MyExtension(object p1, object p2)

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SimpleLoadTests.cs

@@ -97,6 +97,19 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 			");
 		}
 		
+		[Test]
+		public void ExampleClassWithFilePathStringPropAttribute()
+		{
+			TestLoading(@"
+<t:ExampleClass
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
+  xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
+  xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
+  StringProp=""C:\Folder A\Sub,Folder,A\SubFolderB\file,with,commas and spaces.txt"">
+</t:ExampleClass>
+			");
+		}
+		
 		[Test]
 		public void ExampleClassUseDefaultProperty()
 		{

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

@@ -96,10 +96,17 @@ namespace ICSharpCode.WpfDesign.XamlDom
 			if (text[pos] == '"' || text[pos] == '\'') {
 				char quote = text[pos++];
 				CheckNotEOF();
+				int lastBackslashPos = -1;
 				while (!(text[pos] == quote && text[pos-1] != '\\')) {
+					int current = pos;
 					char c = text[pos++];
-					if (c != '\\')
+					//check if string is \\ and that the last backslash is not the previously saved char, ie that \\\\ does not become \\\ but just \\
+					bool isEscapedBackslash = string.Concat(text[current-1],c)=="\\\\" && current-1 != lastBackslashPos;
+					if (c != '\\' || isEscapedBackslash){
 						b.Append(c);
+						if(isEscapedBackslash)
+							lastBackslashPos = current;
+					}
 					CheckNotEOF();
 				}
 				pos++; // consume closing quote

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

@@ -93,8 +93,20 @@ namespace ICSharpCode.WpfDesign.XamlDom
 				sb.Append("=");
 
 				var value = property.PropertyValue;
-				if (value is XamlTextValue) {
+				var textValue = value as XamlTextValue;
-					sb.Append((value as XamlTextValue).Text);
+				if (textValue != null) {
+					string text = textValue.Text;
+					bool containsSpace = text.Contains(' ');
+					
+					if(containsSpace) {
+						sb.Append('\'');
+					}
+					
+					sb.Append(text.Replace("\\", "\\\\"));
+					
+					if(containsSpace) {
+						sb.Append('\'');
+					}
 				} else if (value is XamlObject) {
 					sb.Append(Print(value as XamlObject));
 				}

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

@@ -193,7 +193,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
 			
 			XmlElement xml = _xmlDoc.CreateElement(prefix, elementType.Name, ns);
 
-			if (hasStringConverter && XamlObject.GetContentPropertyName(elementType) != null) {
+			if (hasStringConverter && (XamlObject.GetContentPropertyName(elementType) != null || IsNativeType(instance))) {
 				xml.InnerText = c.ConvertToInvariantString(instance);
 			} else if (instance is Brush && forProperty != null) {  // TODO: this is a hacky fix, because Brush Editor doesn't
 										     // edit Design Items and so we have no XML, only the Brush 
@@ -214,8 +214,6 @@ namespace ICSharpCode.WpfDesign.XamlDom
 						}
 					}
 				}
-			} else if (instance is string) {
-				xml.InnerText = (string)instance;
 			}
 
 			return new XamlObject(this, xml, elementType, instance);
@@ -274,5 +272,10 @@ namespace ICSharpCode.WpfDesign.XamlDom
 
 			return prefix;
 		}
+		
+		bool IsNativeType(object instance)
+		{
+			return instance.GetType().Assembly == typeof(String).Assembly;
+		}
 	}
 }

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

@@ -223,7 +223,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
 					foreach(XamlObject propXamlObject in holder.Properties.Where((prop) => prop.IsSet).Select((prop) => prop.PropertyValue).OfType<XamlObject>()) {
 						XamlObject innerHolder;
 						bool updateResult = propXamlObject.UpdateXmlAttribute(true, out innerHolder);
-						Debug.Assert(updateResult);
+						Debug.Assert(updateResult || innerHolder == null);
 						
 						if (propXamlObject == this)
 							isThisUpdated = true;

src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/DesignItemProperty.cs

@@ -81,6 +81,12 @@ namespace ICSharpCode.WpfDesign
 		/// </summary>
 		public abstract DesignItem Value { get; }
 		
+		/// <summary>
+		/// Gets the string value of the property. This property returns null if the value is not set,
+		/// or if the value is set to a non-primitive value (i.e. represented by a <see cref="DesignItem"/>, accessible through <see cref="Value"/> property).
+		/// </summary>
+		public abstract string TextValue { get; }
+		
 		/// <summary>
 		/// Is raised when the value of the property changes (by calling <see cref="SetValue"/> or <see cref="Reset"/>).
 		/// </summary>

src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/DesignPanelHitTestResult.cs

@@ -24,7 +24,7 @@ using ICSharpCode.WpfDesign.Adorners;
 namespace ICSharpCode.WpfDesign
 {
 	/// <summary>
-	/// Describes the result of a <see cref="IDesignPanel.HitTest(Point, bool, bool)"/> call.
+	/// Describes the result of a <see cref="IDesignPanel.HitTest(Point, bool, bool, HitTestType)"/> call.
 	/// </summary>
 	public struct DesignPanelHitTestResult : IEquatable<DesignPanelHitTestResult>
 	{

src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PlacementInformation.cs

@@ -75,7 +75,7 @@ namespace ICSharpCode.WpfDesign
 		/// <summary>
 		/// Gets/sets the alignment of the resize thumb used to start the operation.
 		/// </summary>
-		public PlacementAlignment ResizeThumbAlignment { get; set; }
+		public PlacementAlignment? ResizeThumbAlignment { get; set; }
 		
 		/// <inheritdoc/>
 		public override string ToString()

src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj

@@ -154,6 +154,7 @@
     <Compile Include="Src\InstalledPackagesViewModel.cs" />
     <Compile Include="Src\IPackageRepositoryFactoryEvents.cs" />
     <Compile Include="Src\IPackageViewModelParent.cs" />
+    <Compile Include="Src\ISettingsProvider.cs" />
     <Compile Include="Src\IUpdatePackagesAction.cs" />
     <Compile Include="Src\IPackageExtensions.cs" />
     <Compile Include="Src\IPackageAction.cs" />
@@ -219,7 +220,6 @@
     <Compile Include="Src\IPackageReferenceInstaller.cs" />
     <Compile Include="Src\IPackageReferencesForProject.cs" />
     <Compile Include="Src\IPropertyService.cs" />
-    <Compile Include="Src\ISettingsFactory.cs" />
     <Compile Include="Src\IThreadSafePackageManagementEvents.cs" />
     <Compile Include="Src\ManagePackagesUserPrompts.cs" />
     <Compile Include="Src\ManagePackagesViewTitle.cs" />
@@ -252,6 +252,7 @@
     <Compile Include="Src\Scripting\NullGlobalMSBuildProjectCollection.cs" />
     <Compile Include="Src\Scripting\RunAllProjectPackageScriptsAction.cs" />
     <Compile Include="Src\ServiceWithWorkbenchOwner.cs" />
+    <Compile Include="Src\SettingsProvider.cs" />
     <Compile Include="Src\SharpDevelopCredentialProvider.cs" />
     <Compile Include="Src\SharpDevelopHttpUserAgent.cs" />
     <Compile Include="Src\ThreadSafeCodeGenerator.cs" />
@@ -400,7 +401,6 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Src\SelectProjectsViewModel.cs" />
-    <Compile Include="Src\SettingsFactory.cs" />
     <Compile Include="Src\SolutionPackageRepositoryFactory.cs" />
     <Compile Include="Src\SolutionPackageRepositoryPath.cs" />
     <Compile Include="Src\PackageSourceConverter.cs" />

src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementProjectService.cs

@@ -43,6 +43,7 @@ namespace ICSharpCode.PackageManagement.Design
 		
 		public void FireSolutionClosedEvent(ISolution solution)
 		{
+			OpenSolution = null;
 			if (SolutionClosed != null) {
 				SolutionClosed(this, new SolutionEventArgs(solution));
 			}

src/AddIns/Misc/PackageManagement/Project/Src/ISettingsFactory.cs

@@ -1,28 +0,0 @@
-// 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 NuGet;
-
-namespace ICSharpCode.PackageManagement
-{
-	public interface ISettingsFactory
-	{
-		ISettings CreateSettings(string directory);
-	}
-}

src/AddIns/Misc/PackageManagement/Project/Src/ISettingsProvider.cs

@@ -0,0 +1,14 @@
+// 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 NuGet;
+
+namespace ICSharpCode.PackageManagement
+{
+	public interface ISettingsProvider
+	{
+		event EventHandler SettingsChanged;
+		ISettings LoadSettings();
+	}
+}

src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementOptions.cs

@@ -35,15 +35,17 @@ namespace ICSharpCode.PackageManagement
 		ObservableCollection<RecentPackageInfo> recentPackages;
 		PackageRestoreConsent packageRestoreConsent;
 		
-		public PackageManagementOptions(Properties properties, ISettings settings)
+		public PackageManagementOptions(
+			Properties properties,
+			ISettingsProvider settingsProvider)
 		{
 			this.properties = properties;
-			registeredPackageSourceSettings = new RegisteredPackageSourceSettings(settings);
+			registeredPackageSourceSettings = new RegisteredPackageSourceSettings(settingsProvider);
-			packageRestoreConsent = new PackageRestoreConsent(settings);
+			packageRestoreConsent = new PackageRestoreConsent(settingsProvider.LoadSettings());
 		}
 		
 		public PackageManagementOptions(Properties properties)
-			: this(properties, Settings.LoadDefaultSettings(null, null, null))
+			: this(properties, new SettingsProvider())
 		{
 		}
 		

src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementServices.cs

@@ -42,7 +42,7 @@ namespace ICSharpCode.PackageManagement
 		static PackageManagementServices()
 		{
 			options = new PackageManagementOptions();
-			packageRepositoryCache = new PackageRepositoryCache(options.PackageSources, options.RecentPackages);
+			packageRepositoryCache = new PackageRepositoryCache(options);
 			userAgentGenerator = new UserAgentGeneratorForRepositoryRequests(packageRepositoryCache);
 			registeredPackageRepositories = new RegisteredPackageRepositories(packageRepositoryCache, options);
 			

src/AddIns/Misc/PackageManagement/Project/Src/PackageRepositoryCache.cs

@@ -26,30 +26,36 @@ namespace ICSharpCode.PackageManagement
 	public class PackageRepositoryCache : IPackageRepositoryCache, IPackageRepositoryFactoryEvents
 	{
 		ISharpDevelopPackageRepositoryFactory factory;
-		RegisteredPackageSources registeredPackageSources;
+		RegisteredPackageSources packageSources;
+		PackageManagementOptions options;
 		IList<RecentPackageInfo> recentPackages;
 		IRecentPackageRepository recentPackageRepository;
 		ConcurrentDictionary<string, IPackageRepository> repositories =
 			new ConcurrentDictionary<string, IPackageRepository>();
 		
 		public PackageRepositoryCache(
-			ISharpDevelopPackageRepositoryFactory factory,
+			PackageManagementOptions options,
-			RegisteredPackageSources registeredPackageSources,
+			ISharpDevelopPackageRepositoryFactory factory)
-			IList<RecentPackageInfo> recentPackages)
 		{
+			this.options = options;
 			this.factory = factory;
-			this.registeredPackageSources = registeredPackageSources;
+			this.recentPackages = options.RecentPackages;
-			this.recentPackages = recentPackages;
+		}
+
+		public PackageRepositoryCache(PackageManagementOptions options)
+			: this(
+				options,
+				new SharpDevelopPackageRepositoryFactory())
+		{
 		}
 
 		public PackageRepositoryCache(
-			RegisteredPackageSources registeredPackageSources,
+			RegisteredPackageSources packageSources,
 			IList<RecentPackageInfo> recentPackages)
-			: this(
-				new SharpDevelopPackageRepositoryFactory(),
-				registeredPackageSources,
-				recentPackages)
 		{
+			this.factory = new SharpDevelopPackageRepositoryFactory();
+			this.recentPackages = recentPackages;
+			this.packageSources = packageSources;
 		}
 		
 		public event EventHandler<PackageRepositoryFactoryEventArgs> RepositoryCreated;
@@ -102,11 +108,20 @@ namespace ICSharpCode.PackageManagement
 		
 		IEnumerable<IPackageRepository> CreateAllEnabledRepositories()
 		{
-			foreach (PackageSource source in registeredPackageSources.GetEnabledPackageSources()) {
+			foreach (PackageSource source in PackageSources.GetEnabledPackageSources()) {
 				yield return CreateRepository(source.Source);
 			}
 		}
 
+		RegisteredPackageSources PackageSources {
+			get {
+				if (packageSources != null) {
+					return packageSources;
+				}
+				return options.PackageSources;
+			}
+		}
+		
 		public IPackageRepository CreateAggregateRepository(IEnumerable<IPackageRepository> repositories)
 		{
 			return factory.CreateAggregateRepository(repositories);

src/AddIns/Misc/PackageManagement/Project/Src/RegisteredPackageSourceSettings.cs

@@ -21,6 +21,7 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
 
+using ICSharpCode.SharpDevelop.Project;
 using NuGet;
 
 namespace ICSharpCode.PackageManagement
@@ -35,20 +36,32 @@ namespace ICSharpCode.PackageManagement
 			new PackageSource("(Aggregate source)", "All");
 		
 		ISettings settings;
+		ISettingsProvider settingsProvider;
 		PackageSource defaultPackageSource;
 		RegisteredPackageSources packageSources;
 		PackageSource activePackageSource;
 		
-		public RegisteredPackageSourceSettings(ISettings settings)
+		public RegisteredPackageSourceSettings(ISettingsProvider settingsProvider)
-			: this(settings, RegisteredPackageSources.DefaultPackageSource)
+			: this(settingsProvider, RegisteredPackageSources.DefaultPackageSource)
 		{
 		}
 		
-		public RegisteredPackageSourceSettings(ISettings settings, PackageSource defaultPackageSource)
+		public RegisteredPackageSourceSettings(
+			ISettingsProvider settingsProvider,
+			PackageSource defaultPackageSource)
 		{
-			this.settings = settings;
+			this.settingsProvider = settingsProvider;
 			this.defaultPackageSource = defaultPackageSource;
+			
+			settings = settingsProvider.LoadSettings();
+			
 			ReadActivePackageSource();
+			RegisterSolutionEvents();
+		}
+
+		void RegisterSolutionEvents()
+		{
+			settingsProvider.SettingsChanged += SettingsChanged;
 		}
 		
 		void ReadActivePackageSource()
@@ -176,5 +189,20 @@ namespace ICSharpCode.PackageManagement
 		{
 			settings.SetValue(ActivePackageSourceSectionName, activePackageSource.Key, activePackageSource.Value);
 		}
+		
+		void SettingsChanged(object sender, EventArgs e)
+		{
+			settings = settingsProvider.LoadSettings();
+			ReadActivePackageSource();
+			ResetPackageSources();
+		}
+		
+		void ResetPackageSources()
+		{
+			if (packageSources != null) {
+				packageSources.CollectionChanged -= PackageSourcesChanged;
+				packageSources = null;
+			}
+		}
 	}
 }

src/AddIns/Misc/PackageManagement/Project/Src/SettingsFactory.cs

@@ -1,32 +0,0 @@
-// 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 NuGet;
-
-namespace ICSharpCode.PackageManagement
-{
-	public class SettingsFactory : ISettingsFactory
-	{
-		public ISettings CreateSettings(string directory)
-		{
-			var fileSystem = new PhysicalFileSystem(directory);
-			return new Settings(fileSystem);
-		}
-	}
-}

src/AddIns/Misc/PackageManagement/Project/Src/SettingsProvider.cs

@@ -0,0 +1,62 @@
+// 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.IO;
+using ICSharpCode.SharpDevelop.Project;
+using NuGet;
+
+namespace ICSharpCode.PackageManagement
+{
+	public class SettingsProvider : ISettingsProvider
+	{
+		public static Func<IFileSystem, string, IMachineWideSettings, ISettings> LoadDefaultSettings
+			= Settings.LoadDefaultSettings;
+		
+		IPackageManagementProjectService projectService;
+		
+		public SettingsProvider()
+			: this(PackageManagementServices.ProjectService)
+		{
+		}
+		
+		public SettingsProvider(IPackageManagementProjectService projectService)
+		{
+			this.projectService = projectService;
+			projectService.SolutionOpened += OnSettingsChanged;
+			projectService.SolutionClosed += OnSettingsChanged;
+		}
+		
+		public event EventHandler SettingsChanged;
+		
+		void OnSettingsChanged(object sender, SolutionEventArgs e)
+		{
+			if (SettingsChanged != null) {
+				SettingsChanged(this, new EventArgs());
+			}
+		}
+		
+		public ISettings LoadSettings()
+		{
+			return LoadSettings(GetSolutionDirectory());
+		}
+		
+		string GetSolutionDirectory()
+		{
+			ISolution solution = projectService.OpenSolution;
+			if (solution != null) {
+				return Path.Combine(solution.Directory, ".nuget");
+			}
+			return null;
+		}
+		
+		ISettings LoadSettings(string directory)
+		{
+			if (directory == null) {
+				return LoadDefaultSettings(null, null, null);
+			}
+			
+			return LoadDefaultSettings(new PhysicalFileSystem(directory), null, null);
+		}
+	}
+}

src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj

@@ -176,7 +176,6 @@
     <Compile Include="Src\Helpers\FakePowerShellDetection.cs" />
     <Compile Include="Src\Helpers\FakePowerShellSession.cs" />
     <Compile Include="Src\Helpers\FakePropertyService.cs" />
-    <Compile Include="Src\Helpers\FakeSettingsFactory.cs" />
     <Compile Include="Src\Helpers\FakeSolutionPackageRepository.cs" />
     <Compile Include="Src\Helpers\FakeTextEditorOptions.cs" />
     <Compile Include="Src\Helpers\ProjectItemCollectionAssert.cs" />
@@ -195,6 +194,7 @@
     <Compile Include="Src\Scripting\ConsoleHostFileConflictResolverTests.cs" />
     <Compile Include="Src\Scripting\MSBuildProjectImportsMergerTests.cs" />
     <Compile Include="Src\Scripting\MSBuildProjectPropertiesMergerTests.cs" />
+    <Compile Include="Src\SettingsProviderTests.cs" />
     <Compile Include="Src\UpdatedPackagesTests.cs" />
     <Compile Include="Src\UpdatePackagesActionTests.cs" />
     <Compile Include="Src\UpdateSolutionPackagesActionTests.cs" />

src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageRepositoryFactory.cs

@@ -38,6 +38,13 @@ namespace PackageManagement.Tests.Helpers
 		public Dictionary<string, FakePackageRepository> FakePackageRepositories =
 			new Dictionary<string, FakePackageRepository>();
 	
+		public FakePackageRepositoryFactory()
+		{
+			CreateAggregrateRepositoryAction = (repositories) => {
+				return FakeAggregateRepository;
+			};
+		}
+		
 		public IPackageRepository CreateRepository(string packageSource)
 		{
 			PackageSourcesPassedToCreateRepository.Add(packageSource);
@@ -84,11 +91,12 @@ namespace PackageManagement.Tests.Helpers
 		}
 		
 		public IEnumerable<IPackageRepository> RepositoriesPassedToCreateAggregateRepository;
+		public Func<IEnumerable<IPackageRepository>, IPackageRepository> CreateAggregrateRepositoryAction;
 		
 		public IPackageRepository CreateAggregateRepository(IEnumerable<IPackageRepository> repositories)
 		{
 			RepositoriesPassedToCreateAggregateRepository = repositories;
-			return FakeAggregateRepository;
+			return CreateAggregrateRepositoryAction(repositories);
 		}
 		
 		public FakePackageRepository AddFakePackageRepositoryForPackageSource(string source)

src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakeSettingsFactory.cs

@@ -1,37 +0,0 @@
-// 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 ICSharpCode.PackageManagement;
-using ICSharpCode.PackageManagement.Design;
-using NuGet;
-
-namespace PackageManagement.Tests.Helpers
-{
-	public class FakeSettingsFactory : ISettingsFactory
-	{
-		public FakeSettings FakeSettings = new FakeSettings();
-		public string DirectoryPassedToCreateSettings;
-		
-		public ISettings CreateSettings(string directory)
-		{
-			DirectoryPassedToCreateSettings = directory;
-			return FakeSettings;
-		}
-	}
-}

src/AddIns/Misc/PackageManagement/Test/Src/Helpers/OneRegisteredPackageSourceHelper.cs

@@ -26,11 +26,14 @@ namespace PackageManagement.Tests.Helpers
 {
 	public class OneRegisteredPackageSourceHelper
 	{
-		public RegisteredPackageSources RegisteredPackageSources;
 		public TestablePackageManagementOptions Options;
 		public FakeSettings FakeSettings;
 		public PackageSource PackageSource = new PackageSource("http://sharpdevelop.com", "Test Package Source");
 		
+		public RegisteredPackageSources RegisteredPackageSources {
+			get { return Options.PackageSources; }
+		}
+		
 		public OneRegisteredPackageSourceHelper()
 		{
 			CreateOneRegisteredPackageSource();
@@ -41,7 +44,6 @@ namespace PackageManagement.Tests.Helpers
 			Properties properties = new Properties();
 			Options = new TestablePackageManagementOptions();
 			FakeSettings = Options.FakeSettings;
-			RegisteredPackageSources = Options.PackageSources;
 			AddOnePackageSource();
 		}
 		

src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackageManagementOptions.cs

@@ -27,17 +27,35 @@ namespace PackageManagement.Tests.Helpers
 	{
 		public Properties Properties;
 		public FakeSettings FakeSettings;
+		public FakePackageManagementProjectService ProjectService;
 		
 		public TestablePackageManagementOptions()
-			: this(new Properties(), new FakeSettings())
+			: this(new Properties(), new FakeSettings(), new FakePackageManagementProjectService())
 		{
 		}
 		
-		public TestablePackageManagementOptions(Properties properties, FakeSettings fakeSettings)
+		public TestablePackageManagementOptions(
-			: base(properties, fakeSettings)
+			Properties properties,
+			FakeSettings fakeSettings,
+			FakePackageManagementProjectService projectService)
+			: base(properties, CreateSettingsProvider(fakeSettings, projectService))
 		{
 			this.Properties = properties;
 			this.FakeSettings = fakeSettings;
+			this.ProjectService = projectService;
+		}
+		
+		public static void ChangeSettingsReturnedBySettingsProvider(FakeSettings settings)
+		{
+			SettingsProvider.LoadDefaultSettings = (fileSystem, configFile, machineSettings) => {
+				return settings;
+			};
+		}
+		
+		public static SettingsProvider CreateSettingsProvider(FakeSettings fakeSettings, FakePackageManagementProjectService projectService)
+		{
+			ChangeSettingsReturnedBySettingsProvider(fakeSettings);
+			return new SettingsProvider(projectService);
 		}
 	}
 }

src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementOptionsTests.cs

@@ -36,6 +36,8 @@ namespace PackageManagement.Tests
 		Properties properties;
 		PackageManagementOptions options;
 		FakeSettings fakeSettings;
+		SettingsProvider settingsProvider;
+		FakePackageManagementProjectService projectService;
 		
 		void CreateOptions()
 		{
@@ -63,12 +65,26 @@ namespace PackageManagement.Tests
 		void CreateOptions(FakeSettings fakeSettings)
 		{
 			CreateProperties();
-			options = new PackageManagementOptions(properties, fakeSettings);
+			CreateSettingsProvider(fakeSettings);
+			options = new PackageManagementOptions(properties, settingsProvider);
+		}
+		
+		void CreateSettingsProvider(FakeSettings fakeSettings)
+		{
+			projectService = new FakePackageManagementProjectService();
+			settingsProvider = TestablePackageManagementOptions.CreateSettingsProvider(fakeSettings, projectService);
+		}
+		
+		void ChangeSettingsReturnedBySettingsProvider()
+		{
+			fakeSettings = new FakeSettings();
+			TestablePackageManagementOptions.ChangeSettingsReturnedBySettingsProvider(fakeSettings);
 		}
 		
 		void CreateOptions(Properties properties, FakeSettings fakeSettings)
 		{
-			options = new PackageManagementOptions(properties, fakeSettings);
+			CreateSettingsProvider(fakeSettings);
+			options = new PackageManagementOptions(properties, settingsProvider);
 		}
 		
 		void SaveOptions()
@@ -88,6 +104,18 @@ namespace PackageManagement.Tests
 			fakeSettings.SetPackageRestoreSetting(true);
 		}
 		
+		void OpenSolution()
+		{
+			var helper = new SolutionHelper(@"d:\projects\MyProject\MySolution.sln");
+			projectService.FireSolutionOpenedEvent(helper.MSBuildSolution);
+		}
+		
+		void CloseSolution()
+		{
+			var helper = new SolutionHelper(@"d:\projects\MyProject\MySolution.sln");
+			projectService.FireSolutionClosedEvent(helper.MSBuildSolution);
+		}
+		
 		[Test]
 		public void PackageSources_OnePackageSourceInSettings_ContainsSinglePackageSourceFromSettings()
 		{
@@ -465,5 +493,88 @@ namespace PackageManagement.Tests
 			KeyValuePair<string, string> keyValuePair = fakeSettings.GetValuePassedToSetValueForPackageRestoreSection();
 			Assert.AreEqual("False", keyValuePair.Value);
 		}
+		
+		[Test]
+		public void PackageSources_SolutionOpenedAfterInitialPackageSourcesLoaded_ContainsPackageSourceFromSolutionSpecificSettings()
+		{
+			CreateSettings();
+			var packageSource = new PackageSource("http://codeplex.com", "Test");
+			fakeSettings.AddFakePackageSource(packageSource);
+			CreateOptions(fakeSettings);
+			RegisteredPackageSources initialSources = options.PackageSources;
+			var expectedInitialSources = new List<PackageSource>();
+			expectedInitialSources.Add(packageSource);
+			ChangeSettingsReturnedBySettingsProvider();
+			packageSource = new PackageSource("http://codeplex.com", "Test");
+			fakeSettings.AddFakePackageSource(packageSource);
+			var expectedSources = new List<PackageSource>();
+			expectedSources.Add(packageSource);
+			packageSource = new PackageSource("http://nuget.org", "ProjectSource");
+			fakeSettings.AddFakePackageSource(packageSource);
+			expectedSources.Add(packageSource);
+			OpenSolution();
+			
+			RegisteredPackageSources actualSources = options.PackageSources;
+			
+			Assert.AreEqual(expectedInitialSources, initialSources);
+			Assert.AreEqual(expectedSources, actualSources);
+		}
+		
+		[Test]
+		public void PackageSources_SolutionClosedAfterInitialPackageSourcesLoaded_PackageSourcesReloaded()
+		{
+			CreateSettings();
+			var packageSource = new PackageSource("http://codeplex.com", "Test");
+			fakeSettings.AddFakePackageSource(packageSource);
+			var expectedInitialSources = new List<PackageSource>();
+			expectedInitialSources.Add(packageSource);
+			packageSource = new PackageSource("http://nuget.org", "ProjectSource");
+			fakeSettings.AddFakePackageSource(packageSource);
+			expectedInitialSources.Add(packageSource);
+			OpenSolution();
+			CreateOptions(fakeSettings);
+			RegisteredPackageSources initialSources = options.PackageSources;
+			ChangeSettingsReturnedBySettingsProvider();
+			packageSource = new PackageSource("http://codeplex.com", "Test");
+			fakeSettings.AddFakePackageSource(packageSource);
+			var expectedSources = new List<PackageSource>();
+			expectedSources.Add(packageSource);
+			CloseSolution();
+			
+			RegisteredPackageSources actualSources = options.PackageSources;
+			
+			Assert.AreEqual(expectedInitialSources, initialSources);
+			Assert.AreEqual(expectedSources, actualSources);
+		}
+		
+		[Test]
+		public void PackageSources_SolutionClosedAfterInitialPackageSourcesLoaded_ActivePackageSourceReloaded()
+		{
+			CreateSettings();
+			var packageSource = new PackageSource("http://codeplex.com", "Test");
+			fakeSettings.AddFakePackageSource(packageSource);
+			var expectedInitialSources = new List<PackageSource>();
+			expectedInitialSources.Add(packageSource);
+			var initialActivePackageSource = new PackageSource("http://nuget.org", "ProjectSource");
+			fakeSettings.AddFakePackageSource(initialActivePackageSource);
+			fakeSettings.SetFakeActivePackageSource(initialActivePackageSource);
+			expectedInitialSources.Add(initialActivePackageSource);
+			OpenSolution();
+			CreateOptions(fakeSettings);
+			RegisteredPackageSources actualInitialPackageSources = options.PackageSources;
+			PackageSource actualInitialActivePackageSource = options.ActivePackageSource;
+			ChangeSettingsReturnedBySettingsProvider();
+			var expectedActivePackageSource = new PackageSource("http://codeplex.com", "Test");
+			fakeSettings.SetFakeActivePackageSource(expectedActivePackageSource);
+			fakeSettings.AddFakePackageSource(expectedActivePackageSource);
+			CloseSolution();
+			
+			PackageSource actualSource = options.ActivePackageSource;
+			
+			Assert.AreEqual(initialActivePackageSource, actualInitialActivePackageSource);
+			Assert.AreEqual(expectedActivePackageSource, actualSource);
+			Assert.AreEqual(expectedInitialSources, actualInitialPackageSources);
+			Assert.AreEqual(new PackageSource[] { expectedActivePackageSource }, options.PackageSources);
+		}
 	}
 }

src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementOptionsViewModelTests.cs

@@ -50,8 +50,10 @@ namespace PackageManagement.Tests
 		void CreateOptions()
 		{
 			var properties = new Properties();
+			var projectService = new FakePackageManagementProjectService();
 			fakeSettings = new FakeSettings();
-			options = new PackageManagementOptions(properties, fakeSettings);
+			SettingsProvider settingsProvider = TestablePackageManagementOptions.CreateSettingsProvider(fakeSettings, projectService);
+			options = new PackageManagementOptions(properties, settingsProvider);
 		}
 		
 		void EnablePackageRestoreInOptions()

src/AddIns/Misc/PackageManagement/Test/Src/PackageRepositoryCacheTests.cs

@@ -19,6 +19,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO.Packaging;
+using System.Linq;
 using ICSharpCode.PackageManagement;
 using ICSharpCode.PackageManagement.Design;
 using NuGet;
@@ -52,9 +53,7 @@ namespace PackageManagement.Tests
 		{
 			nuGetPackageSource = new PackageSource("http://nuget.org", "NuGet");
 			fakePackageRepositoryFactory = new FakePackageRepositoryFactory();
-			RegisteredPackageSources packageSources = packageSourcesHelper.Options.PackageSources;
+			cache = new PackageRepositoryCache(packageSourcesHelper.Options, fakePackageRepositoryFactory);
-			IList<RecentPackageInfo> recentPackages = packageSourcesHelper.Options.RecentPackages;
-			cache = new PackageRepositoryCache(fakePackageRepositoryFactory, packageSources, recentPackages);
 		}
 		
 		FakePackageRepository AddFakePackageRepositoryForPackageSource(string source)
@@ -395,5 +394,38 @@ namespace PackageManagement.Tests
 			
 			Assert.IsNull(eventArgs);
 		}
+		
+		[Test]
+		public void CreateAggregateRepository_SolutionClosedAndEnabledPackageSourcesChangedAfterCacheCreated_AggregateRepositoryContainsCorrectEnabledPackageRepositories()
+		{
+			CreatePackageSources();
+			packageSourcesHelper.AddTwoPackageSources("Source1", "Source2");
+			CreateCacheUsingPackageSources();
+			FakePackageRepository source1Repo = AddFakePackageRepositoryForPackageSource("Source1");
+			FakePackageRepository source2Repo = AddFakePackageRepositoryForPackageSource("Source2");
+			fakePackageRepositoryFactory.CreateAggregrateRepositoryAction = (repositories) => {
+				return new AggregateRepository (repositories);
+			};
+			var initialAggregateRepository = cache.CreateAggregateRepository() as AggregateRepository;
+			var expectedInitialRepositories = new FakePackageRepository[] {
+				source1Repo,
+				source2Repo
+			};
+			List<IPackageRepository> actualInitialRepositories = initialAggregateRepository.Repositories.ToList();
+			var solution = new SolutionHelper().MSBuildSolution;
+			packageSourcesHelper.Options.ProjectService.FireSolutionClosedEvent(solution);
+			packageSourcesHelper.Options.PackageSources.Clear();
+			packageSourcesHelper.Options.PackageSources.Add(new PackageSource ("Source3"));
+			FakePackageRepository source3Repo = AddFakePackageRepositoryForPackageSource("Source3");
+			var expectedRepositories = new FakePackageRepository[] {
+				source3Repo
+			};
+
+			var aggregateRepository = cache.CreateAggregateRepository() as AggregateRepository;
+			List<IPackageRepository> actualRepositories = aggregateRepository.Repositories.ToList();
+
+			CollectionAssert.AreEqual(expectedInitialRepositories, actualInitialRepositories);
+			CollectionAssert.AreEqual(expectedRepositories, actualRepositories);
+		}
 	}
 }

src/AddIns/Misc/PackageManagement/Test/Src/SettingsProviderTests.cs

@@ -0,0 +1,80 @@
+// 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 ICSharpCode.PackageManagement;
+using ICSharpCode.PackageManagement.Design;
+using NuGet;
+using NUnit.Framework;
+using PackageManagement.Tests.Helpers;
+
+namespace PackageManagement.Tests
+{
+	[TestFixture]
+	public class SettingsProviderTests
+	{
+		SettingsProvider settingsProvider;
+		FakeSettings fakeSettings;
+		FakePackageManagementProjectService projectService;
+		IFileSystem fileSystemUsedToLoadSettings;
+		string configFileUsedToLoadSettings;
+		IMachineWideSettings machinesettingsUsedToLoadSettings;
+		
+		[SetUp]
+		public void SetUp()
+		{
+			fakeSettings = new FakeSettings();
+			projectService = new FakePackageManagementProjectService();
+			SettingsProvider.LoadDefaultSettings = LoadDefaultSettings;
+			settingsProvider = new SettingsProvider(projectService);
+		}
+		
+		ISettings LoadDefaultSettings(IFileSystem fileSystem, string configFile, IMachineWideSettings machineSettings)
+		{
+			fileSystemUsedToLoadSettings = fileSystem;
+			configFileUsedToLoadSettings = configFile;
+			machinesettingsUsedToLoadSettings = machineSettings;
+			
+			return fakeSettings;
+		}
+		
+		void OpenSolution(string fileName)
+		{
+			var helper = new SolutionHelper(fileName);
+			projectService.OpenSolution = helper.MSBuildSolution;
+		}
+		
+		[TearDown]
+		public void TearDown()
+		{
+			// This resets SettingsProvider.LoadDefaultSettings.
+			TestablePackageManagementOptions.CreateSettingsProvider(fakeSettings, projectService);
+		}
+		
+		[Test]
+		public void LoadSettings_NoSolutionOpen_NullFileSystemAndNullConfigFileAndNullMachineSettingsUsed()
+		{
+			fileSystemUsedToLoadSettings = new FakeFileSystem();
+			configFileUsedToLoadSettings = "configFile";
+			
+			ISettings settings = settingsProvider.LoadSettings();
+			
+			Assert.IsNull(fileSystemUsedToLoadSettings);
+			Assert.IsNull(configFileUsedToLoadSettings);
+			Assert.IsNull(machinesettingsUsedToLoadSettings);
+			Assert.AreEqual(fakeSettings, settings);
+		}
+		
+		[Test]
+		public void LoadSettings_SolutionOpen_FileSystemWithRootSetToSolutionDotNuGetDirectoryUsedToLoadSettings()
+		{
+			string fileName = @"d:\projects\MyProject\MyProject.sln";
+			OpenSolution(fileName);
+			
+			ISettings settings = settingsProvider.LoadSettings();
+			
+			Assert.AreEqual(@"d:\projects\MyProject\.nuget", fileSystemUsedToLoadSettings.Root);
+			Assert.AreEqual(fakeSettings, settings);
+		}
+	}
+}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/ICSharpCode.Reporting.Addin.csproj

@@ -84,7 +84,7 @@
     <Folder Include="src\DesignableItems" />
     <Folder Include="src\Factory" />
     <Folder Include="src\Dialogs" />
-    <Folder Include="src\New Folder" />
+    <Folder Include="src\UndoRedo" />
     <Folder Include="src\Wizard" />
     <Folder Include="src\Toolbox" />
     <Folder Include="src\TypeProvider" />
@@ -97,6 +97,8 @@
       <Link>Configuration\GlobalAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="Configuration\AssemblyInfo.cs" />
+    <Compile Include="src\Commands\DesignerVerbSubmenuBuilder.cs" />
+    <Compile Include="src\Commands\FormsCommands.cs" />
     <Compile Include="src\Commands\ViewCommands.cs" />
     <Compile Include="src\DesignableItems\AbstractGraphicItem.cs" />
     <Compile Include="src\DesignableItems\AbstractItem.cs" />
@@ -160,6 +162,7 @@
     <Compile Include="src\TypeProvider\SectionItemTypeProvider.cs" />
     <Compile Include="src\TypeProvider\TextItemTypeProvider.cs" />
     <Compile Include="src\TypeProvider\TypeProviderHelper.cs" />
+    <Compile Include="src\UndoRedo\ReportDesignerUndoEngine.cs" />
     <Compile Include="src\Views\DesignerView.cs" />
     <Compile Include="src\Views\WpfPreview.cs" />
     <Compile Include="src\Views\XmlView.cs" />

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/ICSharpCode.Reporting.addin

@@ -105,17 +105,19 @@
 	</Path>-->
 	
 
-	<!--<Path name="/SharpDevelop/ReportDesigner/ContextMenus/SelectionMenu">
+	<Path name="/SharpDevelop/ReportDesigner/ContextMenus/SelectionMenu">
-		<MenuItem id="ViewCode" label="${res:SharpDevelop.FormsDesigner.ContextMenus.ViewCodeCommand}" icon="Icons.16x16.FormsDesigner.ViewCode" class="ICSharpCode.Reports.Addin.Commands.ViewCode" />
+		<MenuItem id="ViewCode" label="${res:SharpDevelop.FormsDesigner.ContextMenus.ViewCodeCommand}" icon="Icons.16x16.FormsDesigner.ViewCode" class="ICSharpCode.Reporting.Addin.Commands.ViewCode" />
-		<MenuItem id="ShowProperties" label="${res:XML.MainMenu.FormatMenu.ShowProperties}" icon="Icons.16x16.Property" class="ICSharpCode.Reports.Addin.Commands.ShowProperties" />
+
+		<!--	<MenuItem id="ShowProperties" label="${res:XML.MainMenu.FormatMenu.ShowProperties}" icon="Icons.16x16.Property" class="ICSharpCode.Reports.Addin.Commands.ShowProperties" />-->
+		
 		<MenuItem id="PropertySeparator" type="Separator" />
 		<MenuItem id="Cut" label="${res:XML.MainMenu.EditMenu.Cut}" icon="Icons.16x16.CutIcon" command="Cut" />
 		<MenuItem id="Copy" label="${res:XML.MainMenu.EditMenu.Copy}" icon="Icons.16x16.CopyIcon" command="Copy" />
 		<MenuItem id="Paste" label="${res:XML.MainMenu.EditMenu.Paste}" icon="Icons.16x16.PasteIcon" command="Paste" />
 		<MenuItem id="Delete" label="${res:XML.MainMenu.EditMenu.Delete}" icon="Icons.16x16.DeleteIcon" command="Delete" />
 		<MenuItem id="DesignerVerbsSeparator" type="Separator" />
-		<MenuItem id="DesignerVerbsBuilder" type="Builder" class="ICSharpCode.Reports.Addin.Commands.DesignerVerbSubmenuBuilder" />
+		<MenuItem id="DesignerVerbsBuilder" type="Builder" class="ICSharpCode.Reporting.Addin.Commands.DesignerVerbSubmenuBuilder" />
-	</Path>-->
+	</Path>
 	
 
 	<!-- ReportExplorer ContextMenu's -->

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Commands/DesignerVerbSubmenuBuilder.cs

@@ -0,0 +1,68 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 21.05.2014
+ * Time: 20:05
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+using ICSharpCode.Core;
+using ICSharpCode.Core.WinForms;
+
+namespace ICSharpCode.Reporting.Addin.Commands
+{
+	/// <summary>
+	/// Description of DesignerVerbSubmenuBuilder.
+	/// </summary>
+	public class DesignerVerbSubmenuBuilder : IMenuItemBuilder
+	{
+		#region IMenuItemBuilder implementation
+
+		public IEnumerable<object> BuildItems(Codon codon, object owner)
+		{
+			var menuCommandService = (IMenuCommandService)owner;
+			
+			var items = new List<ToolStripItem>();
+			
+			foreach (DesignerVerb verb in menuCommandService.Verbs) {
+				Console.WriteLine("{0}",verb.Text);
+				items.Add(new ContextMenuCommand(verb));
+			}
+			
+			// add separator at the end of custom designer verbs
+			if (items.Count > 0) {
+				items.Add(new MenuSeparator());
+			}
+			
+			return items.ToArray();
+		}
+
+		#endregion
+	}
+	
+	sealed class ContextMenuCommand : ICSharpCode.Core.WinForms.MenuCommand
+		{
+			DesignerVerb verb;
+			
+			public ContextMenuCommand(DesignerVerb verb) : base(verb.Text)
+			{
+				this.Enabled = verb.Enabled;
+//				this.Checked = verb.Checked;
+				this.verb = verb;
+				Click += InvokeCommand;
+			}
+			
+			void InvokeCommand(object sender, EventArgs e)
+			{
+				try {
+					verb.Invoke();
+				} catch (Exception ex) {
+					MessageService.ShowException(ex);
+				}
+			}
+		}
+}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Commands/FormsCommands.cs

@@ -0,0 +1,83 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 21.05.2014
+ * Time: 20:35
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+using System.ComponentModel.Design;
+using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop;
+using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.Reporting.Addin.Views;
+
+namespace ICSharpCode.Reporting.Addin.Commands
+{
+	/// <summary>
+	/// Description of FormsCommands.
+	/// </summary>
+	
+	public abstract class AbstractFormsDesignerCommand : AbstractMenuCommand
+	{
+		public abstract CommandID CommandID {
+			get;
+		}
+		
+		protected virtual bool CanExecuteCommand(IDesignerHost host)
+		{
+			return true;
+		}
+		
+		protected static DesignerView ReportDesigner {
+			get {
+				var window = SD.Workbench;
+				if (window == null) {
+					return null;
+				}
+				return window.ActiveViewContent as DesignerView;
+			}
+		}
+		
+		
+		public override void Run()
+		{
+			var formDesigner = ReportDesigner;
+			if (formDesigner != null && CanExecuteCommand(formDesigner.Host)) {
+				var menuCommandService = (IMenuCommandService)formDesigner.Host.GetService(typeof(IMenuCommandService));
+				menuCommandService.GlobalInvoke(CommandID);
+			}
+		}
+
+		internal virtual void CommandCallBack(object sender, EventArgs e)
+		{
+			Run();
+		}
+	}
+	
+	
+	
+	public class ViewCode : AbstractFormsDesignerCommand
+	{
+		public override CommandID CommandID {
+			get {
+				return StandardCommands.ViewCode;
+			}
+		}
+		
+		public override void Run()
+		{
+//			var window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
+			var window = SD.Workbench;
+			if (window == null) {
+				return;
+			}
+			
+			var formDesigner = AbstractFormsDesignerCommand.ReportDesigner;
+			if (formDesigner != null) {
+				formDesigner.ShowSourceCode();
+			}
+		}
+	}
+}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignableItems/BaseLineItem.cs

@@ -58,7 +58,7 @@ namespace ICSharpCode.Reporting.Addin.DesignableItems
 				throw new ArgumentNullException("graphics");
 			}
 			using (var p = new Pen(ForeColor,Thickness)) {
-				p.SetLineCap(StartLineCap,EndLineCap,DashLineCap);
+				p.SetLineCap(StartLineCap,EndLineCap,DashCap.Flat);
 				graphics.DrawLine(p,fromPoint,toPoint);
 			}
 		}
@@ -115,14 +115,14 @@ namespace ICSharpCode.Reporting.Addin.DesignableItems
 		}
 		
 		
-		[Category("Appearance")]
+//		[Category("Appearance")]
-		public DashCap DashLineCap {
+//		public DashCap DashLineCap {
-			get { return dashLineCap; }
+//			get { return dashLineCap; }
-			set {
+//			set {
-				dashLineCap = value;
+//				dashLineCap = value;
-				Invalidate();
+//				Invalidate();
-			}
+//			}
-		}
+//		}
 	
 	}
 }

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignableItems/BaseSection.cs

@@ -43,14 +43,14 @@ namespace ICSharpCode.Reporting.Addin.DesignableItems
 	
 		
 		#region Propertys
+//		
+//		[Browsable(false)]
+//		public int SectionOffset {get;set;}
 		
-		[Browsable(false)]
+//		[Browsable(false)]	
-		public int SectionOffset {get;set;}
+//		public int SectionMargin {get;set;}
 			
-		[Browsable(false)]	
+//		public bool PageBreakAfter {get;set;}
-		public int SectionMargin {get;set;}
-			
-		public bool PageBreakAfter {get;set;}
 			
 		public bool CanGrow {get;set;}
 			

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/LineItemTypeProvider.cs

@@ -71,8 +71,8 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 			prop = props.Find("EndLineCap",true);
 			allProperties.Add(prop);
 			
-			prop = props.Find("dashLineCap",true);
+//			prop = props.Find("DashLineCap",true);
-			allProperties.Add(prop);
+//			allProperties.Add(prop);
 			
 			prop = props.Find("DashStyle",true);
 			allProperties.Add(prop);

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/SectionItemTypeProvider.cs

@@ -55,17 +55,17 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 			TypeProviderHelper.AddDefaultProperties(allProperties,props);
 			PropertyDescriptor prop = null;
 			
-			prop = props.Find("SectionOffset",true);
+//			prop = props.Find("SectionOffset",true);
-			allProperties.Add(prop);
+//			allProperties.Add(prop);
 			
-			prop = props.Find("SectionMargin",true);
+//			prop = props.Find("SectionMargin",true);
-			allProperties.Add(prop);
+//			allProperties.Add(prop);
 			
 			prop = props.Find("DrawBorder",true);
 			allProperties.Add(prop);
 			
-			prop = props.Find("PageBreakAfter",true);
+//			prop = props.Find("PageBreakAfter",true);
-			allProperties.Add(prop);
+//			allProperties.Add(prop);
 			
 			prop = props.Find("Controls",true);
 			allProperties.Add(prop);

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/UndoRedo/ReportDesignerUndoEngine.cs

@@ -0,0 +1,66 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 21.05.2014
+ * Time: 19:37
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Design;
+using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.WinForms;
+
+namespace ICSharpCode.Reporting.Addin.UndoRedo
+{
+	/// <summary>
+	/// Description of ReportDesignerUndoEngine.
+	/// </summary>
+	public class ReportDesignerUndoEngine : UndoEngine, IUndoHandler
+	{		
+		Stack<UndoEngine.UndoUnit> undoStack = new Stack<UndoEngine.UndoUnit>();
+		Stack<UndoEngine.UndoUnit> redoStack = new Stack<UndoEngine.UndoUnit>();
+		
+		public ReportDesignerUndoEngine(IServiceProvider provider) : base(provider)
+		{
+		}
+		
+		#region IUndoHandler
+		public bool EnableUndo {
+			get {
+				return undoStack.Count > 0;
+			}
+		}
+		
+		public bool EnableRedo {
+			get {
+				return redoStack.Count > 0;
+			}
+		}		
+
+		public void Undo()
+		{
+			if (undoStack.Count > 0) {
+				UndoEngine.UndoUnit unit = undoStack.Pop();
+				unit.Undo();
+				redoStack.Push(unit);
+			}
+		}
+		
+		public void Redo()
+		{
+			if (redoStack.Count > 0) {
+				UndoEngine.UndoUnit unit = redoStack.Pop();
+				unit.Undo();
+				undoStack.Push(unit);
+			}
+		}
+		#endregion
+		
+		protected override void AddUndoUnit(UndoEngine.UndoUnit unit)
+		{
+			undoStack.Push(unit);
+		}
+	}
+}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Views/DesignerView.cs

@@ -19,20 +19,23 @@ using System.Windows.Forms;
 using System.Windows.Forms.Design;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.WinForms;
 using ICSharpCode.SharpDevelop.Workbench;
 using ICSharpCode.Reporting.Addin.DesignableItems;
 using ICSharpCode.Reporting.Addin.DesignerBinding;
 using ICSharpCode.Reporting.Addin.Services;
 using ICSharpCode.Reporting.Addin.Toolbox;
+using ICSharpCode.Reporting.Addin.UndoRedo;
 
 namespace ICSharpCode.Reporting.Addin.Views
 {
 	/// <summary>
 	/// Description of the view content
 	/// </summary>
-	public class DesignerView : AbstractViewContent,IHasPropertyContainer, IToolsHost
+	public class DesignerView : AbstractViewContent,IHasPropertyContainer, IToolsHost,IUndoHandler,IClipboardHandler
 	{
 		readonly IDesignerGenerator generator;
+		ReportDesignerUndoEngine undoEngine;
 		bool unloading;
 		bool hasUnmergedChanges;
 		bool shouldUpdateSelectableObjects;
@@ -98,9 +101,9 @@ namespace ICSharpCode.Reporting.Addin.Views
 			
 			var selectionService = (ISelectionService)this.designSurface.GetService(typeof(ISelectionService));
 			selectionService.SelectionChanged  += SelectionChangedHandler;
-			/*
+			
 			undoEngine = new ReportDesignerUndoEngine(Host);
-			*/
+		
 			var componentChangeService = (IComponentChangeService)this.designSurface.GetService(typeof(IComponentChangeService));
 			
 			
@@ -228,6 +231,7 @@ namespace ICSharpCode.Reporting.Addin.Views
 		
 		#endregion
 		
+		
 		#region IToolsHost
 		
 		object IToolsHost.ToolsContent {
@@ -274,6 +278,7 @@ namespace ICSharpCode.Reporting.Addin.Views
 		
 		#endregion
 	
+		
 		#region DesignerEvents
 		
 		void DesignerLoading(object sender, EventArgs e)
@@ -312,6 +317,7 @@ namespace ICSharpCode.Reporting.Addin.Views
 			LoggingService.Debug("ReportDesigner: Event > DesignernUnloading...");
 		}
 
+		
 		#endregion
 		
 		
@@ -336,6 +342,130 @@ namespace ICSharpCode.Reporting.Addin.Views
 		
 		#endregion
 		
+		
+		#region IUndoHandler implementation
+		
+		public bool EnableUndo {
+			get {
+				if (undoEngine != null) {
+					return undoEngine.EnableUndo;
+				}
+				return false;
+			}
+		}
+		
+		
+		public bool EnableRedo {
+			get {
+				if (undoEngine != null) {
+					return undoEngine.EnableRedo;
+				}
+				return false;
+			}
+		}
+		
+		
+		public virtual void Undo()
+		{
+			if (undoEngine != null) {
+				undoEngine.Undo();
+			}
+		}
+		
+		
+		public virtual void Redo()
+		{
+			if (undoEngine != null) {
+				undoEngine.Redo();
+			}
+		}
+		
+		#endregion		
+		
+		
+		#region IClipboardHandler implementation
+		
+		
+		public void Cut()
+		{
+			var menuCommandService = (IMenuCommandService)designSurface.GetService(typeof(IMenuCommandService));
+			menuCommandService.GlobalInvoke(StandardCommands.Cut);
+		}
+		
+		public void Copy()
+		{
+			var menuCommandService = (IMenuCommandService)designSurface.GetService(typeof(IMenuCommandService));
+			menuCommandService.GlobalInvoke(StandardCommands.Copy);
+		}
+		
+		public void Paste()
+		{
+			var menuCommandService = (IMenuCommandService)designSurface.GetService(typeof(IMenuCommandService));
+			menuCommandService.GlobalInvoke(StandardCommands.Paste);
+		}
+		
+		public void Delete()
+		{
+			var menuCommandService = (IMenuCommandService)designSurface.GetService(typeof(IMenuCommandService));
+			menuCommandService.GlobalInvoke(StandardCommands.Delete);
+		}
+		
+		public void SelectAll()
+		{
+			throw new NotImplementedException();
+		}
+		
+		public bool EnableCut {
+			get {return IsMenuCommandEnabled(StandardCommands.Cut);}
+		}
+		
+		public bool EnableCopy {
+			get {return IsMenuCommandEnabled(StandardCommands.Copy);}
+		}
+		
+		public bool EnablePaste {
+			get {return IsMenuCommandEnabled(StandardCommands.Paste);}
+		}
+		
+		
+		public bool EnableDelete {
+			get {return IsMenuCommandEnabled(StandardCommands.Delete);}
+		}
+		
+		
+		public bool EnableSelectAll {
+			get {return designSurface != null;}
+		}
+		
+		
+		bool IsMenuCommandEnabled(CommandID commandID)
+		{
+			if (designSurface == null) {
+				return false;
+			}
+			
+			var menuCommandService = (IMenuCommandService)designSurface.GetService(typeof(IMenuCommandService));
+			if (menuCommandService == null) {
+				return false;
+			}
+			
+			MenuCommand menuCommand = menuCommandService.FindCommand(commandID);
+			if (menuCommand == null) {
+				return false;
+			}
+			return menuCommand.Enabled;
+		}
+		#endregion		
+		
+		
+		#region Commands
+		
+		public void ShowSourceCode()
+		{
+			WorkbenchWindow.SwitchView(1);
+		}
+		
+		#endregion
 		#region UI
 		
 		void SetupDesignSurface()
@@ -346,6 +476,7 @@ namespace ICSharpCode.Reporting.Addin.Views
 		}
 
 		
+		
 		void MergeFormChanges()
 		{
 			LoggingService.Info("MergeFormChanges");

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/BaseClasses/ExtensionMethods.cs

@@ -60,11 +60,23 @@ namespace ICSharpCode.Reporting.BaseClasses
 			return new Rect(rect.Location.ToWpf(), rect.Size.ToWpf());
 		}
 		
-		public static System.Windows.Media.Color ToWpf(this System.Drawing.Color c)
+		public static Color ToWpf(this System.Drawing.Color c)
 		{
-			return System.Windows.Media.Color.FromArgb(c.A, c.R, c.G, c.B);
+			return Color.FromArgb(c.A, c.R, c.G, c.B);
 		}
 		
+		
+		public static int FromPoints(double value)
+		{
+			return (int)Math.Round(value * 72.0 / 96.0);
+		}
+
+		public static double ToPoints(int value)
+		{
+			return Math.Round(value * 96.0 / 72.0);
+		}
+		
+		
 		#endregion
 		
 		#region DPI independence

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/AbstractVisitor.cs

@@ -20,6 +20,7 @@ using System;
 using System.Collections.ObjectModel;
 using System.Drawing;
 
+using ICSharpCode.Reporting.Interfaces.Export;
 using ICSharpCode.Reporting.PageBuilder.ExportColumns;
 
 namespace ICSharpCode.Reporting.Exporter.Visitors
@@ -84,5 +85,13 @@ namespace ICSharpCode.Reporting.Exporter.Visitors
 		protected Collection<ExportPage> Pages {get; private set;}
 		
 		
+		protected bool IsContainer (IExportColumn column) {
+			return (column is ExportContainer)|| (column is GraphicsContainer);
+		}
+		
+		
+		protected bool IsGraphicsContainer (IExportColumn column) {
+			return column is GraphicsContainer;
+		}
 	}
 }

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/Graphics/BaseLineItem.cs

@@ -16,6 +16,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+using System.Drawing;
 using ICSharpCode.Reporting.Interfaces.Export;
 using ICSharpCode.Reporting.PageBuilder.ExportColumns;
 
@@ -41,7 +42,16 @@ namespace ICSharpCode.Reporting.Items{
 			ex.DashStyle = DashStyle;
 			ex.StartLineCap = StartLineCap;
 			ex.EndLineCap = EndLineCap;
+			ex.FromPoint = FromPoint;
+			ex.ToPoint = ToPoint;
 			return ex;
 		}
+		
+		
+		public Point FromPoint {get;set;}
+		
+		public Point ToPoint {get;set;}
+		
+		
 	}
 }

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/ExportColumns/ExportLine.cs

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using System.Drawing;
 using System.Drawing.Drawing2D;
 using ICSharpCode.Reporting.Exporter.Visitors;
 using ICSharpCode.Reporting.Interfaces.Export;
@@ -60,5 +61,9 @@ namespace ICSharpCode.Reporting.PageBuilder.ExportColumns
 		public LineCap StartLineCap {get;set;}
 		
 		public LineCap EndLineCap {get;set;}
+		
+		public Point FromPoint {get;set;}
+		
+		public Point ToPoint {get;set;}
 	}
 }

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Pdf/PdfHelper.cs

@@ -21,7 +21,6 @@ using System.Drawing;
 using ICSharpCode.Reporting.Interfaces.Export;
 using ICSharpCode.Reporting.PageBuilder.ExportColumns;
 using PdfSharp.Drawing;
-using System.Drawing.Drawing2D;
 using PdfSharp.Drawing.Layout;
 
 namespace ICSharpCode.Reporting.Pdf
@@ -34,11 +33,11 @@ namespace ICSharpCode.Reporting.Pdf
 		
 		public static void WriteText(XTextFormatter textFormatter,Point columnLocation, ExportText exportColumn)
 		{
-			XFont font = PdfHelper.CreatePdfFont(exportColumn);
+			var font = PdfHelper.CreatePdfFont(exportColumn);
 			var rect = new Rectangle(columnLocation,exportColumn.DesiredSize).ToXRect();
 			textFormatter.DrawString(exportColumn.Text,
 			                         font,
-			                         new XSolidBrush(ToXColor(exportColumn.ForeColor)),
+			                         CreateBrush(exportColumn.ForeColor),
 			                         rect, XStringFormats.TopLeft);
 		}
 		
@@ -76,6 +75,19 @@ namespace ICSharpCode.Reporting.Pdf
 		}
 		
 		
+		public static XPen CreateDashedPen(IExportGraphics exportRectangle)
+		{
+			var pen = PdfHelper.PdfPen(exportRectangle);
+			pen.DashStyle = PdfHelper.DashStyle(exportRectangle);
+			return pen;
+		}
+		
+		
+		public static XSolidBrush CreateBrush(Color color) {
+			return new XSolidBrush(color);
+		}
+		
+		
 		public static XLineCap LineCap (IExportGraphics column) {
 			return XLineCap.Round;
 			

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Pdf/PdfVisitor.cs

@@ -16,8 +16,10 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+using System;
 using System.Drawing;
 using ICSharpCode.Reporting.Exporter.Visitors;
+using ICSharpCode.Reporting.Interfaces.Export;
 using ICSharpCode.Reporting.PageBuilder.ExportColumns;
 using PdfSharp.Drawing;
 using PdfSharp.Drawing.Layout;
@@ -31,7 +33,7 @@ namespace ICSharpCode.Reporting.Pdf
 	class PdfVisitor: AbstractVisitor
 	{
 		readonly PdfDocument pdfDocument;
-		XGraphics gfx;
+		XGraphics xGraphics;
 		XTextFormatter textFormatter;
 		Point containerLocation;
 		
@@ -43,36 +45,69 @@ namespace ICSharpCode.Reporting.Pdf
 		public override void Visit(ExportPage page)
 		{
 			PdfPage = pdfDocument.AddPage();
-			gfx = XGraphics.FromPdfPage(PdfPage);
+			xGraphics = XGraphics.FromPdfPage(PdfPage);
-			textFormatter  = new XTextFormatter(gfx);
+			textFormatter  = new XTextFormatter(xGraphics);
 			base.Visit(page);
 		}
 		
 		
-		public override void Visit(ExportContainer exportContainer)
+		public override void Visit(ExportContainer exportContainer){
-		{
+
 			foreach (var element in exportContainer.ExportedItems) {
+				if (IsContainer(element)) {
 					var container = element as ExportContainer;
-				if (container != null) {
 					containerLocation = PdfHelper.LocationRelToParent(container);
-					var r = new Rectangle(containerLocation,container.DisplayRectangle.Size);
+					RenderRow(container);
-					PdfHelper.FillRectangle(r,container.BackColor,gfx);
+				} else {
-					Visit(container);
-				}
 					containerLocation = PdfHelper.LocationRelToParent(exportContainer);
-				var ac = element as IAcceptor;
+					var acceptor = element as IAcceptor;
-				ac.Accept(this);
+					acceptor.Accept(this);
+				}
 			}
 		}
 		
 		
-		public override void Visit(ExportText exportText)
+		void RenderRow(IExportContainer container)
 		{
-			var columnLocation = containerLocation;
+			if (IsGraphicsContainer(container)) {
-			columnLocation.Offset(exportText.Location);
+				RenderGraphicsContainer(container);
+			} else {
+				RenderDataRow(container);
+			}
+		}
+		
+		
+		void RenderGraphicsContainer(IExportColumn column)
+		{
+			var graphicsContainer = column as GraphicsContainer;
+			if (graphicsContainer != null) {
+				var rect = column as ExportRectangle;
+				if (rect != null) {
+					Visit(rect);
+				}
+				
+				var circle = column as ExportCircle;
+				if (circle != null) {
+					Visit(circle);
+				}
+			}
+		}
+		
+		
+		void RenderDataRow (IExportContainer row) {
+			var r = new Rectangle(containerLocation,row.DisplayRectangle.Size);
+			PdfHelper.FillRectangle(r,row.BackColor,xGraphics);
+			foreach (IAcceptor element in row.ExportedItems) {
+				element.Accept(this);
+			}
+		}
+		
+		
+		public override void Visit(ExportText exportText){
+			var columnLocation = new Point(containerLocation.X + exportText.Location.X,containerLocation.Y + exportText.Location.Y);
 			if (ShouldSetBackcolor(exportText)) {
 				var r = new Rectangle(columnLocation,exportText.DisplayRectangle.Size);
-				PdfHelper.FillRectangle(r,exportText.BackColor,gfx);
+				PdfHelper.FillRectangle(r,exportText.BackColor,xGraphics);
 			}
 			
 			PdfHelper.WriteText(textFormatter,columnLocation, exportText);
@@ -84,29 +119,25 @@ namespace ICSharpCode.Reporting.Pdf
 		{
 			var columnLocation = containerLocation;
 			columnLocation.Offset(exportLine.Location);
-			var pen = PdfHelper.PdfPen(exportLine);
+			var pen = PdfHelper.CreateDashedPen(exportLine);
-			pen.DashStyle = PdfHelper.DashStyle(exportLine);
+			xGraphics.DrawLine(pen,columnLocation.ToXPoints(),new Point(exportLine.Size.Width,columnLocation.Y).ToXPoints());
-			pen.LineCap = PdfHelper.LineCap(exportLine);
-			gfx.DrawLine(pen,columnLocation.ToXPoints(),new Point(exportLine.Size.Width,columnLocation.Y).ToXPoints());
 		}
 		
 		
 		public override void Visit (ExportRectangle exportRectangle) {
-			var columnLocation = containerLocation;
+			var pen = PdfHelper.CreateDashedPen(exportRectangle);
-			columnLocation.Offset(exportRectangle.Location);
+			xGraphics.DrawRectangle(pen,
-			var pen = PdfHelper.PdfPen(exportRectangle);
+			                  PdfHelper.CreateBrush(exportRectangle.BackColor),
-			pen.DashStyle = PdfHelper.DashStyle(exportRectangle);
+			                  new XRect(containerLocation.ToXPoints(),
-			gfx.DrawRectangle(pen,new XRect(columnLocation.ToXPoints(),
 			                            exportRectangle.Size.ToXSize()));
 		}
 		
 		
 		public override void Visit(ExportCircle exportCircle){
-			var columnLocation = containerLocation;
+			var pen = PdfHelper.CreateDashedPen(exportCircle);
-			columnLocation.Offset(exportCircle.Location);
+			xGraphics.DrawEllipse(pen,
-			var pen = PdfHelper.PdfPen(exportCircle);
+			                PdfHelper.CreateBrush(exportCircle.BackColor) ,
-			pen.DashStyle = PdfHelper.DashStyle(exportCircle);
+			                new XRect(containerLocation.ToXPoints(),
-			gfx.DrawEllipse(pen,new XRect(columnLocation.ToXPoints(),
 			                          exportCircle.Size.ToXSize()));
 		}
 

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/FixedDocumentCreator.cs

@@ -63,27 +63,62 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor
 		
 		public static FormattedText CreateFormattedText(ExportText exportText)
 		{
+			FlowDirection flowDirection;
+			
+			var culture = CultureInfo.CurrentCulture;
+			if (culture.TextInfo.IsRightToLeft) {
+				flowDirection = FlowDirection.RightToLeft;
+			} else {
+				flowDirection = FlowDirection.LeftToRight;
+			}
+			
+			var emSize = ExtensionMethodes.ToPoints((int)exportText.Font.SizeInPoints +1);
+			
 			var formattedText = new FormattedText(exportText.Text,
 				CultureInfo.CurrentCulture,
-				FlowDirection.LeftToRight,
+				flowDirection,
 				new Typeface(exportText.Font.FontFamily.Name),
-				exportText.Font.Size,
+				emSize,
 				new SolidColorBrush(exportText.ForeColor.ToWpf()), null, TextFormattingMode.Display);
 			
-			formattedText.MaxTextWidth = exportText.DesiredSize.Width * 96.0 / 72.0;
+			formattedText.MaxTextWidth = ExtensionMethodes.ToPoints(exportText.DesiredSize.Width);
-			formattedText.SetFontSize(Math.Floor(exportText.Font.Size  * 96.0 / 72.0));
+			
+			ApplyPrintStyles(formattedText,exportText);
 
-			var td = new TextDecorationCollection()	;
-			CheckUnderline(td,exportText);
-			formattedText.SetTextDecorations(td);
 			return formattedText;
 		}
 
-		static void CheckUnderline(TextDecorationCollection td, ExportText exportText)
+
-		{
+		static void ApplyPrintStyles (FormattedText formattedText,ExportText exportText) {
-			if (exportText.Font.Underline) {
+			var font = exportText.Font;
-				td.Add(new TextDecoration{Location = TextDecorationLocation.Underline});
+			var textDecorations = new TextDecorationCollection();
+			FontStyle fontStyle;
+			FontWeight fontWeight;
+			
+			if ((font.Style & System.Drawing.FontStyle.Italic) != 0) {
+				fontStyle = FontStyles.Italic;
+			} else {
+				fontStyle = FontStyles.Normal;
 			}
+			
+			formattedText.SetFontStyle(fontStyle);
+			
+			if ((font.Style & System.Drawing.FontStyle.Bold) != 0) {
+				fontWeight = FontWeights.Bold;
+			} else {
+				fontWeight = FontWeights.Normal;
+			}
+			formattedText.SetFontWeight(fontWeight);
+			
+			if ((font.Style & System.Drawing.FontStyle.Underline) != 0) {
+				textDecorations.Add(TextDecorations.Underline);
+			}
+			
+			if ((font.Style & System.Drawing.FontStyle.Strikeout) != 0) {
+				textDecorations.Add(TextDecorations.Strikethrough);
+			}
+			
+			formattedText.SetTextDecorations(textDecorations);
 		}
 			
 		
@@ -116,33 +151,9 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor
 			FixedPage.SetTop(element,exportColumn.Location.Y);
 		}
 		
-		/*
-		static void SetFont(TextBlock textBlock,IExportText exportText){
-			textBlock.FontFamily = new FontFamily(exportText.Font.FontFamily.Name);
-
-			//http://www.codeproject.com/Articles/441009/Drawing-Formatted-Text-in-a-Windows-Forms-Applicat
-			
-			textBlock.FontSize = Math.Floor(exportText.Font.Size * 96/72);
-
-			if (exportText.Font.Bold) {
-				textBlock.FontWeight = FontWeights.Bold;
-			}
-			if (exportText.Font.Underline) {
-				CreateUnderline(textBlock,exportText);
-			}
-			
-			if (exportText.Font.Italic) {
-				textBlock.FontStyle = FontStyles.Italic ;
-			}
-			if (exportText.Font.Strikeout) {
-				CreateStrikeout(textBlock,exportText);
-			}
-		}
-		*/
 		
 		static void SetContentAlignment(TextBlock textBlock,ExportText exportText)
 		{
-	//	http://social.msdn.microsoft.com/Forums/vstudio/en-US/e480abb9-a86c-4f78-8955-dddb866bcfef/vertical-text-alignment-in-textblock?forum=wpf	
 	//Vertical alignment not working
 	
 			switch (exportText.ContentAlignment) {
@@ -188,34 +199,6 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor
 		}
 		
 		
-		static void CreateStrikeout (TextBlock textBlock,IExportText exportColumn ){
-			if (textBlock == null)
-				throw new ArgumentNullException("textBlock");
-			if (exportColumn == null)
-				throw new ArgumentNullException("exportColumn");
-			var strikeOut = new TextDecoration();
-			strikeOut.Location = TextDecorationLocation.Strikethrough;
-
-			Pen p = CreateWpfPen(exportColumn);
-			strikeOut.Pen = p ;
-			strikeOut.PenThicknessUnit = TextDecorationUnit.FontRecommended;
-			textBlock.TextDecorations.Add(strikeOut);
-		}
-		
-		/*
-		static void CreateUnderline(TextBlock textBlock,IExportText exportColumn){
-			if (exportColumn == null)
-				throw new ArgumentNullException("exportColumn");
-			if (textBlock == null)
-				throw new ArgumentNullException("textBlock");
-			var underLine = new TextDecoration();
-			Pen p = CreateWpfPen(exportColumn);
-			underLine.Pen = p ;
-			underLine.PenThicknessUnit = TextDecorationUnit.FontRecommended;
-			textBlock.TextDecorations.Add(underLine);
-		}
-		*/
-		
 		public static Pen CreateWpfPen(IReportObject exportColumn){
 			if (exportColumn == null)
 				throw new ArgumentNullException("exportColumn");
@@ -226,9 +209,9 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor
 			var exportGraphics = exportColumn as IExportGraphics;
 			if (exportGraphics != null) {
 				pen.Thickness = exportGraphics.Thickness;
-				pen.DashStyle = FixedDocumentCreator.DashStyle(exportGraphics);
+				pen.DashStyle = DashStyle(exportGraphics);
-				pen.StartLineCap = FixedDocumentCreator.LineCap(exportGraphics.StartLineCap);
+				pen.StartLineCap = LineCap(exportGraphics.StartLineCap);
-				pen.EndLineCap = FixedDocumentCreator.LineCap(exportGraphics.EndLineCap);
+				pen.EndLineCap = LineCap(exportGraphics.EndLineCap);
 			}
 			return pen;
 		}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/WpfVisitor.cs

@@ -75,6 +75,7 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor
 			return canvas;
 		}
 
+		
 		void RenderRow(Canvas canvas, IExportContainer container)
 		{
 			if (IsGraphicsContainer(container)) {
@@ -134,14 +135,15 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor
 		}
 
 		
-		public override void Visit(ExportLine exportGraphics)
+		public override void Visit(ExportLine exportLine)
 		{
-			var pen = FixedDocumentCreator.CreateWpfPen(exportGraphics);
+			var pen = FixedDocumentCreator.CreateWpfPen(exportLine);
 			var visual = new DrawingVisual();
 			using (var dc = visual.RenderOpen()){
 				dc.DrawLine(pen,
-				            new Point(exportGraphics.Location.X, exportGraphics.Location.Y),
+				            new Point(exportLine.Location.X + exportLine.FromPoint.X, exportLine.Location.Y + exportLine.FromPoint.Y),
-				            new Point(exportGraphics.Location.X + exportGraphics.Size.Width,exportGraphics.Location.Y));
+				            new Point(exportLine.Location.X + exportLine.ToPoint.X ,
+				                      exportLine.Location.Y + exportLine.FromPoint.Y));
 			}
 			var dragingElement = new DrawingElement(visual);
 			UIElement = dragingElement;
@@ -179,16 +181,6 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor
 		}
 		
 		
-		bool IsGraphicsContainer (IExportColumn column) {
-			return column is GraphicsContainer;
-		}
-		
-		
-		bool IsContainer (IExportColumn column) {
-			return (column is ExportContainer)|| (column is GraphicsContainer);
-		}
-		
-		
 		DrawingElement CircleVisual(GraphicsContainer circle){
 			var pen = FixedDocumentCreator.CreateWpfPen(circle);
 			var rad = CalcRadius(circle.Size);

src/Main/Base/Project/ICSharpCode.SharpDevelop.addin

@@ -1961,28 +1961,26 @@
 			          link  = "home://doc/ReadMe.rtf" />
 			<MenuItem id = "Web" label = "${res:XML.MainMenu.HelpMenu.WebMenu}" type="Menu">
 				<MenuItem id = "SharpDevelop" label = "SharpDevelop" type="Menu">
-					<MenuItem id = "Downloads" label = "Downloads" icon = "Icons.16x16.WebSearchIcon" link = "http://www.sharpdevelop.net/OpenSource/SD/Download/" />
+					<MenuItem id = "Downloads" label = "Downloads" icon = "Icons.16x16.WebSearchIcon" link = "http://www.icsharpcode.net/OpenSource/SD/Download/" />
 					<MenuItem id = "Forum" label = "Community Forums" icon = "Icons.16x16.WebSearchIcon" link = "http://community.sharpdevelop.net/forums/" />
-					<MenuItem id = "Announcement" label = "Announcement List" icon = "Icons.16x16.WebSearchIcon" link = "http://www.sharpdevelop.net/OpenSource/SD/AnnouncementList.aspx" />
+					<MenuItem id = "Announcement" label = "Announcements" icon = "Icons.16x16.WebSearchIcon" link = "http://community.sharpdevelop.net/forums/3.aspx" />
 					<MenuItem id = "Mail" label = "Send Us a Mail" icon = "Icons.16x16.WebSearchIcon" link = "http://www.sharpdevelop.net/OpenSource/SD/ContactUs.asp" />
+					<MenuItem id = "Twitter" label = "On Twitter" icon = "Icons.16x16.WebSearchIcon" link = "https://twitter.com/sharpdevelop" />
 				</MenuItem>
 				<MenuItem id = "C#" label = "C#" type="Menu">
 					<MenuItem id = "C# Help" label = "C# Help" icon = "Icons.16x16.WebSearchIcon" link = "http://www.csharphelp.com" />
 					<MenuItem id = "CodeProject" label = "CodeProject" icon = "Icons.16x16.WebSearchIcon" link = "http://www.codeproject.com" />
 					<MenuItem id = "C# Corner" label = "C# Corner" icon = "Icons.16x16.WebSearchIcon" link = "http://www.c-sharpcorner.com" />
-					<MenuItem id = "GotDotNet" label = "GotDotNet" icon = "Icons.16x16.WebSearchIcon" link = "http://www.gotdotnet.com/" />
 				</MenuItem>
 				<MenuItem id = "IntegratedProjects" label = "Integrated Projects" type="Menu">
 					<MenuItem id = "AvalonDock" label = "AvalonDock" icon = "Icons.16x16.WebSearchIcon" link = "http://www.codeplex.com/AvalonDock/" />
 					<MenuItem id = "NUnit" label = "NUnit" icon = "PadIcons.NUnitTest" link = "http://www.nunit.org/" />
 					<MenuItem id = "WiX" label = "WiX" icon = "Icons.16x16.WebSearchIcon" link = "http://sourceforge.net/projects/wix/" />
 					<MenuItem id = "SHFB" label = "Sandcastle Help File Builder" icon = "Icons.16x16.WebSearchIcon" link = "http://www.codeplex.com/SHFB" />
-					<MenuItem id = "#ZipLib" label = "#ZipLib" icon = "Icons.16x16.WebSearchIcon" link = "http://www.sharpdevelop.net/OpenSource/SharpZipLib/" />
 				</MenuItem>
 				<MenuItem id = "NETPlatforms" label = ".NET Platforms" type="Menu">
 					<MenuItem id = "MSNET"  label = "MS .NET" icon = "Icons.16x16.WebSearchIcon" link = "http://msdn.microsoft.com/net" />
 					<MenuItem id = "Mono"   label = "Mono Project" icon = "Icons.16x16.WebSearchIcon" link = "http://www.mono-project.com/" />
-					<MenuItem id = "DotGNU" label = "DotGNU" icon = "Icons.16x16.WebSearchIcon" link = "http://www.dotgnu.org" />
 				</MenuItem>
 			</MenuItem>
 			<MenuItem id = "Separator2" type = "Separator" />

src/Main/Core/Project/Src/Services/PropertyService/Properties.cs

@@ -430,7 +430,7 @@ namespace ICSharpCode.Core
 				if (result == null) {
 					result = new Properties(this);
 					dict[key] = result;
-					result.MakeDirty();
+					isNewContainer = true;
 				}
 			}
 			if (isNewContainer)

src/Main/SharpDevelop/Logging/SDTraceListener.cs

@@ -62,47 +62,34 @@ namespace ICSharpCode.SharpDevelop.Logging
 			}
 			if (!dialogIsOpen.Set())
 				return;
-			if (!SD.MainThread.InvokeRequired) {
+			// We might be unable to display a dialog here, e.g. because
-				// Use a dispatcher frame that immediately exits after it is pushed
+			// we're on the UI thread but dispatcher processing is disabled.
-				// to detect whether dispatcher processing is suspended.
+			// In any case, we don't want to pump messages while the dialog is displaying,
-				DispatcherFrame frame = new DispatcherFrame();
+			// so we create a separate UI thread for the dialog:
-				frame.Continue = false;
+			bool debug = false;
-				try {
+			var thread = new Thread(() => ShowAssertionDialog(message, detailMessage, stackTrace, ref debug));
-					Dispatcher.PushFrame(frame);
+			thread.SetApartmentState(ApartmentState.STA);
-				} catch (InvalidOperationException) {
+			thread.Start();
-					// Dispatcher processing is suspended.
+			thread.Join();
-					// We currently can't show dialogs on the UI thread; so use a new thread instead.
+			if (debug)
-					new Thread(() => ShowAssertionDialog(message, detailMessage, stackTrace, false)).Start();
+				Debugger.Break();
-					return;
-				}
-			}
-			ShowAssertionDialog(message, detailMessage, stackTrace, true);
 		}
 		
-		void ShowAssertionDialog(string message, string detailMessage, string stackTrace, bool canDebug)
+		void ShowAssertionDialog(string message, string detailMessage, string stackTrace, ref bool debug)
 		{
 			message = message + Environment.NewLine + detailMessage + Environment.NewLine + stackTrace;
-			List<string> buttonTexts = new List<string> { "Show Stacktrace", "Debug", "Ignore", "Ignore All" };
+			string[] buttonTexts = { "Show Stacktrace", "Debug", "Ignore", "Ignore All" };
-			if (!canDebug) {
+			CustomDialog inputBox = new CustomDialog("Assertion Failed", message.TakeStartEllipsis(750), -1, 2, buttonTexts);
-				buttonTexts.RemoveAt(1);
-			}
-			CustomDialog inputBox = new CustomDialog("Assertion Failed", message.TakeStartEllipsis(750), -1, 2, buttonTexts.ToArray());
 			try {
 				while (true) { // show the dialog repeatedly until an option other than 'Show Stacktrace' is selected
-					if (SD.MainThread.InvokeRequired) {
 					inputBox.ShowDialog();
-					} else {
-						inputBox.ShowDialog(SD.WinForms.MainWin32Window);
-					}
 					int result = inputBox.Result;
-					if (!canDebug && result >= 1)
-						result++;
 					switch (result) {
 						case 0:
 							ExceptionBox.ShowErrorBox(null, message);
 							break; // show the custom dialog again
 						case 1:
-							Debugger.Break();
+							debug = true;
 							return;
 						case 2:
 							return;

src/Main/SharpDevelop/Project/Solution.cs

@@ -194,7 +194,7 @@ namespace ICSharpCode.SharpDevelop.Project
 				foreach (var project in removedItems)
 					project.Dispose();
 				if (startupProjectWasRemoved || (solution.startupProject == null && addedItems.Contains(solution.AutoDetectStartupProject())))
-					solution.StartupProjectChanged(this, EventArgs.Empty);
+					solution.StartupProjectChanged(solution, EventArgs.Empty);
 			}
 		}