Host option panels in WPF window, allow WPF option panels.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3568 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

AddIns/ICSharpCode.SharpDevelop.addin

@@ -34,7 +34,7 @@
 			
 			<Doozer name="CustomTool" class="ICSharpCode.SharpDevelop.Project.CustomToolDoozer"/>
 			<Doozer name="CustomProperty" class="ICSharpCode.SharpDevelop.Project.CustomPropertyDoozer"/>
-			<Doozer name="DialogPanel" class="ICSharpCode.SharpDevelop.DialogPanelDoozer"/>
+			<Doozer name="OptionPanel" class="ICSharpCode.SharpDevelop.OptionPanelDoozer"/>
 			<Doozer name="DisplayBinding" class="ICSharpCode.SharpDevelop.DisplayBindingDoozer"/>
 			<Doozer name="Pad" class="ICSharpCode.SharpDevelop.PadDoozer"/>
 			<Doozer name="LanguageBinding" class="ICSharpCode.SharpDevelop.LanguageBindingDoozer"/>
@@ -1028,46 +1028,46 @@
 	</Path>
 	
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog">
-		<DialogPanel id    = "UIOptions"
+		<OptionPanel id    = "UIOptions"
 		             label = "${res:Dialog.Options.TreeViewOptions.SharpDevelopOptionsText}">
-			<DialogPanel id    = "SelectCulture"
+			<OptionPanel id    = "SelectCulture"
 			             label = "${res:Dialog.Options.IDEOptions.SelectCulture.PanelName}"
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.IDEOptionPanel"/>
-			<DialogPanel id    = "SelectStyle"
+			<OptionPanel id    = "SelectStyle"
 			             label = "${res:Dialog.Options.IDEOptions.SelectVisualStyle.PanelName}"
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.SelectStylePanel"/>
-			<DialogPanel id    = "Fullscreen"
+			<OptionPanel id    = "Fullscreen"
 			             label = "${res:Dialog.Options.IDEOptions.FullScreen.Title}"
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.FullscreenPanel"/>
-			<DialogPanel id    = "LoadSave"
+			<OptionPanel id    = "LoadSave"
 			             label = "${res:Dialog.Options.IDEOptions.LoadSaveOptions.PanelName}"
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.LoadSavePanel"/>
-			<DialogPanel id    = "TaskListOptions"
+			<OptionPanel id    = "TaskListOptions"
 			             label = "${res:Dialog.Options.IDEOptions.TaskListOptions.PanelName}"
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.TaskListOptions"/>
-			<DialogPanel id    = "OutputWindowOptions"
+			<OptionPanel id    = "OutputWindowOptions"
 			             label = "${res:Dialog.Options.IDEOptions.OutputPanel.Title}"
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.OutputWindowOptionsPanel"/>
-			<DialogPanel id    = "ProjectAndSolutionOptions"
+			<OptionPanel id    = "ProjectAndSolutionOptions"
 			             label = "${res:Dialog.Options.IDEOptions.ProjectAndSolutionOptions.PanelName}"
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ProjectAndSolutionOptionsPanel"/>
-		</DialogPanel>
-		<DialogPanel id    = "CodingOptions"
+		</OptionPanel>
+		<OptionPanel id    = "CodingOptions"
 		             label = "${res:Dialog.Options.IDEOptions.CodingOptionsText}">
-			<DialogPanel id    = "CodeGeneration"
+			<OptionPanel id    = "CodeGeneration"
 			             label = "${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.Title}"
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.CodeGenerationPanel"/>
-			<DialogPanel id    = "EditStandardHeaderPanel"
+			<OptionPanel id    = "EditStandardHeaderPanel"
 			             label = "${res:Dialog.Options.IDEOptions.EditStandardHeaderPanel.Title}"
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.EditStandardHeaderPanel"/>
-		</DialogPanel>
+		</OptionPanel>
 		
-		<DialogPanel id    = "ToolsOptions"
+		<OptionPanel id    = "ToolsOptions"
 		             label = "${res:Dialog.Options.IDEOptions.ToolsOptionsText}">
-			<DialogPanel id    = "ExternalTools"
+			<OptionPanel id    = "ExternalTools"
 			             label = "${res:Dialog.Options.ExternalToolsText}"
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ExternalToolPane"/>
-		</DialogPanel>
+		</OptionPanel>
 	</Path>
 	
 	<Path name = "/SharpDevelop/Workbench/SharpDevelopSideBar/ContextMenu">
@@ -1661,7 +1661,7 @@
 	<!-- TEXT EDITOR -->
 	
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog/CodingOptions">
-		<DialogPanel id = "CodeTemplates"
+		<OptionPanel id = "CodeTemplates"
 		             label = "${res:Dialog.Options.CodeTemplatesText}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.CodeTemplatePanel"/>
 	</Path>
@@ -1936,16 +1936,16 @@
 	</Path>
 	
 	<Path name = "/SharpDevelop/ViewContent/DefaultTextEditor/OptionsDialog">
-		<DialogPanel id = "General"
+		<OptionPanel id = "General"
 		             label = "${res:Dialog.Options.IDEOptions.TextEditor.General.PanelName}"
 		             class = "ICSharpCode.SharpDevelop.DefaultEditor.Gui.OptionPanels.GeneralTextEditorPanel"/>
-		<DialogPanel id = "Markers"
+		<OptionPanel id = "Markers"
 		             label = "${res:Dialog.Options.IDEOptions.TextEditor.Markers.PanelName}"
 		             class = "ICSharpCode.SharpDevelop.DefaultEditor.Gui.OptionPanels.MarkersTextEditorPanel"/>
-		<DialogPanel id = "Behavior"
+		<OptionPanel id = "Behavior"
 		             label = "${res:Dialog.Options.IDEOptions.TextEditor.Behaviour.PanelName}"
 		             class = "ICSharpCode.SharpDevelop.DefaultEditor.Gui.OptionPanels.BehaviorTextEditorPanel"/>
-		<DialogPanel id = "CodeCompletion"
+		<OptionPanel id = "CodeCompletion"
 		             label = "${res:Dialog.Options.IDEOptions.TextEditor.CodeCompletion.PanelName}"
 		             class = "ICSharpCode.SharpDevelop.DefaultEditor.Gui.OptionPanels.CodeCompletionPanel"/>
 	</Path>
@@ -1995,23 +1995,23 @@
 	</Path>
 	
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog">
-		<DialogPanel id    = "TextEditorOptions"
+		<OptionPanel id    = "TextEditorOptions"
 		             insertafter = "CodingOptions"
 		             insertbefore = "ToolsOptions"
 		             label = "${res:Dialog.Options.IDEOptions.TextEditorOptionsText}">
-			<DialogPanel id = "General"
+			<OptionPanel id = "General"
 			             label = "${res:Dialog.Options.IDEOptions.TextEditor.General.PanelName}"
 			             class = "ICSharpCode.SharpDevelop.DefaultEditor.Gui.OptionPanels.GeneralTextEditorPanel"/>
-			<DialogPanel id = "Markers"
+			<OptionPanel id = "Markers"
 			             label = "${res:Dialog.Options.IDEOptions.TextEditor.Markers.PanelName}"
 			             class = "ICSharpCode.SharpDevelop.DefaultEditor.Gui.OptionPanels.MarkersTextEditorPanel"/>
-			<DialogPanel id = "Behavior"
+			<OptionPanel id = "Behavior"
 			             label = "${res:Dialog.Options.IDEOptions.TextEditor.Behaviour.PanelName}"
 			             class = "ICSharpCode.SharpDevelop.DefaultEditor.Gui.OptionPanels.BehaviorTextEditorPanel"/>
-			<DialogPanel id = "CodeCompletion"
+			<OptionPanel id = "CodeCompletion"
 			             label = "${res:Dialog.Options.IDEOptions.TextEditor.CodeCompletion.PanelName}"
 			             class = "ICSharpCode.SharpDevelop.DefaultEditor.Gui.OptionPanels.CodeCompletionPanel"/>
-		</DialogPanel>
+		</OptionPanel>
 	</Path>
 	
 	<!-- Note : Most actions are put directly into the control, because

src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin

@@ -114,25 +114,25 @@
 	</Path>
 	
 	<Path path = "/SharpDevelop/BackendBindings/ProjectOptions/Boo">
-		<DialogPanel id    = "Application"
+		<OptionPanel id    = "Application"
 		             label = "${res:Dialog.ProjectOptions.ApplicationSettings}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ApplicationSettings"/>
-		<!--<DialogPanel id    = "ReferencePaths"
+		<!--<OptionPanel id    = "ReferencePaths"
 		             label = "${res:Dialog.ProjectOptions.ReferencePaths}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ReferencePaths"/>-->
-		<DialogPanel id    = "Signing"
+		<OptionPanel id    = "Signing"
 		             label = "${res:Dialog.ProjectOptions.Signing}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Signing"/>
-		<DialogPanel id    = "BuildEvents"
+		<OptionPanel id    = "BuildEvents"
 		             label = "${res:Dialog.ProjectOptions.BuildEvents}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.BuildEvents"/>
-		<DialogPanel id    = "BuildOptions"
+		<OptionPanel id    = "BuildOptions"
 		             label = "${res:Dialog.ProjectOptions.BuildOptions}"
 		             class = "Grunwald.BooBinding.BuildOptions"/>
-		<DialogPanel id    = "DebugOptions"
+		<OptionPanel id    = "DebugOptions"
 		             label = "${res:Dialog.ProjectOptions.DebugOptions}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.DebugOptions"/>
-		<!--<DialogPanel id    = "Publish"
+		<!--<OptionPanel id    = "Publish"
 		             label = "${res:Dialog.ProjectOptions.Publish}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Publish"/>-->
 		<Include id = "AllManaged" path="/SharpDevelop/BackendBindings/ProjectOptions/AllManaged"/>

src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin

@@ -64,25 +64,25 @@
 	-->
 	
 	<Path path = "/SharpDevelop/BackendBindings/ProjectOptions/C#">
-		<DialogPanel id    = "Application"
+		<OptionPanel id    = "Application"
 		             label = "${res:Dialog.ProjectOptions.ApplicationSettings}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ApplicationSettings"/>
-		<DialogPanel id    = "ReferencePaths"
+		<OptionPanel id    = "ReferencePaths"
 		             label = "${res:Dialog.ProjectOptions.ReferencePaths}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ReferencePaths"/>
-		<DialogPanel id    = "Signing"
+		<OptionPanel id    = "Signing"
 		             label = "${res:Dialog.ProjectOptions.Signing}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Signing"/>
-		<DialogPanel id    = "BuildEvents"
+		<OptionPanel id    = "BuildEvents"
 		             label = "${res:Dialog.ProjectOptions.BuildEvents}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.BuildEvents"/>
-		<DialogPanel id    = "BuildOptions"
+		<OptionPanel id    = "BuildOptions"
 		             label = "${res:Dialog.ProjectOptions.BuildOptions}"
 		             class = "CSharpBinding.OptionPanels.BuildOptions"/>
-		<DialogPanel id    = "DebugOptions"
+		<OptionPanel id    = "DebugOptions"
 		             label = "${res:Dialog.ProjectOptions.DebugOptions}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.DebugOptions"/>
-		<!--<DialogPanel id    = "Publish"
+		<!--<OptionPanel id    = "Publish"
 		             label = "${res:Dialog.ProjectOptions.Publish}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Publish"/>-->
 		<Include id = "AllManaged" path="/SharpDevelop/BackendBindings/ProjectOptions/AllManaged"/>

src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/Src/project.fs

@@ -217,7 +217,7 @@ type MoveDownFileEvent() =
     
  
 type FsOptions() =
-    inherit AbstractProjectOptionPanel()
+    inherit AbstractXmlFormsProjectOptionPanel()
     override x.LoadPanelContents() =
         let this = (typeof<FsOptions>)
         let caller = this.Assembly

src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.addin

@@ -44,13 +44,13 @@
 	</Path>
 	
 	<Path path = "/SharpDevelop/BackendBindings/ProjectOptions/ILAsm">
-		<DialogPanel id    = "Application"
+		<OptionPanel id    = "Application"
 		             label = "${res:Dialog.ProjectOptions.ApplicationSettings}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ApplicationSettings"/>
-		<DialogPanel id    = "BuildEvents"
+		<OptionPanel id    = "BuildEvents"
 		             label = "${res:Dialog.ProjectOptions.BuildEvents}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.BuildEvents"/>
-		<DialogPanel id    = "DebugOptions"
+		<OptionPanel id    = "DebugOptions"
 		             label = "${res:Dialog.ProjectOptions.DebugOptions}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.DebugOptions"/>
 		<Include id = "AllManaged" path="/SharpDevelop/BackendBindings/ProjectOptions/AllManaged"/>

src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.addin

@@ -108,23 +108,23 @@
 	
 	<!-- Options panel -->
 	<Path name="/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">
-		<DialogPanel id="PythonOptionsPanel"
+		<OptionPanel id="PythonOptionsPanel"
 		       	     label="Python"
 		       	     class="ICSharpCode.PythonBinding.PythonOptionsPanel"/>
 	</Path>
 
 	<!-- Project options panels -->
 	<Path path="/SharpDevelop/BackendBindings/ProjectOptions/Python">
-		<DialogPanel id="Application"
+		<OptionPanel id="Application"
 		             label="${res:Dialog.ProjectOptions.ApplicationSettings}"
 		             class="ICSharpCode.PythonBinding.ApplicationSettingsPanel"/>
-		<DialogPanel id="BuildEvents"
+		<OptionPanel id="BuildEvents"
 		             label="${res:Dialog.ProjectOptions.BuildEvents}"
 		             class="ICSharpCode.SharpDevelop.Gui.OptionPanels.BuildEvents"/>
-		<DialogPanel id="CompilingOptions"
+		<OptionPanel id="CompilingOptions"
 		             label="${res:Dialog.ProjectOptions.BuildOptions}"
 		             class="ICSharpCode.PythonBinding.CompilingOptionsPanel"/>
-		<DialogPanel id="DebugOptions"
+		<OptionPanel id="DebugOptions"
 		             label="${res:Dialog.ProjectOptions.DebugOptions}"
 		             class="ICSharpCode.SharpDevelop.Gui.OptionPanels.DebugOptions"/>
 	</Path>

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/ApplicationSettingsPanel.cs

@@ -16,7 +16,7 @@ namespace ICSharpCode.PythonBinding
 	/// <summary>
 	/// Python project's application settings panel.
 	/// </summary>
-	public class ApplicationSettingsPanel : AbstractProjectOptionPanel
+	public class ApplicationSettingsPanel : AbstractXmlFormsProjectOptionPanel
 	{
 		const string AssemblyTextBoxName = "assemblyNameTextBox";
 		const string RootNamespaceTextBoxName = "rootNamespaceTextBox";

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonOptionsPanel.cs

@@ -5,6 +5,7 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using System;
 using System.Drawing;
 using System.Windows.Forms;
@@ -16,7 +17,7 @@ namespace ICSharpCode.PythonBinding
 	/// <summary>
 	/// Panel that displays the python options.
 	/// </summary>
-	public class PythonOptionsPanel : AbstractOptionPanel
+	public class PythonOptionsPanel : XmlFormsOptionPanel
 	{
 		AddInOptions options;
 		TextBox pythonFileNameTextBox;

src/AddIns/BackendBindings/Python/PythonBinding/Test/AddInFileTestFixture.cs

@@ -337,7 +337,7 @@ namespace PythonBinding.Tests
 		[Test]
 		public void OptionsPanelCodonIsDialogPanel()
 		{
-			Assert.AreEqual("DialogPanel", optionsPanelCodon.Name);
+			Assert.AreEqual("OptionPanel", optionsPanelCodon.Name);
 		}
 		
 		[Test]

src/AddIns/BackendBindings/Python/PythonBinding/Test/AppSettingsPanelTestFixture.cs

@@ -41,7 +41,7 @@ namespace PythonBinding.Tests
 			project = new PythonProject(info);
 			
 			appSettingsPanel = new DerivedApplicationSettingsPanel();
-			appSettingsPanel.CustomizationObject = project;
+			appSettingsPanel.Owner = project;
 			appSettingsPanel.LoadPanelContents();
 		}
 		

src/AddIns/BackendBindings/Python/PythonBinding/Test/CompilingOptionsPanelTestFixture.cs

@@ -41,7 +41,7 @@ namespace PythonBinding.Tests
 			project = new PythonProject(info);
 			
 			compilingOptionsPanel = new DerivedCompilingOptionsPanel();
-			compilingOptionsPanel.CustomizationObject = project;
+			compilingOptionsPanel.Owner = project;
 			compilingOptionsPanel.LoadPanelContents();
 		}
 		

src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonOptionsPanelTestFixture.cs

@@ -5,6 +5,7 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using System;
 using System.Windows.Forms;
 using ICSharpCode.Core;
@@ -52,7 +53,7 @@ namespace PythonBinding.Tests
 		[Test]
 		public void PanelIsOptionsPanel()
 		{
-			Assert.IsNotNull(optionsPanel as AbstractOptionPanel);
+			Assert.IsNotNull(optionsPanel as XmlFormsOptionPanel);
 		}
 		
 		[Test]

src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/ProjectImports.cs

@@ -16,7 +16,7 @@ using ICSharpCode.SharpDevelop.Project;
 
 namespace VBNetBinding.OptionPanels
 {
-	public class ProjectImports : AbstractProjectOptionPanel
+	public class ProjectImports : AbstractXmlFormsProjectOptionPanel
 	{
 		public override void LoadPanelContents()
 		{

src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/TextEditorOptions.cs

@@ -5,6 +5,7 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using System;
 using System.Windows.Forms;
 using ICSharpCode.Core;
@@ -12,7 +13,7 @@ using ICSharpCode.SharpDevelop.Gui;
 
 namespace VBNetBinding.OptionPanels
 {
-	public class VBNetTextEditorPanel : AbstractOptionPanel
+	public class VBNetTextEditorPanel : XmlFormsOptionPanel
 	{
 		public override void LoadPanelContents()
 		{

src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin

@@ -61,34 +61,34 @@
 	</Path>
 	
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog/TextEditorOptions">
-		<DialogPanel id = "VBSpecificOptions"
+		<OptionPanel id = "VBSpecificOptions"
 			             label = "${res:Dialog.Options.IDEOptions.TextEditor.VB.PanelName}"
 			             class = "VBNetBinding.OptionPanels.VBNetTextEditorPanel"/>
 	</Path>
 	
 	<Path path = "/SharpDevelop/BackendBindings/ProjectOptions/VBNet">
-		<DialogPanel id    = "Application"
+		<OptionPanel id    = "Application"
 		             label = "${res:Dialog.ProjectOptions.ApplicationSettings}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ApplicationSettings"/>
-		<DialogPanel id    = "ReferencePaths"
+		<OptionPanel id    = "ReferencePaths"
 		             label = "${res:Dialog.ProjectOptions.ReferencePaths}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ReferencePaths"/>
-		<DialogPanel id    = "Signing"
+		<OptionPanel id    = "Signing"
 		             label = "${res:Dialog.ProjectOptions.Signing}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Signing"/>
-		<DialogPanel id    = "BuildEvents"
+		<OptionPanel id    = "BuildEvents"
 		             label = "${res:Dialog.ProjectOptions.BuildEvents}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.BuildEvents"/>
-		<DialogPanel id    = "BuildOptions"
+		<OptionPanel id    = "BuildOptions"
 		             label = "${res:Dialog.ProjectOptions.BuildOptions}"
 		             class = "VBNetBinding.OptionPanels.BuildOptions"/>
-		<DialogPanel id    = "DebugOptions"
+		<OptionPanel id    = "DebugOptions"
 		             label = "${res:Dialog.ProjectOptions.DebugOptions}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.DebugOptions"/>
-		<!--<DialogPanel id    = "Publish"
+		<!--<OptionPanel id    = "Publish"
 		             label = "${res:Dialog.ProjectOptions.Publish}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Publish"/>-->
-		<DialogPanel id    = "ProjectImports"
+		<OptionPanel id    = "ProjectImports"
 		             label = "${res:Dialog.ProjectOptions.ProjectImports}"
 		             class = "VBNetBinding.OptionPanels.ProjectImports"/>
 		<Include id = "AllManaged" path="/SharpDevelop/BackendBindings/ProjectOptions/AllManaged"/>

src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/ApplicationSettingsPanel.cs

@@ -14,7 +14,7 @@ using ICSharpCode.SharpDevelop.Project;
 
 namespace ICSharpCode.WixBinding
 {
-	public class ApplicationSettingsPanel : AbstractProjectOptionPanel
+	public class ApplicationSettingsPanel : AbstractXmlFormsProjectOptionPanel
 	{
 		public override void LoadPanelContents()
 		{

src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/CompilerParametersPanel.cs

@@ -13,7 +13,7 @@ using StringPair = System.Collections.Generic.KeyValuePair<System.String, System
 
 namespace ICSharpCode.WixBinding
 {
-	public class CompilerParametersPanel : AbstractProjectOptionPanel
+	public class CompilerParametersPanel : AbstractXmlFormsProjectOptionPanel
 	{	
 		public override void LoadPanelContents()
 		{

src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/PreprocessorVariablesPanel.cs

@@ -10,7 +10,7 @@ using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 
 namespace ICSharpCode.WixBinding
 {
-	public class PreprocessorVariablesPanel : AbstractProjectOptionPanel
+	public class PreprocessorVariablesPanel : AbstractXmlFormsProjectOptionPanel
 	{
 		public override void LoadPanelContents()
 		{

src/AddIns/BackendBindings/WixBinding/Project/WixBinding.addin

@@ -53,19 +53,19 @@
 	
 	<!-- Project options panels -->
 	<Path path = "/SharpDevelop/BackendBindings/ProjectOptions/Wix">
-		<DialogPanel id = "ApplicationSettings"
+		<OptionPanel id = "ApplicationSettings"
 			         label = "${res:Dialog.ProjectOptions.ApplicationSettings}"
 			         class = "ICSharpCode.WixBinding.ApplicationSettingsPanel"/>
-		<DialogPanel id    = "BuildEvents"
+		<OptionPanel id    = "BuildEvents"
 		             label = "${res:Dialog.ProjectOptions.BuildEvents}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.BuildEvents"/>
-		<DialogPanel id = "WixCompiler"
+		<OptionPanel id = "WixCompiler"
 			         label = "${res:Dialog.ProjectOptions.BuildOptions}"
 			         class = "ICSharpCode.WixBinding.CompilerParametersPanel"/>
-		<DialogPanel id    = "DebugOptions"
+		<OptionPanel id    = "DebugOptions"
 		             label = "${res:Dialog.ProjectOptions.DebugOptions}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.DebugOptions"/>
-		<DialogPanel id    = "PreprocessorVariables"
+		<OptionPanel id    = "PreprocessorVariables"
 		             label = "${res:ICSharpCode.WixBinding.PreprocessorVariablesPanel}"
 		             class = "ICSharpCode.WixBinding.PreprocessorVariablesPanel"/>
 	</Path>

src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.addin

@@ -303,20 +303,20 @@
 	</Path>
 	
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog">
-		<DialogPanel id          = "FormsDesignerOptions"
+		<OptionPanel id          = "FormsDesignerOptions"
 		             insertafter = "ToolsOptions"
 		             label       = "${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.PanelName}">
 			
-			<DialogPanel id    = "GeneralOptions"
+			<OptionPanel id    = "GeneralOptions"
 			             label = "${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.GeneralOptionsPanel.PanelName}"
 			             class = "ICSharpCode.FormsDesigner.Gui.OptionPanels.GeneralOptionsPanel"/>
-			<DialogPanel id    = "GridOptions"
+			<OptionPanel id    = "GridOptions"
 			             label = "${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.GridOptionsPanel.PanelName}"
 			             class = "ICSharpCode.FormsDesigner.Gui.OptionPanels.GridOptionsPanel"/>
-			<DialogPanel id    = "LocalizationModelOptions"
+			<OptionPanel id    = "LocalizationModelOptions"
 			             label = "${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.LocalizationModelOptionsPanel.PanelName}"
 			             class = "ICSharpCode.FormsDesigner.Gui.OptionPanels.LocalizationModelOptionsPanel"/>
 		
-		</DialogPanel>
+		</OptionPanel>
 	</Path>
 </AddIn>

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/OptionPanels/GeneralOptions.cs

@@ -5,6 +5,7 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using System;
 using System.Windows.Forms;
 using ICSharpCode.Core;
@@ -12,7 +13,7 @@ using ICSharpCode.SharpDevelop.Gui;
 
 namespace ICSharpCode.FormsDesigner.Gui.OptionPanels
 {
-	public class GeneralOptionsPanel : AbstractOptionPanel
+	public class GeneralOptionsPanel : XmlFormsOptionPanel
 	{
 		public override void LoadPanelContents()
 		{

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/OptionPanels/GridOptions.cs

@@ -5,6 +5,7 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using System;
 using System.Windows.Forms;
 using ICSharpCode.Core;
@@ -12,7 +13,7 @@ using ICSharpCode.SharpDevelop.Gui;
 
 namespace ICSharpCode.FormsDesigner.Gui.OptionPanels
 {
-	public class GridOptionsPanel : AbstractOptionPanel
+	public class GridOptionsPanel : XmlFormsOptionPanel
 	{
 		public override void LoadPanelContents()
 		{

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/OptionPanels/LocalizationModelOptionsPanel.cs

@@ -5,10 +5,10 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using System;
-using System.Windows.Forms;
 using System.ComponentModel.Design.Serialization;
-
+using System.Windows.Forms;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
 
@@ -17,7 +17,7 @@ namespace ICSharpCode.FormsDesigner.Gui.OptionPanels
 	/// <summary>
 	/// Options panel for localization model options.
 	/// </summary>
-	public class LocalizationModelOptionsPanel : AbstractOptionPanel
+	public class LocalizationModelOptionsPanel : XmlFormsOptionPanel
 	{
 		public LocalizationModelOptionsPanel()
 		{

src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.addin

@@ -21,7 +21,7 @@
 	</Path>
 	
    	<Path name = "/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">
-		<DialogPanel id    = "HexEditor"
+		<OptionPanel id    = "HexEditor"
 		             label = "HexEditor"
 		             class = "HexEditor.View.HexEditOptionsPanel"/>
 	</Path>

src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditOptionsPanel.cs

@@ -5,19 +5,19 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
 using System.Xml;
-
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
 
 namespace HexEditor.View
 {
-	public class HexEditOptionsPanel : AbstractOptionPanel
+	public class HexEditOptionsPanel : XmlFormsOptionPanel
 	{
 		ComboBox cmbForeColor;
 		ListBox lstElements;

src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEditorOptionsPanel.cs

@@ -5,6 +5,7 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using System;
 using System.Windows.Forms;
 using ICSharpCode.SharpDevelop.Gui;
@@ -14,7 +15,7 @@ namespace ICSharpCode.XmlEditor
 	/// <summary>
 	/// Configuration settings for the xml editor.
 	/// </summary>
-	public class XmlEditorOptionsPanel : AbstractOptionPanel
+	public class XmlEditorOptionsPanel : XmlFormsOptionPanel
 	{
 		static readonly string showAttributesWhenFoldedCheckBoxName = "showAttributesWhenFoldedCheckBox";
 		static readonly string showSchemaAnnotationCheckBoxName = "showSchemaAnnotationCheckBox";

src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemasPanel.cs

@@ -5,12 +5,12 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using System;
 using System.Collections.Specialized;
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
-
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
 
@@ -19,7 +19,7 @@ namespace ICSharpCode.XmlEditor
 	/// <summary>
 	/// Shows the xml schemas that SharpDevelop knows about.
 	/// </summary>
-	public class XmlSchemasPanel : AbstractOptionPanel
+	public class XmlSchemasPanel : XmlFormsOptionPanel
 	{		
 		ListBox schemaListBox;
 		Button removeButton;

src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin

@@ -146,11 +146,11 @@
 	
 	<!-- Options panel -->
 	<Path path = "/SharpDevelop/Dialogs/OptionsDialog/TextEditorOptions">
-		<DialogPanel id = "XmlSchemasPanel"
+		<OptionPanel id = "XmlSchemasPanel"
 		             insertafter = "Markers"
 		             label = "${res:ICSharpCode.XmlEditor.XmlSchemasPanel.Title}"
 		             class = "ICSharpCode.XmlEditor.XmlSchemasPanel" />
-		<DialogPanel id = "XmlEditorOptionsPanel"
+		<OptionPanel id = "XmlEditorOptionsPanel"
 		             insertafter = "Markers"
 		             insertbefore = "XmlSchemasPanel"
 		             label = "${res:ICSharpCode.XmlEditor.XmlEditorOptionsPanel.Title}"

src/AddIns/Misc/CodeAnalysis/CodeAnalysis.addin

@@ -20,7 +20,7 @@
 	</Path>
 	
 	<Path name = "/SharpDevelop/BackendBindings/ProjectOptions/AllManaged">
-		<DialogPanel id          = "CodeAnalysis"
+		<OptionPanel id          = "CodeAnalysis"
 		             label       = "${res:ICSharpCode.CodeAnalysis}"
 		             class       = "ICSharpCode.CodeAnalysis.AnalysisProjectOptionsPanel"/>
 	</Path>
@@ -49,7 +49,7 @@
 	
 	<!-- Options panel -->
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">
-		<DialogPanel id    = "CodeAnalysisOptionPanel"
+		<OptionPanel id    = "CodeAnalysisOptionPanel"
 		       	     label = "${res:ICSharpCode.CodeAnalysis}"
 		       	     class = "ICSharpCode.CodeAnalysis.AnalysisIdeOptionsPanel"/>
 	</Path>

src/AddIns/Misc/CodeAnalysis/Src/AnalysisIdeOptionsPanel.cs

@@ -5,10 +5,10 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using System;
 using System.IO;
 using System.Windows.Forms;
-
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
 
@@ -17,7 +17,7 @@ namespace ICSharpCode.CodeAnalysis
 	/// <summary>
 	/// Option panel to choose the FxCop path from.
 	/// </summary>
-	public class AnalysisIdeOptionsPanel : AbstractOptionPanel
+	public class AnalysisIdeOptionsPanel : XmlFormsOptionPanel
 	{
 		public override void LoadPanelContents()
 		{

src/AddIns/Misc/CodeAnalysis/Src/AnalysisProjectOptionsPanel.cs

@@ -12,7 +12,7 @@ using ICSharpCode.SharpDevelop.Project;
 
 namespace ICSharpCode.CodeAnalysis
 {
-	public class AnalysisProjectOptionsPanel : AbstractProjectOptionPanel
+	public class AnalysisProjectOptionsPanel : AbstractXmlFormsProjectOptionPanel
 	{
 		public override void LoadPanelContents()
 		{

src/AddIns/Misc/CodeCoverage/Project/CodeCoverage.addin

@@ -48,7 +48,7 @@
 	</Path>
 	
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">
-		<DialogPanel id          = "CodeCoverageOptionsPanel"
+		<OptionPanel id          = "CodeCoverageOptionsPanel"
 		             label       = "${res:ICSharpCode.UnitTesting.CodeCoverage}"
 		             insertafter = "CodeAnalysisOptionPanel"
 		             class       = "ICSharpCode.CodeCoverage.CodeCoverageOptionsPanel"/>
@@ -88,7 +88,7 @@
 	</Path>
 	
 	<Path path = "/SharpDevelop/BackendBindings/ProjectOptions/AllManaged">
-		<DialogPanel id          = "CodeCoverage"
+		<OptionPanel id          = "CodeCoverage"
 		             label       = "${res:ICSharpCode.UnitTesting.CodeCoverage}"
 		             class       = "ICSharpCode.CodeCoverage.CodeCoverageProjectOptionsPanel"/>
 	</Path>

src/AddIns/Misc/CodeCoverage/Project/CodeCoverage.csproj

@@ -119,4 +119,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-</Project>
+</Project>

src/AddIns/Misc/CodeCoverage/Project/Src/CodeCoverageOptionsPanel.cs

@@ -5,16 +5,16 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
 
 namespace ICSharpCode.CodeCoverage
 {
-	public class CodeCoverageOptionsPanel : AbstractOptionPanel
+	public class CodeCoverageOptionsPanel : XmlFormsOptionPanel
 	{
 		static readonly string foregroundCustomColourButtonName = "foregroundCustomColourButton";
 		static readonly string backgroundCustomColourButtonName = "backgroundCustomColourButton";

src/AddIns/Misc/CodeCoverage/Project/Src/CodeCoverageProjectOptionsPanel.cs

@@ -16,7 +16,7 @@ using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 
 namespace ICSharpCode.CodeCoverage
 {
-	public class CodeCoverageProjectOptionsPanel : AbstractProjectOptionPanel
+	public class CodeCoverageProjectOptionsPanel : AbstractXmlFormsProjectOptionPanel
 	{
 		static readonly string IncludeListTextBoxName = "includeListTextBox";
 		static readonly string ExcludeListTextBoxName = "excludeListTextBox";

src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.addin

@@ -44,19 +44,19 @@
 	</Path>
 	
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog">
-		<DialogPanel id="ComponentInspectorOptions"
+		<OptionPanel id="ComponentInspectorOptions"
 		             label="${res:ComponentInspector.ToolsMenu.ShowComponentInspectorMenuItem}"
 		             insertafter="CodingOptions"
 		             insertbefore="TextEditorOptions">
-			<DialogPanel id="GeneralOptionsPanel"
+			<OptionPanel id="GeneralOptionsPanel"
 			             label="${res:Dialog.Options.IDEOptions.TextEditor.General.PanelName}"
 			             class="ICSharpCode.ComponentInspector.AddIn.GeneralOptionsPanel"/>
-			<DialogPanel id="ObjectTreeOptionsPanel"
+			<OptionPanel id="ObjectTreeOptionsPanel"
 			             label="${res:ComponentInspector.InspectorMenu.ObjectTreeOptionsPanel.Title}"
 			             class="ICSharpCode.ComponentInspector.AddIn.ObjectTreeOptionsPanel"/>
-			<DialogPanel id="TypeHandlerOptionsPanel"
+			<OptionPanel id="TypeHandlerOptionsPanel"
 			             label="${res:ComponentInspector.InspectorMenu.TypeHandlerOptionsPanel.Title}"
 			             class="ICSharpCode.ComponentInspector.AddIn.TypeHandlerOptionsPanel"/>
-		</DialogPanel>
+		</OptionPanel>
 	</Path>
 </AddIn>

src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/GeneralOptionsPanel.cs

@@ -5,6 +5,7 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using System;
 using System.Windows.Forms;
 using ICSharpCode.SharpDevelop.Gui;
@@ -12,7 +13,7 @@ using NoGoop.ObjBrowser;
 
 namespace ICSharpCode.ComponentInspector.AddIn
 {
-	public class GeneralOptionsPanel : AbstractOptionPanel
+	public class GeneralOptionsPanel : XmlFormsOptionPanel
 	{
 		public override void LoadPanelContents()
 		{

src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/ObjectTreeOptionsPanel.cs

@@ -5,6 +5,7 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using System;
 using System.Windows.Forms;
 using ICSharpCode.SharpDevelop.Gui;
@@ -12,7 +13,7 @@ using NoGoop.ObjBrowser;
 
 namespace ICSharpCode.ComponentInspector.AddIn
 {
-	public class ObjectTreeOptionsPanel : AbstractOptionPanel
+	public class ObjectTreeOptionsPanel : XmlFormsOptionPanel
 	{
 		public override void LoadPanelContents()
 		{

src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/TypeHandlerOptionsPanel.cs

@@ -5,17 +5,17 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using System;
 using System.Collections;
 using System.ComponentModel;
 using System.Windows.Forms;
-
 using ICSharpCode.SharpDevelop.Gui;
 using NoGoop.ObjBrowser;
 
 namespace ICSharpCode.ComponentInspector.AddIn
 {
-	public class TypeHandlerOptionsPanel : AbstractOptionPanel
+	public class TypeHandlerOptionsPanel : XmlFormsOptionPanel
 	{
 		public override void LoadPanelContents()
 		{

src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.addin

@@ -116,15 +116,15 @@
 	</Path>
 	
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog">
-		<DialogPanel id    = "Debugging"
+		<OptionPanel id    = "Debugging"
 		             label = "${res:Dialog.Options.IDEOptions.Debugging}"
 		             insertbefore = "TextEditorOptions">
-			<DialogPanel id    = "General"
+			<OptionPanel id    = "General"
 			             label = "${res:Dialog.Options.IDEOptions.Debugging.General}"
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.DebuggingOptionsPanel"/>
-			<DialogPanel id    = "Symbols"
+			<OptionPanel id    = "Symbols"
 			             label = "${res:Dialog.Options.IDEOptions.Debugging.Symbols}"
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.DebuggingSymbolsPanel"/>
-		</DialogPanel>
+		</OptionPanel>
 	</Path>
 </AddIn>

src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Options/DebuggingOptionsPanel.cs

@@ -18,7 +18,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 	/// <summary>
 	/// Panel for general debugging options
 	/// </summary>
-	public partial class DebuggingOptionsPanel : AbstractOptionPanel
+	public partial class DebuggingOptionsPanel : XmlFormsOptionPanel
 	{
 		public DebuggingOptionsPanel()
 		{

src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Options/DebuggingSymbolsPanel.cs

@@ -19,7 +19,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 	/// Options panel which allows user to specify where to look
 	/// for symbols (pdb files) and source codes
 	/// </summary>
-	public partial class DebuggingSymbolsPanel : AbstractOptionPanel
+	public partial class DebuggingSymbolsPanel : XmlFormsOptionPanel
 	{
 		public DebuggingSymbolsPanel()
 		{

src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.addin

@@ -83,7 +83,7 @@
 	-->
 	
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog/UIOptions">
-		<DialogPanel id          = "RegisterFiletypes"
+		<OptionPanel id          = "RegisterFiletypes"
 		             label       = "${res:ICSharpCode.SharpDevelop.Gui.Dialogs.OptionPanels.RegisterFiletypesPanel.PanelName}"
 		             insertafter = "LoadSave"
 		             class       = "ICSharpCode.FiletypeRegisterer.RegisterFiletypesPanel"/>

src/AddIns/Misc/FiletypeRegisterer/Project/Src/RegisterFiletypesPanel.cs

@@ -5,18 +5,18 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using System;
 using System.ComponentModel;
 using System.Drawing;
 using System.Windows.Forms;
-
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
 
 namespace ICSharpCode.FiletypeRegisterer
 {
-	public partial class RegisterFiletypesPanel : AbstractOptionPanel
+	public partial class RegisterFiletypesPanel : XmlFormsOptionPanel
 	{
 		sealed class ListEntry
 		{

src/AddIns/Misc/HighlightingEditor/Project/Configuration/AssemblyInfo.cs

@@ -1,20 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System.Reflection;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("HighlightingEditor")]
-[assembly: AssemblyDescription("Editor for editor highlighting styles in #develop")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]

src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.addin

@@ -1,21 +0,0 @@
-<AddIn name        = "Highlighting Editor"
-       author      = "Georg Brandl"
-       copyright   = "prj:///doc/copyright.txt"
-       description = "Editor for syntax highlighting styles for the text editor">
-	
-	<Manifest>
-		<Identity name = "ICSharpCode.HighlightingEditor"/>
-	</Manifest>
-	
-	<Runtime>
-		<Import assembly="HighlightingEditor.dll"/>
-	</Runtime>
-
-	<Path name = "/SharpDevelop/Dialogs/OptionsDialog/TextEditorOptions">
-		<DialogPanel id = "EditHighlighting"
-		             label = "${res:Dialog.Options.TextEditorOptions.EditHighlighting.Title}"
-			     	 insertafter = "Behavior"
-		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.EditHighlightingPanel"/>
-	</Path>
-	
-</AddIn>

src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj

@@ -1,143 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50215</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{8A462940-E5E9-4E85-982D-D4C006EE31D4}</ProjectGuid>
-    <AssemblyName>HighlightingEditor</AssemblyName>
-    <OutputTarget>Library</OutputTarget>
-    <WarningLevel>0</WarningLevel>
-    <NoStdLib>False</NoStdLib>
-    <NoConfig>False</NoConfig>
-    <RunPostBuildEvent>OnSuccessfulBuild</RunPostBuildEvent>
-    <OutputType>Library</OutputType>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <BaseAddress>117964800</BaseAddress>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <FileAlignment>4096</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>False</Optimize>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <OutputPath>..\..\..\..\..\AddIns\AddIns\Misc\HighlightingEditor\</OutputPath>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <DefineConstants>DEBUG</DefineConstants>
-    <DebugType>Full</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>False</DebugSymbols>
-    <Optimize>True</Optimize>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <OutputPath>..\..\..\..\..\AddIns\AddIns\Misc\HighlightingEditor\</OutputPath>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.XML" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Configuration\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Resources\ColorDialog.xfrm" />
-    <EmbeddedResource Include="Resources\Digits.xfrm" />
-    <EmbeddedResource Include="Resources\EditDialog.xfrm" />
-    <EmbeddedResource Include="Resources\Environment.xfrm" />
-    <EmbeddedResource Include="Resources\KeywordList.xfrm" />
-    <EmbeddedResource Include="Resources\KeywordLists.xfrm" />
-    <EmbeddedResource Include="Resources\Marker.xfrm" />
-    <EmbeddedResource Include="Resources\Markers.xfrm" />
-    <EmbeddedResource Include="Resources\OptionPanel.xfrm" />
-    <EmbeddedResource Include="Resources\Properties.xfrm" />
-    <EmbeddedResource Include="Resources\RuleSet.xfrm" />
-    <EmbeddedResource Include="Resources\RuleSets.xfrm" />
-    <EmbeddedResource Include="Resources\Scheme.xfrm" />
-    <EmbeddedResource Include="Resources\Span.xfrm" />
-    <EmbeddedResource Include="Resources\Spans.xfrm" />
-    <Compile Include="Src\ColorButton.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Src\ColorDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Src\EditHighlightingColorDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Src\EditHighlightingDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Src\EditHighlightingPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\EditorHighlightColor.cs" />
-    <Compile Include="Src\Nodes\AbstractNode.cs" />
-    <Compile Include="Src\Nodes\DigitsNode.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Nodes\EnvironmentNode.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Nodes\KeywordListNode.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Nodes\KeywordListsNode.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Nodes\MarkerNode.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Nodes\MarkersNode.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Nodes\NodeOptionPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Nodes\PropertiesNode.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Nodes\RuleSetNode.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Nodes\RuleSetsNode.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Nodes\SchemeNode.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Nodes\SpanNode.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Nodes\SpansNode.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <None Include="HighlightingEditor.addin">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
-      <Link>Configuration\GlobalAssemblyInfo.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj">
-      <Project>{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}</Project>
-      <Name>ICSharpCode.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
-      <Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
-      <Name>ICSharpCode.SharpDevelop</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Main\Core\Project\ICSharpCode.Core.csproj">
-      <Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
-      <Name>ICSharpCode.Core</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>

src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj.user

@@ -1,13 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <LastOpenVersion>8.0.50215</LastOpenVersion>
-    <ProjectView>ShowAllFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <StartProgram>..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <StartProgram>..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
-  </PropertyGroup>
-</Project>

src/AddIns/Misc/HighlightingEditor/Project/Resources/ColorDialog.xfrm

@@ -1,134 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.Form>
-    <Name value="InputBox" />
-    <ShowInTaskbar value="False" />
-    <FormBorderStyle value="FixedDialog" />
-    <StartPosition value="CenterParent" />
-    <ClientSize value="{Width=450, Height=288}" />
-    <MinimizeBox value="False" />
-    <DockPadding value="" />
-    <Text value="${res:Dialog.HighlightingEditor.ColorDlg.Title}" />
-    <AcceptButton value="acceptBtn [System.Windows.Forms.Button], Text: ${res:Global.OKButtonText}" />
-    <CancelButton value="cancelBtn [System.Windows.Forms.Button], Text: ${res:Global.CancelButtonText}" />
-    <MaximizeBox value="False" />
-    <Controls>
-      <System.Windows.Forms.GroupBox>
-        <Name value="backBox" />
-        <TabIndex value="30" />
-        <Location value="{X=232,Y=72}" />
-        <ClientSize value="{Width=204, Height=174}" />
-        <Text value="${res:Dialog.HighlightingEditor.ColorDlg.Background}" />
-        <Controls>
-          <System.Windows.Forms.RadioButton>
-            <Name value="backUser" />
-            <Location value="{X=9,Y=54}" />
-            <ClientSize value="{Width=186, Height=18}" />
-            <Text value="${res:Dialog.HighlightingEditor.ColorDlg.UserDefined}" />
-            <TabIndex value="9" />
-          </System.Windows.Forms.RadioButton>
-          <System.Windows.Forms.RadioButton>
-            <Name value="backNo" />
-            <Location value="{X=9,Y=18}" />
-            <Checked value="True" />
-            <ClientSize value="{Width=186, Height=30}" />
-            <Text value="${res:Dialog.HighlightingEditor.ColorDlg.NoColor}" />
-            <TabStop value="True" />
-            <TabIndex value="7" />
-          </System.Windows.Forms.RadioButton>
-          <System.Windows.Forms.RadioButton>
-            <Name value="backSys" />
-            <Location value="{X=9,Y=114}" />
-            <ClientSize value="{Width=186, Height=18}" />
-            <Text value="${res:Dialog.HighlightingEditor.ColorDlg.SystemColor}" />
-            <TabIndex value="8" />
-          </System.Windows.Forms.RadioButton>
-          <System.Windows.Forms.ComboBox>
-            <Name value="backList" />
-            <TabIndex value="8" />
-            <Location value="{X=30,Y=138}" />
-            <ClientSize value="{Width=166, Height=21}" />
-            <DropDownStyle value="DropDownList" />
-          </System.Windows.Forms.ComboBox>
-        </Controls>
-      </System.Windows.Forms.GroupBox>
-      <System.Windows.Forms.GroupBox>
-        <Name value="foreBox" />
-        <TabIndex value="29" />
-        <Location value="{X=16,Y=72}" />
-        <ClientSize value="{Width=204, Height=174}" />
-        <Text value="${res:Dialog.HighlightingEditor.ColorDlg.Foreground}" />
-        <Controls>
-          <System.Windows.Forms.ComboBox>
-            <Name value="foreList" />
-            <TabIndex value="8" />
-            <Location value="{X=30,Y=138}" />
-            <ClientSize value="{Width=166, Height=21}" />
-            <DropDownStyle value="DropDownList" />
-          </System.Windows.Forms.ComboBox>
-          <System.Windows.Forms.RadioButton>
-            <Name value="foreUser" />
-            <Location value="{X=12,Y=54}" />
-            <ClientSize value="{Width=186, Height=18}" />
-            <Text value="${res:Dialog.HighlightingEditor.ColorDlg.UserDefined}" />
-            <TabIndex value="1" />
-          </System.Windows.Forms.RadioButton>
-          <System.Windows.Forms.RadioButton>
-            <Name value="foreNo" />
-            <Location value="{X=12,Y=18}" />
-            <Checked value="True" />
-            <ClientSize value="{Width=186, Height=30}" />
-            <Text value="${res:Dialog.HighlightingEditor.ColorDlg.NoColor}" />
-            <TabStop value="True" />
-            <TabIndex value="0" />
-          </System.Windows.Forms.RadioButton>
-          <System.Windows.Forms.RadioButton>
-            <Name value="foreSys" />
-            <Location value="{X=12,Y=114}" />
-            <ClientSize value="{Width=186, Height=18}" />
-            <Text value="${res:Dialog.HighlightingEditor.ColorDlg.SystemColor}" />
-            <TabIndex value="1" />
-          </System.Windows.Forms.RadioButton>
-        </Controls>
-      </System.Windows.Forms.GroupBox>
-      <System.Windows.Forms.Label>
-        <Name value="label" />
-        <Text value="${res:Dialog.HighlightingEditor.ColorDlg.Caption}" />
-        <TabIndex value="28" />
-        <ClientSize value="{Width=432, Height=23}" />
-        <Location value="{X=8,Y=8}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Button>
-        <Name value="acceptBtn" />
-        <Location value="{X=280,Y=256}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Global.OKButtonText}" />
-        <Anchor value="Bottom, Right" />
-        <TabIndex value="27" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.CheckBox>
-        <Name value="boldBox" />
-        <Location value="{X=16,Y=40}" />
-        <ClientSize value="{Width=136, Height=18}" />
-        <Text value="${res:Dialog.HighlightingEditor.ColorDlg.Bold}" />
-        <TabIndex value="23" />
-      </System.Windows.Forms.CheckBox>
-      <System.Windows.Forms.CheckBox>
-        <Name value="italicBox" />
-        <Location value="{X=160,Y=40}" />
-        <ClientSize value="{Width=102, Height=18}" />
-        <Text value="${res:Dialog.HighlightingEditor.ColorDlg.Italic}" />
-        <TabIndex value="24" />
-      </System.Windows.Forms.CheckBox>
-      <System.Windows.Forms.Button>
-        <Name value="cancelBtn" />
-        <Location value="{X=360,Y=256}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Global.CancelButtonText}" />
-        <Anchor value="Bottom, Right" />
-        <TabIndex value="26" />
-        <DialogResult value="Cancel" />
-        <AccessibleDescription value="" />
-      </System.Windows.Forms.Button>
-    </Controls>
-  </System.Windows.Forms.Form>
-</Components>

src/AddIns/Misc/HighlightingEditor/Project/Resources/Digits.xfrm

@@ -1,67 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.UserControl>
-    <Name value="highlightingOptionPanel" />
-    <DockPadding value="" />
-    <ClientSize value="{Width=312, Height=312}" />
-    <Controls>
-      <System.Windows.Forms.Button>
-        <Name value="button" />
-        <Location value="{X=224,Y=96}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Dialog.HighlightingEditor.Edit}" />
-        <Anchor value="Top, Right" />
-        <TabIndex value="4" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.Label>
-        <Name value="sampleLabel" />
-        <Text value="0 1 2 3 4 5 6 7 8 9" />
-        <TextAlign value="MiddleCenter" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="3" />
-        <ClientSize value="{Width=280, Height=40}" />
-        <Location value="{X=16,Y=40}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Label>
-        <Name value="label3" />
-        <Text value="${res:Dialog.HighlightingEditor.Digits.Sample}" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="1" />
-        <ClientSize value="{Width=312, Height=16}" />
-        <Location value="{X=0,Y=8}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Panel>
-        <Name value="panel" />
-        <Location value="{X=0,Y=144}" />
-        <ClientSize value="{Width=312, Height=168}" />
-        <DockPadding value="" />
-        <Anchor value="Top, Bottom, Left, Right" />
-        <TabIndex value="0" />
-        <Controls>
-          <System.Windows.Forms.Label>
-            <Name value="explLabel" />
-            <Text value="${res:Dialog.HighlightingEditor.Digits.Explanation}" />
-            <Anchor value="Top, Bottom, Left, Right" />
-            <TabIndex value="2" />
-            <ClientSize value="{Width=280, Height=144}" />
-            <Location value="{X=16,Y=24}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label" />
-            <Text value="${res:Dialog.HighlightingEditor.Explanation}" />
-            <TabIndex value="0" />
-            <ClientSize value="{Width=96, Height=16}" />
-            <Location value="{X=0,Y=0}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label2" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="1" />
-            <ClientSize value="{Width=304, Height=0}" />
-            <Location value="{X=0,Y=8}" />
-            <BorderStyle value="Fixed3D" />
-          </System.Windows.Forms.Label>
-        </Controls>
-      </System.Windows.Forms.Panel>
-    </Controls>
-  </System.Windows.Forms.UserControl>
-</Components>

src/AddIns/Misc/HighlightingEditor/Project/Resources/EditDialog.xfrm

@@ -1,80 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.Form>
-    <Name value="EditHighlightingDialog" />
-    <ShowInTaskbar value="False" />
-    <FormBorderStyle value="FixedDialog" />
-    <StartPosition value="CenterParent" />
-    <ClientSize value="{Width=634, Height=480}" />
-    <MinimizeBox value="False" />
-    <DockPadding value="" />
-    <Text value="${res:Dialog.HighlightingEditor.EditDlg.Title}" />
-    <AcceptButton value="acceptBtn [System.Windows.Forms.Button], Text: ${res:Global.OKButtonText}" />
-    <CancelButton value="cancelBtn [System.Windows.Forms.Button], Text: ${res:Global.CancelButtonText}" />
-    <MaximizeBox value="False" />
-    <Controls>
-      <System.Windows.Forms.Panel>
-        <Name value="panel" />
-        <Location value="{X=8,Y=8}" />
-        <ClientSize value="{Width=618, Height=434}" />
-        <DockPadding value="" />
-        <Anchor value="Top, Bottom, Left, Right" />
-        <TabIndex value="25" />
-        <Controls>
-          <System.Windows.Forms.Panel>
-            <Name value="propPanel" />
-            <Location value="{X=294,Y=0}" />
-            <ClientSize value="{Width=324, Height=434}" />
-            <DockPadding value="" />
-            <TabIndex value="2" />
-            <Dock value="Fill" />
-            <Controls>
-              <System.Windows.Forms.Panel>
-                <Name value="optionPanel" />
-                <Location value="{X=6,Y=42}" />
-                <ClientSize value="{Width=312, Height=384}" />
-                <DockPadding value="" />
-                <Anchor value="Top, Bottom, Left, Right" />
-                <TabIndex value="0" />
-              </System.Windows.Forms.Panel>
-            </Controls>
-          </System.Windows.Forms.Panel>
-          <System.Windows.Forms.Splitter>
-            <Name value="splitter" />
-            <TabIndex value="1" />
-            <ClientSize value="{Width=6, Height=434}" />
-            <Location value="{X=288,Y=0}" />
-          </System.Windows.Forms.Splitter>
-          <System.Windows.Forms.TreeView>
-            <Name value="nodeTree" />
-            <ImageIndex value="-1" />
-            <Dock value="Left" />
-            <TabIndex value="0" />
-            <FullRowSelect value="True" />
-            <Location value="{X=0,Y=0}" />
-            <SelectedImageIndex value="-1" />
-            <ClientSize value="{Width=284, Height=430}" />
-            <HideSelection value="False" />
-          </System.Windows.Forms.TreeView>
-        </Controls>
-      </System.Windows.Forms.Panel>
-      <System.Windows.Forms.Button>
-        <Name value="acceptBtn" />
-        <Location value="{X=472,Y=448}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Global.OKButtonText}" />
-        <Anchor value="Bottom, Right" />
-        <TabIndex value="24" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.Button>
-        <Name value="cancelBtn" />
-        <Location value="{X=551,Y=448}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Global.CancelButtonText}" />
-        <Anchor value="Bottom, Right" />
-        <TabIndex value="23" />
-        <DialogResult value="Cancel" />
-        <AccessibleDescription value="" />
-      </System.Windows.Forms.Button>
-    </Controls>
-  </System.Windows.Forms.Form>
-</Components>

src/AddIns/Misc/HighlightingEditor/Project/Resources/Environment.xfrm

@@ -1,93 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.UserControl>
-    <Name value="highlightingOptionPanel" />
-    <DockPadding value="" />
-    <ClientSize value="{Width=312, Height=408}" />
-    <Controls>
-      <System.Windows.Forms.ListView>
-        <Name value="listView" />
-        <GridLines value="True" />
-        <MultiSelect value="False" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="5" />
-        <View value="Details" />
-        <FullRowSelect value="True" />
-        <Location value="{X=16,Y=32}" />
-        <ClientSize value="{Width=276, Height=212}" />
-        <HeaderStyle value="None" />
-        <HideSelection value="False" />
-        <Columns>
-          <System.Windows.Forms.ColumnHeader>
-            <Width value="150" />
-            <Name value="columnHeader" />
-            <Text value="(Name)" />
-          </System.Windows.Forms.ColumnHeader>
-          <System.Windows.Forms.ColumnHeader>
-            <Width value="100" />
-            <Name value="columnHeader2" />
-            <Text value="(Sample)" />
-          </System.Windows.Forms.ColumnHeader>
-        </Columns>
-      </System.Windows.Forms.ListView>
-      <System.Windows.Forms.Button>
-        <Name value="button" />
-        <Location value="{X=221,Y=256}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Dialog.HighlightingEditor.Edit}" />
-        <Anchor value="Top, Right" />
-        <TabIndex value="4" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.Label>
-        <Name value="label3" />
-        <Text value="${res:Dialog.HighlightingEditor.Environment.Colors}" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="1" />
-        <ClientSize value="{Width=312, Height=16}" />
-        <Location value="{X=0,Y=8}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Panel>
-        <Name value="panel" />
-        <Location value="{X=0,Y=296}" />
-        <ClientSize value="{Width=312, Height=112}" />
-        <DockPadding value="" />
-        <Anchor value="Top, Bottom, Left, Right" />
-        <TabIndex value="0" />
-        <Controls>
-          <System.Windows.Forms.Label>
-            <Name value="explLabel" />
-            <Text value="${res:Dialog.HighlightingEditor.Environment.Explanation}" />
-            <Anchor value="Top, Bottom, Left, Right" />
-            <TabIndex value="2" />
-            <ClientSize value="{Width=280, Height=88}" />
-            <Location value="{X=16,Y=24}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label" />
-            <Text value="${res:Dialog.HighlightingEditor.Explanation}" />
-            <TabIndex value="0" />
-            <ClientSize value="{Width=96, Height=16}" />
-            <Location value="{X=0,Y=0}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label2" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="1" />
-            <ClientSize value="{Width=304, Height=0}" />
-            <Location value="{X=0,Y=8}" />
-            <BorderStyle value="Fixed3D" />
-          </System.Windows.Forms.Label>
-        </Controls>
-      </System.Windows.Forms.Panel>
-    </Controls>
-  </System.Windows.Forms.UserControl>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="100" />
-    <Name value="columnHeader2" />
-    <Text value="(Sample)" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="150" />
-    <Name value="columnHeader" />
-    <Text value="(Name)" />
-  </System.Windows.Forms.ColumnHeader>
-</Components>

src/AddIns/Misc/HighlightingEditor/Project/Resources/KeywordList.xfrm

@@ -1,168 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.UserControl>
-    <Name value="highlightingOptionPanel" />
-    <DockPadding value="" />
-    <ClientSize value="{Width=320, Height=440}" />
-    <Controls>
-      <System.Windows.Forms.Label>
-        <Name value="sampleLabel" />
-        <Text value="${res:Dialog.HighlightingEditor.SampleText}" />
-        <TextAlign value="MiddleCenter" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="11" />
-        <ClientSize value="{Width=176, Height=40}" />
-        <Location value="{X=24,Y=280}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.ListBox>
-        <Name value="listBox" />
-        <IntegralHeight value="False" />
-        <ClientSize value="{Width=284, Height=140}" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="10" />
-        <Location value="{X=16,Y=64}" />
-        <MultiColumn value="True" />
-      </System.Windows.Forms.ListBox>
-      <System.Windows.Forms.TextBox>
-        <Name value="nameBox" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="9" />
-        <Location value="{X=128,Y=5}" />
-        <ClientSize value="{Width=188, Height=17}" />
-        <Text value="" />
-      </System.Windows.Forms.TextBox>
-      <System.Windows.Forms.Label>
-        <Name value="label5" />
-        <Text value="${res:Dialog.HighlightingEditor.KeywordList.ListName}" />
-        <TabIndex value="8" />
-        <ClientSize value="{Width=128, Height=16}" />
-        <Location value="{X=0,Y=8}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Button>
-        <Name value="addBtn" />
-        <Location value="{X=141,Y=216}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Dialog.HighlightingEditor.Add}" />
-        <Anchor value="Top, Right" />
-        <TabIndex value="7" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.Button>
-        <Name value="removeBtn" />
-        <Location value="{X=229,Y=216}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Dialog.HighlightingEditor.Remove}" />
-        <Anchor value="Top, Right" />
-        <TabIndex value="4" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.Label>
-        <Name value="label3" />
-        <Text value="${res:Dialog.HighlightingEditor.KeywordList.Keywords}" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="1" />
-        <ClientSize value="{Width=320, Height=16}" />
-        <Location value="{X=0,Y=40}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Panel>
-        <Name value="panel" />
-        <Location value="{X=0,Y=336}" />
-        <ClientSize value="{Width=320, Height=104}" />
-        <DockPadding value="" />
-        <Anchor value="Top, Bottom, Left, Right" />
-        <TabIndex value="0" />
-        <Controls>
-          <System.Windows.Forms.Label>
-            <Name value="explLabel" />
-            <Text value="${res:Dialog.HighlightingEditor.KeywordList.Explanation}" />
-            <Anchor value="Top, Bottom, Left, Right" />
-            <TabIndex value="2" />
-            <ClientSize value="{Width=288, Height=80}" />
-            <Location value="{X=16,Y=24}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label" />
-            <Text value="${res:Dialog.HighlightingEditor.Explanation}" />
-            <TabIndex value="0" />
-            <ClientSize value="{Width=96, Height=16}" />
-            <Location value="{X=0,Y=0}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label2" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="1" />
-            <ClientSize value="{Width=298, Height=0}" />
-            <Location value="{X=0,Y=8}" />
-            <BorderStyle value="Fixed3D" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label4" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="3" />
-            <ClientSize value="{Width=244, Height=0}" />
-            <Location value="{X=64,Y=8}" />
-            <BorderStyle value="Fixed3D" />
-          </System.Windows.Forms.Label>
-        </Controls>
-      </System.Windows.Forms.Panel>
-      <System.Windows.Forms.Label>
-        <Name value="label3" />
-        <Text value="${res:Dialog.HighlightingEditor.KeywordList.ColorSample}" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="1" />
-        <ClientSize value="{Width=320, Height=16}" />
-        <Location value="{X=0,Y=256}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Button>
-        <Name value="chgBtn" />
-        <Location value="{X=216,Y=288}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Dialog.HighlightingEditor.Change}" />
-        <Anchor value="Top, Right" />
-        <TabIndex value="4" />
-      </System.Windows.Forms.Button>
-    </Controls>
-  </System.Windows.Forms.UserControl>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader3" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="250" />
-    <Name value="columnHeader2" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader7" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Value}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="150" />
-    <Name value="columnHeader6" />
-    <Text value="(Name)" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="100" />
-    <Name value="columnHeader5" />
-    <Text value="(Sample)" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader4" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Value}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="250" />
-    <Name value="columnHeader8" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader9" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="250" />
-    <Name value="columnHeader10" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-</Components>

src/AddIns/Misc/HighlightingEditor/Project/Resources/KeywordLists.xfrm

@@ -1,139 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.UserControl>
-    <Name value="highlightingOptionPanel" />
-    <DockPadding value="" />
-    <ClientSize value="{Width=312, Height=408}" />
-    <Controls>
-      <System.Windows.Forms.Button>
-        <Name value="addBtn" />
-        <Location value="{X=133,Y=240}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Dialog.HighlightingEditor.Add}" />
-        <Anchor value="Top, Right" />
-        <TabIndex value="7" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.ListView>
-        <Name value="listView" />
-        <GridLines value="True" />
-        <MultiSelect value="False" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="5" />
-        <View value="Details" />
-        <FullRowSelect value="True" />
-        <Location value="{X=16,Y=32}" />
-        <ClientSize value="{Width=276, Height=196}" />
-        <HeaderStyle value="None" />
-        <HideSelection value="False" />
-        <Columns>
-          <System.Windows.Forms.ColumnHeader>
-            <Width value="250" />
-            <Name value="columnHeader" />
-            <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-          </System.Windows.Forms.ColumnHeader>
-        </Columns>
-      </System.Windows.Forms.ListView>
-      <System.Windows.Forms.Button>
-        <Name value="removeBtn" />
-        <Location value="{X=221,Y=240}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Dialog.HighlightingEditor.Remove}" />
-        <Anchor value="Top, Right" />
-        <TabIndex value="4" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.Label>
-        <Name value="label3" />
-        <Text value="${res:Dialog.HighlightingEditor.KeywordLists.Lists}" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="1" />
-        <ClientSize value="{Width=312, Height=16}" />
-        <Location value="{X=0,Y=8}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Panel>
-        <Name value="panel" />
-        <Location value="{X=0,Y=280}" />
-        <ClientSize value="{Width=312, Height=128}" />
-        <DockPadding value="" />
-        <Anchor value="Top, Bottom, Left, Right" />
-        <TabIndex value="0" />
-        <Controls>
-          <System.Windows.Forms.Label>
-            <Name value="explLabel" />
-            <Text value="${res:Dialog.HighlightingEditor.KeywordLists.Explanation}" />
-            <Anchor value="Top, Bottom, Left, Right" />
-            <TabIndex value="2" />
-            <ClientSize value="{Width=280, Height=104}" />
-            <Location value="{X=16,Y=24}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label" />
-            <Text value="${res:Dialog.HighlightingEditor.Explanation}" />
-            <TabIndex value="0" />
-            <ClientSize value="{Width=96, Height=16}" />
-            <Location value="{X=0,Y=0}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label2" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="1" />
-            <ClientSize value="{Width=294, Height=0}" />
-            <Location value="{X=0,Y=8}" />
-            <BorderStyle value="Fixed3D" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label4" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="3" />
-            <ClientSize value="{Width=240, Height=0}" />
-            <Location value="{X=64,Y=8}" />
-            <BorderStyle value="Fixed3D" />
-          </System.Windows.Forms.Label>
-        </Controls>
-      </System.Windows.Forms.Panel>
-    </Controls>
-  </System.Windows.Forms.UserControl>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader3" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="250" />
-    <Name value="columnHeader2" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader7" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Value}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="150" />
-    <Name value="columnHeader6" />
-    <Text value="(Name)" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="100" />
-    <Name value="columnHeader5" />
-    <Text value="(Sample)" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader4" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Value}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="250" />
-    <Name value="columnHeader" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader8" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="250" />
-    <Name value="columnHeader9" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-</Components>

src/AddIns/Misc/HighlightingEditor/Project/Resources/Marker.xfrm

@@ -1,145 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.UserControl>
-    <Name value="highlightingOptionPanel" />
-    <DockPadding value="" />
-    <ClientSize value="{Width=320, Height=440}" />
-    <Controls>
-      <System.Windows.Forms.CheckBox>
-        <Name value="checkBox" />
-        <Location value="{X=0,Y=184}" />
-        <ClientSize value="{Width=320, Height=16}" />
-        <Text value="${res:Dialog.HighlightingEditor.Marker.MarkMarker}" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="12" />
-      </System.Windows.Forms.CheckBox>
-      <System.Windows.Forms.Label>
-        <Name value="sampleLabel" />
-        <Text value="${res:Dialog.HighlightingEditor.SampleText}" />
-        <TextAlign value="MiddleCenter" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="11" />
-        <ClientSize value="{Width=176, Height=40}" />
-        <Location value="{X=24,Y=120}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.TextBox>
-        <Name value="nameBox" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="9" />
-        <Location value="{X=16,Y=32}" />
-        <ClientSize value="{Width=284, Height=17}" />
-        <Text value="" />
-      </System.Windows.Forms.TextBox>
-      <System.Windows.Forms.Label>
-        <Name value="label5" />
-        <Text value="${res:Dialog.HighlightingEditor.Marker.KeyString}" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="8" />
-        <ClientSize value="{Width=320, Height=16}" />
-        <Location value="{X=0,Y=8}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Panel>
-        <Name value="panel" />
-        <Location value="{X=0,Y=224}" />
-        <ClientSize value="{Width=320, Height=216}" />
-        <DockPadding value="" />
-        <Anchor value="Top, Bottom, Left, Right" />
-        <TabIndex value="0" />
-        <Controls>
-          <System.Windows.Forms.Label>
-            <Name value="explLabel" />
-            <Text value="${res:Dialog.HighlightingEditor.Marker.ExplanationPrev}" />
-            <Anchor value="Top, Bottom, Left, Right" />
-            <TabIndex value="2" />
-            <ClientSize value="{Width=288, Height=192}" />
-            <Location value="{X=16,Y=24}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label" />
-            <Text value="${res:Dialog.HighlightingEditor.Explanation}" />
-            <TabIndex value="0" />
-            <ClientSize value="{Width=96, Height=16}" />
-            <Location value="{X=0,Y=0}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label2" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="1" />
-            <ClientSize value="{Width=294, Height=0}" />
-            <Location value="{X=0,Y=8}" />
-            <BorderStyle value="Fixed3D" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label4" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="3" />
-            <ClientSize value="{Width=240, Height=0}" />
-            <Location value="{X=64,Y=8}" />
-            <BorderStyle value="Fixed3D" />
-          </System.Windows.Forms.Label>
-        </Controls>
-      </System.Windows.Forms.Panel>
-      <System.Windows.Forms.Label>
-        <Name value="label3" />
-        <Text value="${res:Dialog.HighlightingEditor.Marker.SampleColor}" />
-        <TextAlign value="BottomLeft" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="1" />
-        <ClientSize value="{Width=320, Height=32}" />
-        <Location value="{X=0,Y=72}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Button>
-        <Name value="chgBtn" />
-        <Location value="{X=216,Y=128}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Dialog.HighlightingEditor.Change}" />
-        <Anchor value="Top, Right" />
-        <TabIndex value="4" />
-      </System.Windows.Forms.Button>
-    </Controls>
-  </System.Windows.Forms.UserControl>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader3" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="250" />
-    <Name value="columnHeader2" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader7" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Value}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="150" />
-    <Name value="columnHeader6" />
-    <Text value="(Name)" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="100" />
-    <Name value="columnHeader5" />
-    <Text value="(Sample)" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader4" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Value}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="250" />
-    <Name value="columnHeader8" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader9" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="250" />
-    <Name value="columnHeader10" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-</Components>

src/AddIns/Misc/HighlightingEditor/Project/Resources/Markers.xfrm

@@ -1,149 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.UserControl>
-    <Name value="highlightingOptionPanel" />
-    <DockPadding value="" />
-    <ClientSize value="{Width=312, Height=408}" />
-    <Controls>
-      <System.Windows.Forms.Button>
-        <Name value="addBtn" />
-        <Location value="{X=133,Y=184}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Dialog.HighlightingEditor.Add}" />
-        <Anchor value="Top, Right" />
-        <TabIndex value="7" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.ListView>
-        <Name value="listView" />
-        <GridLines value="True" />
-        <MultiSelect value="False" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="5" />
-        <View value="Details" />
-        <FullRowSelect value="True" />
-        <Location value="{X=16,Y=32}" />
-        <ClientSize value="{Width=276, Height=140}" />
-        <HeaderStyle value="Nonclickable" />
-        <HideSelection value="False" />
-        <Columns>
-          <System.Windows.Forms.ColumnHeader>
-            <Width value="250" />
-            <Name value="columnHeader" />
-            <Text value="${res:Dialog.HighlightingEditor.Markers.KeyString}" />
-          </System.Windows.Forms.ColumnHeader>
-        </Columns>
-      </System.Windows.Forms.ListView>
-      <System.Windows.Forms.Button>
-        <Name value="removeBtn" />
-        <Location value="{X=221,Y=184}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Dialog.HighlightingEditor.Remove}" />
-        <Anchor value="Top, Right" />
-        <TabIndex value="4" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.Label>
-        <Name value="label" />
-        <Text value="${res:Dialog.HighlightingEditor.Markers.Previous}" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="1" />
-        <ClientSize value="{Width=312, Height=16}" />
-        <Location value="{X=0,Y=8}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Panel>
-        <Name value="panel" />
-        <Location value="{X=0,Y=232}" />
-        <ClientSize value="{Width=312, Height=176}" />
-        <DockPadding value="" />
-        <Anchor value="Top, Bottom, Left, Right" />
-        <TabIndex value="0" />
-        <Controls>
-          <System.Windows.Forms.Label>
-            <Name value="explLabel" />
-            <Text value="${res:Dialog.HighlightingEditor.Markers.Explanation}" />
-            <Anchor value="Top, Bottom, Left, Right" />
-            <TabIndex value="2" />
-            <ClientSize value="{Width=280, Height=152}" />
-            <Location value="{X=16,Y=24}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="labele" />
-            <Text value="${res:Dialog.HighlightingEditor.Explanation}" />
-            <TabIndex value="0" />
-            <ClientSize value="{Width=96, Height=16}" />
-            <Location value="{X=0,Y=0}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label2" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="1" />
-            <ClientSize value="{Width=290, Height=0}" />
-            <Location value="{X=0,Y=8}" />
-            <BorderStyle value="Fixed3D" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label4" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="3" />
-            <ClientSize value="{Width=236, Height=0}" />
-            <Location value="{X=64,Y=8}" />
-            <BorderStyle value="Fixed3D" />
-          </System.Windows.Forms.Label>
-        </Controls>
-      </System.Windows.Forms.Panel>
-    </Controls>
-  </System.Windows.Forms.UserControl>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader3" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="250" />
-    <Name value="columnHeader2" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader7" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Value}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="150" />
-    <Name value="columnHeader6" />
-    <Text value="(Name)" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="100" />
-    <Name value="columnHeader5" />
-    <Text value="(Sample)" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader4" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Value}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="250" />
-    <Name value="columnHeader" />
-    <Text value="${res:Dialog.HighlightingEditor.Markers.KeyString}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="250" />
-    <Name value="columnHeader8" />
-    <Text value="${res:Dialog.HighlightingEditor.Markers.KeyString}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="250" />
-    <Name value="columnHeader9" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader10" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="250" />
-    <Name value="columnHeader11" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-</Components>

src/AddIns/Misc/HighlightingEditor/Project/Resources/OptionPanel.xfrm

@@ -1,80 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.UserControl>
-    <Name value="highlightingOptionPanel" />
-    <ClientSize value="{Width=328, Height=288}" />
-    <Controls>
-      <System.Windows.Forms.Label>
-        <Name value="label4" />
-        <Text value="${res:Dialog.Options.TextEditorOptions.EditHighlighting.DescLabel}" />
-        <Anchor value="Bottom, Left, Right" />
-        <TabIndex value="4" />
-        <ClientSize value="{Width=312, Height=48}" />
-        <Location value="{X=8,Y=232}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Button>
-        <Name value="copyButton" />
-        <Location value="{X=8,Y=192}" />
-        <ClientSize value="{Width=152, Height=24}" />
-        <Text value="${res:Dialog.Options.TextEditorOptions.EditHighlighting.CopyButton}" />
-        <Anchor value="Bottom, Left" />
-        <TabIndex value="3" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.ListBox>
-        <Name value="builtinList" />
-        <IntegralHeight value="False" />
-        <ClientSize value="{Width=148, Height=132}" />
-        <Anchor value="Top, Bottom, Left" />
-        <HorizontalScrollbar value="True" />
-        <TabIndex value="2" />
-        <Location value="{X=8,Y=48}" />
-      </System.Windows.Forms.ListBox>
-      <System.Windows.Forms.Label>
-        <Name value="builtinLabel" />
-        <Text value="${res:Dialog.Options.TextEditorOptions.EditHighlighting.BuiltinLabel}" />
-        <TabIndex value="1" />
-        <ClientSize value="{Width=152, Height=16}" />
-        <Location value="{X=8,Y=32}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Label>
-        <Name value="capLabel" />
-        <Text value="${res:Dialog.Options.TextEditorOptions.EditHighlighting.CaptionLabel}" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="0" />
-        <ClientSize value="{Width=312, Height=16}" />
-        <Location value="{X=8,Y=8}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Label>
-        <Name value="userLabel" />
-        <Text value="${res:Dialog.Options.TextEditorOptions.EditHighlighting.UserLabel}" />
-        <TabIndex value="1" />
-        <ClientSize value="{Width=152, Height=16}" />
-        <Location value="{X=168,Y=32}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.ListBox>
-        <Name value="userList" />
-        <IntegralHeight value="False" />
-        <ClientSize value="{Width=148, Height=132}" />
-        <Anchor value="Top, Bottom, Left" />
-        <HorizontalScrollbar value="True" />
-        <TabIndex value="2" />
-        <Location value="{X=168,Y=48}" />
-      </System.Windows.Forms.ListBox>
-      <System.Windows.Forms.Button>
-        <Name value="deleteButton" />
-        <Location value="{X=168,Y=192}" />
-        <ClientSize value="{Width=72, Height=24}" />
-        <Text value="${res:Dialog.Options.TextEditorOptions.EditHighlighting.DeleteButton}" />
-        <Anchor value="Bottom, Left" />
-        <TabIndex value="3" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.Button>
-        <Name value="modifyButton" />
-        <Location value="{X=248,Y=192}" />
-        <ClientSize value="{Width=72, Height=24}" />
-        <Text value="${res:Dialog.Options.TextEditorOptions.EditHighlighting.ModifyButton}" />
-        <Anchor value="Bottom, Left" />
-        <TabIndex value="3" />
-      </System.Windows.Forms.Button>
-    </Controls>
-  </System.Windows.Forms.UserControl>
-</Components>

src/AddIns/Misc/HighlightingEditor/Project/Resources/Properties.xfrm

@@ -1,119 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.UserControl>
-    <Name value="highlightingOptionPanel" />
-    <DockPadding value="" />
-    <ClientSize value="{Width=312, Height=408}" />
-    <Controls>
-      <System.Windows.Forms.Button>
-        <Name value="addBtn" />
-        <Location value="{X=48,Y=184}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Dialog.HighlightingEditor.Add}" />
-        <Anchor value="Top, Right" />
-        <TabIndex value="7" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.Button>
-        <Name value="editBtn" />
-        <Location value="{X=136,Y=184}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Dialog.HighlightingEditor.Edit}" />
-        <Anchor value="Top, Right" />
-        <TabIndex value="6" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.ListView>
-        <Name value="listView" />
-        <GridLines value="True" />
-        <MultiSelect value="False" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="5" />
-        <View value="Details" />
-        <FullRowSelect value="True" />
-        <Location value="{X=16,Y=32}" />
-        <ClientSize value="{Width=276, Height=140}" />
-        <HeaderStyle value="Nonclickable" />
-        <HideSelection value="False" />
-        <Columns>
-          <System.Windows.Forms.ColumnHeader>
-            <Width value="130" />
-            <Name value="columnHeader" />
-            <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-          </System.Windows.Forms.ColumnHeader>
-          <System.Windows.Forms.ColumnHeader>
-            <Width value="130" />
-            <Name value="columnHeader2" />
-            <Text value="${res:Dialog.HighlightingEditor.Properties.Value}" />
-          </System.Windows.Forms.ColumnHeader>
-        </Columns>
-      </System.Windows.Forms.ListView>
-      <System.Windows.Forms.Button>
-        <Name value="removeBtn" />
-        <Location value="{X=221,Y=184}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Dialog.HighlightingEditor.Remove}" />
-        <Anchor value="Top, Right" />
-        <TabIndex value="4" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.Label>
-        <Name value="label3" />
-        <Text value="${res:Dialog.HighlightingEditor.Properties.Properties}" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="1" />
-        <ClientSize value="{Width=312, Height=16}" />
-        <Location value="{X=0,Y=8}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Panel>
-        <Name value="panel" />
-        <Location value="{X=0,Y=232}" />
-        <ClientSize value="{Width=312, Height=176}" />
-        <DockPadding value="" />
-        <Anchor value="Top, Bottom, Left, Right" />
-        <TabIndex value="0" />
-        <Controls>
-          <System.Windows.Forms.Label>
-            <Name value="explLabel" />
-            <Text value="${res:Dialog.HighlightingEditor.Properties.Explanation}" />
-            <Anchor value="Top, Bottom, Left, Right" />
-            <TabIndex value="2" />
-            <ClientSize value="{Width=280, Height=152}" />
-            <Location value="{X=16,Y=24}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label" />
-            <Text value="${res:Dialog.HighlightingEditor.Explanation}" />
-            <TabIndex value="0" />
-            <ClientSize value="{Width=96, Height=16}" />
-            <Location value="{X=0,Y=0}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label2" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="1" />
-            <ClientSize value="{Width=302, Height=0}" />
-            <Location value="{X=0,Y=8}" />
-            <BorderStyle value="Fixed3D" />
-          </System.Windows.Forms.Label>
-        </Controls>
-      </System.Windows.Forms.Panel>
-    </Controls>
-  </System.Windows.Forms.UserControl>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="100" />
-    <Name value="columnHeader3" />
-    <Text value="(Sample)" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader2" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Value}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="150" />
-    <Name value="columnHeader4" />
-    <Text value="(Name)" />
-  </System.Windows.Forms.ColumnHeader>
-</Components>

src/AddIns/Misc/HighlightingEditor/Project/Resources/RuleSet.xfrm

@@ -1,112 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.UserControl>
-    <Name value="highlightingOptionPanel" />
-    <ClientSize value="{Width=312, Height=376}" />
-    <Controls>
-      <System.Windows.Forms.TextBox>
-        <Name value="escCharTextBox" />
-        <TabIndex value="7" />
-        <MaxLength value="1" />
-        <Size value="61, 20" />
-        <Location value="146, 157" />
-      </System.Windows.Forms.TextBox>
-      <System.Windows.Forms.Label>
-        <Name value="label1" />
-        <Location value="3, 157" />
-        <Text value="${res:Dialog.HighlightingEditor.Span.EscChar}" />
-        <Size value="137, 23" />
-        <TabIndex value="6" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.CheckBox>
-        <Name value="igcaseBox" />
-        <Location value="0, 128" />
-        <Text value="${res:Dialog.HighlightingEditor.RuleSet.IgnoreCase}" />
-        <TabIndex value="5" />
-        <Size value="312, 16" />
-        <Anchor value="Top, Left, Right" />
-      </System.Windows.Forms.CheckBox>
-      <System.Windows.Forms.TextBox>
-        <Name value="refBox" />
-        <TabIndex value="4" />
-        <Size value="184, 20" />
-        <Location value="128, 32" />
-        <Anchor value="Top, Left, Right" />
-      </System.Windows.Forms.TextBox>
-      <System.Windows.Forms.Label>
-        <Name value="label3a" />
-        <Location value="0, 35" />
-        <Text value="${res:Dialog.HighlightingEditor.RuleSet.Reference}" />
-        <Size value="128, 16" />
-        <TabIndex value="3" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.TextBox>
-        <Name value="nameBox" />
-        <TabIndex value="2" />
-        <Size value="184, 20" />
-        <Location value="128, 5" />
-        <Anchor value="Top, Left, Right" />
-      </System.Windows.Forms.TextBox>
-      <System.Windows.Forms.Label>
-        <Name value="label3b" />
-        <Location value="0, 8" />
-        <Text value="${res:Dialog.HighlightingEditor.RuleSet.Name}" />
-        <Size value="128, 16" />
-        <TabIndex value="1" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Panel>
-        <Name value="panel" />
-        <Location value="0, 192" />
-        <TabIndex value="0" />
-        <Anchor value="Top, Bottom, Left, Right" />
-        <Size value="312, 184" />
-        <Controls>
-          <System.Windows.Forms.Label>
-            <Name value="explLabel" />
-            <Location value="16, 24" />
-            <Text value="${res:Dialog.HighlightingEditor.RuleSet.Explanation}" />
-            <Anchor value="Top, Bottom, Left, Right" />
-            <Size value="280, 160" />
-            <TabIndex value="2" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label" />
-            <Location value="0, 0" />
-            <Text value="${res:Dialog.HighlightingEditor.Explanation}" />
-            <Size value="96, 16" />
-            <TabIndex value="0" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label2" />
-            <Location value="0, 8" />
-            <Anchor value="Top, Left, Right" />
-            <Size value="306, 0" />
-            <TabIndex value="1" />
-            <BorderStyle value="Fixed3D" />
-          </System.Windows.Forms.Label>
-        </Controls>
-      </System.Windows.Forms.Panel>
-      <System.Windows.Forms.TextBox>
-        <Name value="delimBox" />
-        <TabIndex value="4" />
-        <Size value="184, 20" />
-        <Location value="128, 69" />
-        <Anchor value="Top, Left, Right" />
-      </System.Windows.Forms.TextBox>
-      <System.Windows.Forms.Label>
-        <Name value="label3c" />
-        <Location value="0, 72" />
-        <Text value="${res:Dialog.HighlightingEditor.RuleSet.Delimiters}" />
-        <Size value="128, 16" />
-        <TabIndex value="3" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Label>
-        <Name value="label3d" />
-        <Location value="16, 96" />
-        <Text value="${res:Dialog.HighlightingEditor.RuleSet.SpaceAndTab}" />
-        <Anchor value="Top, Left, Right" />
-        <Size value="280, 16" />
-        <TabIndex value="3" />
-      </System.Windows.Forms.Label>
-    </Controls>
-  </System.Windows.Forms.UserControl>
-</Components>

src/AddIns/Misc/HighlightingEditor/Project/Resources/RuleSets.xfrm

@@ -1,129 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.UserControl>
-    <Name value="highlightingOptionPanel" />
-    <DockPadding value="" />
-    <ClientSize value="{Width=312, Height=408}" />
-    <Controls>
-      <System.Windows.Forms.Button>
-        <Name value="addBtn" />
-        <Location value="{X=133,Y=184}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Dialog.HighlightingEditor.Add}" />
-        <Anchor value="Top, Right" />
-        <TabIndex value="7" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.ListView>
-        <Name value="listView" />
-        <GridLines value="True" />
-        <MultiSelect value="False" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="5" />
-        <View value="Details" />
-        <FullRowSelect value="True" />
-        <Location value="{X=16,Y=32}" />
-        <ClientSize value="{Width=276, Height=140}" />
-        <HeaderStyle value="None" />
-        <HideSelection value="False" />
-        <Columns>
-          <System.Windows.Forms.ColumnHeader>
-            <Width value="250" />
-            <Name value="columnHeader" />
-            <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-          </System.Windows.Forms.ColumnHeader>
-        </Columns>
-      </System.Windows.Forms.ListView>
-      <System.Windows.Forms.Button>
-        <Name value="removeBtn" />
-        <Location value="{X=221,Y=184}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Dialog.HighlightingEditor.Remove}" />
-        <Anchor value="Top, Right" />
-        <TabIndex value="4" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.Label>
-        <Name value="label3" />
-        <Text value="${res:Dialog.HighlightingEditor.RuleSets.NamedRuleSets}" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="1" />
-        <ClientSize value="{Width=312, Height=16}" />
-        <Location value="{X=0,Y=8}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Panel>
-        <Name value="panel" />
-        <Location value="{X=0,Y=232}" />
-        <ClientSize value="{Width=312, Height=176}" />
-        <DockPadding value="" />
-        <Anchor value="Top, Bottom, Left, Right" />
-        <TabIndex value="0" />
-        <Controls>
-          <System.Windows.Forms.Label>
-            <Name value="explLabel" />
-            <Text value="${res:Dialog.HighlightingEditor.RuleSets.Explanation}" />
-            <Anchor value="Top, Bottom, Left, Right" />
-            <TabIndex value="2" />
-            <ClientSize value="{Width=280, Height=152}" />
-            <Location value="{X=16,Y=24}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label" />
-            <Text value="${res:Dialog.HighlightingEditor.Explanation}" />
-            <TabIndex value="0" />
-            <ClientSize value="{Width=96, Height=16}" />
-            <Location value="{X=0,Y=0}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label2" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="1" />
-            <ClientSize value="{Width=298, Height=0}" />
-            <Location value="{X=0,Y=8}" />
-            <BorderStyle value="Fixed3D" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label4" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="3" />
-            <ClientSize value="{Width=244, Height=0}" />
-            <Location value="{X=64,Y=8}" />
-            <BorderStyle value="Fixed3D" />
-          </System.Windows.Forms.Label>
-        </Controls>
-      </System.Windows.Forms.Panel>
-    </Controls>
-  </System.Windows.Forms.UserControl>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader3" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader7" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Value}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="150" />
-    <Name value="columnHeader6" />
-    <Text value="(Name)" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader4" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Value}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="100" />
-    <Name value="columnHeader5" />
-    <Text value="(Sample)" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="250" />
-    <Name value="columnHeader" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader8" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-</Components>

src/AddIns/Misc/HighlightingEditor/Project/Resources/Scheme.xfrm

@@ -1,72 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.UserControl>
-    <Name value="highlightingOptionPanel" />
-    <DockPadding value="" />
-    <ClientSize value="{Width=312, Height=312}" />
-    <Controls>
-      <System.Windows.Forms.TextBox>
-        <Name value="extBox" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="4" />
-        <Location value="{X=128,Y=37}" />
-        <ClientSize value="{Width=180, Height=17}" />
-        <Text value="" />
-      </System.Windows.Forms.TextBox>
-      <System.Windows.Forms.Label>
-        <Name value="label3" />
-        <Text value="${res:Dialog.HighlightingEditor.Scheme.Extensions}" />
-        <TabIndex value="3" />
-        <ClientSize value="{Width=128, Height=16}" />
-        <Location value="{X=0,Y=40}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.TextBox>
-        <Name value="nameBox" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="2" />
-        <Location value="{X=128,Y=5}" />
-        <ClientSize value="{Width=180, Height=17}" />
-        <Text value="" />
-      </System.Windows.Forms.TextBox>
-      <System.Windows.Forms.Label>
-        <Name value="label3" />
-        <Text value="${res:Dialog.HighlightingEditor.Scheme.Name}" />
-        <TabIndex value="1" />
-        <ClientSize value="{Width=128, Height=16}" />
-        <Location value="{X=0,Y=8}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Panel>
-        <Name value="panel" />
-        <Location value="{X=0,Y=88}" />
-        <ClientSize value="{Width=312, Height=224}" />
-        <DockPadding value="" />
-        <Anchor value="Top, Bottom, Left, Right" />
-        <TabIndex value="0" />
-        <Controls>
-          <System.Windows.Forms.Label>
-            <Name value="explLabel" />
-            <Text value="${res:Dialog.HighlightingEditor.Scheme.Explanation}" />
-            <Anchor value="Top, Bottom, Left, Right" />
-            <TabIndex value="2" />
-            <ClientSize value="{Width=280, Height=200}" />
-            <Location value="{X=16,Y=24}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label" />
-            <Text value="${res:Dialog.HighlightingEditor.Explanation}" />
-            <TabIndex value="0" />
-            <ClientSize value="{Width=96, Height=16}" />
-            <Location value="{X=0,Y=0}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label2" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="1" />
-            <ClientSize value="{Width=308, Height=0}" />
-            <Location value="{X=0,Y=8}" />
-            <BorderStyle value="Fixed3D" />
-          </System.Windows.Forms.Label>
-        </Controls>
-      </System.Windows.Forms.Panel>
-    </Controls>
-  </System.Windows.Forms.UserControl>
-</Components>

src/AddIns/Misc/HighlightingEditor/Project/Resources/Span.xfrm

@@ -1,205 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.UserControl>
-    <Name value="highlightingOptionPanel" />
-    <ClientSize value="{Width=312, Height=460}" />
-    <Controls>
-      <System.Windows.Forms.CheckBox>
-        <Name value="endSingleWordCheckBox" />
-        <Cursor value="IBeam" />
-        <CheckAlign value="MiddleRight" />
-        <Location value="-1, 104" />
-        <Text value="${res:Dialog.HighlightingEditor.Span.EndSingleWord}" />
-        <TabIndex value="24" />
-        <Size value="144, 24" />
-        <UseVisualStyleBackColor value="True" />
-      </System.Windows.Forms.CheckBox>
-      <System.Windows.Forms.CheckBox>
-        <Name value="beginSingleWordCheckBox" />
-        <CheckAlign value="MiddleRight" />
-        <Location value="-1, 52" />
-        <Text value="${res:Dialog.HighlightingEditor.Span.BeginSingleWord}" />
-        <TabIndex value="23" />
-        <Size value="144, 24" />
-        <UseVisualStyleBackColor value="True" />
-        <Cursor value="IBeam" />
-      </System.Windows.Forms.CheckBox>
-      <System.Windows.Forms.TextBox>
-        <Name value="escCharTextBox" />
-        <TabIndex value="20" />
-        <MaxLength value="1" />
-        <Size value="100, 20" />
-        <Location value="128, 320" />
-      </System.Windows.Forms.TextBox>
-      <System.Windows.Forms.Label>
-        <Name value="label1" />
-        <Location value="0, 320" />
-        <Text value="${res:Dialog.HighlightingEditor.Span.EscChar}" />
-        <TextAlign value="MiddleLeft" />
-        <Size value="128, 23" />
-        <TabIndex value="19" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Button>
-        <Name value="chgCont" />
-        <Location value="216, 261" />
-        <Text value="${res:Dialog.HighlightingEditor.Change}" />
-        <Size value="88, 23" />
-        <TabIndex value="18" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.Label>
-        <Name value="samCont" />
-        <Location value="216, 197" />
-        <Text value="${res:Dialog.HighlightingEditor.Span.ContCol}" />
-        <TextAlign value="MiddleCenter" />
-        <Size value="88, 40" />
-        <TabIndex value="16" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Button>
-        <Name value="chgEnd" />
-        <Location value="112, 261" />
-        <Text value="${res:Dialog.HighlightingEditor.Change}" />
-        <Size value="88, 23" />
-        <TabIndex value="15" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.CheckBox>
-        <Name value="useEnd" />
-        <Location value="112, 237" />
-        <Text value="${res:Dialog.HighlightingEditor.Span.Use}" />
-        <TabIndex value="14" />
-        <Size value="88, 24" />
-      </System.Windows.Forms.CheckBox>
-      <System.Windows.Forms.Label>
-        <Name value="samEnd" />
-        <Location value="112, 197" />
-        <Text value="${res:Dialog.HighlightingEditor.Span.EndCol}" />
-        <TextAlign value="MiddleCenter" />
-        <Size value="88, 40" />
-        <TabIndex value="13" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Button>
-        <Name value="chgBegin" />
-        <Location value="8, 261" />
-        <Text value="${res:Dialog.HighlightingEditor.Change}" />
-        <Size value="88, 23" />
-        <TabIndex value="12" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.CheckBox>
-        <Name value="useBegin" />
-        <Location value="8, 237" />
-        <Text value="${res:Dialog.HighlightingEditor.Span.Use}" />
-        <TabIndex value="11" />
-        <Size value="88, 24" />
-      </System.Windows.Forms.CheckBox>
-      <System.Windows.Forms.Label>
-        <Name value="samBegin" />
-        <Location value="8, 197" />
-        <Text value="${res:Dialog.HighlightingEditor.Span.BeginCol}" />
-        <TextAlign value="MiddleCenter" />
-        <Size value="88, 40" />
-        <TabIndex value="10" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Label>
-        <Name value="label7" />
-        <Location value="0, 165" />
-        <Text value="${res:Dialog.HighlightingEditor.Span.Colors}" />
-        <Size value="280, 16" />
-        <TabIndex value="9" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.ComboBox>
-        <Name value="ruleBox" />
-        <Size value="184, 21" />
-        <TabIndex value="8" />
-        <Text value="comboBox" />
-        <Location value="128, 130" />
-      </System.Windows.Forms.ComboBox>
-      <System.Windows.Forms.Label>
-        <Name value="label3wjej" />
-        <Location value="0, 133" />
-        <Text value="${res:Dialog.HighlightingEditor.Span.Ruleset}" />
-        <Size value="128, 16" />
-        <TabIndex value="6" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.CheckBox>
-        <Name value="stopEolBox" />
-        <Location value="0, 301" />
-        <Text value="${res:Dialog.HighlightingEditor.Span.StopEol}" />
-        <TabIndex value="5" />
-        <Size value="312, 16" />
-        <Anchor value="Top, Left, Right" />
-      </System.Windows.Forms.CheckBox>
-      <System.Windows.Forms.TextBox>
-        <Name value="beginBox" />
-        <TabIndex value="4" />
-        <Size value="184, 20" />
-        <Location value="128, 27" />
-        <Anchor value="Top, Left, Right" />
-      </System.Windows.Forms.TextBox>
-      <System.Windows.Forms.Label>
-        <Name value="label3qgae" />
-        <Location value="0, 30" />
-        <Text value="${res:Dialog.HighlightingEditor.Span.Begin}" />
-        <Size value="128, 16" />
-        <TabIndex value="3" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.TextBox>
-        <Name value="nameBox" />
-        <TabIndex value="2" />
-        <Size value="184, 20" />
-        <Location value="128, 0" />
-        <Anchor value="Top, Left, Right" />
-      </System.Windows.Forms.TextBox>
-      <System.Windows.Forms.Label>
-        <Name value="label3wr" />
-        <Location value="0, 3" />
-        <Text value="${res:Dialog.HighlightingEditor.Span.Name}" />
-        <Size value="128, 16" />
-        <TabIndex value="1" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Panel>
-        <Name value="panel" />
-        <Location value="0, 350" />
-        <TabIndex value="0" />
-        <Anchor value="Top, Bottom, Left, Right" />
-        <Size value="312, 110" />
-        <Controls>
-          <System.Windows.Forms.Label>
-            <Name value="explLabel" />
-            <Location value="16, 24" />
-            <Text value="${res:Dialog.HighlightingEditor.Span.Explanation}" />
-            <Anchor value="Top, Bottom, Left, Right" />
-            <Size value="280, 76" />
-            <TabIndex value="2" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label" />
-            <Location value="0, 0" />
-            <Text value="${res:Dialog.HighlightingEditor.Explanation}" />
-            <Size value="96, 16" />
-            <TabIndex value="0" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label2" />
-            <Location value="0, 8" />
-            <Anchor value="Top, Left, Right" />
-            <Size value="302, 0" />
-            <TabIndex value="1" />
-            <BorderStyle value="Fixed3D" />
-          </System.Windows.Forms.Label>
-        </Controls>
-      </System.Windows.Forms.Panel>
-      <System.Windows.Forms.TextBox>
-        <Name value="endBox" />
-        <TabIndex value="4" />
-        <Size value="184, 20" />
-        <Location value="128, 78" />
-        <Anchor value="Top, Left, Right" />
-      </System.Windows.Forms.TextBox>
-      <System.Windows.Forms.Label>
-        <Name value="label3b" />
-        <Location value="0, 81" />
-        <Text value="${res:Dialog.HighlightingEditor.Span.End}" />
-        <Size value="128, 16" />
-        <TabIndex value="3" />
-      </System.Windows.Forms.Label>
-    </Controls>
-  </System.Windows.Forms.UserControl>
-</Components>

src/AddIns/Misc/HighlightingEditor/Project/Resources/Spans.xfrm

@@ -1,139 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.UserControl>
-    <Name value="highlightingOptionPanel" />
-    <DockPadding value="" />
-    <ClientSize value="{Width=312, Height=408}" />
-    <Controls>
-      <System.Windows.Forms.Button>
-        <Name value="addBtn" />
-        <Location value="{X=133,Y=184}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Dialog.HighlightingEditor.Add}" />
-        <Anchor value="Top, Right" />
-        <TabIndex value="7" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.ListView>
-        <Name value="listView" />
-        <GridLines value="True" />
-        <MultiSelect value="False" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="5" />
-        <View value="Details" />
-        <FullRowSelect value="True" />
-        <Location value="{X=16,Y=32}" />
-        <ClientSize value="{Width=276, Height=140}" />
-        <HeaderStyle value="None" />
-        <HideSelection value="False" />
-        <Columns>
-          <System.Windows.Forms.ColumnHeader>
-            <Width value="250" />
-            <Name value="columnHeader" />
-            <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-          </System.Windows.Forms.ColumnHeader>
-        </Columns>
-      </System.Windows.Forms.ListView>
-      <System.Windows.Forms.Button>
-        <Name value="removeBtn" />
-        <Location value="{X=221,Y=184}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Dialog.HighlightingEditor.Remove}" />
-        <Anchor value="Top, Right" />
-        <TabIndex value="4" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.Label>
-        <Name value="label3" />
-        <Text value="${res:Dialog.HighlightingEditor.Spans.Spans}" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="1" />
-        <ClientSize value="{Width=312, Height=16}" />
-        <Location value="{X=0,Y=8}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Panel>
-        <Name value="panel" />
-        <Location value="{X=0,Y=232}" />
-        <ClientSize value="{Width=312, Height=176}" />
-        <DockPadding value="" />
-        <Anchor value="Top, Bottom, Left, Right" />
-        <TabIndex value="0" />
-        <Controls>
-          <System.Windows.Forms.Label>
-            <Name value="explLabel" />
-            <Text value="${res:Dialog.HighlightingEditor.Spans.Explanation}" />
-            <Anchor value="Top, Bottom, Left, Right" />
-            <TabIndex value="2" />
-            <ClientSize value="{Width=280, Height=152}" />
-            <Location value="{X=16,Y=24}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label" />
-            <Text value="${res:Dialog.HighlightingEditor.Explanation}" />
-            <TabIndex value="0" />
-            <ClientSize value="{Width=96, Height=16}" />
-            <Location value="{X=0,Y=0}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label2" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="1" />
-            <ClientSize value="{Width=294, Height=0}" />
-            <Location value="{X=0,Y=8}" />
-            <BorderStyle value="Fixed3D" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.Label>
-            <Name value="label4" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="3" />
-            <ClientSize value="{Width=240, Height=0}" />
-            <Location value="{X=64,Y=8}" />
-            <BorderStyle value="Fixed3D" />
-          </System.Windows.Forms.Label>
-        </Controls>
-      </System.Windows.Forms.Panel>
-    </Controls>
-  </System.Windows.Forms.UserControl>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader3" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="250" />
-    <Name value="columnHeader2" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader7" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Value}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="150" />
-    <Name value="columnHeader6" />
-    <Text value="(Name)" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="100" />
-    <Name value="columnHeader5" />
-    <Text value="(Sample)" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader4" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Value}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="250" />
-    <Name value="columnHeader" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="130" />
-    <Name value="columnHeader8" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Width value="250" />
-    <Name value="columnHeader9" />
-    <Text value="${res:Dialog.HighlightingEditor.Properties.Name}" />
-  </System.Windows.Forms.ColumnHeader>
-</Components>

src/AddIns/Misc/HighlightingEditor/Project/Src/ColorButton.cs

@@ -1,117 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace ICSharpCode.SharpDevelop.Gui
-{
-
-	public class ColorButton : Button
-	{			
-		Color centerColor;
-		
-		public ColorButton()
-		{		
-		}
-		
-		public Color CenterColor
-		{
-			get { return centerColor; }
-			set { centerColor = value; }
-		}		
-		
-		protected override void OnMouseEnter(EventArgs e)
-		{
-			base.OnMouseEnter(e);
-			Invalidate();
-		}
-		
-		protected override void OnMouseLeave(EventArgs e)
-		{
-			base.OnMouseLeave(e);
-			Invalidate();
-		}	
-		
-		protected override void OnMouseUp(MouseEventArgs e)
-		{
-			base.OnMouseUp(e);
-			Invalidate();
-		}
-		
-		protected override void OnEnabledChanged(EventArgs e)
-		{
-			base.OnEnabledChanged(e);
-			Invalidate();
-		}
-		
-    	protected override void OnClick(EventArgs e)
-    	{
-    		base.OnClick(e);
-    		
-    		Point p = new Point(0, Height);
-    		p = PointToScreen(p);
-			
-			using (ColorPaletteDialog clDlg = new ColorPaletteDialog(p.X, p.Y)) {
-		    	clDlg.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window);    	 
-				if (clDlg.DialogResult == DialogResult.OK) {
-		    		CenterColor = clDlg.Color;
-				}
-			}
-	    		
-    	}  	    
-		
-		protected override void OnPaint(PaintEventArgs e)
-		{
-			base.OnPaint(e);
-			
-			Graphics g = e.Graphics;
-			
-			Rectangle r = ClientRectangle;	
-			
-			byte border = 4;
-			byte right_border = 15;
-			
-			Rectangle rc = new Rectangle(r.Left + border, r.Top + border,
-			                             r.Width - border - right_border - 1, r.Height - border * 2 - 1);
-			
-			SolidBrush centerColorBrush = new SolidBrush( centerColor );
-			g.FillRectangle(centerColorBrush, rc);	
-			
-			Pen pen = Pens.Black;
-			g.DrawRectangle(pen, rc);
-			
-			Pen greyPen = new Pen(SystemColors.ControlDark);
-			
-			//draw the arrow
-			Point p1 = new Point(r.Width - 9, r.Height / 2 - 1);
-			Point p2 = new Point(r.Width - 5, r.Height / 2 - 1);		
-			g.DrawLine(Enabled ? pen : greyPen, p1, p2);
-			
-			p1 = new Point(r.Width - 8, r.Height / 2);
-			p2 = new Point(r.Width - 6, r.Height / 2);		
-			g.DrawLine(Enabled ? pen : greyPen, p1, p2);
-			
-			p1 = new Point(r.Width - 7, r.Height / 2);
-			p2 = new Point(r.Width - 7, r.Height / 2 + 1);		
-			g.DrawLine(Enabled ? pen : greyPen, p1, p2);
-			
-			//draw the divider line
-			pen = new Pen(SystemColors.ControlDark); 
-			p1 = new Point(r.Width - 12, 4);
-			p2 = new Point(r.Width - 12, r.Height - 5 );		
-			g.DrawLine(pen, p1, p2);
-			
-			pen = new Pen(SystemColors.ControlLightLight); 
-			p1 = new Point(r.Width - 11, 4);
-			p2 = new Point(r.Width - 11, r.Height - 5 );		
-			g.DrawLine(pen, p1, p2);
-		} 
-	}
-
-}

src/AddIns/Misc/HighlightingEditor/Project/Src/ColorDialog.cs

@@ -1,211 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace ICSharpCode.SharpDevelop.Gui 
-{
-
-	public class ColorPaletteDialog : Form
-	{		
-		byte max = 40;	
-		ColorPanel[] panel = new ColorPanel[40];	
-		
-		Color[] color = new Color[40]
-		{
-			//row 1
-			Color.FromArgb(0,0,0), Color.FromArgb(153,51,0), Color.FromArgb(51,51,0), Color.FromArgb(0,51,0),
-			Color.FromArgb(0,51,102), Color.FromArgb(0,0,128), Color.FromArgb(51,51,153), Color.FromArgb(51,51,51),
-			
-			//row 2
-			Color.FromArgb(128,0,0), Color.FromArgb(255,102,0), Color.FromArgb(128,128,0), Color.FromArgb(0,128,0),
-			Color.FromArgb(0,128,128), Color.FromArgb(0,0,255), Color.FromArgb(102,102,153), Color.FromArgb(128,128,128),
-			
-			//row 3
-			Color.FromArgb(255,0,0), Color.FromArgb(255,153,0), Color.FromArgb(153,204,0), Color.FromArgb(51,153,102),
-			Color.FromArgb(51,204,204), Color.FromArgb(51,102,255), Color.FromArgb(128,0,128), Color.FromArgb(153,153,153),
-			
-			//row 4
-			Color.FromArgb(255,0,255), Color.FromArgb(255,204,0), Color.FromArgb(255,255,0), Color.FromArgb(0,255,0),
-			Color.FromArgb(0,255,255), Color.FromArgb(0,204,255), Color.FromArgb(153,51,102), Color.FromArgb(192,192,192),
-			
-			//row 5
-			Color.FromArgb(255,153,204), Color.FromArgb(255,204,153), Color.FromArgb(255,255,153), Color.FromArgb(204,255,204),
-			Color.FromArgb(204,255,255), Color.FromArgb(153,204,255), Color.FromArgb(204,153,255), Color.FromArgb(255,255,255)						
-		};	
-		
-		string[] colorName = new string[40]
-		{
-			"Black", "Brown", "Olive Green", "Dark Green", "Dark Teal", "Dark Blue", "Indigo", "Gray-80%",
-			"Dark Red", "Orange", "Dark Yellow", "Green", "Teal", "Blue", "Blue-Gray", "Gray-50%",
-			"Red", "Light Orange", "Lime", "Sea Green", "Aqua", "Light Blue", "Violet", "Gray-40%",
-			"Pink", "Gold", "Yellow", "Bright Green", "Turquoise", "Sky Blue", "Plum", "Gray-25%",
-			"Rose", "Tan", "Light Yellow", "Light Green", "Light Turquoise", "Pale Blue", "Lavender", "White"
-		};	
-		
-		Button moreColorsButton = new Button();
-		Button cancelButton = new Button();
-		Color selectedColor;
-		
-		public ColorPaletteDialog(int x, int y)
-		{
-			Size = new Size(158, 158);					
-			FormBorderStyle = FormBorderStyle.FixedDialog;	
-			MinimizeBox = MaximizeBox = ControlBox = false;				
-			ShowInTaskbar = false;					
-			CenterToScreen();	
-			Location = new Point(x, y);	
-			
-			BuildPalette();						
-	
-			moreColorsButton.Text = "More colors ...";			
-			moreColorsButton.Size = new Size(142, 22);
-			moreColorsButton.Location = new Point(5, 99);		
-			moreColorsButton.Click += new EventHandler(moreColorsButton_Click);		
-			moreColorsButton.FlatStyle = FlatStyle.Popup;
-			Controls.Add(moreColorsButton);	
-			
-			//"invisible" button to cancel at Escape
-			cancelButton.Text = "Cancel";
-			cancelButton.Size = new Size(142, 22);
-			cancelButton.Location = new Point(5, 125);		
-			cancelButton.FlatStyle = FlatStyle.Popup;
-			cancelButton.Click += new EventHandler(cancelButton_Click);				
-			Controls.Add(cancelButton);	
-			cancelButton.DialogResult = DialogResult.Cancel;
-			this.CancelButton = cancelButton;
-			
-			moreColorsButton.TabIndex = 0;
-		}
-		
-		public Color Color
-		{
-			get { return selectedColor; }
-		}
-		
-		void BuildPalette()
-		{
-			byte pwidth = 16;
-			byte pheight = 16;
-			byte pdistance = 2;		
-			byte border = 5;		
-			int x = border, y = border;	
-			ToolTip toolTip = new ToolTip();		
-			
-			for(int i = 0; i < max; i++)
-			{
-				panel[i] = new ColorPanel();			
-				panel[i].Height = pwidth;
-				panel[i].Width = pheight;			
-				panel[i].Location = new Point(x, y);
-				toolTip.SetToolTip(panel[i], colorName[i]);
-						
-				this.Controls.Add(panel[i]);			
-				
-				if(x < ( 7 * (pwidth + pdistance)))
-					x += pwidth + pdistance;
-				else
-				{
-					x = border;
-					y += pheight + pdistance;
-				}
-				
-				panel[i].BackColor = color[i];
-				panel[i].MouseUp += new MouseEventHandler(OnPanelMouseUp);
-			}
-		}
-		
-		void OnPanelMouseUp(object sender, MouseEventArgs e)
-		{
-			Panel panel = (Panel)sender;
-			selectedColor = panel.BackColor;
-			DialogResult = DialogResult.OK;
-			Close();
-		}
-		
-		void moreColorsButton_Click(object sender, System.EventArgs e)
-		{
-			using (ColorDialog colDialog = new ColorDialog()) {
-				colDialog.FullOpen = true;
-				if (colDialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
-					selectedColor = colDialog.Color;
-					DialogResult = DialogResult.OK;
-				}
-			}
-			
-			Close();
-		}
-		
-		void cancelButton_Click(object sender, System.EventArgs e)
-		{
-			Close();
-		}
-		
-		internal class ColorPanel : Panel
-		{
-			protected override void OnMouseEnter(EventArgs e)
-			{
-				base.OnMouseEnter(e);
-				Draw(1, CreateGraphics());
-			}
-			
-			protected override void OnMouseLeave(EventArgs e)
-			{	
-				base.OnMouseLeave(e);
-				Draw(0, CreateGraphics());	
-			}	
-			
-			protected override void OnMouseDown(MouseEventArgs e)
-			{	
-				base.OnMouseDown(e);
-				Draw(2, CreateGraphics());				
-			}
-			
-			protected override void OnPaint(PaintEventArgs e)
-			{					
-				Draw(0, e.Graphics);		
-			} 
-		
-			void Draw(byte state, Graphics g)
-			{		
-				Pen pen1, pen2;
-				
-				if(state == 1) 		//mouse over
-				{
-					pen1 = new Pen( SystemColors.ControlLightLight ); 				
-					pen2 = new Pen( SystemColors. ControlDarkDark);		
-				}
-				else if(state == 2)	//clicked
-				{
-					pen1 = new Pen( SystemColors.ControlDarkDark ); 				
-					pen2 = new Pen( SystemColors.ControlLightLight );						
-				}
-				else				//neutral
-				{
-					pen1 = new Pen( SystemColors.ControlDark ); 				
-					pen2 = new Pen( SystemColors.ControlDark );
-					
-				}	
-				
-				Rectangle r = ClientRectangle;
-				Point p1 = new Point( r.Left, r.Top ); 				//top left
-				Point p2 = new Point( r.Right -1, r.Top );			//top right
-				Point p3 = new Point( r.Left, r.Bottom -1 );		//bottom left
-				Point p4 = new Point( r.Right -1, r.Bottom -1 );	//bottom right
-				
-				g.DrawLine( pen1, p1, p2 ); 		
-				g.DrawLine( pen1, p1, p3 ); 		
-				g.DrawLine( pen2, p2, p4 ); 		
-				g.DrawLine( pen2, p3, p4 ); 				
-			}
-			
-		}
-	}
-
-}

src/AddIns/Misc/HighlightingEditor/Project/Src/EditHighlightingColorDialog.cs

@@ -1,172 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Reflection;
-using System.Windows.Forms;
-
-using ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes;
-using ICSharpCode.SharpDevelop.Gui.XmlForms;
-
-namespace ICSharpCode.SharpDevelop.Gui {
-	
-	public class EditHighlightingColorDialog : BaseSharpDevelopForm
-	{
-		private System.Windows.Forms.RadioButton foreNo;
-		private System.Windows.Forms.RadioButton foreUser;
-		private ICSharpCode.SharpDevelop.Gui.ColorButton backBtn;
-		private System.Windows.Forms.RadioButton backSys;
-		private System.Windows.Forms.Button acceptBtn;
-		private ICSharpCode.SharpDevelop.Gui.ColorButton foreBtn;
-		private System.Windows.Forms.RadioButton backNo;
-		private System.Windows.Forms.ComboBox foreList;
-		private System.Windows.Forms.CheckBox italicBox;
-		private System.Windows.Forms.RadioButton foreSys;
-		private System.Windows.Forms.RadioButton backUser;
-		private System.Windows.Forms.CheckBox boldBox;
-		private System.Windows.Forms.ComboBox backList;
-
-		public EditorHighlightColor Color;
-		
-		public EditHighlightingColorDialog(EditorHighlightColor color)
-		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.ColorDialog.xfrm"));
-			
-			if (color == null) {
-				color = new EditorHighlightColor(true);
-			}
-			Color = color;
-			
-			boldBox   = (CheckBox)ControlDictionary["boldBox"];
-			italicBox = (CheckBox)ControlDictionary["italicBox"];
-			
-			foreNo   = (RadioButton)ControlDictionary["foreNo"];
-			foreUser = (RadioButton)ControlDictionary["foreUser"];
-			foreSys  = (RadioButton)ControlDictionary["foreSys"];
-			foreList = (ComboBox)ControlDictionary["foreList"];
-			
-			backNo   = (RadioButton)ControlDictionary["backNo"];
-			backUser = (RadioButton)ControlDictionary["backUser"];
-			backSys  = (RadioButton)ControlDictionary["backSys"];
-			backList = (ComboBox)ControlDictionary["backList"];
-			
-			acceptBtn = (Button)ControlDictionary["acceptBtn"];
-			
-			this.foreBtn = new ColorButton();
-			this.foreBtn.CenterColor = System.Drawing.Color.Empty;
-			this.foreBtn.Enabled = false;
-			this.foreBtn.Location = new System.Drawing.Point(30, 78);
-			this.foreBtn.Name = "foreBtn";
-			this.foreBtn.Size = new System.Drawing.Size(98, 24);
-			
-			this.ControlDictionary["foreBox"].Controls.Add(foreBtn);
-			
-			this.backBtn = new ColorButton();
-			this.backBtn.CenterColor = System.Drawing.Color.Empty;
-			this.backBtn.Enabled = false;
-			this.backBtn.Location = new System.Drawing.Point(30, 78);
-			this.backBtn.Name = "backBtn";
-			this.backBtn.Size = new System.Drawing.Size(98, 24);
-			
-			this.ControlDictionary["backBox"].Controls.Add(backBtn);
-
-			this.acceptBtn.Click += new EventHandler(AcceptClick);
-			this.foreNo.CheckedChanged   += new EventHandler(foreCheck);
-			this.foreSys.CheckedChanged  += new EventHandler(foreCheck);
-			this.foreUser.CheckedChanged += new EventHandler(foreCheck);
-			this.backNo.CheckedChanged   += new EventHandler(backCheck);
-			this.backSys.CheckedChanged  += new EventHandler(backCheck);
-			this.backUser.CheckedChanged += new EventHandler(backCheck);
-			
-			PropertyInfo[] names = typeof(System.Drawing.SystemColors).GetProperties(BindingFlags.Static | BindingFlags.Public);
-			
-			foreach(PropertyInfo info in names) {
-				foreList.Items.Add(info.Name);
-				backList.Items.Add(info.Name);
-			}
-			foreList.SelectedIndex = backList.SelectedIndex = 0;
-			
-			if (color.SysForeColor) {
-				foreSys.Checked = true;
-				for (int i = 0; i < foreList.Items.Count; ++i) {
-					if ((string)foreList.Items[i] == color.SysForeColorName) foreList.SelectedIndex = i;
-				}
-			} else if (color.HasForeColor) {
-				foreUser.Checked = true;
-				foreBtn.CenterColor = color.ForeColor;
-			} else {
-				foreNo.Checked = true;
-			}
-			
-			if (color.SysBackColor) {
-				backSys.Checked = true;
-				for (int i = 0; i < backList.Items.Count; ++i) {
-					if ((string)backList.Items[i] == color.SysForeColorName) backList.SelectedIndex = i;
-				}
-			} else if (color.HasBackColor) {
-				backUser.Checked = true;
-				backBtn.CenterColor = color.BackColor;
-			} else {
-				backNo.Checked = true;
-			}
-			
-			boldBox.Checked = color.Bold;
-			italicBox.Checked = color.Italic;
-		}
-		
-		void foreCheck(object sender, EventArgs e)
-		{
-			if (foreNo.Checked) {
-				foreBtn.Enabled = false;
-				foreList.Enabled = false;
-			} else if (foreUser.Checked) {
-				foreBtn.Enabled = true;
-				foreList.Enabled = false;
-			} else if (foreSys.Checked) {
-				foreBtn.Enabled = false;
-				foreList.Enabled = true;
-			}
-		}
-		
-		void backCheck(object sender, EventArgs e)
-		{
-			if (backNo.Checked) {
-				backBtn.Enabled = false;
-				backList.Enabled = false;
-			} else if (backUser.Checked) {
-				backBtn.Enabled = true;
-				backList.Enabled = false;
-			} else if (backSys.Checked) {
-				backBtn.Enabled = false;
-				backList.Enabled = true;
-			}
-		}
-		
-		void AcceptClick(object sender, EventArgs e)
-		{
-			object foreColor = null;
-			object backColor = null;
-			
-			if (foreUser.Checked) {
-				foreColor = (System.Drawing.Color)foreBtn.CenterColor;
-			} else if (foreSys.Checked) {
-				foreColor = (string)foreList.SelectedItem;
-			}
-			
-			if (backUser.Checked) {
-				backColor = (System.Drawing.Color)backBtn.CenterColor;
-			} else if (backSys.Checked) {
-				backColor = (string)backList.SelectedItem;
-			}
-			
-			Color = new EditorHighlightColor(foreColor, backColor, boldBox.Checked, italicBox.Checked);
-			
-			DialogResult = DialogResult.OK;
-		}
-		
-	}
-}

src/AddIns/Misc/HighlightingEditor/Project/Src/EditHighlightingDialog.cs

@@ -1,145 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Windows.Forms;
-
-using ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes;
-using ICSharpCode.SharpDevelop.Gui.XmlForms;
-
-namespace ICSharpCode.SharpDevelop.Gui 
-{
-	public class EditHighlightingDialog : BaseSharpDevelopForm
-	{
-		private System.Windows.Forms.Button acceptBtn;
-		private System.Windows.Forms.Panel propPanel;
-		private System.Windows.Forms.Panel optionPanel;
-		private System.Windows.Forms.TreeView nodeTree;
-
-		private GradientLabel gradientLabel = new GradientLabel();
-		private Label         bottomLabel   = new Label();
-				
-		public EditHighlightingDialog(TreeNode topNode)
-		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.EditDialog.xfrm"));
-			acceptBtn = (Button)ControlDictionary["acceptBtn"];
-			nodeTree  = (TreeView)ControlDictionary["nodeTree"];
-			propPanel = (Panel)ControlDictionary["propPanel"];
-			optionPanel = (Panel)ControlDictionary["optionPanel"];
-			
-			// Form editor does not work properly with the custom control
-			this.gradientLabel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-			this.gradientLabel.BorderStyle = BorderStyle.Fixed3D;
-			this.gradientLabel.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
-			this.gradientLabel.Location = new System.Drawing.Point(0, 0);
-			this.gradientLabel.Size = new System.Drawing.Size(propPanel.Width, 30);
-			this.gradientLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-			this.propPanel.Controls.Add(gradientLabel);
-
-			this.bottomLabel.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
-			this.bottomLabel.BorderStyle = BorderStyle.Fixed3D;
-			this.bottomLabel.Location = new System.Drawing.Point(0, propPanel.Height - 2);
-			this.bottomLabel.Size = new System.Drawing.Size(propPanel.Width, 2);
-			this.propPanel.Controls.Add(bottomLabel);
-			
-			this.ClientSize = new Size(660, 530);
-			this.acceptBtn.Click += new EventHandler(acceptClick);
-			ControlDictionary["cancelBtn"].Click += new EventHandler(cancelClick);
-			
-			this.nodeTree.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.NodeTreeAfterSelect);
-			this.nodeTree.BeforeSelect += new System.Windows.Forms.TreeViewCancelEventHandler(this.NodeTreeBeforeSelect);
-			
-			nodeTree.Nodes.Add(topNode);
-			nodeTree.ExpandAll();
-			
-			nodeTree.SelectedNode = topNode;
-		}
-		
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing) {
-				nodeTree.Nodes.Clear();
-				optionPanel.Controls.Clear();
-			}
-			base.Dispose(disposing);
-		}
-		
-		void cancelClick(object sender, EventArgs e)
-		{
-			if (currentPanel != null) {
-				currentPanel.ParentNode.UpdateNodeText();
-				optionPanel.Controls.Clear();
-			}
-			nodeTree.Nodes.Clear();
-			DialogResult = DialogResult.Cancel;
-		}
-		
-		void acceptClick(object sender, EventArgs e)
-		{
-			if (currentPanel != null) {
-				if (!currentPanel.ValidateSettings()) {
-					return;
-				}
-				currentPanel.StoreSettings();
-				currentPanel.ParentNode.UpdateNodeText();
-				optionPanel.Controls.Clear();
-			}
-			nodeTree.Nodes.Clear();
-			DialogResult = DialogResult.OK;
-		}
-				
-		public class GradientLabel : Label
-		{
-			protected override void OnPaintBackground(PaintEventArgs pe)
-			{
-//				base.OnPaintBackground(pe);
-				Graphics g = pe.Graphics;
-				g.FillRectangle(new LinearGradientBrush(new Point(0, 0), new Point(Width, Height),
-			                                        SystemColors.ControlLightLight,
-			                                        SystemColors.Control),
-			                                        new Rectangle(0, 0, Width, Height));
-			}
-			
-			public GradientLabel()
-			{
-				UseMnemonic = false;
-			}
-		}
-		
-		private NodeOptionPanel currentPanel;
-		
-		void NodeTreeBeforeSelect(object sender, TreeViewCancelEventArgs e)
-		{
-			if (currentPanel != null) {
-				if (!currentPanel.ValidateSettings()) {
-					e.Cancel = true;
-					return;
-				}
-			}
-		}
-		
-		void NodeTreeAfterSelect(object sender, TreeViewEventArgs e)
-		{
-			if (currentPanel != null) {
-				currentPanel.StoreSettings();
-				currentPanel.ParentNode.UpdateNodeText();
-			}
-			
-			optionPanel.Controls.Clear();
-			NodeOptionPanel control = ((AbstractNode)e.Node).OptionPanel;
-			if (control != null) {
-				optionPanel.Controls.Add(control);
-				currentPanel = control;
-				currentPanel.LoadSettings();
-			}
-			
-			gradientLabel.Text = " " + e.Node.Text;
-		}
-	}
-}

src/AddIns/Misc/HighlightingEditor/Project/Src/EditHighlightingPanel.cs

@@ -1,316 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Windows.Forms;
-using System.Xml;
-using System.Xml.Schema;
-
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes;
-using ICSharpCode.TextEditor.Document;
-
-namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
-{
-	class EditHighlightingPanel : AbstractOptionPanel {
-		Label   builtinLabel;
-		ListBox builtinList;
-		Button  copyButton;
-		Label   userLabel;
-		ListBox userList;
-		Button  deleteButton;
-		Button  modifyButton;
-				
-		public override bool StorePanelContents()
-		{
-			ICSharpCode.TextEditor.Document.HighlightingManager.Manager.ReloadSyntaxModes();
-			return true;
-		}
-		
-		public EditHighlightingPanel() {
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.OptionPanel.xfrm"));
-			InitializeComponent();
-		}
-		
-		public override void LoadPanelContents()
-		{
-			FillLists();
-		}
-
-		void InitializeComponent() {
-			builtinLabel = (Label)ControlDictionary["builtinLabel"];
-			builtinList  = (ListBox)ControlDictionary["builtinList"];
-			builtinList.SelectedIndexChanged += new EventHandler(BuiltinListSelectedIndexChanged);
-			
-			copyButton   = (Button)ControlDictionary["copyButton"];
-			copyButton.Click     += new EventHandler(CopyButtonClick);
-			
-			userLabel    = (Label)ControlDictionary["userLabel"];
-			userList     = (ListBox)ControlDictionary["userList"];
-			
-			deleteButton = (Button)ControlDictionary["deleteButton"];
-			deleteButton.Click   += new EventHandler(DeleteButtonClick);
-			
-			modifyButton = (Button)ControlDictionary["modifyButton"];
-			modifyButton.Click   += new EventHandler(ModifyButtonClick);
-			
-		}
-		
-		void BuiltinListSelectedIndexChanged(object sender, EventArgs e)
-		{
-			if (builtinList.SelectedIndex == -1) {
-				copyButton.Enabled = false;
-				return;
-			}
-			HighlightItem item = (HighlightItem)builtinList.SelectedItem;
-			string filename = item.FileName;
-			if (filename == null) {
-				filename = item.SyntaxMode.FileName;
-			}
-			
-			string newname  = Path.GetFileName(filename);
-			foreach (HighlightItem item2 in userList.Items) {
-				if (Path.GetFileName(item2.FileName) == newname) {
-					copyButton.Enabled = false;
-					return;
-				}
-			}
-			copyButton.Enabled = true;
-		}
-		
-		protected override void OnResize(System.EventArgs ev)
-		{
-			int halfWidth  = (Width - 24) / 2;
-			
-			builtinLabel.Width = userLabel.Width = halfWidth;
-			builtinList.Width  = userList.Width  = halfWidth;
-			
-			userLabel.Left     = userList.Left = halfWidth + 16;
-			deleteButton.Left  = userList.Left;
-			modifyButton.Left  = deleteButton.Left + 90;
-			
-			base.OnResize(ev);
-		}
-		
-		void FillLists()
-		{
-			builtinList.Items.Clear();
-			userList.Items.Clear();
-			
-			string uPath = Path.Combine(PropertyService.ConfigDirectory, "modes");
-			
-			List<string> uCol;
-			
-			if (Directory.Exists(uPath)) {
-				uCol = FileUtility.SearchDirectory(uPath, "*.xshd", true);
-			} else {
-				Directory.CreateDirectory(uPath);
-				uCol = new List<string>();
-			}
-			
-			foreach(string str in uCol) {
-				SchemeNode node = LoadFile(new XmlTextReader(str), true, Path.GetFileNameWithoutExtension(str));
-				if (node == null) continue;
-				userList.Items.Add(new HighlightItem(null, str, node));
-			}
-			
-			ISyntaxModeFileProvider modeProvider;
-			modeProvider = new ResourceSyntaxModeProvider();
-			
-			foreach(SyntaxMode mode in modeProvider.SyntaxModes) {
-				SchemeNode node = LoadFile(modeProvider.GetSyntaxModeFile(mode), false, mode.Name);
-				if (node == null) continue;
-				builtinList.Items.Add(new HighlightItem(mode, null, node));
-			}
-			
-			modeProvider = new ICSharpCode.SharpDevelop.DefaultEditor.Codons.AddInTreeSyntaxModeProvider();
-			
-			foreach(SyntaxMode mode in modeProvider.SyntaxModes) {
-				SchemeNode node = LoadFile(modeProvider.GetSyntaxModeFile(mode), false, mode.Name);
-				if (node == null) continue;
-				builtinList.Items.Add(new HighlightItem(mode, null, node));
-			}
-			
-			if (builtinList.Items.Count > 0)
-				builtinList.SelectedIndex = 0;
-			
-			if (userList.Items.Count > 0)
-				userList.SelectedIndex = 0;
-		}
-			
-		void CopyButtonClick(object sender, EventArgs ev)
-		{
-			if (builtinList.SelectedIndex == -1) return;
-			
-			try {
-				HighlightItem item = (HighlightItem)builtinList.SelectedItem;
-				
-				string filename = item.FileName;
-				if (filename == null) filename = item.SyntaxMode.FileName;
-				
-				string newname  = Path.GetFileName(filename);
-				newname = Path.Combine(PropertyService.ConfigDirectory, "modes" + 
-							Path.DirectorySeparatorChar + newname);
-				
-				using (StreamWriter fs = File.CreateText(newname)) {
-					fs.Write(item.Node.Content);
-				}
-				
-				SchemeNode newNode = LoadFile(new XmlTextReader(newname), true, Path.GetFileNameWithoutExtension(newname));
-				if (newNode == null) throw new Exception();
-				
-				userList.Items.Add(new HighlightItem(null, newname, newNode));
-			} catch (Exception e) {
-				MessageService.ShowError(e, "${res:Dialog.Options.TextEditorOptions.EditHighlighting.CopyError}");
-			}
-			BuiltinListSelectedIndexChanged(this, EventArgs.Empty);
-		}
-		
-		void ModifyButtonClick(object sender, EventArgs ev)
-		{
-			if (userList.SelectedIndex == -1) {
-				return;
-			}
-			
-			HighlightItem item = (HighlightItem)userList.SelectedItem;
-			
-			using (EditHighlightingDialog dlg = new EditHighlightingDialog(item.Node)) {
-				DialogResult res = dlg.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window);
-				
-				if (res == DialogResult.OK) {
-					using (XmlTextWriter writer = new XmlTextWriter(item.FileName, Encoding.UTF8)) {
-						writer.Formatting = Formatting.Indented;
-						writer.IndentChar = '\t';
-						writer.Indentation = 1;
-						writer.WriteStartDocument();
-						item.Node.WriteXml(writer);
-						writer.WriteEndDocument();
-					}
-					// refresh item text
-					userList.Items.RemoveAt(userList.SelectedIndex);
-					userList.Items.Add(item);
-				}
-				
-				try {
-					item.Node.Remove();
-				} catch {}
-				
-			}
-		}
-
-		void DeleteButtonClick(object sender, EventArgs ev)
-		{
-			if (userList.SelectedIndex == -1) return;
-			HighlightItem item = (HighlightItem)userList.SelectedItem;
-			
-			if (!MessageService.AskQuestion("${res:Dialog.Options.TextEditorOptions.EditHighlighting.DeleteConfirm}")) return;
-			
-			try {
-				File.Delete(item.FileName);
-			} catch (Exception e) {
-				MessageService.ShowError(e, "${res:Dialog.Options.TextEditorOptions.EditHighlighting.DeleteError}");
-			}
-			userList.Items.RemoveAt(userList.SelectedIndex);
-			BuiltinListSelectedIndexChanged(this, EventArgs.Empty);
-		}
-		
-		List<ValidationEventArgs> errors = new List<ValidationEventArgs>();
-		
-		private SchemeNode LoadFile(XmlTextReader reader, bool userList, string name)
-		{
-			if (reader == null)
-				return null;
-			errors.Clear();
-			try {
-				XmlValidatingReader validatingReader = new XmlValidatingReader(reader);
-				Stream schemaStream = typeof(SyntaxMode).Assembly.GetManifestResourceStream("ICSharpCode.TextEditor.Resources.Mode.xsd");
-				validatingReader.Schemas.Add("", new XmlTextReader(schemaStream));
-				validatingReader.ValidationType = ValidationType.Schema;
-				validatingReader.ValidationEventHandler += new ValidationEventHandler(ValidationHandler);
-				
-				XmlDocument doc = new XmlDocument();
-				doc.Load(validatingReader);
-				
-				if (errors.Count != 0) {
-					ReportErrors(name);
-					return null;
-				} else {
-					return new SchemeNode(doc.DocumentElement, userList);
-				}
-			} catch (Exception e) {
-
-				MessageService.ShowError(e, name + ": ${res:Dialog.Options.TextEditorOptions.EditHighlighting.LoadError}");
-				return null;
-			} finally {
-				reader.Close();
-			}
-			
-		}
-		
-		private void ValidationHandler(object sender, ValidationEventArgs args)
-		{
-			errors.Add(args);
-		}
-
-		private void ReportErrors(string name)
-		{
-			StringBuilder msg = new StringBuilder();
-			msg.Append(name);
-			msg.Append(": ");
-			msg.Append(ResourceService.GetString("Dialog.Options.TextEditorOptions.EditHighlighting.LoadError") + "\n\n");
-			foreach(ValidationEventArgs args in errors) {
-				msg.AppendLine(args.Message);
-			}
-			
-			MessageService.ShowWarning(msg.ToString());
-		}
-			
-		internal class HighlightItem
-		{
-			string fileName;
-			SyntaxMode syntaxMode;
-			SchemeNode node;
-			
-			public HighlightItem(SyntaxMode mode, string filename, SchemeNode Node)
-			{
-				syntaxMode = mode;
-				fileName = filename;
-				node = Node;
-			}
-			
-			public string FileName {
-				get {
-					return fileName;
-				}
-			}
-			
-			public SyntaxMode SyntaxMode {
-				get {
-					return syntaxMode;
-				}
-			}
-			
-			public SchemeNode Node {
-				get {
-					return node;
-				}
-			}
-			
-			public override string ToString()
-			{
-				try {
-					return syntaxMode.Name + " (" + String.Join(", ", node.Extensions) + ")";
-				} catch {
-					return fileName;
-				}
-			}
-		}
-	}
-}

src/AddIns/Misc/HighlightingEditor/Project/Src/EditorHighlightColor.cs

@@ -1,293 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Collections;
-using System.Drawing;
-using System.Globalization;
-using System.Reflection;
-using System.Xml;
-
-namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
-{
-	public class EditorHighlightColor
-	{
-		bool hasForeColor = false;
-		bool hasBackColor = false;
-		
-		Color  foreColor;
-		bool   sysForeColor     = false;
-		string sysForeColorName = "";
-		
-		Color  backColor;
-		bool   sysBackColor     = false;
-		string sysBackColorName = "";
-		
-		bool   bold   = false;
-		bool   italic = false;
-		
-		bool noColor = false;
-		
-		public bool NoColor {
-			get {
-				return noColor;
-			}
-		}
-		public bool HasForeColor {
-			get {
-				return hasForeColor;
-			}
-		}
-		public bool HasBackColor {
-			get {
-				return hasBackColor;
-			}
-		}
-		public Color ForeColor {
-			get {
-				return foreColor;
-			}
-		}
-		public bool SysForeColor {
-			get {
-				return sysForeColor;
-			}
-		}
-		public string SysForeColorName {
-			get {
-				return sysForeColorName;
-			}
-		}
-		public Color BackColor {
-			get {
-				return backColor;
-			}
-		}
-		public bool SysBackColor {
-			get {
-				return sysBackColor;
-			}
-		}
-		public string SysBackColorName {
-			get {
-				return sysBackColorName;
-			}
-		}
-		public bool Bold {
-			get {
-				return bold;
-			}
-		}
-		public bool Italic {
-			get {
-				return italic;
-			}
-		}
-
-		
-		public EditorHighlightColor(XmlElement el)
-		{
-			if (el == null) {
-				noColor = true;
-				return;
-			}
-			
-			if (el.Attributes["bold"] == null &&
-			    el.Attributes["italic"] == null &&
-			    el.Attributes["color"] == null &&
-			    el.Attributes["bgcolor"] == null)
-			{
-				noColor = true;
-				return;
-			}
-			
-			if (el.Attributes["bold"] != null) {
-				bold = Boolean.Parse(el.Attributes["bold"].InnerText);
-			}
-			
-			if (el.Attributes["italic"] != null) {
-				italic = Boolean.Parse(el.Attributes["italic"].InnerText);
-			}
-			
-			if (el.Attributes["color"] != null) {
-				hasForeColor = true;
-				string c = el.Attributes["color"].InnerText;
-				if (c[0] == '#') {
-					foreColor = ParseColor(c);
-				} else if (c.StartsWith("SystemColors.")) {
-					sysForeColor     = true;
-					sysForeColorName = c.Substring("SystemColors.".Length);
-				} else {
-					PropertyInfo myPropInfo = typeof(Color).GetProperty(c, BindingFlags.Public | BindingFlags.Static);
-					foreColor = (Color)myPropInfo.GetValue(null, null);
-				}
-			}
-			
-			if (el.Attributes["bgcolor"] != null) {
-				hasBackColor = true;
-				string c = el.Attributes["bgcolor"].InnerText;
-				if (c[0] == '#') {
-					backColor = ParseColor(c);
-				} else if (c.StartsWith("SystemColors.")) {
-					sysBackColor     = true;
-					sysBackColorName = c.Substring("SystemColors.".Length);
-				} else {
-					PropertyInfo myPropInfo = typeof(Color).GetProperty(c, BindingFlags.Public | BindingFlags.Static);
-					backColor = (Color)myPropInfo.GetValue(null, null);
-				}
-			}
-		}
-		
-		public static EditorHighlightColor FromTextEditor(ICSharpCode.TextEditor.Document.HighlightColor color)
-		{
-			return new EditorHighlightColor(color.HasForeground, color.Color, color.HasBackground, color.BackgroundColor, color.Bold, color.Italic);
-		}
-		
-		public EditorHighlightColor(bool hascolor, Color Color, bool hasbackcolor, Color BackColor, bool bold, bool italic)
-		{
-			hasForeColor   = hascolor;
-			hasBackColor   = hasbackcolor;
-			this.backColor = BackColor;
-			this.foreColor = Color;
-			this.bold      = bold;
-			this.italic    = italic;
-		}
-		
-		public EditorHighlightColor(object ForeColor, object BackColor, bool Bold, bool Italic)
-		{
-			bold   = Bold;
-			italic = Italic;
-			
-			if (ForeColor is Color) {
-				hasForeColor = true;
-				foreColor = (Color)ForeColor;
-			} else if (ForeColor is string) {
-				hasForeColor = true;
-				sysForeColor = true;
-				sysForeColorName = (string)ForeColor;
-			}
-			
-			if (BackColor is Color) {
-				hasBackColor = true;
-				backColor = (Color)BackColor;
-			} else if (BackColor is string) {
-				hasBackColor = true;
-				sysBackColor = true;
-				sysBackColorName = (string)BackColor;
-			}
-		}
-		
-		public EditorHighlightColor()
-		{
-			bold = false;
-			italic = false;
-			hasForeColor = true;
-			sysForeColor = true;
-			sysForeColorName = "WindowText";
-		}
-		
-		public EditorHighlightColor(bool NoColor) : this()
-		{
-			noColor = NoColor;
-		}
-		
-		static Color ParseColor(string c)
-		{
-			int a = 255;
-			int offset = 0;
-			if (c.Length > 7) {
-				offset = 2;
-				a = Int32.Parse(c.Substring(1,2), NumberStyles.HexNumber);
-			}
-			
-			int r = Int32.Parse(c.Substring(1 + offset,2), NumberStyles.HexNumber);
-			int g = Int32.Parse(c.Substring(3 + offset,2), NumberStyles.HexNumber);
-			int b = Int32.Parse(c.Substring(5 + offset,2), NumberStyles.HexNumber);
-			return Color.FromArgb(a, r, g, b);
-		}
-		
-		public void WriteXmlAttributes(XmlWriter writer)
-		{
-			writer.WriteAttributeString("bold", bold.ToString().ToLowerInvariant());
-			writer.WriteAttributeString("italic", italic.ToString().ToLowerInvariant());
-			if (hasForeColor) {
-				if (sysForeColor) {
-					writer.WriteAttributeString("color", "SystemColors." + sysForeColorName);
-				} else {
-					writer.WriteAttributeString("color", ReplaceColorName("#" + (foreColor.A != 255 ? foreColor.A.ToString("X2") : "") +
-					                                                      foreColor.R.ToString("X2") +
-					                                                      foreColor.G.ToString("X2") +
-					                                                      foreColor.B.ToString("X2")));
-				}
-			}
-			if (hasBackColor) {
-				if (sysBackColor) {
-					writer.WriteAttributeString("bgcolor", "SystemColors." + sysBackColorName);
-				} else {
-					writer.WriteAttributeString("bgcolor", ReplaceColorName("#" + (backColor.A != 255 ? backColor.A.ToString("X2") : "") +
-					                                                        backColor.R.ToString("X2") +
-					                                                        backColor.G.ToString("X2") +
-					                                                        backColor.B.ToString("X2")));
-				}
-			}
-		}
-		
-		Color ParseSysColor(string colorName)
-		{
-			string[] cNames = colorName.Split('*');
-			PropertyInfo myPropInfo = typeof(System.Drawing.SystemColors).GetProperty(cNames[0], BindingFlags.Public | BindingFlags.Static);
-			Color c = (Color)myPropInfo.GetValue(null, null);
-			
-			if (cNames.Length == 2) {
-				// hack : can't figure out how to parse doubles with '.' (culture info might set the '.' to ',')
-				double factor = Double.Parse(cNames[1]) / 100;
-				c = Color.FromArgb((int)((double)c.R * factor), (int)((double)c.G * factor), (int)((double)c.B * factor));
-			}
-			
-			return c;
-		}
-		
-		public Color GetForeColor()
-		{
-			if (!hasForeColor) return Color.Transparent;
-			
-			if (sysForeColor) return ParseSysColor(sysForeColorName);
-			
-			return foreColor;
-		}
-
-		public Color GetBackColor()
-		{
-			if (!hasBackColor) return Color.Transparent;
-			
-			if (sysBackColor) return ParseSysColor(sysBackColorName);
-			
-			return backColor;
-		}
-		
-		static Hashtable colorNames = new Hashtable();
-		
-		static string ReplaceColorName(string color)
-		{
-			if (colorNames.ContainsKey(color)) return (string)colorNames[color];
-			return color;
-		}
-		
-		static EditorHighlightColor()
-		{
-			PropertyInfo[] names = typeof(System.Drawing.Color).GetProperties(BindingFlags.Public | BindingFlags.Static);
-			
-			foreach(PropertyInfo pi in names) {
-				Color pcolor = (Color)pi.GetValue(null, null);
-				string colorDesc = "#" + (pcolor.A != 255 ? pcolor.A.ToString("X2") : "") + pcolor.R.ToString("X2") + pcolor.G.ToString("X2") + pcolor.B.ToString("X2");
-				try {
-					colorNames.Add(colorDesc, pi.Name);
-				} catch {}
-			}
-		}
-	}
-}

src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/AbstractNode.cs

@@ -1,39 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Windows.Forms;
-using System.Xml;
-
-using ICSharpCode.Core;
-
-namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
-{
-	abstract class AbstractNode : TreeNode
-	{
-		protected NodeOptionPanel panel;
-		protected string ResNodeName(string resName)
-		{
-			try {
-				return ResourceService.GetString("Dialog.HighlightingEditor.TreeView." + resName);
-			} catch {
-				return resName;
-			}
-		}
-		
-		public NodeOptionPanel OptionPanel {
-			get {
-				return panel;
-			}
-		}
-		
-		public abstract void UpdateNodeText();
-		
-		// should be made abstract when implementing ToXml()
-		public abstract void WriteXml(XmlWriter writer);
-	}
-}

src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/DigitsNode.cs

@@ -1,99 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Windows.Forms;
-using System.Xml;
-
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Gui;
-using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
-
-namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
-{
-	class DigitsNode : AbstractNode
-	{
-		EditorHighlightColor color;
-		
-		public EditorHighlightColor Color {
-			get {
-				return color;
-			}
-			set {
-				color = value;
-			}
-		}
-
-		public DigitsNode(XmlElement el)
-		{
-			if (el != null) {
-				color = new EditorHighlightColor(el);
-			} else {
-				color = new EditorHighlightColor();
-			}
-			
-			Text = ResNodeName("DigitsColor");
-			
-			panel = new DigitsOptionPanel(this);
-		}
-
-		public override void UpdateNodeText()
-		{
-		}
-		
-		public override void WriteXml(XmlWriter writer)
-		{
-			writer.WriteStartElement("Digits");
-			writer.WriteAttributeString("name", "Digits");
-			color.WriteXmlAttributes(writer);
-			writer.WriteEndElement();
-		}
-	}
-	
-	class DigitsOptionPanel : NodeOptionPanel
-	{
-		private System.Windows.Forms.Button button;
-		private System.Windows.Forms.Label sampleLabel;
-		
-		EditorHighlightColor color = new EditorHighlightColor();
-		
-		public DigitsOptionPanel(DigitsNode parent) : base(parent)
-		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.Digits.xfrm"));
-			
-			button = (Button)ControlDictionary["button"];
-			button.Click += new EventHandler(EditButtonClicked);
-			sampleLabel  = (Label)ControlDictionary["sampleLabel"];
-		}
-
-		public override void StoreSettings()
-		{
-			DigitsNode node = (DigitsNode)parent;
-			
-			node.Color = color;
-		}
-		
-		public override void LoadSettings()
-		{
-			DigitsNode node = (DigitsNode)parent;
-			
-			sampleLabel.Font = SharpDevelopTextEditorProperties.Instance.FontContainer.DefaultFont;
-			color = node.Color;
-			PreviewUpdate(sampleLabel, color);
-		}
-		
-		void EditButtonClicked(object sender, EventArgs e)
-		{
-			using (EditHighlightingColorDialog dlg = new EditHighlightingColorDialog(color)) {
-				if (dlg.ShowDialog(this) == DialogResult.OK) {
-					color = dlg.Color;
-					PreviewUpdate(sampleLabel, color);
-				}
-			}
-		}
-	}
-}

src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/EnvironmentNode.cs

@@ -1,177 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Windows.Forms;
-using System.Xml;
-
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Gui;
-using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
-using ICSharpCode.TextEditor.Document;
-
-namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
-{
-	class EnvironmentNode : AbstractNode
-	{
-		public string[] ColorNames;
-		public string[] ColorDescs;
-		public EditorHighlightColor[] Colors;
-		
-		const string CustomColorPrefix = "Custom$";
-		
-		public EnvironmentNode(XmlElement el)
-		{
-			List<EditorHighlightColor> envColors = new List<EditorHighlightColor>();
-			List<string> envColorNames = new List<string>();
-			List<string> envColorDescriptions = new List<string>();
-			
-			if (el != null) {
-				foreach (XmlNode node in el.ChildNodes) {
-					if (node is XmlElement) {
-						if (node.Name == "Custom") {
-							envColorNames.Add(CustomColorPrefix + (node as XmlElement).GetAttribute("name"));
-							envColorDescriptions.Add((node as XmlElement).GetAttribute("name"));
-						} else {
-							envColorNames.Add(node.Name);
-							envColorDescriptions.Add("${res:Dialog.HighlightingEditor.EnvColors." + node.Name + "}");
-						}
-						envColors.Add(new EditorHighlightColor((XmlElement)node));
-					}
-				}
-			}
-			
-			foreach (KeyValuePair<string, HighlightColor> pair in new DefaultHighlightingStrategy().EnvironmentColors) {
-				if (!envColorNames.Contains(pair.Key)) {
-					envColorNames.Add(pair.Key);
-					envColorDescriptions.Add("${res:Dialog.HighlightingEditor.EnvColors." + pair.Key + "}");
-					envColors.Add(EditorHighlightColor.FromTextEditor(pair.Value));
-				}
-			}
-			
-			this.ColorNames = envColorNames.ToArray();
-			this.ColorDescs = envColorDescriptions.ToArray();
-			this.Colors = envColors.ToArray();
-			StringParser.Parse(ColorDescs);
-			
-			Text = ResNodeName("EnvironmentColors");
-			
-			panel = new EnvironmentOptionPanel(this);
-		}
-
-		public override void UpdateNodeText()
-		{
-		}
-		
-		public override void WriteXml(XmlWriter writer)
-		{
-			writer.WriteStartElement("Environment");
-			for (int i = 0; i < ColorNames.Length; i++) {
-				if (ColorNames[i].StartsWith(CustomColorPrefix)) {
-					writer.WriteStartElement("Custom");
-					writer.WriteAttributeString("name", ColorNames[i].Substring(CustomColorPrefix.Length));
-				} else {
-					writer.WriteStartElement(ColorNames[i]);
-				}
-				Colors[i].WriteXmlAttributes(writer);
-				writer.WriteEndElement();
-			}
-			writer.WriteEndElement();
-		}
-	}
-	
-	class EnvironmentOptionPanel : NodeOptionPanel
-	{
-		private System.Windows.Forms.Button button;
-		private System.Windows.Forms.ListView listView;
-
-		public EnvironmentOptionPanel(EnvironmentNode parent) : base(parent)
-		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.Environment.xfrm"));
-			
-			button = (Button)ControlDictionary["button"];
-			button.Click += new EventHandler(EditButtonClicked);
-			listView  = (ListView)ControlDictionary["listView"];
-			
-			listView.Font = new Font(listView.Font.FontFamily, 10);
-		}
-		
-		public override void StoreSettings()
-		{
-			EnvironmentNode node = (EnvironmentNode)parent;
-			
-			foreach (EnvironmentItem item in listView.Items) {
-				node.Colors[item.arrayIndex] = item.Color;
-			}
-		}
-		
-		public override void LoadSettings()
-		{
-			EnvironmentNode node = (EnvironmentNode)parent;
-			listView.Items.Clear();
-			
-			for (int i = 0; i <= node.ColorNames.GetUpperBound(0); ++i) {
-				listView.Items.Add(new EnvironmentItem(i, node.ColorDescs[i], node.Colors[i], listView.Font));
-			}
-		}
-		
-		void EditButtonClicked(object sender, EventArgs e)
-		{
-			if (listView.SelectedItems.Count != 1) return;
-			
-			EnvironmentItem item = (EnvironmentItem)listView.SelectedItems[0];
-			using (EditHighlightingColorDialog dlg = new EditHighlightingColorDialog(item.Color)) {
-				if (dlg.ShowDialog(this) == DialogResult.OK) {
-					item.Color = dlg.Color;
-					item.ColorUpdate();
-				}
-			}
-		}
-		
-		private class EnvironmentItem : ListViewItem
-		{
-			public string Name;
-			public EditorHighlightColor Color;
-			public int arrayIndex;
-			
-			Font basefont;
-			Font listfont;
-			
-			public EnvironmentItem(int index, string name, EditorHighlightColor color, Font listFont) : base(new string[] {name, "Sample"})
-			{
-				Name = name;
-				Color = color;
-				arrayIndex = index;
-				
-				this.UseItemStyleForSubItems = false;
-				
-				basefont = SharpDevelopTextEditorProperties.Instance.FontContainer.DefaultFont;
-				listfont = listFont;
-				
-				ColorUpdate();
-			}
-			
-			public void ColorUpdate()
-			{
-				FontStyle fs = FontStyle.Regular;
-				if (Color.Bold)   fs |= FontStyle.Bold;
-				if (Color.Italic) fs |= FontStyle.Italic;
-				
-				this.Font = new Font(listfont.FontFamily, 8);
-				
-				Font font = new Font(basefont, fs);
-				
-				this.SubItems[1].Font = font;
-				
-				this.SubItems[1].ForeColor = Color.GetForeColor();
-				this.SubItems[1].BackColor = Color.GetBackColor();
-			}
-		}
-	}
-}

src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/KeywordListNode.cs

@@ -1,200 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Collections.Specialized;
-using System.Windows.Forms;
-using System.Xml;
-
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Gui;
-using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
-
-namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
-{
-	class KeywordListNode : AbstractNode
-	{
-		EditorHighlightColor color;
-		StringCollection words = new StringCollection();
-		string name;
-		
-		public EditorHighlightColor Color {
-			get {
-				return color;
-			}
-			set {
-				color = value;
-			}
-		}
-		
-		public StringCollection Words {
-			get {
-				return words;
-			}
-			set {
-				if (words != null) {
-					words.Clear();
-				}
-				words = value;
-			}
-		}
-		
-		public string Name {
-			get {
-				return name;
-			}
-			set {
-				name = value;
-			}
-		}
-		
-		public KeywordListNode(XmlElement el)
-		{
-			Text = ResNodeName("KeywordList");
-			panel = new KeywordListOptionPanel(this);
-			
-			if (el == null) return;
-
-			color = new EditorHighlightColor(el);
-			
-			XmlNodeList keys = el.GetElementsByTagName("Key");
-			foreach (XmlElement node in keys) {
-				if (node.Attributes["word"] != null) words.Add(node.Attributes["word"].InnerText);
-			}
-			
-			if (el.Attributes["name"] != null) {
-				name = el.Attributes["name"].InnerText;
-			}
-			UpdateNodeText();
-			
-		}
-		
-		public KeywordListNode(string Name)
-		{
-			name = Name;
-			color = new EditorHighlightColor();
-			UpdateNodeText();
-
-			panel = new KeywordListOptionPanel(this);
-		}
-		
-		public override void UpdateNodeText()
-		{
-			if (name != "") Text = name;
-		}
-		
-		public override void WriteXml(XmlWriter writer)
-		{
-			writer.WriteStartElement("KeyWords");
-			writer.WriteAttributeString("name", name);
-			color.WriteXmlAttributes(writer);
-			foreach(string str in words) {
-				writer.WriteStartElement("Key");
-				writer.WriteAttributeString("word", str);
-				writer.WriteEndElement();
-			}
-			writer.WriteEndElement();
-		}
-	}
-	
-	class KeywordListOptionPanel : NodeOptionPanel
-	{
-		private System.Windows.Forms.Button chgBtn;
-		private System.Windows.Forms.Button addBtn;
-		private System.Windows.Forms.ListBox listBox;
-		private System.Windows.Forms.Button removeBtn;
-		private System.Windows.Forms.TextBox nameBox;
-		private System.Windows.Forms.Label sampleLabel;
-
-		public KeywordListOptionPanel(KeywordListNode parent) : base(parent)
-		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.KeywordList.xfrm"));
-			
-			addBtn = (Button)ControlDictionary["addBtn"];
-			addBtn.Click += new EventHandler(addBtnClick);
-			removeBtn = (Button)ControlDictionary["removeBtn"];
-			removeBtn.Click += new EventHandler(removeBtnClick);
-			chgBtn = (Button)ControlDictionary["chgBtn"];
-			chgBtn.Click += new EventHandler(chgBtnClick);
-			
-			nameBox = (TextBox)ControlDictionary["nameBox"];
-			sampleLabel = (Label)ControlDictionary["sampleLabel"];
-			listBox  = (ListBox)ControlDictionary["listBox"];
-		}
-		
-		EditorHighlightColor color;
-		
-		public override void StoreSettings()
-		{
-			KeywordListNode node = (KeywordListNode)parent;
-			StringCollection col = new StringCollection();
-			
-			foreach (string word in listBox.Items) {
-				col.Add(word);
-			}
-			node.Words = col;
-			node.Name = nameBox.Text;
-			node.Color = color;
-		}
-		
-		public override void LoadSettings()
-		{
-			KeywordListNode node = (KeywordListNode)parent;
-			listBox.Items.Clear();
-			
-			foreach (string word in node.Words) {
-				listBox.Items.Add(word);
-			}
-			
-			sampleLabel.Font = SharpDevelopTextEditorProperties.Instance.FontContainer.DefaultFont;
-
-			color = node.Color;
-			nameBox.Text = node.Name;
-			PreviewUpdate(sampleLabel, color);
-		}
-		
-		public override bool ValidateSettings()
-		{
-			if (nameBox.Text == "") {
-				ValidationMessage("${res:Dialog.HighlightingEditor.KeywordList.NameEmpty}");
-				return false;
-			}
-			
-			return true;
-		}
-		
-		void chgBtnClick(object sender, EventArgs e)
-		{
-			using (EditHighlightingColorDialog dlg = new EditHighlightingColorDialog(color)) {
-				if (dlg.ShowDialog(this) == DialogResult.OK) {
-					color = dlg.Color;
-					PreviewUpdate(sampleLabel, color);
-				}
-			}
-		}
-		
-		void addBtnClick(object sender, EventArgs e)
-		{
-			string result = MessageService.ShowInputBox("", "${res:Dialog.HighlightingEditor.KeywordList.EnterName}", "");
-			if (string.IsNullOrEmpty(result))
-				return;
-			foreach (string item in listBox.Items) {
-				if (item == result)
-					return;
-			}
-			
-			listBox.Items.Add(result);
-		}
-		
-		void removeBtnClick(object sender, EventArgs e)
-		{
-			if (listBox.SelectedIndex == -1) return;
-			
-			listBox.Items.RemoveAt(listBox.SelectedIndex);
-		}
-	}
-}

src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/KeywordListsNode.cs

@@ -1,106 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Windows.Forms;
-using System.Xml;
-
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
-{
-	class KeywordListsNode : AbstractNode
-	{
-		public KeywordListsNode(XmlElement el)
-		{
-			Text = ResNodeName("KeywordLists");
-			panel = new KeywordListsOptionPanel(this);
-			
-			if (el == null) return;
-			
-			XmlNodeList nodes = el.GetElementsByTagName("KeyWords");
-			if (nodes == null) return;
-			
-			foreach (XmlElement el2 in nodes) {
-				Nodes.Add(new KeywordListNode(el2));
-			}
-			
-		}
-
-		public override void UpdateNodeText()
-		{
-		}
-		
-		public override void WriteXml(XmlWriter writer)
-		{
-			foreach (KeywordListNode node in Nodes) {
-				node.WriteXml(writer);
-			}
-		}
-	}
-	
-	class KeywordListsOptionPanel : NodeOptionPanel
-	{
-		private System.Windows.Forms.Button removeBtn;
-		private System.Windows.Forms.Button addBtn;
-		private System.Windows.Forms.ListView listView;
-		
-		public KeywordListsOptionPanel(KeywordListsNode parent) : base(parent)
-		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.KeywordLists.xfrm"));
-			
-			addBtn = (Button)ControlDictionary["addBtn"];
-			addBtn.Click += new EventHandler(addClick);
-			removeBtn = (Button)ControlDictionary["removeBtn"];
-			removeBtn.Click += new EventHandler(removeClick);
-			
-			listView  = (ListView)ControlDictionary["listView"];
-		}
-		
-		public override void StoreSettings()
-		{
-		}
-		
-		public override void LoadSettings()
-		{
-			KeywordListsNode node = (KeywordListsNode)parent;
-			listView.Items.Clear();
-			
-			foreach (KeywordListNode rn in node.Nodes) {
-				ListViewItem lv = new ListViewItem(rn.Name);
-				lv.Tag = rn;
-				listView.Items.Add(lv);
-			}
-		}
-		
-		void addClick(object sender, EventArgs e)
-		{
-			string result = MessageService.ShowInputBox("", "${res:Dialog.HighlightingEditor.KeywordList.EnterName}", "");
-			if (string.IsNullOrEmpty(result))
-				return;
-			foreach (ListViewItem item in listView.Items) {
-				if (item.Text == result)
-					return;
-			}
-			
-			KeywordListNode kwn = new KeywordListNode(result);
-			ListViewItem lv = new ListViewItem(result);
-			lv.Tag = kwn;
-			parent.Nodes.Add(kwn);
-			listView.Items.Add(lv);
-		}
-		
-		void removeClick(object sender, EventArgs e)
-		{
-			if (listView.SelectedItems.Count != 1) return;
-			
-			((TreeNode)listView.SelectedItems[0].Tag).Remove();
-			listView.SelectedItems[0].Remove();
-		}
-	}
-}

src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/MarkerNode.cs

@@ -1,164 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Windows.Forms;
-using System.Xml;
-
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Gui;
-using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
-
-namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
-{
-	class MarkerNode : AbstractNode
-	{
-		bool        previous;
-		string      what;
-		EditorHighlightColor color;
-		bool        markMarker = false;
-		
-		public MarkerNode(XmlElement el, bool prev)
-		{
-			Text = "Marker";
-			previous = prev;
-			panel = new MarkerOptionPanel(this, prev);
-			
-			if (el == null) return;
-			
-			color = new EditorHighlightColor(el);
-			what  = el.InnerText;
-			if (el.Attributes["markmarker"] != null) {
-				markMarker = Boolean.Parse(el.Attributes["markmarker"].InnerText);
-			}
-			
-			UpdateNodeText();
-			
-		}
-		
-		public MarkerNode(string What, bool prev)
-		{
-			what = What;
-			previous = prev;
-			color = new EditorHighlightColor();
-			UpdateNodeText();
-			
-			panel = new MarkerOptionPanel(this, prev);
-		}
-		
-		public override void UpdateNodeText()
-		{
-			Text = what;
-		}
-		
-		public override void WriteXml(XmlWriter writer)
-		{
-			writer.WriteStartElement("Mark" + (previous ? "Previous" : "Following"));
-			color.WriteXmlAttributes(writer);
-			if (markMarker) writer.WriteAttributeString("markmarker", "true");
-			writer.WriteString(what);
-			writer.WriteEndElement();
-		}
-		
-		public string What {
-			get {
-				return what;
-			}
-			set {
-				what = value;
-			}
-		}
-		
-		public EditorHighlightColor Color {
-			get {
-				return color;
-			}
-			set {
-				color = value;
-			}
-		}
-		
-		public bool MarkMarker {
-			get {
-				return markMarker;
-			}
-			set {
-				markMarker = value;
-			}
-		}
-		
-	}
-	
-	class MarkerOptionPanel : NodeOptionPanel
-	{
-		private System.Windows.Forms.Button chgBtn;
-		private System.Windows.Forms.CheckBox checkBox;
-		private System.Windows.Forms.TextBox nameBox;
-		private System.Windows.Forms.Label sampleLabel;
-		
-		bool previous;
-		
-		public MarkerOptionPanel(MarkerNode parent, bool prev) : base(parent)
-		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.Marker.xfrm"));
-			
-			chgBtn = (Button)ControlDictionary["chgBtn"];
-			chgBtn.Click += new EventHandler(chgBtnClick);
-			
-			checkBox  = (CheckBox)ControlDictionary["checkBox"];
-			nameBox   = (TextBox)ControlDictionary["nameBox"];
-			sampleLabel = (Label)ControlDictionary["sampleLabel"];
-
-			previous = prev;
-			ControlDictionary["explLabel"].Text = ResourceService.GetString(previous ? "Dialog.HighlightingEditor.Marker.ExplanationPrev" : "Dialog.HighlightingEditor.Marker.ExplanationNext");
-		}
-		
-		EditorHighlightColor color;
-		
-		public override void StoreSettings()
-		{
-			MarkerNode node = (MarkerNode)parent;
-			
-			node.What = nameBox.Text;
-			node.Color = color;
-			node.MarkMarker = checkBox.Checked;
-		}
-		
-		public override void LoadSettings()
-		{
-			MarkerNode node = (MarkerNode)parent;
-			
-			
-			sampleLabel.Font = SharpDevelopTextEditorProperties.Instance.FontContainer.DefaultFont;
-
-			color = node.Color;
-			nameBox.Text = node.What;
-			checkBox.Checked = node.MarkMarker;
-			PreviewUpdate(sampleLabel, color);
-		}
-		
-		public override bool ValidateSettings()
-		{
-			if (nameBox.Text == "") {
-				ValidationMessage(ResourceService.GetString("Dialog.HighlightingEditor.Marker.NameEmpty"));
-				return false;
-			}
-			
-			return true;
-		}
-		
-		void chgBtnClick(object sender, EventArgs e)
-		{
-			using (EditHighlightingColorDialog dlg = new EditHighlightingColorDialog(color)) {
-				if (dlg.ShowDialog(this) == DialogResult.OK) {
-					color = dlg.Color;
-					PreviewUpdate(sampleLabel, color);
-				}
-			}
-		}
-	}
-}

src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/MarkersNode.cs

@@ -1,111 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Windows.Forms;
-using System.Xml;
-
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
-{
-	class MarkersNode : AbstractNode
-	{
-		public MarkersNode(XmlElement el, bool prev)
-		{
-			Text = ResNodeName(prev ? "MarkPreviousWord" : "MarkNextWord");
-			
-			panel = new MarkersOptionPanel(this, prev);
-			if (el == null) return;
-			
-			XmlNodeList nodes = el.GetElementsByTagName(prev ? "MarkPrevious" : "MarkFollowing");
-			
-			foreach (XmlElement el2 in nodes) {
-				Nodes.Add(new MarkerNode(el2, prev));
-			}
-			
-		}
-
-		public override void UpdateNodeText()
-		{
-		}
-		
-		public override void WriteXml(XmlWriter writer)
-		{
-			foreach (MarkerNode node in Nodes) {
-				node.WriteXml(writer);
-			}
-		}
-	}
-	
-	class MarkersOptionPanel : NodeOptionPanel
-	{
-		private System.Windows.Forms.Button addBtn;
-		private System.Windows.Forms.Button removeBtn;
-		private System.Windows.Forms.ListView listView;
-		
-		bool previous = false;
-		
-		public MarkersOptionPanel(MarkersNode parent, bool prev) : base(parent)
-		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.Markers.xfrm"));
-			
-			addBtn = (Button)ControlDictionary["addBtn"];
-			addBtn.Click += new EventHandler(addClick);
-			removeBtn = (Button)ControlDictionary["removeBtn"];
-			removeBtn.Click += new EventHandler(removeClick);
-			
-			listView  = (ListView)ControlDictionary["listView"];
-			
-			previous = prev;
-			ControlDictionary["label"].Text = ResourceService.GetString(previous ? "Dialog.HighlightingEditor.Markers.Previous" : "Dialog.HighlightingEditor.Markers.Next");
-		}
-		
-		public override void StoreSettings()
-		{
-		}
-		
-		public override void LoadSettings()
-		{
-			MarkersNode node = (MarkersNode)parent;
-			listView.Items.Clear();
-			
-			foreach (MarkerNode rn in node.Nodes) {
-				ListViewItem lv = new ListViewItem(rn.What);
-				lv.Tag = rn;
-				listView.Items.Add(lv);
-			}
-		}
-		
-		void addClick(object sender, EventArgs e)
-		{
-			string result = MessageService.ShowInputBox("", "${res:Dialog.HighlightingEditor.Markers.EnterName}", "");
-			if (string.IsNullOrEmpty(result))
-				return;
-			
-			foreach (ListViewItem item in listView.Items) {
-				if (item.Text == result)
-					return;
-			}
-			
-			MarkerNode rsn = new MarkerNode(result, previous);
-			ListViewItem lv = new ListViewItem(result);
-			lv.Tag = rsn;
-			parent.Nodes.Add(rsn);
-			listView.Items.Add(lv);
-		}
-		
-		void removeClick(object sender, EventArgs e)
-		{
-			if (listView.SelectedItems.Count != 1) return;
-			
-			((TreeNode)listView.SelectedItems[0].Tag).Remove();
-			listView.SelectedItems[0].Remove();
-		}
-	}
-}

src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/NodeOptionPanel.cs

@@ -1,79 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Gui.XmlForms;
-
-namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
-{
-	abstract class NodeOptionPanel : BaseSharpDevelopUserControl
-	{
-		protected AbstractNode parent;
-		
-		public AbstractNode ParentNode {
-			get {
-				return parent;
-			}
-		}
-		
-		public NodeOptionPanel(AbstractNode Parent) {
-			parent = Parent;
-			
-			this.Dock = DockStyle.Fill;
-			this.ClientSize = new Size(320, 392);
-
-		}
-		
-		public virtual bool ValidateSettings()
-		{
-			return true;
-		}
-		
-		
-		
-		protected void ValidationMessage(string str)
-		{
-			MessageService.ShowWarning("${res:Dialog.HighlightingEditor.ValidationError}\n\n" + str);
-		}
-
-		protected static Font ParseFont(string font)
-		{
-			string[] descr = font.Split(new char[]{',', '='});
-			return new Font(descr[1], Single.Parse(descr[3]));
-		}
-			
-		protected static void PreviewUpdate(Label label, EditorHighlightColor color)
-		{
-			if (label == null) return;
-			
-			if (color == null) {
-				label.ForeColor = label.BackColor = Color.Transparent;
-				return;
-			}
-			if (color.NoColor) {
-				label.ForeColor = label.BackColor = Color.Transparent;
-				return;
-			}
-			
-			label.ForeColor = color.GetForeColor();
-			label.BackColor = color.GetBackColor();
-			
-			FontStyle fs = FontStyle.Regular;
-			if (color.Bold)   fs |= FontStyle.Bold;
-			if (color.Italic) fs |= FontStyle.Italic;
-			
-			label.Font = new Font(label.Font, fs);
-		}
-		
-		public abstract void StoreSettings();
-		public abstract void LoadSettings();
-	}
-}

src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/PropertiesNode.cs

@@ -1,129 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Collections;
-using System.Windows.Forms;
-using System.Xml;
-
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
-{
-	class PropertiesNode : AbstractNode
-	{
-		public Hashtable Properties = new Hashtable();
-		
-		public PropertiesNode(XmlElement el)
-		{
-			Text = ResNodeName("Properties");
-			panel = new PropertiesOptionPanel(this);
-
-			if (el == null) return;
-			
-			foreach (XmlElement el2 in el.ChildNodes) {
-				if (el2.Attributes["name"] == null || el2.Attributes["value"] == null) continue;
-				Properties.Add(el2.Attributes["name"].InnerText, el2.Attributes["value"].InnerText);
-			}
-			
-		}
-		
-		public override void UpdateNodeText()
-		{
-		}
-		
-		public override void WriteXml(XmlWriter writer)
-		{
-			writer.WriteStartElement("Properties");
-			foreach (DictionaryEntry de in Properties) {
-				writer.WriteStartElement("Property");
-				writer.WriteAttributeString("name", (string)de.Key);
-				writer.WriteAttributeString("value", (string)de.Value);
-				writer.WriteEndElement();
-			}
-			writer.WriteEndElement();
-		}
-	}
-	
-	class PropertiesOptionPanel : NodeOptionPanel
-	{
-		private System.Windows.Forms.Button addBtn;
-		private System.Windows.Forms.Button editBtn;
-		private System.Windows.Forms.Button removeBtn;
-		private System.Windows.Forms.ListView listView;
-		
-		public PropertiesOptionPanel(PropertiesNode parent) : base(parent)
-		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.Properties.xfrm"));
-			
-			addBtn = (Button)ControlDictionary["addBtn"];
-			addBtn.Click += new EventHandler(addClick);
-			editBtn = (Button)ControlDictionary["editBtn"];
-			editBtn.Click += new EventHandler(editClick);
-			removeBtn = (Button)ControlDictionary["removeBtn"];
-			removeBtn.Click += new EventHandler(removeClick);
-			
-			listView  = (ListView)ControlDictionary["listView"];
-		}
-		
-		public override void StoreSettings()
-		{
-			PropertiesNode node = (PropertiesNode)parent;
-			
-			node.Properties.Clear();
-			foreach (ListViewItem item in listView.Items) {
-				node.Properties.Add(item.Text, item.SubItems[1].Text);
-			}
-		}
-		
-		public override void LoadSettings()
-		{
-			PropertiesNode node = (PropertiesNode)parent;
-			listView.Items.Clear();
-			
-			foreach (DictionaryEntry de in node.Properties) {
-				ListViewItem lv = new ListViewItem(new string[] {(string)de.Key, (string)de.Value});
-				listView.Items.Add(lv);
-			}
-		}
-		
-		void addClick(object sender, EventArgs e)
-		{
-			string result = MessageService.ShowInputBox("", "${res:Dialog.HighlightingEditor.Properties.EnterName}", "");
-			if (string.IsNullOrEmpty(result))
-				return;
-			
-			foreach (ListViewItem item in listView.Items) {
-				if (item.Text == result)
-					return;
-			}
-			
-			listView.Items.Add(new ListViewItem(new string[] {result, ""}));
-		}
-		
-		void removeClick(object sender, EventArgs e)
-		{
-			if (listView.SelectedItems.Count != 1) return;
-			
-			listView.SelectedItems[0].Remove();
-		}
-		
-		void editClick(object sender, EventArgs e)
-		{
-			if (listView.SelectedItems.Count != 1) return;
-
-			string result = MessageService.ShowInputBox("${res:Dialog.HighlightingEditor.EnterText}",
-			                                            String.Format(ResourceService.GetString("Dialog.HighlightingEditor.Properties.EnterValue"), listView.SelectedItems[0].Text),
-			                                            "");
-			if (string.IsNullOrEmpty(result))
-				return;
-			
-			listView.SelectedItems[0].SubItems[1].Text = result;
-		}
-	}
-}

src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/RuleSetNode.cs

@@ -1,233 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Windows.Forms;
-using System.Xml;
-
-using ICSharpCode.Core;
-
-namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
-{
-	class RuleSetNode : AbstractNode
-	{
-		char escapeCharacter;
-		bool ignoreCase   = false;
-		bool isRoot       = false;
-		string name       = String.Empty;
-		string delimiters = String.Empty;
-		string reference  = String.Empty;
-		
-		KeywordListsNode keywordNode;
-		SpansNode spansNode;
-		MarkersNode prevMarkerNode;
-		MarkersNode nextMarkerNode;
-		
-		public RuleSetNode(XmlElement el)
-		{
-			Text = ResNodeName("RuleSet");
-			
-			panel = new RuleSetOptionPanel(this);
-			
-			if (el == null) return;
-			
-			if (el.Attributes["name"] != null) {
-				name = el.Attributes["name"].InnerText;
-				Text = name;
-				isRoot = false;
-			}
-			
-			if (name == "") {
-				Text = ResNodeName("RootRuleSet");
-				isRoot = true;
-			}
-			
-			if (el.Attributes["escapecharacter"] != null) {
-				escapeCharacter = el.Attributes["escapecharacter"].InnerText[0];
-			}
-			
-			if (el.Attributes["reference"] != null) {
-				reference = el.Attributes["reference"].InnerText;
-			}
-			
-			if (el.Attributes["ignorecase"] != null) {
-				ignoreCase  = Boolean.Parse(el.Attributes["ignorecase"].InnerText);
-			}
-			
-			if (el["Delimiters"] != null) {
-				delimiters = el["Delimiters"].InnerText;
-			}
-			
-			keywordNode = new KeywordListsNode(el);
-			spansNode   = new SpansNode(el);
-			prevMarkerNode = new MarkersNode(el, true);  // Previous
-			nextMarkerNode = new MarkersNode(el, false); // Next
-			Nodes.Add(keywordNode);
-			Nodes.Add(spansNode);
-			Nodes.Add(prevMarkerNode);
-			Nodes.Add(nextMarkerNode);
-			
-		}
-		
-		public RuleSetNode(string Name, string Delim, string Ref, char escChar, bool noCase)
-		{
-			name = Name;
-			Text = Name;
-			delimiters = Delim;
-			reference = Ref;
-			escapeCharacter = escChar;
-			ignoreCase = noCase;
-			
-			keywordNode = new KeywordListsNode(null);
-			spansNode   = new SpansNode(null);
-			prevMarkerNode = new MarkersNode(null, true);  // Previous
-			nextMarkerNode = new MarkersNode(null, false); // Next
-			Nodes.Add(keywordNode);
-			Nodes.Add(spansNode);
-			Nodes.Add(prevMarkerNode);
-			Nodes.Add(nextMarkerNode);
-			
-			panel = new RuleSetOptionPanel(this);
-		}
-		
-		public override void UpdateNodeText()
-		{
-			if (name != "" && !isRoot) {
-				Text = name;
-			}
-		}
-		
-		public override void WriteXml(XmlWriter writer)
-		{
-			writer.WriteStartElement("RuleSet");
-			if (!isRoot)
-				writer.WriteAttributeString("name", name);
-			if (reference != "") {
-				writer.WriteAttributeString("reference", reference);
-			} else {
-				writer.WriteAttributeString("ignorecase", ignoreCase.ToString().ToLowerInvariant());
-				if (escapeCharacter != '\0')
-					writer.WriteAttributeString("escapecharacter", escapeCharacter.ToString());
-				if (delimiters != "")
-					writer.WriteElementString("Delimiters", delimiters);
-				spansNode.WriteXml(writer);
-				prevMarkerNode.WriteXml(writer);
-				nextMarkerNode.WriteXml(writer);
-				keywordNode.WriteXml(writer);
-			}
-			writer.WriteEndElement();
-		}
-		
-		public string Delimiters {
-			get {
-				return delimiters;
-			}
-			set {
-				delimiters = value;
-			}
-		}
-		
-		public char EscapeCharacter {
-			get { return escapeCharacter; }
-			set { escapeCharacter = value; }
-		}
-		
-		public bool IgnoreCase {
-			get {
-				return ignoreCase;
-			}
-			set {
-				ignoreCase = value;
-			}
-		}
-		
-		public string Name {
-			get {
-				return name;
-			}
-			set {
-				name = value;
-			}
-		}
-		
-		public string Reference {
-			get {
-				return reference;
-			}
-			set {
-				reference = value;
-			}
-		}
-		
-		public bool IsRoot {
-			get {
-				return isRoot;
-			}
-		}
-		
-	}
-	
-	class RuleSetOptionPanel : NodeOptionPanel
-	{
-		private System.Windows.Forms.CheckBox igcaseBox;
-		private System.Windows.Forms.TextBox escCharTextBox;
-		private System.Windows.Forms.TextBox refBox;
-		private System.Windows.Forms.TextBox delimBox;
-		private System.Windows.Forms.TextBox nameBox;
-		
-		public RuleSetOptionPanel(RuleSetNode parent) : base(parent)
-		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.RuleSet.xfrm"));
-			
-			nameBox  = (TextBox)ControlDictionary["nameBox"];
-			refBox   = (TextBox)ControlDictionary["refBox"];
-			delimBox = (TextBox)ControlDictionary["delimBox"];
-			
-			igcaseBox = (CheckBox)ControlDictionary["igcaseBox"];
-			escCharTextBox  = (TextBox)ControlDictionary["escCharTextBox"];
-		}
-		
-		public override void StoreSettings()
-		{
-			RuleSetNode node = (RuleSetNode)parent;
-			if (!node.IsRoot) node.Name = nameBox.Text;
-			node.Reference = refBox.Text;
-			node.Delimiters = delimBox.Text;
-			node.EscapeCharacter = (escCharTextBox.TextLength == 0) ? '\0' : escCharTextBox.Text[0];
-			node.IgnoreCase = igcaseBox.Checked;
-		}
-		
-		public override void LoadSettings()
-		{
-			RuleSetNode node = (RuleSetNode)parent;
-			
-			nameBox.Text = node.Name;
-			
-			if (node.IsRoot) {
-				nameBox.Text = ResourceService.GetString("Dialog.HighlightingEditor.TreeView.RootRuleSet");
-				nameBox.Enabled = false;
-			}
-			
-			refBox.Text = node.Reference;
-			delimBox.Text = node.Delimiters;
-			
-			escCharTextBox.Text = (node.EscapeCharacter == '\0') ? "" : node.EscapeCharacter.ToString();
-			igcaseBox.Checked = node.IgnoreCase;
-		}
-		
-		public override bool ValidateSettings()
-		{
-			if (nameBox.Text == "") {
-				ValidationMessage(ResourceService.GetString("Dialog.HighlightingEditor.RuleSet.NameEmpty"));
-				return false;
-			}
-			
-			return true;
-		}
-
-	}
-}

src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/RuleSetsNode.cs

@@ -1,108 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Windows.Forms;
-using System.Xml;
-
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
-{
-	class RuleSetsNode : AbstractNode
-	{
-		public RuleSetsNode(XmlElement el)
-		{
-			Text = ResNodeName("RuleSets");
-			
-			panel = new RuleSetsOptionPanel(this);
-			if (el == null) return;
-
-			XmlNodeList nodes = el.GetElementsByTagName("RuleSet");
-			
-			foreach (XmlElement element in nodes) {
-				Nodes.Add(new RuleSetNode(element));
-			}
-			
-		}
-
-		public override void UpdateNodeText()
-		{
-		}
-		
-		public override void WriteXml(XmlWriter writer)
-		{
-			writer.WriteStartElement("RuleSets");
-			foreach (RuleSetNode node in Nodes) {
-				node.WriteXml(writer);
-			}
-			writer.WriteEndElement();
-		}
-	}
-	
-	class RuleSetsOptionPanel : NodeOptionPanel
-	{
-		private System.Windows.Forms.Button addBtn;
-		private System.Windows.Forms.ListView listView;
-		private System.Windows.Forms.Button removeBtn;
-		
-		public RuleSetsOptionPanel(RuleSetsNode parent) : base(parent)
-		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.RuleSets.xfrm"));
-			
-			addBtn = (Button)ControlDictionary["addBtn"];
-			addBtn.Click += new EventHandler(addClick);
-			removeBtn = (Button)ControlDictionary["removeBtn"];
-			removeBtn.Click += new EventHandler(removeClick);
-			
-			listView  = (ListView)ControlDictionary["listView"];
-		}
-		
-		public override void StoreSettings()
-		{
-		}
-		
-		public override void LoadSettings()
-		{
-			RuleSetsNode node = (RuleSetsNode)parent;
-			listView.Items.Clear();
-			
-			foreach (RuleSetNode rn in node.Nodes) {
-				if (rn.Name == "") continue;
-				ListViewItem lv = new ListViewItem(rn.Name);
-				lv.Tag = rn;
-				listView.Items.Add(lv);
-			}
-		}
-		
-		void addClick(object sender, EventArgs e)
-		{
-			string result = MessageService.ShowInputBox("", "${res:Dialog.HighlightingEditor.RuleSets.EnterName}", "");
-			if (string.IsNullOrEmpty(result)) 
-				return;
-			foreach (ListViewItem item in listView.Items) {
-				if (item.Text == result)
-					return;
-			}
-			
-			RuleSetNode rsn = new RuleSetNode(result, "&<>~!@%^*()-+=|\\#/{}[]:;\"' ,	.?", "", '\0', false);
-			ListViewItem lv = new ListViewItem(result);
-			lv.Tag = rsn;
-			parent.Nodes.Add(rsn);
-			listView.Items.Add(lv);
-		}
-		
-		void removeClick(object sender, EventArgs e)
-		{
-			if (listView.SelectedItems.Count != 1) return;
-			
-			((TreeNode)listView.SelectedItems[0].Tag).Remove();
-			listView.SelectedItems[0].Remove();
-		}
-	}
-}

src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/SchemeNode.cs

@@ -1,150 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Windows.Forms;
-using System.Xml;
-
-namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
-{
-	class SchemeNode : AbstractNode
-	{
-		string name;
-		string[] extensions;
-		string extends;
-		
-		public string Extends {
-			get {
-				return extends;
-			}
-			set {
-				extends = value;
-			}
-		}
-		
-		public string[] Extensions {
-			get {
-				return extensions;
-			}
-			set {
-				extensions = value;
-			}
-		}
-		
-		public string Name {
-			get {
-				return name;
-			}
-			set {
-				name = value;
-			}
-		}
-		
-		EnvironmentNode envNode;
-		DigitsNode digitsNode;
-		PropertiesNode propNode;
-		RuleSetsNode rulesetsNode;
-		
-		string content;
-		
-		public string Content {
-			get {
-				return content;
-			}
-		}
-		
-		public SchemeNode(XmlElement el, bool readChildren)
-		{
-			content = el.OuterXml;
-			
-			name = el.Attributes["name"].InnerText;
-			
-			if (el.Attributes["extensions"] != null) {
-				extensions = el.Attributes["extensions"].InnerText.Split('|');
-			}
-			
-			extends = el.GetAttribute("extends");
-			
-			UpdateNodeText();
-
-			panel = new SchemeOptionPanel(this);
-
-			if (!readChildren) return;
-			
-			envNode = new EnvironmentNode(el["Environment"]);
-			digitsNode = new DigitsNode(el["Digits"]);
-			propNode = new PropertiesNode(el["Properties"]);
-			rulesetsNode = new RuleSetsNode(el);
-			
-			Nodes.Add(envNode);
-			Nodes.Add(digitsNode);
-			Nodes.Add(propNode);
-			Nodes.Add(rulesetsNode);
-		}
-		
-		public override void UpdateNodeText()
-		{
-			Text = name;
-		}
-		
-		public override void WriteXml(XmlWriter writer)
-		{
-			writer.WriteComment("This file was autogenerated by the #Develop highlighting editor.");
-			writer.WriteStartElement("SyntaxDefinition");
-			
-			writer.WriteAttributeString("name", name);
-			writer.WriteAttributeString("extensions", String.Join(";", extensions));
-			if (extends != "") {
-				writer.WriteAttributeString("extends", extends);
-			}
-			
-			envNode.WriteXml(writer);
-			propNode.WriteXml(writer);
-			digitsNode.WriteXml(writer);
-			rulesetsNode.WriteXml(writer);
-			
-			writer.WriteEndElement();
-		}
-	}
-	
-	class SchemeOptionPanel : NodeOptionPanel
-	{
-		private System.Windows.Forms.TextBox extBox;
-		private System.Windows.Forms.TextBox nameBox;
-		
-		public SchemeOptionPanel(SchemeNode parent) : base(parent)
-		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.Scheme.xfrm"));
-			nameBox = (TextBox)ControlDictionary["nameBox"];
-			extBox  = (TextBox)ControlDictionary["extBox"];
-		}
-		
-		public override void StoreSettings()
-		{
-			SchemeNode node = (SchemeNode)parent;
-			node.Name = nameBox.Text;
-			node.Extensions = extBox.Text.Split(';');
-		}
-		
-		public override void LoadSettings()
-		{
-			SchemeNode node = (SchemeNode)parent;
-			nameBox.Text = node.Name;
-			extBox.Text = String.Join(";", node.Extensions);
-		}
-		
-		public override bool ValidateSettings()
-		{
-			if (nameBox.Text == "") {
-				ValidationMessage("${res:Dialog.HighlightingEditor.Scheme.NameEmpty}");
-				return false;
-			}
-			
-			return true;
-		}
-	}
-}

src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/SpanNode.cs

@@ -1,410 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Windows.Forms;
-using System.Xml;
-
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
-{
-	class SpanNode : AbstractNode
-	{
-		bool        stopEOL;
-		EditorHighlightColor color;
-		EditorHighlightColor beginColor = null;
-		EditorHighlightColor endColor = null;
-		string      begin = String.Empty;
-		string      end   = String.Empty;
-		string      name  = String.Empty;
-		string      rule  = String.Empty;
-		char        escapeCharacter;
-		bool        isBeginSingleWord;
-		bool        isEndSingleWord;
-		
-		public SpanNode(XmlElement el)
-		{
-			Text = ResNodeName("Span");
-			
-			panel = new SpanOptionPanel(this);
-
-			if (el == null) return;
-			
-			color   = new EditorHighlightColor(el);
-			
-			if (el.Attributes["rule"] != null) {
-				rule = el.Attributes["rule"].InnerText;
-			}
-			
-			if (el.Attributes["escapecharacter"] != null) {
-				escapeCharacter = el.Attributes["escapecharacter"].Value[0];
-			}
-			
-			name    = el.Attributes["name"].InnerText;
-			if (el.HasAttribute("stopateol")) {
-				stopEOL = Boolean.Parse(el.Attributes["stopateol"].InnerText);
-			} else {
-				stopEOL = true;
-			}
-			XmlElement beginElement = el["Begin"];
-			begin = beginElement.InnerText;
-			beginColor = new EditorHighlightColor(beginElement);
-			if (beginElement.HasAttribute("singleword")) {
-				isBeginSingleWord = Boolean.Parse(beginElement.GetAttribute("singleword"));
-			}
-			
-			XmlElement endElement = el["End"];
-			if (endElement != null) {
-				end  = endElement.InnerText;
-				endColor = new EditorHighlightColor(endElement);
-				if (endElement.HasAttribute("singleword")) {
-					isEndSingleWord = Boolean.Parse(endElement.GetAttribute("singleword"));
-				}
-			}
-			
-			UpdateNodeText();
-			
-		}
-		
-		public override void WriteXml(XmlWriter writer)
-		{
-			writer.WriteStartElement("Span");
-			writer.WriteAttributeString("name", name);
-			if (escapeCharacter != '\0')
-				writer.WriteAttributeString("escapecharacter", escapeCharacter.ToString());
-			if (rule != "")
-				writer.WriteAttributeString("rule", rule);
-			writer.WriteAttributeString("stopateol", stopEOL.ToString().ToLowerInvariant());
-			color.WriteXmlAttributes(writer);
-			
-			writer.WriteStartElement("Begin");
-			if (isBeginSingleWord) 
-				writer.WriteAttributeString("singleword", isBeginSingleWord.ToString().ToLowerInvariant());
-			if (beginColor != null && !beginColor.NoColor)
-				beginColor.WriteXmlAttributes(writer);
-			writer.WriteString(begin);
-			writer.WriteEndElement();
-			
-			if (end != String.Empty) {
-				writer.WriteStartElement("End");
-				if (isEndSingleWord) 
-					writer.WriteAttributeString("singleword", isEndSingleWord.ToString().ToLowerInvariant());
-				if (endColor != null && !endColor.NoColor)
-					endColor.WriteXmlAttributes(writer);
-				writer.WriteString(end);
-				writer.WriteEndElement();
-			}
-			
-			writer.WriteEndElement();
-		}
-		
-		public SpanNode(string Name)
-		{
-			name = Name;
-			color = new EditorHighlightColor();
-			UpdateNodeText();
-			
-			panel = new SpanOptionPanel(this);
-		}
-		
-		
-		public override void UpdateNodeText()
-		{
-			if (name != String.Empty) { Text = name; return; }
-			
-			if (end == String.Empty && stopEOL) {
-				Text = begin + " to EOL";
-			} else {
-				Text = begin + " to " + end;
-			}
-		}
-		
-		public bool StopEOL {
-			get {
-				return stopEOL;
-			}
-			set {
-				stopEOL = value;
-			}
-		}
-		
-		public EditorHighlightColor Color {
-			get {
-				return color;
-			}
-			set {
-				color = value;
-			}
-		}
-		
-		public EditorHighlightColor BeginColor {
-			get {
-				return beginColor;
-			}
-			set {
-				beginColor = value;
-			}
-		}
-		
-		public EditorHighlightColor EndColor {
-			get {
-				return endColor;
-			}
-			set {
-				endColor = value;
-			}
-		}
-		
-		public string Begin {
-			get {
-				return begin;
-			}
-			set {
-				begin = value;
-			}
-		}
-		
-		public bool IsBeginSingleWord {
-			get {
-				return isBeginSingleWord;
-			}
-			set {
-				isBeginSingleWord = value;
-			}
-		}
-		
-		public string End {
-			get {
-				return end;
-			}
-			set {
-				end = value;
-			}
-		}
-		
-		public bool IsEndSingleWord {
-			get {
-				return isEndSingleWord;
-			}
-			set {
-				isEndSingleWord = value;
-			}
-		}
-		
-		public string Name {
-			get {
-				return name;
-			}
-			set {
-				name = value;
-			}
-		}
-		
-		public string Rule {
-			get {
-				return rule;
-			}
-			set {
-				rule = value;
-			}
-		}
-		
-		public char EscapeCharacter {
-			get { return escapeCharacter; }
-			set { escapeCharacter = value; }
-		}
-	}
-	
-	class SpanOptionPanel : NodeOptionPanel {
-		
-		private System.Windows.Forms.TextBox nameBox;
-		private System.Windows.Forms.TextBox beginBox;
-		private System.Windows.Forms.TextBox endBox;
-		private System.Windows.Forms.ComboBox ruleBox;
-		private System.Windows.Forms.CheckBox useBegin;
-		private System.Windows.Forms.CheckBox useEnd;
-		private System.Windows.Forms.Button chgBegin;
-		private System.Windows.Forms.Button chgEnd;
-		private System.Windows.Forms.Button chgCont;
-		private System.Windows.Forms.Label samBegin;
-		private System.Windows.Forms.Label samEnd;
-		private System.Windows.Forms.Label samCont;
-		private System.Windows.Forms.TextBox escCharTextBox;
-		private System.Windows.Forms.CheckBox stopEolBox;
-		private System.Windows.Forms.CheckBox beginSingleWordCheckBox;
-		private System.Windows.Forms.CheckBox endSingleWordCheckBox;		
-		
-		public SpanOptionPanel(SpanNode parent) : base(parent)
-		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.Span.xfrm"));
-			nameBox  = (TextBox)ControlDictionary["nameBox"];
-			beginBox = (TextBox)ControlDictionary["beginBox"];
-			beginBox.TextChanged += BeginTextChanged;
-			endBox   = (TextBox)ControlDictionary["endBox"];
-			endBox.TextChanged += EndTextChanged;
-			ruleBox  = (ComboBox)ControlDictionary["ruleBox"];
-
-			useBegin = (CheckBox)ControlDictionary["useBegin"];
-			useEnd   = (CheckBox)ControlDictionary["useEnd"];
-
-			chgBegin = (Button)ControlDictionary["chgBegin"];
-			chgEnd   = (Button)ControlDictionary["chgEnd"];
-			chgCont  = (Button)ControlDictionary["chgCont"];
-			
-			samBegin = (Label)ControlDictionary["samBegin"];
-			samEnd   = (Label)ControlDictionary["samEnd"];
-			samCont  = (Label)ControlDictionary["samCont"];
-
-			stopEolBox = (CheckBox)ControlDictionary["stopEolBox"];
-			beginSingleWordCheckBox = (CheckBox)ControlDictionary["beginSingleWordCheckBox"];
-			endSingleWordCheckBox = (CheckBox)ControlDictionary["endSingleWordCheckBox"];
-			escCharTextBox   = (TextBox)ControlDictionary["escCharTextBox"];
-
-			this.chgBegin.Click += new EventHandler(chgBeginClick);
-			this.chgCont.Click  += new EventHandler(chgContClick);
-			this.chgEnd.Click   += new EventHandler(chgEndClick);
-			
-			this.useBegin.CheckedChanged += new EventHandler(CheckedChanged);
-			this.useEnd.CheckedChanged += new EventHandler(CheckedChanged);
-		}
-		
-		EditorHighlightColor color;
-		EditorHighlightColor beginColor;
-		EditorHighlightColor endColor;
-		
-		public override void StoreSettings()
-		{
-			SpanNode node = (SpanNode)parent;
-			
-			node.Name = nameBox.Text;
-			node.Begin = beginBox.Text;
-			node.End = endBox.Text;
-			node.StopEOL = stopEolBox.Checked;
-			node.IsBeginSingleWord = beginSingleWordCheckBox.Checked;
-			node.IsEndSingleWord = endSingleWordCheckBox.Checked;
-			node.EscapeCharacter = escCharTextBox.TextLength > 0 ? escCharTextBox.Text[0] : '\0';
-			node.Rule = ruleBox.Text;
-			
-			node.Color = color;
-			
-			if (useBegin.Checked) {
-				node.BeginColor = beginColor;
-			} else {
-				node.BeginColor = new EditorHighlightColor(true);
-			}
-			
-			if (useEnd.Checked) {
-				node.EndColor 	= endColor;
-			} else {
-				node.EndColor = new EditorHighlightColor(true);
-			}
-		}
-		
-		public override void LoadSettings()
-		{
-			SpanNode node = (SpanNode)parent;
-			
-			try {
-				ruleBox.Items.Clear();
-				foreach(RuleSetNode rn in node.Parent.Parent.Parent.Nodes) { // list rule sets
-					if (!rn.IsRoot) ruleBox.Items.Add(rn.Text);
-				}
-			} catch {}
-			
-			samBegin.Font = samEnd.Font = samCont.Font = ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.SharpDevelopTextEditorProperties.Instance.FontContainer.DefaultFont;
-
-			nameBox.Text = node.Name;
-			ruleBox.Text = node.Rule;
-			beginBox.Text = node.Begin;
-			endBox.Text = node.End;
-			stopEolBox.Checked = node.StopEOL;
-			beginSingleWordCheckBox.Checked = node.IsBeginSingleWord;
-			endSingleWordCheckBox.Checked = node.IsEndSingleWord;			
-			escCharTextBox.Text = (node.EscapeCharacter == '\0') ? "" : node.EscapeCharacter.ToString();
-			
-			color = node.Color;
-			beginColor = node.BeginColor;
-			endColor = node.EndColor;
-			
-			if (beginColor != null) {
-				if (!beginColor.NoColor) useBegin.Checked = true;
-			}
-			if (endColor != null) {
-				if (!endColor.NoColor) useEnd.Checked = true;
-			}
-			
-			PreviewUpdate(samBegin, beginColor);
-			PreviewUpdate(samEnd, endColor);
-			PreviewUpdate(samCont, color);
-			CheckedChanged(null, null);
-			BeginTextChanged(null, null);
-			EndTextChanged(null, null);
-		}
-		
-		public override bool ValidateSettings()
-		{
-			if (nameBox.Text == String.Empty) {
-				ValidationMessage(ResourceService.GetString("Dialog.HighlightingEditor.Span.NameEmpty"));
-				return false;
-			}
-			if (beginBox.Text == String.Empty) {
-				ValidationMessage(ResourceService.GetString("Dialog.HighlightingEditor.Span.BeginEmpty"));
-				return false;
-			}
-			
-			return true;
-		}
-		
-		void chgBeginClick(object sender, EventArgs e)
-		{
-			using (EditHighlightingColorDialog dlg = new EditHighlightingColorDialog(beginColor)) {
-				if (dlg.ShowDialog(this) == DialogResult.OK) {
-					beginColor = dlg.Color;
-					PreviewUpdate(samBegin, beginColor);
-				}
-			}
-		}
-		
-		void chgEndClick(object sender, EventArgs e)
-		{
-			using (EditHighlightingColorDialog dlg = new EditHighlightingColorDialog(endColor)) {
-				if (dlg.ShowDialog(this) == DialogResult.OK) {
-					endColor = dlg.Color;
-					PreviewUpdate(samEnd, endColor);
-				}
-			}
-		}
-		
-		void chgContClick(object sender, EventArgs e)
-		{
-			using (EditHighlightingColorDialog dlg = new EditHighlightingColorDialog(color)) {
-				if (dlg.ShowDialog(this) == DialogResult.OK) {
-					color = dlg.Color;
-					PreviewUpdate(samCont, color);
-				}
-			}
-		}
-		
-		void CheckedChanged(object sender, EventArgs e)
-		{
-			chgEnd.Enabled = useEnd.Checked;
-			chgBegin.Enabled = useBegin.Checked;
-		}
-		
-		void BeginTextChanged(object sender, EventArgs e)
-		{
-			beginSingleWordCheckBox.Enabled = beginBox.Text.Length > 0; 
-		}
-		
-		void EndTextChanged(object sender, EventArgs e)
-		{
-			endSingleWordCheckBox.Enabled = endBox.Text.Length > 0; 
-		}
-	}
-}

src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/SpansNode.cs

@@ -1,99 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Windows.Forms;
-using System.Xml;
-
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
-{
-	class SpansNode : AbstractNode
-	{
-		public SpansNode(XmlElement el)
-		{
-			Text = ResNodeName("Spans");
-			
-			panel = new SpansOptionPanel(this);
-			if (el == null) return;
-			
-			XmlNodeList nodes = el.GetElementsByTagName("Span");
-			foreach (XmlElement el2 in nodes) {
-				Nodes.Add(new SpanNode(el2));
-			}
-			
-		}
-
-		public override void UpdateNodeText()
-		{
-		}
-		
-		public override void WriteXml(XmlWriter writer)
-		{
-			foreach (SpanNode node in Nodes) {
-				node.WriteXml(writer);
-			}
-		}
-	}
-	
-	class SpansOptionPanel : NodeOptionPanel
-	{
-		private System.Windows.Forms.ListView listView;
-		private System.Windows.Forms.Button addBtn;
-		private System.Windows.Forms.Button removeBtn;
-		
-		public SpansOptionPanel(SpansNode parent) : base(parent)
-		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.Spans.xfrm"));
-			
-			addBtn = (Button)ControlDictionary["addBtn"];
-			addBtn.Click += new EventHandler(addClick);
-			removeBtn = (Button)ControlDictionary["removeBtn"];
-			removeBtn.Click += new EventHandler(removeClick);
-			
-			listView  = (ListView)ControlDictionary["listView"];
-		}
-		
-		public override void StoreSettings()
-		{
-		}
-		
-		public override void LoadSettings()
-		{
-			SpansNode node = (SpansNode)parent;
-			listView.Items.Clear();
-			
-			foreach (SpanNode rn in node.Nodes) {
-				ListViewItem lv = new ListViewItem(rn.Text);
-				lv.Tag = rn;
-				listView.Items.Add(lv);
-			}
-		}
-		
-		void addClick(object sender, EventArgs e)
-		{
-			string result = MessageService.ShowInputBox("", "${res:Dialog.HighlightingEditor.Spans.EnterName}", "");
-			if (string.IsNullOrEmpty(result))
-				return;
-			SpanNode rsn = new SpanNode(result);
-			ListViewItem lv = new ListViewItem(rsn.Text);
-			lv.Tag = rsn;
-			parent.Nodes.Add(rsn);
-			listView.Items.Add(lv);
-		}
-		
-		void removeClick(object sender, EventArgs e)
-		{
-			if (listView.SelectedItems.Count != 1) return;
-			
-			((TreeNode)listView.SelectedItems[0].Tag).Remove();
-			listView.SelectedItems[0].Remove();
-		}
-	}
-}

src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin

@@ -47,7 +47,7 @@
 	</Path>
 	
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">
-		<DialogPanel id    = "HtmlHelp2Options"
+		<OptionPanel id    = "HtmlHelp2Options"
 		             label = "${res:AddIns.HtmlHelp2.Environment}"
 		             class = "HtmlHelp2.Environment.HtmlHelp2OptionsPanel"/>
 	</Path>

src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs

@@ -7,13 +7,13 @@
 
 namespace HtmlHelp2.Environment
 {
+	using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 	using System;
 	using System.Windows.Forms;
 	using System.Xml.Serialization;
-	
 	using ICSharpCode.SharpDevelop.Gui;
 
-	public class HtmlHelp2OptionsPanel : AbstractOptionPanel
+	public class HtmlHelp2OptionsPanel : XmlFormsOptionPanel
 	{
 		ComboBox help2Collections;
 		CheckBox tocPictures;

src/AddIns/Misc/SourceAnalysis/SourceAnalysis.addin

@@ -21,7 +21,7 @@
 	</Path>
 	
 	<Path name = "/SharpDevelop/BackendBindings/ProjectOptions/AllManaged">
-		<DialogPanel id          = "SourceAnalysis"
+		<OptionPanel id          = "SourceAnalysis"
 		             label       = "Source Analysis"
 		             class       = "MattEverson.SourceAnalysis.AnalysisProjectOptionsPanel"/>
 	</Path>
@@ -34,7 +34,7 @@
 	
 	<!-- Options panel -->
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">
-		<DialogPanel id    = "SourceAnalysisOptionPanel"
+		<OptionPanel id    = "SourceAnalysisOptionPanel"
 		       	     label = "Source Analysis"
 		       	     class = "MattEverson.SourceAnalysis.AnalysisIdeOptionsPanel"/>
 	</Path>

src/AddIns/Misc/SourceAnalysis/Src/AnalysisIdeOptionsPanel.cs

@@ -5,11 +5,11 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Windows.Forms;
-using System.Diagnostics;
-
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
 
@@ -18,7 +18,7 @@ namespace MattEverson.SourceAnalysis
 	/// <summary>
 	/// Option panel to choose the StyleCop path from.
 	/// </summary>
-	public class AnalysisIdeOptionsPanel : AbstractOptionPanel
+	public class AnalysisIdeOptionsPanel : XmlFormsOptionPanel
 	{
 		public override void LoadPanelContents()
 		{

src/AddIns/Misc/SourceAnalysis/Src/AnalysisProjectOptionsPanel.cs

@@ -14,7 +14,7 @@ using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using ICSharpCode.SharpDevelop.Project;
 
 namespace MattEverson.SourceAnalysis {
-    public class AnalysisProjectOptionsPanel : AbstractProjectOptionPanel {
+    public class AnalysisProjectOptionsPanel : AbstractXmlFormsProjectOptionPanel {
 		
         public override void LoadPanelContents() {
             InitializeHelper();

src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin

@@ -173,7 +173,7 @@
 	</Path>
 	
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">
-		<DialogPanel id = "SubversionOptionsPanel"
+		<OptionPanel id = "SubversionOptionsPanel"
 		             label = "${res:AddIns.Subversion.Options.Title}"
 		             class = "ICSharpCode.Svn.Gui.SubversionOptionsPanel"/>
 	</Path>

src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SubversionOptionsPanel.cs

@@ -5,6 +5,7 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using System;
 using System.Windows.Forms;
 using ICSharpCode.SharpDevelop.Gui;
@@ -14,7 +15,7 @@ namespace ICSharpCode.Svn.Gui
 	/// <summary>
 	/// The Output Window options panel.
 	/// </summary>
-	public class SubversionOptionsPanel : AbstractOptionPanel
+	public class SubversionOptionsPanel : XmlFormsOptionPanel
 	{
 		public SubversionOptionsPanel()
 		{

src/AddIns/Misc/UnitTesting/Src/UnitTestingOptionsPanel.cs

@@ -5,16 +5,16 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
 
 namespace ICSharpCode.UnitTesting
 {
-	public class UnitTestingOptionsPanel : AbstractOptionPanel
+	public class UnitTestingOptionsPanel : XmlFormsOptionPanel
 	{
 		UnitTestingOptions options;
 		CheckBox labelsCheckBox;

src/AddIns/Misc/UnitTesting/UnitTesting.addin

@@ -164,7 +164,7 @@
 
 	<!-- Options panel -->
 	<Path name="/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">
-		<DialogPanel id="UnitTestingOptionsPanel"
+		<OptionPanel id="UnitTestingOptionsPanel"
 		       	     label="${res:ICSharpCode.NUnitPad.NUnitPadContent.PadName}"
 		       	     class="ICSharpCode.UnitTesting.UnitTestingOptionsPanel"/>
 	</Path>

src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj

@@ -216,4 +216,4 @@
   <PropertyGroup>
     <PreBuildEvent>..\src\Tools\UpdateAssemblyInfo\bin\Debug\UpdateAssemblyInfo.exe</PreBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

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

@@ -111,10 +111,19 @@
     <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ConvertToMSBuild35Dialog.Designer.cs">
       <DependentUpon>ConvertToMSBuild35Dialog.cs</DependentUpon>
     </Compile>
+    <Compile Include="Src\Gui\Dialogs\OptionPanels\XmlFormsOptionPanel.cs" />
     <Compile Include="Src\Gui\Dialogs\SolutionConfiguration\AddNewConfigurationDialog.cs" />
     <Compile Include="Src\Gui\Dialogs\SolutionConfiguration\AddNewConfigurationDialog.Designer.cs">
       <DependentUpon>AddNewConfigurationDialog.cs</DependentUpon>
     </Compile>
+    <Compile Include="Src\Gui\Dialogs\TabbedOptionsDialog.xaml.cs">
+      <DependentUpon>TabbedOptionsDialog.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Src\Gui\Dialogs\TreeViewOptionsDialog.xaml.cs">
+      <DependentUpon>TreeViewOptionsDialog.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Src\Gui\Pads\ProjectBrowser\TreeNodes\DirectoryNodeFactory.cs" />
     <Compile Include="Src\Gui\Pads\SearchResultPad\Nodes\SearchFolderNode.cs" />
     <Compile Include="Src\Gui\Pads\SearchResultPad\Nodes\SearchResultNode.cs" />
@@ -134,6 +143,7 @@
     <Compile Include="Src\Gui\Workbench\WpfWorkbench.cs" />
     <Compile Include="Src\Internal\ConditionEvaluators\WriteableProjectEvaluator.cs" />
     <Compile Include="Src\Internal\ConditionEvaluators\WriteableSolutionEvaluator.cs" />
+    <Compile Include="Src\Internal\Doozers\IOptionPanel.cs" />
     <Compile Include="Src\Internal\ExternalTool\ExternalTool.cs" />
     <Compile Include="Src\Internal\Templates\CodeTemplate.cs" />
     <Compile Include="Src\Internal\Templates\Project\ProjectTemplate.cs" />
@@ -160,10 +170,9 @@
     <Compile Include="Src\Services\File\RecentOpen.cs" />
     <Compile Include="Src\Services\Language\LanguageService.cs" />
     <Compile Include="Src\Internal\ConditionEvaluators\WindowActiveEvaluator.cs" />
-    <Compile Include="Src\Internal\Doozers\DefaultDialogPanelDescriptor.cs" />
-    <Compile Include="Src\Internal\Doozers\DialogPanelDoozer.cs" />
-    <Compile Include="Src\Internal\Doozers\IDialogPanel.cs" />
-    <Compile Include="Src\Internal\Doozers\IDialogPanelDescriptor.cs" />
+    <Compile Include="Src\Internal\Doozers\DefaultOptionPanelDescriptor.cs" />
+    <Compile Include="Src\Internal\Doozers\OptionPanelDoozer.cs" />
+    <Compile Include="Src\Internal\Doozers\IOptionPanelDescriptor.cs" />
     <Compile Include="Src\Services\File\FileService.cs" />
     <Compile Include="Src\Services\File\FileEventArgs.cs" />
     <Compile Include="Src\Services\ProjectService\CompileModifiedProjectsOnly.cs" />
@@ -243,9 +252,6 @@
     <Compile Include="Src\Gui\Dialogs\TabbedOptions.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Src\Gui\Dialogs\TreeViewOptions.cs">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="Src\Gui\Dialogs\WordCountDialog.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -255,9 +261,6 @@
     <Compile Include="Src\Gui\Dialogs\OptionPanels\ExternalToolPanel.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Src\Gui\Dialogs\OptionPanels\PropertyGridPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
     <Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\CodeGenerationPanel.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -286,19 +289,6 @@
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Src\Gui\Dialogs\ReferenceDialog\WebReference.cs" />
-    <Compile Include="Src\Gui\Dialogs\Wizard\AbstractWizardPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Gui\Dialogs\Wizard\CurrentPanelPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Gui\Dialogs\Wizard\IWizardPanel.cs" />
-    <Compile Include="Src\Gui\Dialogs\Wizard\StatusPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Gui\Dialogs\Wizard\WizardDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="Src\Gui\Pads\FileScout.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -476,9 +466,7 @@
     <EmbeddedResource Include="Resources\NewFileDialog.xfrm" />
     <EmbeddedResource Include="Resources\OutputWindowOptionsPanel.xfrm" />
     <EmbeddedResource Include="Resources\SelectStylePanel.xfrm" />
-    <EmbeddedResource Include="Resources\TabbedOptionsDialog.xfrm" />
     <EmbeddedResource Include="Resources\TaskListOptions.xfrm" />
-    <EmbeddedResource Include="Resources\TreeViewOptionsDialog.xfrm" />
     <EmbeddedResource Include="Resources\WordCountDialog.xfrm" />
     <EmbeddedResource Include="Resources\BehaviorTextEditorPanel.xfrm" />
     <EmbeddedResource Include="Resources\GeneralTextEditorPanel.xfrm" />
@@ -621,7 +609,7 @@
     <Compile Include="Src\Project\Solution\SolutionPreferences.cs" />
     <Compile Include="Src\Project\ConfigurationGuiHelper.cs" />
     <Compile Include="Src\Gui\ContentInterfaces\ICanBeDirty.cs" />
-    <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\AbstractProjectOptionPanel.cs">
+    <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\AbstractXmlFormsProjectOptionPanel.cs">
       <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\CreateKey.cs">
@@ -799,6 +787,8 @@
       <Private>True</Private>
     </ProjectReference>
     <Page Include="Src\Gui\App.xaml" />
+    <Page Include="Src\Gui\Dialogs\TabbedOptionsDialog.xaml" />
+    <Page Include="Src\Gui\Dialogs\TreeViewOptionsDialog.xaml" />
     <Page Include="Src\Gui\Workbench\WpfWorkbench.xaml" />
     <Page Include="Src\TextEditor\Gui\Dialogs\GotoDialog.xaml" />
   </ItemGroup>

src/Main/Base/Project/Resources/TabbedOptionsDialog.xfrm

@@ -1,39 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.Form>
-    <Name value="MyForm" />
-    <ShowInTaskbar value="False" />
-    <StartPosition value="CenterParent" />
-    <ClientSize value="{Width=344, Height=310}" />
-    <MinimizeBox value="False" />
-    <DockPadding value="" />
-    <AcceptButton value="okButton [System.Windows.Forms.Button], Text: ${res:Global.OKButtonText}" />
-    <CancelButton value="cancelButton [System.Windows.Forms.Button], Text: ${res:Global.CancelButtonText}" />
-    <MaximizeBox value="False" />
-    <Controls>
-      <System.Windows.Forms.Button>
-        <Name value="cancelButton" />
-        <Location value="{X=262,Y=280}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Global.CancelButtonText}" />
-        <Anchor value="Bottom, Right" />
-        <TabIndex value="2" />
-        <DialogResult value="Cancel" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.Button>
-        <Name value="okButton" />
-        <Location value="{X=182,Y=280}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Global.OKButtonText}" />
-        <Anchor value="Bottom, Right" />
-        <TabIndex value="1" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.TabControl>
-        <Name value="optionPanelTabControl" />
-        <Anchor value="Top, Bottom, Left, Right" />
-        <TabIndex value="0" />
-        <ClientSize value="{Width=330, Height=264}" />
-        <Location value="{X=8,Y=8}" />
-      </System.Windows.Forms.TabControl>
-    </Controls>
-  </System.Windows.Forms.Form>
-</Components>

src/Main/Base/Project/Resources/TreeViewOptionsDialog.xfrm

@@ -1,76 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.Form>
-    <Name value="MyForm" />
-    <ShowInTaskbar value="False" />
-    <FormBorderStyle value="FixedDialog" />
-    <StartPosition value="CenterParent" />
-    <ClientSize value="{Width=552, Height=414}" />
-    <MinimizeBox value="False" />
-    <DockPadding value="" />
-    <AcceptButton value="okButton [System.Windows.Forms.Button], Text: ${res:Global.OKButtonText}" />
-    <CancelButton value="cancelButton [System.Windows.Forms.Button], Text: ${res:Global.CancelButtonText}" />
-    <MaximizeBox value="False" />
-    <Controls>
-      <System.Windows.Forms.Button>
-        <Name value="cancelButton" />
-        <Location value="{X=470,Y=384}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Global.CancelButtonText}" />
-        <Anchor value="Bottom, Right" />
-        <TabIndex value="2" />
-        <DialogResult value="Cancel" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.Button>
-        <Name value="okButton" />
-        <Location value="{X=390,Y=384}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Global.OKButtonText}" />
-        <Anchor value="Bottom, Right" />
-        <TabIndex value="1" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.Panel>
-        <Name value="panel" />
-        <Location value="{X=8,Y=8}" />
-        <ClientSize value="{Width=536, Height=366}" />
-        <DockPadding value="" />
-        <Anchor value="Top, Bottom, Left, Right" />
-        <TabIndex value="0" />
-        <Controls>
-          <System.Windows.Forms.Panel>
-            <Name value="optionControlPanel" />
-            <Location value="{X=190,Y=32}" />
-            <ClientSize value="{Width=346, Height=334}" />
-            <DockPadding value="" />
-            <TabIndex value="3" />
-            <Dock value="Fill" />
-          </System.Windows.Forms.Panel>
-          <System.Windows.Forms.Panel>
-            <Name value="headerPanel" />
-            <Location value="{X=190,Y=0}" />
-            <ClientSize value="{Width=346, Height=32}" />
-            <DockPadding value="" />
-            <TabIndex value="2" />
-            <Dock value="Top" />
-          </System.Windows.Forms.Panel>
-          <System.Windows.Forms.Splitter>
-            <Name value="splitter" />
-            <TabIndex value="1" />
-            <ClientSize value="{Width=6, Height=366}" />
-            <Location value="{X=184,Y=0}" />
-          </System.Windows.Forms.Splitter>
-          <System.Windows.Forms.TreeView>
-            <Name value="optionsTreeView" />
-            <ImageIndex value="-1" />
-            <ShowPlusMinus value="False" />
-            <Dock value="Left" />
-            <TabIndex value="0" />
-            <Location value="{X=0,Y=0}" />
-            <SelectedImageIndex value="-1" />
-            <ClientSize value="{Width=180, Height=362}" />
-            <ShowLines value="False" />
-          </System.Windows.Forms.TreeView>
-        </Controls>
-      </System.Windows.Forms.Panel>
-    </Controls>
-  </System.Windows.Forms.Form>
-</Components>

src/Main/Base/Project/Src/Commands/ToolsCommands.cs

@@ -16,21 +16,25 @@ namespace ICSharpCode.SharpDevelop.Commands
 	{
 		public static void ShowTabbedOptions(string dialogTitle, AddInTreeNode node)
 		{
-			using (TabbedOptions o = new TabbedOptions(dialogTitle, node)) {
-				o.Width  = 450;
-				o.Height = 425;
-				o.FormBorderStyle = FormBorderStyle.FixedDialog;
-				o.ShowDialog(WorkbenchSingleton.MainWin32Window);
-			}
+			TabbedOptionsDialog o = new TabbedOptionsDialog(node.BuildChildItems<IOptionPanelDescriptor>(null));
+			o.Title = dialogTitle;
+			o.Owner = WorkbenchSingleton.MainWindow;
+			o.ShowDialog();
+		}
+		
+		public static void ShowTreeOptions(string dialogTitle, AddInTreeNode node)
+		{
+			TreeViewOptionsDialog o = new TreeViewOptionsDialog(node.BuildChildItems<IOptionPanelDescriptor>(null));
+			o.Title = dialogTitle;
+			o.Owner = WorkbenchSingleton.MainWindow;
+			o.ShowDialog();
 		}
 		
 		public override void Run()
 		{
-			using (TreeViewOptions optionsDialog = new TreeViewOptions(AddInTree.GetTreeNode("/SharpDevelop/Dialogs/OptionsDialog"))) {
-				optionsDialog.FormBorderStyle = FormBorderStyle.FixedDialog;
-				
-				optionsDialog.ShowDialog(WorkbenchSingleton.MainWin32Window);
-			}
+			ShowTreeOptions(
+				ResourceService.GetString("Dialog.Options.TreeViewOptions.DialogName"),
+				AddInTree.GetTreeNode("/SharpDevelop/Dialogs/OptionsDialog"));
 		}
 	}
 	

src/Main/Base/Project/Src/Gui/Components/StatusBar/SdStatusBar.cs

@@ -44,16 +44,20 @@ namespace ICSharpCode.SharpDevelop.Gui
 			modeStatusBarPanel.Width = 25;
 			statusProgressBarItem.Visibility = Visibility.Hidden;
 			statusProgressBarItem.Width = 100;
+			statusProgressBarItem.Content = statusProgressBar;
+			statusProgressBarItem.VerticalContentAlignment = VerticalAlignment.Stretch;
+			statusProgressBarItem.HorizontalContentAlignment = HorizontalAlignment.Stretch;
 			
 			DockPanel.SetDock(modeStatusBarPanel, Dock.Right);
 			DockPanel.SetDock(cursorStatusBarPanel, Dock.Right);
 			DockPanel.SetDock(statusProgressBarItem, Dock.Right);
 			DockPanel.SetDock(jobNamePanel, Dock.Right);
 			
-			Items.Add(jobNamePanel);
-			Items.Add(statusProgressBarItem);
-			Items.Add(cursorStatusBarPanel);
 			Items.Add(modeStatusBarPanel);
+			Items.Add(cursorStatusBarPanel);
+			Items.Add(statusProgressBarItem);
+			Items.Add(jobNamePanel);
+			
 			Items.Add(txtStatusBarPanel);
 		}
 		

src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs

@@ -6,233 +6,15 @@
 // </file>
 
 using System;
-using System.Windows.Forms;
-
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Gui.XmlForms;
-using ICSharpCode.SharpDevelop.Project;
 
 namespace ICSharpCode.SharpDevelop.Gui
 {
-	public class AbstractOptionPanel : BaseSharpDevelopUserControl, IDialogPanel
+	public abstract class AbstractOptionPanel : IOptionPanel
 	{
-		bool   wasActivated = false;
-		bool   isFinished   = true;
-		object customizationObject;
-		
-		public Control Control {
-			get {
-				return this;
-			}
-		}
-		
-		public bool WasActivated {
-			get {
-				return wasActivated;
-			}
-		}
-		
-		public object CustomizationObject {
-			get {
-				return customizationObject;
-			}
-			set {
-				customizationObject = value;
-				OnCustomizationObjectChanged();
-			}
-		}
-		
-		public virtual bool EnableFinish {
-			get {
-				return isFinished;
-			}
-			set {
-				if (isFinished != value) {
-					isFinished = value;
-					OnEnableFinishChanged();
-				}
-			}
-		}
-		
-		
-//		public AbstractOptionPanel(string fileName) : base(fileName)
-//		{
-//		}
-		
-		public AbstractOptionPanel()
-		{
-		}
-		
-		
-		public virtual bool ReceiveDialogMessage(DialogMessage message)
-		{
-			switch (message) {
-				case DialogMessage.Activated:
-					if (!wasActivated) {
-						LoadPanelContents();
-						wasActivated = true;
-					}
-					break;
-				case DialogMessage.OK:
-					if (wasActivated) {
-						return StorePanelContents();
-					}
-					break;
-			}
-			
-			return true;
-		}
-		
-		public virtual void LoadPanelContents()
-		{
-			
-		}
-		
-		public virtual bool StorePanelContents()
-		{
-			return true;
-		}
-		
-		protected string baseDirectory;
-		
-		protected void ConnectBrowseButton(string browseButton, string target, string fileFilter, TextBoxEditMode textBoxEditMode)
-		{
-			if (ControlDictionary[browseButton] == null) {
-				
-				MessageService.ShowError(browseButton + " not found!");
-				return;
-			}
-			if (ControlDictionary[target] == null) {
-				MessageService.ShowError(target + " not found!");
-				return;
-			}
-			ControlDictionary[browseButton].Click += new EventHandler(new BrowseButtonEvent(this, ControlDictionary[target], fileFilter, textBoxEditMode).Event);
-		}
-		
-		protected void ConnectBrowseFolder(string browseButton, string target, TextBoxEditMode textBoxEditMode)
-		{
-			ConnectBrowseFolder(browseButton, target, "${res:Dialog.ProjectOptions.SelectFolderTitle}", textBoxEditMode);
-		}
-		protected void ConnectBrowseFolder(string browseButton, string target, string description, TextBoxEditMode textBoxEditMode)
-		{
-			if (ControlDictionary[browseButton] == null) {
-				MessageService.ShowError(browseButton + " not found!");
-				return;
-			}
-			if (ControlDictionary[target] == null) {
-				MessageService.ShowError(target + " not found!");
-				return;
-			}
-			
-			ControlDictionary[browseButton].Click += new EventHandler(new BrowseFolderEvent(this, target, description, textBoxEditMode).Event);
-		}
-		protected void BrowseForFile(Control target, string filter, TextBoxEditMode textBoxEditMode)
-		{
-			if (target == null) {
-				throw new ArgumentNullException("target");
-			}
-			new BrowseButtonEvent(this, target, filter, textBoxEditMode).Event(null, null);
-		}
-		
-		sealed class BrowseButtonEvent
-		{
-			AbstractOptionPanel panel;
-			Control target;
-			string filter;
-			TextBoxEditMode textBoxEditMode;
-			
-			public BrowseButtonEvent(AbstractOptionPanel panel, Control target, string filter, TextBoxEditMode textBoxEditMode)
-			{
-				this.panel  = panel;
-				this.filter = filter;
-				this.target = target;
-				this.textBoxEditMode = textBoxEditMode;
-			}
-			
-			public void Event(object sender, EventArgs e)
-			{
-				using (OpenFileDialog fdiag = new OpenFileDialog()) {
-					fdiag.Filter      = StringParser.Parse(filter);
-					fdiag.Multiselect = false;
-					try {
-						string initialDir = System.IO.Path.GetDirectoryName(System.IO.Path.Combine(panel.baseDirectory, target.Text));
-						if (FileUtility.IsValidPath(initialDir) && System.IO.Directory.Exists(initialDir)) {
-							fdiag.InitialDirectory = initialDir;
-						}
-					} catch {}
-					if(fdiag.ShowDialog() == DialogResult.OK) {
-						string file = fdiag.FileName;
-						if (panel.baseDirectory != null) {
-							file = FileUtility.GetRelativePath(panel.baseDirectory, file);
-						}
-						if (textBoxEditMode == TextBoxEditMode.EditEvaluatedProperty) {
-							target.Text = file;
-						} else {
-							target.Text = MSBuildInternals.Escape(file);
-						}
-					}
-				}
-			}
-		}
-		
-		sealed class BrowseFolderEvent
-		{
-			AbstractOptionPanel panel;
-			string target;
-			string description;
-			TextBoxEditMode textBoxEditMode;
-			
-			internal BrowseFolderEvent(AbstractOptionPanel panel, string target, string description, TextBoxEditMode textBoxEditMode)
-			{
-				this.panel  = panel;
-				this.description = description;
-				this.target = target;
-				this.textBoxEditMode = textBoxEditMode;
-			}
-			
-			public void Event(object sender, EventArgs e)
-			{
-				string startLocation = panel.baseDirectory;
-				if (startLocation != null) {
-					string text = panel.ControlDictionary[target].Text;
-					if (textBoxEditMode == TextBoxEditMode.EditRawProperty)
-						text = MSBuildInternals.Unescape(text);
-					startLocation = FileUtility.GetAbsolutePath(startLocation, text);
-				}
-				
-				using (FolderBrowserDialog fdiag = FileService.CreateFolderBrowserDialog(description, startLocation)) {
-					if (fdiag.ShowDialog() == DialogResult.OK) {
-						string path = fdiag.SelectedPath;
-						if (panel.baseDirectory != null) {
-							path = FileUtility.GetRelativePath(panel.baseDirectory, path);
-						}
-						if (!path.EndsWith("\\") && !path.EndsWith("/"))
-							path += "\\";
-						if (textBoxEditMode == TextBoxEditMode.EditEvaluatedProperty) {
-							panel.ControlDictionary[target].Text = path;
-						} else {
-							panel.ControlDictionary[target].Text = MSBuildInternals.Escape(path);
-						}
-					}
-				}
-			}
-		}
-		
-		
-		protected virtual void OnEnableFinishChanged()
-		{
-			if (EnableFinishChanged != null) {
-				EnableFinishChanged(this, null);
-			}
-		}
-		protected virtual void OnCustomizationObjectChanged()
-		{
-			if (CustomizationObjectChanged != null) {
-				CustomizationObjectChanged(this, null);
-			}
-		}
+		public virtual object Owner { get; set; }
 		
-		public event EventHandler CustomizationObjectChanged;
-		public event EventHandler EnableFinishChanged;
+		public abstract object Content { get; }
+		public abstract void LoadOptions();
+		public abstract bool SaveOptions();
 	}
 }

src/Main/Base/Project/Src/Gui/Dialogs/NewFileDialog.cs

@@ -503,37 +503,27 @@ namespace ICSharpCode.SharpDevelop.Gui
 					}
 				}
 				
-				if (item.Template.WizardPath != null) {
-					Properties customizer = new Properties();
-					customizer.Set("Template", item.Template);
-					customizer.Set("Creator",  this);
-					WizardDialog wizard = new WizardDialog("File Wizard", customizer, item.Template.WizardPath);
-					if (wizard.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
-						DialogResult = DialogResult.OK;
-					}
-				} else {
-					foreach (FileDescriptionTemplate newfile in item.Template.FileDescriptionTemplates) {
-						if (!IsFilenameAvailable(StringParser.Parse(newfile.Name))) {
-							MessageService.ShowError("Filename " + StringParser.Parse(newfile.Name) + " is in use.\nChoose another one");
-							return;
-						}
-					}
-					ScriptRunner scriptRunner = new ScriptRunner();
-					
-					foreach (FileDescriptionTemplate newfile in item.Template.FileDescriptionTemplates) {
-						if (newfile.ContentData != null) {
-							SaveFile(newfile, null, newfile.ContentData);
-						} else {
-							SaveFile(newfile, scriptRunner.CompileScript(item.Template, newfile), null);
-						}
+				foreach (FileDescriptionTemplate newfile in item.Template.FileDescriptionTemplates) {
+					if (!IsFilenameAvailable(StringParser.Parse(newfile.Name))) {
+						MessageService.ShowError("Filename " + StringParser.Parse(newfile.Name) + " is in use.\nChoose another one");
+						return;
 					}
-					DialogResult = DialogResult.OK;
-					
-					// raise FileCreated event for the new files.
-					foreach (KeyValuePair<string, FileDescriptionTemplate> entry in createdFiles) {
-						FileService.FireFileCreated(entry.Key, false);
+				}
+				ScriptRunner scriptRunner = new ScriptRunner();
+				
+				foreach (FileDescriptionTemplate newfile in item.Template.FileDescriptionTemplates) {
+					if (newfile.ContentData != null) {
+						SaveFile(newfile, null, newfile.ContentData);
+					} else {
+						SaveFile(newfile, scriptRunner.CompileScript(item.Template, newfile), null);
 					}
 				}
+				DialogResult = DialogResult.OK;
+				
+				// raise FileCreated event for the new files.
+				foreach (KeyValuePair<string, FileDescriptionTemplate> entry in createdFiles) {
+					FileService.FireFileCreated(entry.Key, false);
+				}
 			}
 		}