diff --git a/src/AddIns/Debugger/Debugger.AddIn/Pads/CallStackPad.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/CallStackPad.cs index a6f830a87f..2186f77f1b 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Pads/CallStackPad.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/Pads/CallStackPad.cs @@ -143,7 +143,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads previousItemIsExternalMethod = false; return new CallStackItem() { Frame = frame, - ImageSource = new ResourceServiceImage("Icons.16x16.Method").ImageSource, + ImageSource = SD.ResourceService.GetImageSource("Icons.16x16.Method"), Name = GetFullName(frame) }; } else { diff --git a/src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPad.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPad.cs index f7726b9ad5..1d05435e7a 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPad.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPad.cs @@ -91,7 +91,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads try { node = new ValueNode(null, name, () => WindowsDebugger.Evaluate(name)); } catch (GetValueException e) { - node = new TreeNode(new ResourceServiceImage("Icons.16x16.Error"), name, e.Message, string.Empty, null); + node = new TreeNode(SD.ResourceService.GetImage("Icons.16x16.Error"), name, e.Message, string.Empty, null); } node.CanDelete = true; node.CanSetName = true; diff --git a/src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs b/src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs index 9ad24094ab..d868f77fbe 100644 --- a/src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs +++ b/src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs @@ -459,7 +459,7 @@ namespace ICSharpCode.SharpDevelop.Commands var item = new System.Windows.Controls.MenuItem(); item.Header = ICSharpCode.Core.Presentation.MenuService.ConvertLabel(StringParser.Parse(padContent.Title)); if (!string.IsNullOrEmpty(padContent.Icon)) { - item.Icon = PresentationResourceService.GetImage(padContent.Icon); + item.Icon = SD.ResourceService.GetImage(padContent.Icon).CreateImage(); } item.Command = new BringPadToFrontCommand(padContent); if (!string.IsNullOrEmpty(padContent.Shortcut)) { diff --git a/src/Main/Base/Project/Src/Gui/Components/StringListEditor.cs b/src/Main/Base/Project/Src/Gui/Components/StringListEditor.cs index 5fb184f012..a58647844b 100644 --- a/src/Main/Base/Project/Src/Gui/Components/StringListEditor.cs +++ b/src/Main/Base/Project/Src/Gui/Components/StringListEditor.cs @@ -279,15 +279,13 @@ namespace ICSharpCode.SharpDevelop.Gui void BrowseButtonClick(object sender, EventArgs e) { - using (FolderBrowserDialog fdiag = FileService.CreateFolderBrowserDialog("${res:Dialog.ProjectOptions.SelectFolderTitle}")) { - if (fdiag.ShowDialog() == DialogResult.OK) { - string path = fdiag.SelectedPath; - if (!path.EndsWith("\\") && !path.EndsWith("/")) - path += "\\"; - editTextBox.Text = path; - if (autoAddAfterBrowse) { - AddButtonClick(null, null); - } + string path = SD.FileService.BrowseForFolder("${res:Dialog.ProjectOptions.SelectFolderTitle}"); + if (path != null) { + if (!path.EndsWith("\\") && !path.EndsWith("/")) + path += "\\"; + editTextBox.Text = path; + if (autoAddAfterBrowse) { + AddButtonClick(null, null); } } } diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractBuildOptions.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractBuildOptions.cs index c779aeea81..8f7cf37f09 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractBuildOptions.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractBuildOptions.cs @@ -13,6 +13,7 @@ using StringPair = System.Collections.Generic.KeyValuePair; namespace ICSharpCode.SharpDevelop.Gui.OptionPanels { + [Obsolete("XML Forms are obsolete")] public class AbstractBuildOptions : AbstractXmlFormsProjectOptionPanel { protected void InitBaseIntermediateOutputPath() diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractXmlFormsProjectOptionPanel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractXmlFormsProjectOptionPanel.cs index 1aeffde50c..7142582e1a 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractXmlFormsProjectOptionPanel.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractXmlFormsProjectOptionPanel.cs @@ -10,6 +10,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels /// /// Base class for project option panels that are using the . /// + [Obsolete("XML Forms are obsolete")] public abstract class AbstractXmlFormsProjectOptionPanel : XmlFormsOptionPanel, ICanBeDirty { protected ConfigurationGuiHelper helper; diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/XmlFormsOptionPanel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/XmlFormsOptionPanel.cs index 2d4dd37d9f..8fcd130bb1 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/XmlFormsOptionPanel.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/XmlFormsOptionPanel.cs @@ -10,6 +10,7 @@ using ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.SharpDevelop.Gui.OptionPanels { + [Obsolete("XML Forms are obsolete")] public class XmlFormsOptionPanel : BaseSharpDevelopUserControl, IOptionPanel { public object Owner { get; set; } diff --git a/src/Main/Base/Project/Src/Gui/FileService.cs b/src/Main/Base/Project/Src/Gui/FileService.cs index 3a21279c20..cc9cb61398 100644 --- a/src/Main/Base/Project/Src/Gui/FileService.cs +++ b/src/Main/Base/Project/Src/Gui/FileService.cs @@ -144,7 +144,7 @@ namespace ICSharpCode.SharpDevelop /// behaviour of the FolderBrowserDialog is used where it selects the /// desktop folder. /// - [Obsolete("Use SD.FileService.BrowseForFolder instead.")] + [Obsolete("Use SD.FileService.BrowseForFolder() instead.")] public static FolderBrowserDialog CreateFolderBrowserDialog(string description, string selectedPath = null) { FolderBrowserDialog dialog = new FolderBrowserDialog(); diff --git a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs index 2951cce858..12a83a837b 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs @@ -152,7 +152,7 @@ namespace ICSharpCode.SharpDevelop.Gui void DisplayActiveCategory() { - WorkbenchSingleton.DebugAssertMainThread(); + SD.MainThread.VerifyAccess(); if (selectedCategory < 0) { textEditor.Text = ""; } else { diff --git a/src/Main/Base/Project/Src/Gui/Pads/ErrorList/ErrorListPad.cs b/src/Main/Base/Project/Src/Gui/Pads/ErrorList/ErrorListPad.cs index 083eb2c2e1..c3b88c0b1f 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/ErrorList/ErrorListPad.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/ErrorList/ErrorListPad.cs @@ -88,7 +88,7 @@ namespace ICSharpCode.SharpDevelop.Gui InternalShowResults(); }; - ProjectService.BuildFinished += ProjectServiceEndBuild; + SD.BuildService.BuildFinished += ProjectServiceEndBuild; ProjectService.SolutionLoaded += OnSolutionOpen; ProjectService.SolutionClosed += OnSolutionClosed; diff --git a/src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPadCommands.cs b/src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPadCommands.cs index 182111bbd2..36192531b4 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPadCommands.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPadCommands.cs @@ -2,15 +2,12 @@ // This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; -using System.Collections.Generic; using System.Windows.Forms; -using ICSharpCode.Core; namespace ICSharpCode.SharpDevelop.Gui { public class SelectScopeComboBox : ToolStripComboBox { - private ComboBox comboBox; private static string[] viewTypes = new string[] {"Solution", "Project", "All open documents", "Document", "Namespace", "Class/Module"}; public SelectScopeComboBox() diff --git a/src/Main/Base/Project/Src/Gui/XmlForms/BaseSharpDevelopForm.cs b/src/Main/Base/Project/Src/Gui/XmlForms/BaseSharpDevelopForm.cs index 15d90b0b63..04f3889ccb 100644 --- a/src/Main/Base/Project/Src/Gui/XmlForms/BaseSharpDevelopForm.cs +++ b/src/Main/Base/Project/Src/Gui/XmlForms/BaseSharpDevelopForm.cs @@ -7,6 +7,7 @@ using ICSharpCode.Core; namespace ICSharpCode.SharpDevelop.Gui.XmlForms { + [Obsolete("XML Forms are obsolete")] public abstract class BaseSharpDevelopForm : XmlForm { // public BaseSharpDevelopForm(string fileName) : base(fileName) diff --git a/src/Main/Base/Project/Src/Gui/XmlForms/BaseSharpDevelopUserControl.cs b/src/Main/Base/Project/Src/Gui/XmlForms/BaseSharpDevelopUserControl.cs index 6576af98db..4b71e88b6c 100644 --- a/src/Main/Base/Project/Src/Gui/XmlForms/BaseSharpDevelopUserControl.cs +++ b/src/Main/Base/Project/Src/Gui/XmlForms/BaseSharpDevelopUserControl.cs @@ -8,6 +8,7 @@ using ICSharpCode.Core; namespace ICSharpCode.SharpDevelop.Gui.XmlForms { + [Obsolete("XML Forms are obsolete")] public abstract class BaseSharpDevelopUserControl : XmlUserControl { // public BaseSharpDevelopUserControl(string fileName) : base(fileName) diff --git a/src/Main/Base/Project/Src/Gui/XmlForms/Lib/DefaultObjectCreator.cs b/src/Main/Base/Project/Src/Gui/XmlForms/Lib/DefaultObjectCreator.cs index 8746ebef0a..26f0819dff 100644 --- a/src/Main/Base/Project/Src/Gui/XmlForms/Lib/DefaultObjectCreator.cs +++ b/src/Main/Base/Project/Src/Gui/XmlForms/Lib/DefaultObjectCreator.cs @@ -12,6 +12,7 @@ namespace ICSharpCode.SharpDevelop.Gui.XmlForms /// /// Default implementation of the IObjectCreator interface. /// + [Obsolete("XML Forms are obsolete")] public class DefaultObjectCreator : IObjectCreator { public virtual Type GetType(string name) diff --git a/src/Main/Base/Project/Src/Gui/XmlForms/Lib/IObjectCreator.cs b/src/Main/Base/Project/Src/Gui/XmlForms/Lib/IObjectCreator.cs index 07f8a9d1ef..2b84824833 100644 --- a/src/Main/Base/Project/Src/Gui/XmlForms/Lib/IObjectCreator.cs +++ b/src/Main/Base/Project/Src/Gui/XmlForms/Lib/IObjectCreator.cs @@ -10,6 +10,7 @@ namespace ICSharpCode.SharpDevelop.Gui.XmlForms /// This interface is used to create the objects which are given by name in /// the xml definition. /// + [Obsolete("XML Forms are obsolete")] public interface IObjectCreator { /// diff --git a/src/Main/Base/Project/Src/Gui/XmlForms/Lib/IPropertyValueCreator.cs b/src/Main/Base/Project/Src/Gui/XmlForms/Lib/IPropertyValueCreator.cs index 03f1b673a7..45b200598e 100644 --- a/src/Main/Base/Project/Src/Gui/XmlForms/Lib/IPropertyValueCreator.cs +++ b/src/Main/Base/Project/Src/Gui/XmlForms/Lib/IPropertyValueCreator.cs @@ -5,6 +5,7 @@ using System; namespace ICSharpCode.SharpDevelop.Gui.XmlForms { + [Obsolete("XML Forms are obsolete")] public interface IPropertyValueCreator { bool CanCreateValueForType(Type propertyType); diff --git a/src/Main/Base/Project/Src/Gui/XmlForms/Lib/IStringValueFilter.cs b/src/Main/Base/Project/Src/Gui/XmlForms/Lib/IStringValueFilter.cs index 0e53bc4e2b..a6c5b3df2e 100644 --- a/src/Main/Base/Project/Src/Gui/XmlForms/Lib/IStringValueFilter.cs +++ b/src/Main/Base/Project/Src/Gui/XmlForms/Lib/IStringValueFilter.cs @@ -9,6 +9,7 @@ namespace ICSharpCode.SharpDevelop.Gui.XmlForms /// This interface is used to filter the values defined in the xml files. /// It could be used for the localization of control texts. /// + [Obsolete("XML Forms are obsolete")] public interface IStringValueFilter { /// diff --git a/src/Main/Base/Project/Src/Gui/XmlForms/Lib/StringWrapper.cs b/src/Main/Base/Project/Src/Gui/XmlForms/Lib/StringWrapper.cs index 8b0374859e..70da54df87 100644 --- a/src/Main/Base/Project/Src/Gui/XmlForms/Lib/StringWrapper.cs +++ b/src/Main/Base/Project/Src/Gui/XmlForms/Lib/StringWrapper.cs @@ -10,6 +10,7 @@ namespace ICSharpCode.SharpDevelop.Gui.XmlForms /// through the 'Text' property. This class was written for setting the /// items in a combobox inside a xml definition. /// + [Obsolete("XML Forms are obsolete")] public class StringWrapper { string text; diff --git a/src/Main/Base/Project/Src/Gui/XmlForms/Lib/XmlForm.cs b/src/Main/Base/Project/Src/Gui/XmlForms/Lib/XmlForm.cs index 4fc04d5dd4..24ddea3421 100644 --- a/src/Main/Base/Project/Src/Gui/XmlForms/Lib/XmlForm.cs +++ b/src/Main/Base/Project/Src/Gui/XmlForms/Lib/XmlForm.cs @@ -13,6 +13,7 @@ namespace ICSharpCode.SharpDevelop.Gui.XmlForms /// /// The basic xml generated form. /// + [Obsolete("XML Forms are obsolete")] public abstract class XmlForm : Form { protected XmlLoader xmlLoader; diff --git a/src/Main/Base/Project/Src/Gui/XmlForms/Lib/XmlLoader.cs b/src/Main/Base/Project/Src/Gui/XmlForms/Lib/XmlLoader.cs index 4c8b71a76e..03d2b1e37f 100644 --- a/src/Main/Base/Project/Src/Gui/XmlForms/Lib/XmlLoader.cs +++ b/src/Main/Base/Project/Src/Gui/XmlForms/Lib/XmlLoader.cs @@ -17,6 +17,7 @@ namespace ICSharpCode.SharpDevelop.Gui.XmlForms /// /// This class is able to generate a GUI definition out of a XML file. /// + [Obsolete("XML Forms are obsolete")] public class XmlLoader { Dictionary controlDictionary = new Dictionary(); diff --git a/src/Main/Base/Project/Src/Gui/XmlForms/Lib/XmlUserControl.cs b/src/Main/Base/Project/Src/Gui/XmlForms/Lib/XmlUserControl.cs index 744baa3aed..5ef9e75168 100644 --- a/src/Main/Base/Project/Src/Gui/XmlForms/Lib/XmlUserControl.cs +++ b/src/Main/Base/Project/Src/Gui/XmlForms/Lib/XmlUserControl.cs @@ -12,6 +12,7 @@ namespace ICSharpCode.SharpDevelop.Gui.XmlForms /// /// The basic xml generated user control. /// + [Obsolete("XML Forms are obsolete")] public abstract class XmlUserControl : UserControl { protected XmlLoader xmlLoader; diff --git a/src/Main/Base/Project/Src/Gui/XmlForms/SharpDevelopPropertyValueCreator.cs b/src/Main/Base/Project/Src/Gui/XmlForms/SharpDevelopPropertyValueCreator.cs index 480e767f56..6e3240c5b2 100644 --- a/src/Main/Base/Project/Src/Gui/XmlForms/SharpDevelopPropertyValueCreator.cs +++ b/src/Main/Base/Project/Src/Gui/XmlForms/SharpDevelopPropertyValueCreator.cs @@ -7,6 +7,7 @@ using ICSharpCode.SharpDevelop.WinForms; namespace ICSharpCode.SharpDevelop.Gui.XmlForms { + [Obsolete("XML Forms are obsolete")] public class SharpDevelopPropertyValueCreator : IPropertyValueCreator { public bool CanCreateValueForType(Type propertyType) diff --git a/src/Main/Base/Project/Src/Gui/XmlForms/SharpDevelopStringValueFilter.cs b/src/Main/Base/Project/Src/Gui/XmlForms/SharpDevelopStringValueFilter.cs index 91346e5768..60bdedb4c0 100644 --- a/src/Main/Base/Project/Src/Gui/XmlForms/SharpDevelopStringValueFilter.cs +++ b/src/Main/Base/Project/Src/Gui/XmlForms/SharpDevelopStringValueFilter.cs @@ -10,6 +10,7 @@ namespace ICSharpCode.SharpDevelop.Gui.XmlForms /// This interface is used to filter the values defined in the xml files. /// It could be used for the localization of control texts. /// + [Obsolete("XML Forms are obsolete")] public class SharpDevelopStringValueFilter : IStringValueFilter { /// diff --git a/src/Main/Base/Project/Src/Project/BeforeBuildCustomToolRunner.cs b/src/Main/Base/Project/Src/Project/BeforeBuildCustomToolRunner.cs index e867d8ff72..dbda8d16a7 100644 --- a/src/Main/Base/Project/Src/Project/BeforeBuildCustomToolRunner.cs +++ b/src/Main/Base/Project/Src/Project/BeforeBuildCustomToolRunner.cs @@ -11,7 +11,7 @@ namespace ICSharpCode.SharpDevelop.Project { public BeforeBuildCustomToolRunner() { - ProjectService.BuildStarted += ProjectBuildStarted; + SD.BuildService.BuildStarted += ProjectBuildStarted; } void ProjectBuildStarted(object sender, BuildEventArgs e) diff --git a/src/Main/Base/Project/Src/Project/ConfigurationGuiBinding.cs b/src/Main/Base/Project/Src/Project/ConfigurationGuiBinding.cs index 8798213402..179616c62d 100644 --- a/src/Main/Base/Project/Src/Project/ConfigurationGuiBinding.cs +++ b/src/Main/Base/Project/Src/Project/ConfigurationGuiBinding.cs @@ -7,6 +7,7 @@ using System.Windows.Forms; namespace ICSharpCode.SharpDevelop.Project { + [Obsolete("XML Forms are obsolete")] public abstract class ConfigurationGuiBinding { ConfigurationGuiHelper helper; diff --git a/src/Main/Base/Project/Src/Services/ClassBrowserIcons/ClassBrowserIconService.cs b/src/Main/Base/Project/Src/Services/ClassBrowserIcons/ClassBrowserIconService.cs index 256fa6eb20..81b083e358 100644 --- a/src/Main/Base/Project/Src/Services/ClassBrowserIcons/ClassBrowserIconService.cs +++ b/src/Main/Base/Project/Src/Services/ClassBrowserIcons/ClassBrowserIconService.cs @@ -68,15 +68,15 @@ namespace ICSharpCode.SharpDevelop } #endregion - public static readonly IImage Namespace = GetIImage(CompletionImage.NamespaceImage); - public static readonly IImage Solution = new ResourceServiceImage("Icons.16x16.CombineIcon"); - public static readonly IImage Const = GetIImage(CompletionImage.Literal.BaseImage); - public static readonly IImage GotoArrow = new ResourceServiceImage("Icons.16x16.SelectionArrow"); + public static IImage Namespace { get { return GetIImage(CompletionImage.NamespaceImage); } } + public static IImage Solution { get { return SD.ResourceService.GetImage("Icons.16x16.CombineIcon"); } } + public static IImage Const { get { return GetIImage(CompletionImage.Literal.BaseImage); } } + public static IImage GotoArrow { get { return SD.ResourceService.GetImage("Icons.16x16.SelectionArrow"); } } - public static readonly IImage LocalVariable = new ResourceServiceImage("Icons.16x16.Local"); - public static readonly IImage Parameter = new ResourceServiceImage("Icons.16x16.Parameter"); - public static readonly IImage Keyword = new ResourceServiceImage("Icons.16x16.Keyword"); - public static readonly IImage Operator = new ResourceServiceImage("Icons.16x16.Operator"); - public static readonly IImage CodeTemplate = new ResourceServiceImage("Icons.16x16.TextFileIcon"); + public static IImage LocalVariable { get { return SD.ResourceService.GetImage("Icons.16x16.Local"); } } + public static IImage Parameter { get { return SD.ResourceService.GetImage("Icons.16x16.Parameter"); } } + public static IImage Keyword { get { return SD.ResourceService.GetImage("Icons.16x16.Keyword"); } } + public static IImage Operator { get { return SD.ResourceService.GetImage("Icons.16x16.Operator"); } } + public static IImage CodeTemplate { get { return SD.ResourceService.GetImage("Icons.16x16.TextFileIcon"); } } } } diff --git a/src/Main/Base/Project/Src/Services/Debugger/BreakpointBookmark.cs b/src/Main/Base/Project/Src/Services/Debugger/BreakpointBookmark.cs index e54489ac4a..d695b2e4dc 100644 --- a/src/Main/Base/Project/Src/Services/Debugger/BreakpointBookmark.cs +++ b/src/Main/Base/Project/Src/Services/Debugger/BreakpointBookmark.cs @@ -11,7 +11,6 @@ using ICSharpCode.NRefactory; using ICSharpCode.NRefactory.Editor; using ICSharpCode.SharpDevelop.Editor.Bookmarks; using ICSharpCode.SharpDevelop.Editor; -using ICSharpCode.SharpDevelop.Editor.Bookmarks; namespace ICSharpCode.SharpDevelop.Debugging { @@ -120,11 +119,21 @@ namespace ICSharpCode.SharpDevelop.Debugging public static readonly Color DefaultBackground = Color.FromRgb(180, 38, 38); public static readonly Color DefaultForeground = Colors.White; - public static readonly IImage BreakpointImage = new ResourceServiceImage("Bookmarks.Breakpoint"); - public static readonly IImage BreakpointConditionalImage = new ResourceServiceImage("Bookmarks.BreakpointConditional"); - public static readonly IImage DisabledBreakpointImage = new ResourceServiceImage("Bookmarks.DisabledBreakpoint"); - public static readonly IImage UnhealthyBreakpointImage = new ResourceServiceImage("Bookmarks.UnhealthyBreakpoint"); - public static readonly IImage UnhealthyBreakpointConditionalImage = new ResourceServiceImage("Bookmarks.UnhealthyBreakpointConditional"); + public static IImage BreakpointImage { + get { return SD.ResourceService.GetImage("Bookmarks.Breakpoint"); } + } + public static IImage BreakpointConditionalImage { + get { return SD.ResourceService.GetImage("Bookmarks.BreakpointConditional"); } + } + public static IImage DisabledBreakpointImage { + get { return SD.ResourceService.GetImage("Bookmarks.DisabledBreakpoint"); } + } + public static IImage UnhealthyBreakpointImage { + get { return SD.ResourceService.GetImage("Bookmarks.UnhealthyBreakpoint"); } + } + public static IImage UnhealthyBreakpointConditionalImage { + get { return SD.ResourceService.GetImage("Bookmarks.UnhealthyBreakpointConditional"); } + } public override IImage Image { get { diff --git a/src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs b/src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs index aa6416fdb9..bac5313ffb 100644 --- a/src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs +++ b/src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs @@ -709,12 +709,12 @@ namespace ICSharpCode.SharpDevelop.Project /// public static event SolutionFolderEventHandler SolutionFolderRemoved; - [Obsolete] + [Obsolete("Use SD.BuildService.BuildStarted instead")] public static event EventHandler BuildStarted { add { SD.BuildService.BuildStarted += value; } - remove { SD.BuildService.BuildFinished -= value; } + remove { SD.BuildService.BuildStarted -= value; } } - [Obsolete] + [Obsolete("Use SD.BuildService.BuildFinished instead")] public static event EventHandler BuildFinished { add { SD.BuildService.BuildFinished += value; } remove { SD.BuildService.BuildFinished -= value; }