Merge branch 'master' of github.com:icsharpcode/SharpDevelop

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

@@ -100,12 +100,14 @@ namespace CSharpBinding.FormattingStrategy
 				string key = project.FileName;
 				if (!projectOptions.ContainsKey(key)) {
 					// Lazily create options container for project
-					projectOptions[key] = new CSharpFormattingOptionsPersistence(
+					var projectFormattingPersistence = new CSharpFormattingOptionsPersistence(
 						csproject.GlobalPreferences,
 						new CSharpFormattingOptionsContainer((SolutionOptions ?? GlobalOptions).OptionsContainer)
 						{
 							DefaultText = StringParser.Parse("${res:CSharpBinding.Formatting.ProjectOptionReference}")
 						});
+					projectFormattingPersistence.Load();
+					projectOptions[key] = projectFormattingPersistence;
 				}
 				
 				return projectOptions[key];
@@ -123,6 +125,7 @@ namespace CSharpBinding.FormattingStrategy
 				{
 					DefaultText = StringParser.Parse("${res:CSharpBinding.Formatting.SolutionOptionReference}")
 				});
+			SolutionOptions.Load();
 		}
 		
 		static void SolutionClosed(object sender, SolutionEventArgs e)

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

@@ -151,7 +151,7 @@ namespace CSharpBinding.OptionPanels
 			presets["SharpDevelop"] = FormattingOptionsFactory.CreateSharpDevelop;
 			presets["Mono"] = FormattingOptionsFactory.CreateMono;
 			presets["K&R"] = FormattingOptionsFactory.CreateKRStyle;
-			presets["Allman"] = FormattingOptionsFactory.CreateAllman;
+			presets["VisualStudio"] = FormattingOptionsFactory.CreateAllman;
 			presets["Whitesmiths"] = FormattingOptionsFactory.CreateWhitesmiths;
 			presets["GNU"] = FormattingOptionsFactory.CreateGNU;
 			
@@ -163,7 +163,7 @@ namespace CSharpBinding.OptionPanels
 			presetItems.Add(new ComboBoxItem { Content = "SharpDevelop", Tag = "SharpDevelop" });
 			presetItems.Add(new ComboBoxItem { Content = "Mono", Tag = "Mono" });
 			presetItems.Add(new ComboBoxItem { Content = "K&R", Tag = "K&R" });
-			presetItems.Add(new ComboBoxItem { Content = "Allman", Tag = "Allman" });
+			presetItems.Add(new ComboBoxItem { Content = "Visual Studio", Tag = "VisualStudio" });
 			presetItems.Add(new ComboBoxItem { Content = "Whitesmiths", Tag = "Whitesmiths" });
 			presetItems.Add(new ComboBoxItem { Content = "GNU", Tag = "GNU" });
 			presetItems.Add(new ComboBoxItem { Content = "Empty", Tag = "Empty" });

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

@@ -79,7 +79,6 @@ namespace CSharpBinding.OptionPanels
 		public override void LoadOptions()
 		{
 			base.LoadOptions();
-			persistenceHelper.Load();
 			formattingEditor.OptionsContainer = persistenceHelper.StartEditing(); 
 		}
 		

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

@@ -51,7 +51,6 @@ namespace CSharpBinding.OptionPanels
 			persistenceHelper = CSharpFormattingOptionsPersistence.GetProjectOptions(project);
 			formattingEditor.OptionsContainer = persistenceHelper.OptionsContainer;
 			formattingEditor.AllowPresets = true;
-			persistenceHelper.Load();
 			persistenceHelper.OptionsContainer.PropertyChanged += ContainerPropertyChanged;
 		}