diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index 67901c4cbd..cb89b479f3 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -241,6 +241,10 @@
OpenWithDialog.cs
+
+ EditStandardHeaderPanel.xaml
+ Code
+
LoadSaveOptions.xaml
Code
@@ -581,9 +585,6 @@
-
- UserControl
-
@@ -702,7 +703,6 @@
-
@@ -735,9 +735,6 @@
UserControl
-
- UserControl
-
UserControl
@@ -885,6 +882,7 @@
+
diff --git a/src/Main/Base/Project/Resources/EditStandardHeaderPanel.xfrm b/src/Main/Base/Project/Resources/EditStandardHeaderPanel.xfrm
deleted file mode 100644
index 9c97f7ea26..0000000000
--- a/src/Main/Base/Project/Resources/EditStandardHeaderPanel.xfrm
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/EditStandardHeaderPanel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/EditStandardHeaderPanel.cs
deleted file mode 100644
index d4dce88287..0000000000
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/EditStandardHeaderPanel.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.Windows.Forms;
-using ICSharpCode.Core.WinForms;
-using ICSharpCode.SharpDevelop.Internal.Templates;
-
-namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
-{
- public class EditStandardHeaderPanel : XmlFormsOptionPanel
- {
- public override void LoadPanelContents()
- {
- SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.EditStandardHeaderPanel.xfrm"));
-
- ControlDictionary["headerTextBox"].Font = WinFormsResourceService.DefaultMonospacedFont;
- foreach (StandardHeader header in StandardHeader.StandardHeaders) {
- ((ComboBox)ControlDictionary["headerChooser"]).Items.Add(header);
- }
- ((ComboBox)ControlDictionary["headerChooser"]).SelectedIndexChanged += new EventHandler(SelectedIndexChanged);
- ((ComboBox)ControlDictionary["headerChooser"]).SelectedIndex = 0;
- ((TextBox)ControlDictionary["headerTextBox"]).TextChanged += new EventHandler(TextChangedEvent);
- }
-
- void TextChangedEvent(object sender , EventArgs e)
- {
- ((StandardHeader)((ComboBox)ControlDictionary["headerChooser"]).SelectedItem).Header = ControlDictionary["headerTextBox"].Text;
- }
- void SelectedIndexChanged(object sender , EventArgs e)
- {
- ((TextBox)ControlDictionary["headerTextBox"]).TextChanged -= new EventHandler(TextChangedEvent);
- int idx =((ComboBox)ControlDictionary["headerChooser"]).SelectedIndex;
- if (idx >= 0) {
- ControlDictionary["headerTextBox"].Text = ((StandardHeader)((ComboBox)ControlDictionary["headerChooser"]).SelectedItem).Header;
- ControlDictionary["headerTextBox"].Enabled = true;
- } else {
- ControlDictionary["headerTextBox"].Text = "";
- ControlDictionary["headerTextBox"].Enabled = false;
- }
- ((TextBox)ControlDictionary["headerTextBox"]).TextChanged += new EventHandler(TextChangedEvent);
- }
-
- public override bool StorePanelContents()
- {
- StandardHeader.StoreHeaders();
- return true;
- }
- }
-}
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/EditStandardHeaderPanel.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/EditStandardHeaderPanel.xaml
new file mode 100644
index 0000000000..7640030384
--- /dev/null
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/EditStandardHeaderPanel.xaml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/EditStandardHeaderPanel.xaml.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/EditStandardHeaderPanel.xaml.cs
new file mode 100644
index 0000000000..51c90a75dd
--- /dev/null
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/EditStandardHeaderPanel.xaml.cs
@@ -0,0 +1,67 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 30.03.2012
+ * Time: 20:41
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+
+using ICSharpCode.Core.WinForms;
+using ICSharpCode.SharpDevelop.Internal.Templates;
+
+namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
+{
+ ///
+ /// Interaction logic for EditStandardHeaderPanelXaml.xaml
+ ///
+ public partial class EditStandardHeaderPanel : OptionPanel
+ {
+ public EditStandardHeaderPanel()
+ {
+ InitializeComponent();
+ }
+
+
+ public override void LoadOptions()
+ {
+ headerTextBox.FontFamily = new FontFamily("Consolas, Courier New");
+
+ foreach (StandardHeader header in StandardHeader.StandardHeaders) {
+ headerChooser.Items.Add(header);
+ }
+ headerChooser.SelectionChanged += HeaderChooser_SelectionChanged;
+ headerChooser.SelectedIndex = 0;
+ headerTextBox.TextChanged += HeaderTextBox_TextChanged;
+ }
+
+ void HeaderChooser_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+ headerTextBox.TextChanged -= HeaderTextBox_TextChanged;
+ int idx =headerChooser.SelectedIndex;
+ if (idx >= 0) {
+ headerTextBox.Text = ((StandardHeader)((ComboBox)headerChooser).SelectedItem).Header;
+ headerTextBox.IsEnabled = true;
+ } else {
+ headerTextBox.Text = "";
+ headerTextBox.IsEnabled = false;
+ }
+ headerTextBox.TextChanged += HeaderTextBox_TextChanged;
+ }
+
+
+ void HeaderTextBox_TextChanged(object sender, TextChangedEventArgs e)
+ {
+ ((StandardHeader)((ComboBox)headerChooser).SelectedItem).Header = headerTextBox.Text;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/old_ReferencePaths.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/old_ReferencePaths.cs
deleted file mode 100644
index 4a178f2dcc..0000000000
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/old_ReferencePaths.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// 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.Core;
-using ICSharpCode.SharpDevelop.Project;
-
-namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
-{
- public class old_ReferencePaths : AbstractXmlFormsProjectOptionPanel
- {
- public override void LoadPanelContents()
- {
- InitializeHelper();
-
- StringListEditor editor = new StringListEditor();
- editor.BrowseForDirectory = true;
- editor.ListCaption = StringParser.Parse("&${res:Dialog.ProjectOptions.ReferencePaths}:");
- editor.TitleText = StringParser.Parse("&${res:Global.Folder}:");
- editor.AddButtonText = StringParser.Parse("${res:Dialog.ProjectOptions.ReferencePaths.AddPath}");
- editor.ListChanged += delegate { IsDirty = true; };
- SemicolonSeparatedStringListBinding b = new SemicolonSeparatedStringListBinding(editor);
- helper.AddBinding("ReferencePath", b);
- this.Controls.Add(editor);
- b.CreateLocationButton(editor);
-
- helper.AddConfigurationSelector(this);
- }
-
- sealed class SemicolonSeparatedStringListBinding : ConfigurationGuiBinding
- {
- StringListEditor editor;
-
- public SemicolonSeparatedStringListBinding(StringListEditor editor)
- {
- this.editor = editor;
- }
-
- public override void Load()
- {
- string[] values = Get("").Split(';');
- if (values.Length == 1 && values[0].Length == 0) {
- editor.LoadList(new string[0]);
- } else {
- editor.LoadList(values);
- }
- }
-
- public override bool Save()
- {
- Set(string.Join(";", editor.GetList()));
- return true;
- }
- }
- }
-}