diff --git a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin
index 751c30b013..c7143dbb8d 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin
+++ b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin
@@ -132,12 +132,10 @@
+
-
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
index 4723927cfa..5073f705f1 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
+++ b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
@@ -103,8 +103,8 @@
DebuggingOptionsPanel.xaml
Code
-
- DebuggingSymbolsPanelXaml.xaml
+
+ DebuggingSymbolsPanel.xaml
Code
@@ -114,12 +114,6 @@
-
- UserControl
-
-
- DebuggingSymbolsPanel.cs
-
UserControl
@@ -152,9 +146,6 @@
DebuggeeExceptionForm.cs
-
- DebuggingSymbolsPanel.cs
-
Properties\GlobalAssemblyInfo.cs
@@ -221,7 +212,7 @@
-
+
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.Designer.cs b/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.Designer.cs
deleted file mode 100644
index b744619b25..0000000000
--- a/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.Designer.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the BSD license (for details please see \src\AddIns\Debugger\Debugger.AddIn\license.txt)
-
-namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
-{
- partial class DebuggingSymbolsPanel
- {
- ///
- /// Designer variable used to keep track of non-visual components.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Disposes resources used by the form.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing) {
- if (components != null) {
- components.Dispose();
- }
- }
- base.Dispose(disposing);
- }
-
- ///
- /// This method is required for Windows Forms designer support.
- /// Do not change the method contents inside the source code editor. The Forms designer might
- /// not be able to load this method if it was changed manually.
- ///
- private void InitializeComponent()
- {
- this.pathList = new ICSharpCode.SharpDevelop.Gui.StringListEditor();
- this.SuspendLayout();
- //
- // pathList
- //
- this.pathList.AddButtonText = "${res:Global.AddButtonText}";
- this.pathList.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.pathList.AutoAddAfterBrowse = true;
- this.pathList.BrowseForDirectory = true;
- this.pathList.ListCaption = "${res:Dialog.Options.IDEOptions.Debugging.Symbols.ListCaption}";
- this.pathList.Location = new System.Drawing.Point(0, 0);
- this.pathList.ManualOrder = true;
- this.pathList.Margin = new System.Windows.Forms.Padding(2);
- this.pathList.Name = "pathList";
- this.pathList.Size = new System.Drawing.Size(233, 192);
- this.pathList.TabIndex = 4;
- this.pathList.TitleText = "${res:Global.Folder}:";
- //
- // DebuggingSymbolsPanel
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Controls.Add(this.pathList);
- this.Margin = new System.Windows.Forms.Padding(2);
- this.Name = "DebuggingSymbolsPanel";
- this.Size = new System.Drawing.Size(235, 194);
- this.ResumeLayout(false);
- }
- private ICSharpCode.SharpDevelop.Gui.StringListEditor pathList;
- }
-}
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.cs b/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.cs
deleted file mode 100644
index 1a3e3eee63..0000000000
--- a/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the BSD license (for details please see \src\AddIns\Debugger\Debugger.AddIn\license.txt)
-
-using System.Windows.Forms;
-using Debugger;
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Services;
-using ICSharpCode.SharpDevelop.WinForms;
-
-namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
-{
- ///
- /// Options panel which allows user to specify where to look
- /// for symbols (pdb files) and source codes
- ///
- public partial class DebuggingSymbolsPanel : XmlFormsOptionPanel
- {
- public DebuggingSymbolsPanel()
- {
- InitializeComponent();
- foreach (Control ctl in Controls.GetRecursive()) {
- ctl.Text = StringParser.Parse(ctl.Text);
- }
- }
-
- public override void LoadPanelContents()
- {
- pathList.LoadList(DebuggingOptions.Instance.SymbolsSearchPaths);
- }
-
- public override bool StorePanelContents()
- {
- DebuggingOptions.Instance.SymbolsSearchPaths = pathList.GetList();
- DebuggingOptions.ResetStatus(
- proc => {
- proc.Debugger.ReloadModuleSymbols();
- proc.Debugger.ResetJustMyCodeStatus();
- });
- return true;
- }
- }
-}
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.resx b/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.resx
deleted file mode 100644
index 1af7de150c..0000000000
--- a/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanelXaml.xaml b/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.xaml
similarity index 87%
rename from src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanelXaml.xaml
rename to src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.xaml
index b2d16d557c..b2b9894ce9 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanelXaml.xaml
+++ b/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.xaml
@@ -1,4 +1,4 @@
-
/// Interaction logic for DebuggingSymbolsPanelXaml.xaml
///
- public partial class DebuggingSymbolsPanelXaml : OptionPanel
+ public partial class DebuggingSymbolsPanel : OptionPanel
{
- public DebuggingSymbolsPanelXaml()
+ public DebuggingSymbolsPanel()
{
InitializeComponent();
this.DataContext = this;